From nobody Mon Oct 21 01:32: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 4XWyVL5rKkz5b2Gg; Mon, 21 Oct 2024 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWyVL5J9qz58yZ; Mon, 21 Oct 2024 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729474362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y3ZVUy9B9u595oznzXg8TfOrsft1pWbE2/5k1iz2bRk=; b=HROKQKdvrk1gSHqXh/IpN3YetdDhkuetIXesh5rvnZTT6QAJwKYGwMV4a5vO9bgk+0Q+fk coTnowcT0BpYxrChSMw2edsnP9OUHi2MT+bQZydjLNYovY75rlalr5/WNfryYpKmqKfvKP TDW0x/ZanR2iQeIhvpLcsgjRCIM/21o0wkDW3vKRxCD/OtsnaBVyfBDaC18mqpGbBXiqmD TLLucH9DYSlalJI1hVPw8r8zWUyVcfiLY1Bq1T9Mz64UeH+QeUlL21bPv9ttikC/e4KIUA qs8cWvijwpBXYsiNDE+PmwdZFjDYZ2kR7VxDlw7TuxaKjBcrwgQ1pY7Ke17u8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729474362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y3ZVUy9B9u595oznzXg8TfOrsft1pWbE2/5k1iz2bRk=; b=CXDnpXfuXV8Vd3bDANZuUkAaWcFwAIXlCP1sqQfvJYmMf3MZbovnm4sueLv/BVp9CSemoA 9fO09z3tOI6dMozB6WuAexQWksu/Nhh5dCT8iyncWsqkTCmJYAMZ9nHy5ID+uh0wzYoJYW beppcuMnvLjSO+nq1slMiyLYZbCBca08VxFlt8ZfAscIuZr8lfj2AuvNJTYArbP1vT7hoR efS8R+Ed4W92xguwbEQFn+H1jh99K6y11ymzY6tCVQCQXvYm6kY4Dh1K0xCYpkGupwZ6b/ NxDgdRRU5umH1ZRlMLdEYLHUAqhNlWlMAVcMcZ5fgqe2yZUCtt0SIzbPkg9nPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729474362; a=rsa-sha256; cv=none; b=UN8KztPmbx2dERbw+ruKK1J5U/ycgtX7BvcOzCndy+jZZIKp+mjJI6vabCxtIlkPhjtlXy ex2+kJclwXQk/CMb7+4O22BSsujz/7XNROUjL7Sq4DCsIiepc6OSgj4WhIk0qAFI1S0svc VY15saTWjfiJOlD1IKhMFU6LRQu2Xl4hwdKmCuIHRBCFoBpAAIce+Rl7S9vb8ESrV0qGVz zs7fSCn4wsMt2bl6UxNSdR4g3uaOjS0wYN2q7NAfXVv0NpfxgBSAHBRvM8KJcsuT1q07f/ r4bRwltUlUCpx7ieqRqIVvwU9+y1A+tMLLcYR3g6SLdipvkk4RuiskPtYhWUvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XWyVL4vTjz1PwR; Mon, 21 Oct 2024 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L1WgFB036863; Mon, 21 Oct 2024 01:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L1Wg0u036860; Mon, 21 Oct 2024 01:32:42 GMT (envelope-from git) Date: Mon, 21 Oct 2024 01:32:42 GMT Message-Id: <202410210132.49L1Wg0u036860@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: 44f736c385f6 - main - mk: add PLAIN_TESTS_PORCH support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 44f736c385f6b8d451feb9d6543220e8e61abcaa Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=44f736c385f6b8d451feb9d6543220e8e61abcaa commit 44f736c385f6b8d451feb9d6543220e8e61abcaa Author: Kyle Evans AuthorDate: 2024-10-21 01:31:50 +0000 Commit: Kyle Evans CommitDate: 2024-10-21 01:32:31 +0000 mk: add PLAIN_TESTS_PORCH support porch(1), available via sysutils/porch, is an expect(1)-like program that uses lua instead of tcl for scripting. Imminent use will be to execute tests of tty canonicalization to ensure we don't regress some of the corner cases we've fixed, but tests for other interactive programs are being considered as well. PLAIN_TESTS_PORCH is being introduced primarily to get the metadata right without writing it out for every single test; required_programs ensures that we skip the tests if the port is not installed. Reviewed by: 0mp (previous version), ngie Differential Revision: https://reviews.freebsd.org/D46805 --- share/mk/bsd.README | 3 +++ share/mk/plain.test.mk | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 70d489a9f59f..e957e9cdd48b 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -701,6 +701,9 @@ PLAIN_TESTS_C The names of the plain (legacy) programs to build. PLAIN_TESTS_CXX The names of the plain (legacy) test programs to build. +PLAIN_TESTS_PORCH The names of the plain (legacy) porch(1)-based + test programs to build. + PLAIN_TESTS_SH The names of the plain (legacy) test programs to build. TAP_PERL_INTERPRETER diff --git a/share/mk/plain.test.mk b/share/mk/plain.test.mk index cc6d268185da..485a78f8ea47 100644 --- a/share/mk/plain.test.mk +++ b/share/mk/plain.test.mk @@ -43,6 +43,17 @@ TEST_INTERFACE.${_T}= plain .endfor .endif +.if !empty(PLAIN_TESTS_PORCH) +SCRIPTS+= ${PLAIN_TESTS_PORCH:S/$/.orch/} +_TESTS+= ${PLAIN_TESTS_PORCH} +.for _T in ${PLAIN_TESTS_PORCH} +SCRIPTSDIR_${_T}.orch= ${TESTSDIR} + +TEST_INTERFACE.${_T}= plain +TEST_METADATA.${_T}+= required_programs="porch" +.endfor +.endif + .if !empty(PLAIN_TESTS_SH) SCRIPTS+= ${PLAIN_TESTS_SH} _TESTS+= ${PLAIN_TESTS_SH} From nobody Mon Oct 21 01:32: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 4XWyVN05pMz5b22g; Mon, 21 Oct 2024 01:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWyVM5t2Hz58mX; Mon, 21 Oct 2024 01:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729474363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rAzYI0c98aEDIBAod/3Tnd630R+7wnu0+TwRUzjhOcc=; b=HkESGCJyAg9xbsaT38blncSYdSS1T3hxe+Xlr5EZQi8OrEBTo8n4pDDgAvxRazL4n8g5jx 9srOwoU4mY1kwYdffeEzeZbJpMmsEcz1efVJNIl19ctfrtYYgzi2u4yc7o9vcrrEcGmXYg INFYzo150sOOqnEQk1TXO2NG86J0kPPMufAuKjyrArCQK8PDlpAAkNzsUe5YehzbqAqZA0 eZd55xH6dcygDAYpP8qK+7KfN9z3e+Y3l/vmbl+wda2pgSQaFi7aUWpzYM9a8A8Fztk6J0 nMjyjAMgi3SBo/r3ef9ll97lzSW2CNVSWSRF5/JDM7axRl7LwLKlt0APDO4NWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729474363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rAzYI0c98aEDIBAod/3Tnd630R+7wnu0+TwRUzjhOcc=; b=l9ere6cru9ZD/0w+S5TmcTWkz7l6KWpri2LXPfMjl4GCYg3U8qbEA6/Lln2tcd3tYJDL1b 4mQOT00yV+xyxNUH3dZcH+MTj7V9wckZ3ST9eaNDEUT2AFpiG1AYghsdGJEUPYHYGAOr38 fJ5o6etR53bKNHpyKONN+JOLVP4fvsqeEs7epTYm7YrWwKcuhEcuUFQ5FfbMUL6gjtRndQ pKdD2MgF/59gFAMJ8biInmmRFKq25/IIDMUR5872HhqRagj/xpBA7IIja+g/B8ktn6kNlO 8cGkcoz26zUnk+PbNhTOM0G3YPzFabi+LEDZDGDCFLgMhSkisQUsV3FQa/tqSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729474363; a=rsa-sha256; cv=none; b=LwwMFszw4/iC1ZHkfUUCInblpUTXTmx/g0Xh3rgkhW2gwAJl0lWJ9K5I5zHc7dnHOO/Htr xrcbO5zHLB3/wr+bx4PH4Z34RAKlqjk3XInDlfKdlCC7CYm9gRmz/19zYL5wAUxQNnp4Es EP1w8bR/PJIetO16vyhS6BhZOJcZYO8Qe+DNVChLT+ruFhl6G42jNRr5mGSaOwFMGswqXP uHpa0kVYcsKk1SZQVZjfes6/p7+JfINBIK6QCNfWRrfGHIEBicvBEHc7LsmFrN59uWdb5l oQtR1iTBCE6NS55gF2SU1LE5G5wKmgT7yrmyKOIkpP5VJOfbs6UpTgGDXZYzHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XWyVM5Tckz1PkD; Mon, 21 Oct 2024 01:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L1Wh2Z036916; Mon, 21 Oct 2024 01:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L1WhXk036913; Mon, 21 Oct 2024 01:32:43 GMT (envelope-from git) Date: Mon, 21 Oct 2024 01:32:43 GMT Message-Id: <202410210132.49L1WhXk036913@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: 096c39fae4ad - main - tests: kern: add some porch(1)-based tty 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 096c39fae4ad5135a317925d8749b7d83f65ebf8 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=096c39fae4ad5135a317925d8749b7d83f65ebf8 commit 096c39fae4ad5135a317925d8749b7d83f65ebf8 Author: Kyle Evans AuthorDate: 2024-10-21 01:31:59 +0000 Commit: Kyle Evans CommitDate: 2024-10-21 01:32:31 +0000 tests: kern: add some porch(1)-based tty tests If sysutils/porch is installed, we'll do some basic testing of tty behavior. The existing tests primarily cover ICANON-related processing and corner cases that have been fixed somewhat recently, but I anticipate growing this out a bit in due time. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D46806 --- etc/mtree/BSD.tests.dist | 2 + tests/sys/kern/Makefile | 1 + tests/sys/kern/tty/Makefile | 12 +++ tests/sys/kern/tty/fionread.c | 21 +++++ tests/sys/kern/tty/readsz.c | 130 +++++++++++++++++++++++++++++ tests/sys/kern/tty/test_canon.orch | 102 ++++++++++++++++++++++ tests/sys/kern/tty/test_canon_fullbuf.orch | 23 +++++ tests/sys/kern/tty/test_ncanon.orch | 39 +++++++++ tests/sys/kern/tty/test_recanon.orch | 90 ++++++++++++++++++++ 9 files changed, 420 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 8cac5e8d55e2..221e4b32a89b 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -854,6 +854,8 @@ .. pipe .. + tty + .. .. kqueue libkqueue diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index e334ff64da41..933c1c9aa10e 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -127,6 +127,7 @@ WARNS?= 3 TESTS_SUBDIRS+= acct TESTS_SUBDIRS+= execve TESTS_SUBDIRS+= pipe +TESTS_SUBDIRS+= tty .include diff --git a/tests/sys/kern/tty/Makefile b/tests/sys/kern/tty/Makefile new file mode 100644 index 000000000000..c362793a8b64 --- /dev/null +++ b/tests/sys/kern/tty/Makefile @@ -0,0 +1,12 @@ +TESTSDIR= ${TESTSBASE}/sys/kern/tty +BINDIR= ${TESTSDIR} + +PLAIN_TESTS_PORCH+= test_canon +PLAIN_TESTS_PORCH+= test_canon_fullbuf +PLAIN_TESTS_PORCH+= test_ncanon +PLAIN_TESTS_PORCH+= test_recanon + +PROGS+= fionread +PROGS+= readsz + +.include diff --git a/tests/sys/kern/tty/fionread.c b/tests/sys/kern/tty/fionread.c new file mode 100644 index 000000000000..929d613f883b --- /dev/null +++ b/tests/sys/kern/tty/fionread.c @@ -0,0 +1,21 @@ +/*- + * Copyright (c) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include + +int +main(void) +{ + int nb; + + assert(ioctl(STDIN_FILENO, FIONREAD, &nb) == 0); + printf("%d", nb); + return (0); +} diff --git a/tests/sys/kern/tty/readsz.c b/tests/sys/kern/tty/readsz.c new file mode 100644 index 000000000000..95dafa02472f --- /dev/null +++ b/tests/sys/kern/tty/readsz.c @@ -0,0 +1,130 @@ +/*- + * Copyright (c) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +static void +usage(void) +{ + + fprintf(stderr, "usage: %s [-b bytes | -c lines | -e] [-s buffer-size]\n", + getprogname()); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + char *buf; + const char *errstr; + size_t bufsz = 0, reps; + ssize_t ret; + enum { MODE_BYTES, MODE_COUNT, MODE_EOF } mode; + int ch; + + /* + * -b specifies number of bytes. + * -c specifies number of read() calls. + * -e specifies eof (default) + * -s to pass a buffer size + * + * Reading N lines is the same as -c with a high buffer size. + */ + mode = MODE_EOF; + while ((ch = getopt(argc, argv, "b:c:es:")) != -1) { + switch (ch) { + case 'b': + mode = MODE_BYTES; + reps = strtonum(optarg, 0, SSIZE_MAX, &errstr); + if (errstr != NULL) + errx(1, "strtonum: %s", errstr); + break; + case 'c': + mode = MODE_COUNT; + reps = strtonum(optarg, 1, SSIZE_MAX, &errstr); + if (errstr != NULL) + errx(1, "strtonum: %s", errstr); + break; + case 'e': + mode = MODE_EOF; + break; + case 's': + bufsz = strtonum(optarg, 1, SSIZE_MAX, &errstr); + if (errstr != NULL) + errx(1, "strtonum: %s", errstr); + break; + default: + usage(); + } + } + + if (bufsz == 0) { + if (mode == MODE_BYTES) + bufsz = reps; + else + bufsz = LINE_MAX; + } + + buf = malloc(bufsz); + if (buf == NULL) + err(1, "malloc"); + + for (;;) { + size_t readsz; + + /* + * Be careful not to over-read if we're in byte-mode. In every other + * mode, we'll read as much as we can. + */ + if (mode == MODE_BYTES) + readsz = MIN(bufsz, reps); + else + readsz = bufsz; + + ret = read(STDIN_FILENO, buf, readsz); + if (ret == -1 && errno == EINTR) + continue; + if (ret == -1) + err(1, "read"); + if (ret == 0) { + if (mode == MODE_EOF) + return (0); + errx(1, "premature EOF"); + } + + /* Write out what we've got */ + write(STDOUT_FILENO, buf, ret); + + /* + * Bail out if we've hit our metric (byte mode / count mode). + */ + switch (mode) { + case MODE_BYTES: + reps -= ret; + if (reps == 0) + return (0); + break; + case MODE_COUNT: + reps--; + if (reps == 0) + return (0); + break; + default: + break; + } + } + + return (0); +} diff --git a/tests/sys/kern/tty/test_canon.orch b/tests/sys/kern/tty/test_canon.orch new file mode 100644 index 000000000000..28018edfdcd6 --- /dev/null +++ b/tests/sys/kern/tty/test_canon.orch @@ -0,0 +1,102 @@ +#!/usr/bin/env -S porch -f +-- +-- Copyright (c) 2024 Kyle Evans +-- +-- SPDX-License-Identifier: BSD-2-Clause +-- + +timeout(3) + +spawn("cat") + +write "Complete\r" +match "Complete\r" + +write "Basic\rIncomplete" +match "Basic\r" + +-- We shouldn't see any of the "Incomplete" line +fail(function() +end) + +match "Incomp" { + callback = function() + exit(1) + end +} + +fail(nil) + +-- Pushing a ^D along should force a flush of the tty, cat(1) will write the +-- result without a trailing newline. +write " line^D" +match "Incomplete line$" + +-- Erase! +write "Dog^H^D" +match "Do$" + +-- More erase! +write "Cat Dog^W^D" +match "Cat $" + +write "^D" +eof() + +local function fionread_test(str, expected) + spawn("fionread") + + write(str) + match(expected) +end + +-- Incomplete line +fionread_test("Hello", "0") +-- VEOF does not count +fionread_test("Hello^D", "5") +-- VEOF still doesn't count, even if the next line is an extra VEOF later +fionread_test("Hello^D^D", "5") +-- read(2) definitely won't return the second incomplete line +fionread_test("Hello^Dther", "5") +-- read(2) also won't return a second complete line at once +fionread_test("Hello^Dthere^D", "5") +-- Finally, send a VEOF to terminate a blank line and signal EOF in read(2) +fionread_test("^D", "0") + +-- \r will instead show up in the input stream to the application, so we must +-- make sure those are counted where VEOF generally wouldn't be. +fionread_test("Hello\r", "6") +fionread_test("Hello\rther", "6") +fionread_test("Hello\rthere\r", "6") +fionread_test("\r", "1") + +local function readsz_test(str, arg, expected) + spawn("readsz", table.unpack(arg)) + + if type(str) == "table" then + assert(#str == 2) + write(str[1]) + release() + + -- Give readsz a chance to consume the partial input before we send more + -- along. + sleep(1) + write(str[2]) + else + write(str) + end + match(expected) +end + +readsz_test("partial", {"-b", 3}, "^$") +readsz_test("partial^D", {"-b", 3}, "^par$") +readsz_test("partial^D", {"-c", 1}, "^partial$") +for s = 1, #"partial" do + readsz_test("partial^D", {"-s", s}, "^partial$") +end +-- Send part of the line, release and pause, then finish it. +readsz_test({"par", "tial^D"}, {"-c", 1}, "^partial$") +-- line is incomplete, so we'll just see the "partial" even if we want two +readsz_test("partial^Dline", {"-c", 2}, "^partial$") +readsz_test("partial^Dline^D", {"-c", 1}, "^partial$") +readsz_test("partial^Dline^D", {"-c", 2}, "^partialline$") diff --git a/tests/sys/kern/tty/test_canon_fullbuf.orch b/tests/sys/kern/tty/test_canon_fullbuf.orch new file mode 100644 index 000000000000..1833703e4f45 --- /dev/null +++ b/tests/sys/kern/tty/test_canon_fullbuf.orch @@ -0,0 +1,23 @@ +#!/usr/bin/env -S porch -f +-- +-- Copyright (c) 2024 Kyle Evans +-- +-- SPDX-License-Identifier: BSD-2-Clause +-- + +timeout(3) + +local TTYINQ_DATASIZE = 128 +local scream = string.rep("A", TTYINQ_DATASIZE - 1) + +spawn("cat") + +-- Fill up a whole block with screaming + VEOF +write(scream .. "^D") +match(scream .. "$") + +scream = scream .. "A" + +-- Now fill up the next block, but spill the VEOF over to a third block. +write(scream .. "^D") +match(scream .. "$") diff --git a/tests/sys/kern/tty/test_ncanon.orch b/tests/sys/kern/tty/test_ncanon.orch new file mode 100644 index 000000000000..14a34d82fa9a --- /dev/null +++ b/tests/sys/kern/tty/test_ncanon.orch @@ -0,0 +1,39 @@ +#!/usr/bin/env -S porch -f +-- +-- Copyright (c) 2024 Kyle Evans +-- +-- SPDX-License-Identifier: BSD-2-Clause +-- + +timeout(3) + +local function spawn_one(...) + spawn(...) + + stty("lflag", 0, tty.lflag.ICANON) +end + +-- We can send one byte... +spawn_one("readsz", "-c", 1) +write "H" +match "^H$" + +-- or many. +spawn_one("readsz", "-c", 1) +write "Hello" +match "^Hello$" + +-- VEOF is a normal character here, passed through as-is. +spawn_one("readsz", "-c", 1) +write "Hello^D" +match "^Hello\x04$" +spawn_one("readsz", "-c", 1) +write "^D" +match "^\x04$" + +-- Confirm that FIONREAD agrees that VEOF will be returned, even if it was sent +-- while the tty was still in canonical mode. +spawn("fionread") +write "^D" +stty("lflag", 0, tty.lflag.ICANON) +match "^1$" diff --git a/tests/sys/kern/tty/test_recanon.orch b/tests/sys/kern/tty/test_recanon.orch new file mode 100644 index 000000000000..e3943495ca5d --- /dev/null +++ b/tests/sys/kern/tty/test_recanon.orch @@ -0,0 +1,90 @@ +#!/usr/bin/env -S porch -f +-- +-- Copyright (c) 2024 Kyle Evans +-- +-- SPDX-License-Identifier: BSD-2-Clause +-- + +timeout(3) + +local TTYINQ_DATASIZE = 128 +local scream = string.rep("A", TTYINQ_DATASIZE - 1) + +local function ncanon() + stty("lflag", nil, tty.lflag.ICANON) +end + +local function canon() + stty("lflag", tty.lflag.ICANON) +end + +spawn("readsz", "-e") +ncanon() + +-- Fill up a whole block with screaming + VEOF; when it gets recanonicalized, +-- the next line should be pointing to the beginning of the next block. +write(scream .. "^D") + +canon() +match(scream .. "$") + +-- The same as above, but spilling VEOF over to the next block. +spawn("readsz", "-e") +ncanon() + +write(scream .. "A^D") + +canon() +match(scream .. "A$") + +-- We'll do it again, except with one character spilled over to the next block +-- before we recanonicalize. We should then have the scream, followed by a +-- partial line containing the spill over. +spawn("cat") +ncanon() + +write(scream .. "^DZ") + +canon() +match(scream .. "$") + +-- Sending "B^D" should give us "ZB" to make sure that we didn't lose anything +-- at the beginning of the next block. + +write("B^D") +match("^ZB$") + +-- Next we'll VEOF at the beginning. +spawn("readsz", "-e") +ncanon() + +write("^D") +match("^$") + +-- Finally, we'll trigger recanonicalization with an empty buffer. This one is +-- just about avoiding a panic. +spawn("true") + +ncanon() +canon() +release() +eof() + +spawn("readsz", "-c", "1") + +write("Test^Dfoo") +ncanon() + +match("^Test\x04foo$") + +-- Finally, swap VEOF out with ^F; before recent changes, we would remain +-- canonicalized at Test^D and the kernel would block on it unless a short +-- buffer was used since VEOF would not appear within the canonicalized bit. +spawn("readsz", "-c", 1) + +write("Test^DLine^F") +stty("cc", { + VEOF = "^F" +}) + +match("^Test\x04Line$") From nobody Mon Oct 21 02:47: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 4XX08h3GLZz5b5hW; Mon, 21 Oct 2024 02:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX08h2lQFz422C; Mon, 21 Oct 2024 02:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729478852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX6M6p26yEsApvLkjkzNx0Qw87rnr1lim5mIoF+v6M4=; b=yChKD23vR55ew2pClxkEydrO349yqYsoY0BnNdDlWw05TdupN3Z9c3QsjNuqvjxFiuXxCR TEmxDWhnIu9/qFk3vEFNNNsb5itP2+Z1CaFV5lYz4dmZLMQScJaf6ZvG3rYKD3zbrnIIt+ p2ES9wQaBsPDtJsFW+Okw5aQEkOyYTauoBVlnMd4SyxMMG6xam1dVc6yEjdxCtf6R55KUG EVx0nBHebEMiX/SDrSlrNxxhn8wguM3hzAPs1nnqgN9QP7T0tahXSjElLr3vKxCqcHPMxM y2IRbZDKX6+TMmoFRfw8M0FKOzmMA6IWY54Nwb9PN2/8UJ2rQxNQXQq/1H7y+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729478852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX6M6p26yEsApvLkjkzNx0Qw87rnr1lim5mIoF+v6M4=; b=TYN0+HuQ1UKzrGPbDowynu0QwiumJde1JzATw43rr1E5pRiM6xcbJLLRHQaEpw0sYGMUQ7 F3ohrpsm1doDfKfQIAbNnXSD1V4wWbrH8oDgKV7QaYVEaYvcZ4uvJjWKE7laKcTZNkgg2u GO8+caMgtaxLIfWqdO2dryj4HlS8YGiHiTrjR/cFsioRmfA8v2mcvaXWBaI6aMRD4wtMz1 T0cgSCcvpNO2TOtnaOVNbqzzj0kFzhkQs4dAXo/QwOfk9X/Op/WMrWaIwjgDknFUcoLNBK otaNL2M4lpWnGPcYqbFqjO8mRVzYPeZ3Fqp/OBH239xva9yj3c2kdUUrjqYhCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729478852; a=rsa-sha256; cv=none; b=EBYKlsTDJYAXbns3XkudDvUr4yPr557Nneo8PxJN2kDo2Tg23H5d2qHRP4tY19eORtNRIC wqUNDHBKOlc6cc/o1EG8mZhApD+5RzrxzV4utUIsXyVzKYNELa2VPv/qYgVXm7hC3UV6zv YCLP6QSwtD3ypatpxRWTYvJJVLXPgskXoUH4CE6sit53jPaGb0b6XCYNvhj5Jjq4sw7MIx Cl0sEod0IZLVKsBe4DQt4s9qSPZjP7hISQ0jDg4M6Eqfktelh9CJC8Sw5C7r+wF83FFMnP QewH6fRxa9NwEZ3T/5lDRybSE5hozaZXK01pTSNH6zI40f0jkOPEQH7NRXxk2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX08h2Cb1z1RMb; Mon, 21 Oct 2024 02:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2lWaa067226; Mon, 21 Oct 2024 02:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2lWft067223; Mon, 21 Oct 2024 02:47:32 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:47:32 GMT Message-Id: <202410210247.49L2lWft067223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: d2d0d6cb47c8 - main - subr_pctrie: fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2d0d6cb47c8568f34fff83477284dd3365b6298 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=d2d0d6cb47c8568f34fff83477284dd3365b6298 commit d2d0d6cb47c8568f34fff83477284dd3365b6298 Author: Doug Moore AuthorDate: 2024-10-21 02:46:30 +0000 Commit: Doug Moore CommitDate: 2024-10-21 02:46:30 +0000 subr_pctrie: fix a comment A comment used least > instead of greatest <. Fix it. --- sys/kern/subr_pctrie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 50216287845f..ea1c1cf881d2 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -958,7 +958,7 @@ pctrie_iter_lookup_le(struct pctrie_iter *it, uint64_t index) /* * If no such node was found, and instead this path leads only to nodes - * > index, back up to find a subtrie with the least value > index. + * > index, back up to find a subtrie with the greatest value < index. */ if (pctrie_isleaf(node) ? (m = pctrie_toval(node)) == NULL || *m > index : From nobody Mon Oct 21 02:52: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 4XX0GV5Fgvz5b63j; Mon, 21 Oct 2024 02:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0GV4JsXz435K; Mon, 21 Oct 2024 02:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sUvyKNgopXx+f7xM1gVhGeowL9LdgmnsiMgj8MbENS8=; b=SzxE/ax031EhAnhw/gGSAUv+IwiTpl37y8Kkj/5uUzD2T6RP3siw6ZMB8T3SUA6nUsGmuP zUxg56gldt+MK+wQ2/VSOnOGiSUwRotNchFmrMPuP9ZIRjWVkojKhpfacMv8vVgszW4oGL 0v/6Hm9v85oNmOyOG5Fig2ZwVBR88WPKi4piKKjb20sOi7b2n9uZidNQ1eSw5H1mEsZF/D r6+pdfpHueeF8kUy33F3sqnqsJ1aMu8Js/I3NtjYGuoksKZJq2uik8C4lkiYErDQ9BL3/6 BYU+wJmg3bm5dtiRQsplwuWiVZ8PdOZgIhyHAU0/ahEOp+UaibCFnmCGOIVdVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sUvyKNgopXx+f7xM1gVhGeowL9LdgmnsiMgj8MbENS8=; b=sJNdI7MJMkRyk6HaseGaARK4x6taGSez71K46tpHlHhvHrTA0Wvg/bUy2gVQmOweiakHXD p77JgpR9XUQDI7MkbMhnHdkdZisJddgEcJvC/GXy6gFP6Fn1v1l/Xfw4Yiu8vcwGpgi0Hs JZDZM29FCW2Sly1IUb+aJ/k9VuEU3p4IyHLM8Hmm+5C2QzlAa18zumGwmAMTBTo4vf0PXH /7yOmM2ZpHrU3RjeDisffcD8A6U8WCDJggQ9TSGZ59zJZH0E/bqAJX1rb55bpjojCu9A6h eHJFLP41vCDt826KNJh92cOmZT1aZwkO2OYshiTIAQn0Po71bq2dYVXRnqmJ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479154; a=rsa-sha256; cv=none; b=Rjnt33uqNKt93SNX3mBIUkr78c16IZYB6oyNwbDyEwBRIwSR3NUeOCOvfpYQOgKsPQOzaf YdrmV5csUt3GH3MocDs02oGVJGuHy8H2bMqBDWBzPi5FTl/U8VjkmVXUqt7ULavDKZRs+L sZpgMFnJOyvzR9wYa9a2Km31axuIAMsh2NrgB9/WSH6TzrYj52/2MOXjOxIqZIoZrDIn+w 6xP1rK/th06iv3eFUK8dtUfTLcA4X69dsQSd4ZrSSvX3pAqcoIbkWYzr8mInno6/TJO2o+ RFFlKwlRCtF2IdK0CMlXbjvfUKz1gNOryrfeyLMDu98uBpDI8hjTdVEd9DznGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0GV3wLkz1RwX; Mon, 21 Oct 2024 02:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qY1u083727; Mon, 21 Oct 2024 02:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qYnl083724; Mon, 21 Oct 2024 02:52:34 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:34 GMT Message-Id: <202410210252.49L2qYnl083724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 8e2e9e01131e - stable/14 - bsd-family-tree: shorter URL for FreeBSD manual pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8e2e9e01131e16c386ce9565eb60da2c1d66fe24 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=8e2e9e01131e16c386ce9565eb60da2c1d66fe24 commit 8e2e9e01131e16c386ce9565eb60da2c1d66fe24 Author: Wolfram Schneider AuthorDate: 2024-08-19 19:32:51 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:47:16 +0000 bsd-family-tree: shorter URL for FreeBSD manual pages (cherry picked from commit 2a916499470ae35178ca218e68175478037c3b0a) --- share/misc/bsd-family-tree | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index a664be3161a5..7823a2727626 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -934,8 +934,8 @@ Die freien BSD-Varianten von Unix. c't April 1997, page 368ff. BSD Release Announcements collection. URL: https://www.FreeBSD.org/releases/ -BSD Hypertext Man Pages -URL: https://www.FreeBSD.org/cgi/man.cgi +Manual pages for FreeBSD and ports +URL: https://man.FreeBSD.org UNIX history graphing project URL: https://minnie.tuhs.org/Unix_History/index.html From nobody Mon Oct 21 02:52: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 4XX0GX06h4z5b5jL; Mon, 21 Oct 2024 02:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0GW547yz43K7; Mon, 21 Oct 2024 02:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRYVJ0Skf/WlWYLqRtjwxnp7Dk/v2LBZLgmjDsFspNM=; b=CS1SDlrD7y+EnAIN9ohX55hO4oyV+Pyayl9Tw8BUoz8l3AAgeVWpYXrj4tk+XSRZZ7PrFA IjTEmM2Asr8DeCgRX72LFP0PmlHVj44sco/RVkSoTWkCV5sBfOup2yAzKoib9nY4ao0Qm8 51VAnX4ghLRE+dw5JgPtvuHThzoNGfgvYcYbAOkP9DJix3k84Xn0F2+cuL7dbuVmSTtWsE JuEAbwZ30vSdkditNWMmixmPzh6o9DgecH7tOhHIUN5mzTRmXUH4Wy8yOr5+RTJGfhk+Xo 2n5Sd7O0/US+0F95BBcpUjSnvB7FJLGlfHHdEwPAj/oGmClJc1wffPUujn24wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MRYVJ0Skf/WlWYLqRtjwxnp7Dk/v2LBZLgmjDsFspNM=; b=kEHy2HxsClweEiXHDkL4tSxiPhKK+bCJnmSNf0WAPKDKfOG0mEpCxIq8xbtgIL9Hh1JV8Y 57Fi3TWKTI74cczPcDTdj/7GrIvA+ysWEDO8Mok5yt47zwjUyw43rPt8e2boDKT2W1LAP2 nIJUEyoQGuy4DW1r50Hp8fzeouRwtO35RiVeH9q+w+3PCNOqKog+H/8oYdzgLArHxAnh8+ 8mi9gfadkzdj+E69aOvANqmig1VNbwEtcuKpnaAgeF2U08Eh9W6pH7RtouWJpH/6RvMLGo gQ+K/K1iPe9XQri3xifk7H58eUUWgQ9TMpSnd+47bGrCW/qC0qYouXXIRZsUvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479155; a=rsa-sha256; cv=none; b=NqrTI58AM420SH3StxatO6IbeYWZi5uziTbSrEWwjSZFXB5QrNcjcOdbP2F9dMA97Lda88 pgk+VHDD2RWJXuc5297Trhy4d3YFec8qEV5/ENIJkck0v8JjpTni8g0zoxBiKL8FLsX67S UevSYZrAd4azmFRTrobXBVCAtX+bW9yCJuCALqF0CbX6FmNlABznfg3FaIq7aL1H9iXrpA qd71PSh7onXyx0pIu925SFjsGESjli/8hgHbr9LSwV2jQSNLvkhMZn8F3y+kYaF8ZHRf0o oKhnfAYBNSxYv/EZasPzMzmlw2E+fypjdA6ztH2MsSDfWOMBPTXe7Y4DRm1BnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0GW4cdjz1RnB; Mon, 21 Oct 2024 02:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qZRj083775; Mon, 21 Oct 2024 02:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qZSe083772; Mon, 21 Oct 2024 02:52:35 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:35 GMT Message-Id: <202410210252.49L2qZSe083772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 8a74a9c397ea - stable/14 - bsd-family-tree: add FreeBSD Documentation Archive List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a74a9c397ea2cdc4b24d40a59d95c3d3aa31d37 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=8a74a9c397ea2cdc4b24d40a59d95c3d3aa31d37 commit 8a74a9c397ea2cdc4b24d40a59d95c3d3aa31d37 Author: Wolfram Schneider AuthorDate: 2024-08-19 19:40:34 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:47:47 +0000 bsd-family-tree: add FreeBSD Documentation Archive (cherry picked from commit 4132c4be4c0a4b80a4ef6f4b8ff0d8ac9a3b9939) --- share/misc/bsd-family-tree | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 7823a2727626..9373928759b8 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -937,6 +937,9 @@ URL: https://www.FreeBSD.org/releases/ Manual pages for FreeBSD and ports URL: https://man.FreeBSD.org +FreeBSD Documentation Archive +URL: https://docs-archive.freebsd.org/doc/ + UNIX history graphing project URL: https://minnie.tuhs.org/Unix_History/index.html From nobody Mon Oct 21 02:52: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 4XX0GY1Tcnz5b5NV; Mon, 21 Oct 2024 02:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0GX6Z9Vz43MR; Mon, 21 Oct 2024 02:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vxyS5kIE1DIqp3WMSuMPq2hs+Qy1eAH1Hzc5uOAGJzA=; b=krP/UheqPcXCdLkAwWH+JMo5P/zqRUfoTidBMAkjfvjr6+gyBdGBV7Rh6oM23xxDWSawZO tKx+QMBxl29MPj/LJ4jsVZXkY9DN2yaeDeS1O5NuvSg+x6dFB/wNUXcEabmgnh4QsS9e6V LSuxhAwEhA4CqldQieVno1w/ykN2Zdql/NsNsFuX12RJCxblQak9QYlBCysd3fokMCDQex 6Axbqgm3dMmvc28QzwMmqAJoDbwSwb8Km1JkGpwnilbErjt81pYvF+4dTuadClTRB2Sfj0 kZ3DQi8dL3T7por+BSrbrgI0BsWiv7/gGB9iVFreDUJSj/z7fg6kHw+Y9DtR5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vxyS5kIE1DIqp3WMSuMPq2hs+Qy1eAH1Hzc5uOAGJzA=; b=GqcTua5SPIlsQ/5MDmRSiBzeYxOgmDrAO1eMAWD5O3vzuA8Zo/fSQU8TZPqos+59rUgFeP 3cqU0j+yRduBv0+Yww0Hvu4HrBPKLW2TZzpQtqHSu87Y5RKDQI2PcMjTN1UNummeKWGXJz zkodesMl8tpfdR45InfqIvZqHYFZmBochiXFfGJ36bxUJCwQcn4YkoS/th4+tSOiQzkygM +32CHIpLwAYFm0J4cVGTfyVQvd8AMdC727Bp0kvFFbJUlmnGCAVUv7+h+NEmD+OBLUkKmH RSdtB6Nsq8R58RuMjxTx4NuYTU+y572+Xj+C70nFVINHuV9Oz5vVMWG55OrXSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479156; a=rsa-sha256; cv=none; b=X4F0yBoM00RYbfqunnl7koDvPRFPL9GfcRZqNDZVpW5IvZh6hstW92q0f7KRASj8y+B7Q/ a0sMxA7fF1h6BgrtrX3FDBXANvziixPAdDZmR0v6hUQzG6MrP5DVeL0o6wAjxvDkCuZHU8 VAoyhqjDPFYdQi6sh8574AmJsRtscI6a4uJ4cP6P0oiShjHxdTX30TADejLuTkIjXMXt3g rmN823BWbNo4JgFSg5DJySooh67s3Ye/CCu6ewx8OJWTxhVeYNBqmCNE28OUSQyf8FDIFL +qD4ILHmayDoXjavKp41lf1TONGS6rgZqoVGOIodI9HmUHU2E+voAm2Vbh5DjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0GX5plHz1RPX; Mon, 21 Oct 2024 02:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qaJW083823; Mon, 21 Oct 2024 02:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qa7o083820; Mon, 21 Oct 2024 02:52:36 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:36 GMT Message-Id: <202410210252.49L2qa7o083820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: f080b51748a3 - stable/14 - bsd-family-tree: add NetBSD 9.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f080b51748a39f6ec1f55c11bfcc3920d3fd5698 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=f080b51748a39f6ec1f55c11bfcc3920d3fd5698 commit f080b51748a39f6ec1f55c11bfcc3920d3fd5698 Author: Wolfram Schneider AuthorDate: 2024-08-20 13:26:46 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:48:46 +0000 bsd-family-tree: add NetBSD 9.4 (cherry picked from commit d1e78fbd4a67245e058e9d26b333216093f8d2d1) --- share/misc/bsd-family-tree | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 9373928759b8..a2dd40c7ce8e 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -438,23 +438,23 @@ FreeBSD 5.2 | | | | | 13.1 | | | | | | | | | | | | | DragonFly 6.2.2 | | | | | NetBSD 9.3 | | - | | | macOS | OpenBSD 7.2 | - | | | 13 | | | - | | FreeBSD | | | | - | | 12.4 | | | | - | | | | | DragonFly 6.4.0 - | | | | OpenBSD 7.3 | - | FreeBSD | | | | - | 13.2 | | | | - | | | | | | - | `------. | | | | - | | macOS | | | - | | 14 | | | - | | | | OpenBSD 7.4 | - *--FreeBSD | | | | | - | 14.0 | | | | | - | | | | | | | - | | FreeBSD | | | | + | | | macOS | | OpenBSD 7.2 | + | | | 13 | | | | + | | FreeBSD | | | | | + | | 12.4 | | | | | + | | | | | | DragonFly 6.4.0 + | | | | | OpenBSD 7.3 | + | FreeBSD | | | | | + | 13.2 | | | | | + | | | | | | | + | `------. | | | | | + | | macOS | | | | + | | 14 | | | | + | | | | | OpenBSD 7.4 | + *--FreeBSD | | | | | | + | 14.0 | | | | | | + | | | | | | | | + | | FreeBSD | | NetBSD 9.4 | | | | 13.3 | | | | | | | *--NetBSD | | | | | | 10.0 | | @@ -895,6 +895,7 @@ FreeBSD 14.0 2023-11-20 [FBD] FreeBSD 13.3 2024-03-05 [FBD] NetBSD 10.0 2024-03-28 [NBD] OpenBSD 7.5 2024-04-05 [OBD] +NetBSD 9.4 2024-04-20 [NBD] FreeBSD 14.1 2024-06-04 [FBD] Bibliography @@ -960,5 +961,5 @@ original BSD announcements from Usenet or tapes. Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages. -- -Copyright (c) 1997-2012 Wolfram Schneider +Copyright (c) 1997-2024 Wolfram Schneider URL: https://cgit.freebsd.org/src/tree/share/misc/bsd-family-tree From nobody Mon Oct 21 02:52: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 4XX0Gb6wpRz5b5p7; Mon, 21 Oct 2024 02:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Gb3hHsz43Sd; Mon, 21 Oct 2024 02:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BkPnPgQ2vprHNrWiF9EDf8iI8iXKvMXNwC9C5u1qNp4=; b=oRy14GdMMGD4LIGS9/EchHmVXXORYoTwd6oTzujTvhtIvXs/GlXRv9cPR7nZuwc5AZbHGa kbC29vDNLdghVwWPbOAALSsM7jm1cBem9QRsM+zzAR3Cigb9V7t31bIgYdPRgw1lTc058U kfDZAZNoQsY1pw1kG5iVHVMeM/1CH+ZJzJ8Vte6xFVrm8LzYRtTfoi3a4l1Bjt1XCsd3Cj X9Pa9bZggMa1NlHSezfMwEG065x9EXS1nW+3TiCrYZCiqGQWIwKxU4MYYEA8a3tFobvs+L OfEvMUlGLmlSdw3W4fvFrq3bKvCxH1BlnuOTOuEXsYcNctOIrplPQJ2Fqwku3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BkPnPgQ2vprHNrWiF9EDf8iI8iXKvMXNwC9C5u1qNp4=; b=tfqJ2T5zUp49RNZ/fXy32CEdA+xYlzydxcxDAAflYyiZP4M2j1LuqA+dwLKTZKbaRoY7x6 py5NNHwdl7csME/FNJHmxGyzxY9Wr36TJpqXniHQwEjlFDbu2rLJx7T6W0zXQxQ/3xGxx5 dAK5AWY8Sc3qTbc02KK6AWHdYcL95KbC57fK3PbIRaIJQOtLu6bc7o7grp5lOWFXVjFqSX Mgi8B3epKUU/pePqfDi3ciPoi1/WN48i0XeyYPd1Ot7ccPOgqj4EzsTN/yOsqIgo62gXyU Jdx+ERnjecVzN5Xp/eIrbSNxF7MZzI5zpwqopZ49m6qZTJq5oSUsKQu4Vbko3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479159; a=rsa-sha256; cv=none; b=WniNck0JEIZukygj938d1MvDH0QQiYXS4SqTNnQ/R8e7PkVwEHsNXun8Hn4peiq8oeWgQG yawX2iwRwYjq3hWtvWFzSv+3u45i1VdMSbIX7PqAoL1ozBUJzbN+Iil62Rgv3d6Q8qvYzI dpj7s+O/JwCTiOSL1DPKKP+jlFZbMsXjre4II8Ym3agcxg+AGz67TMuvK40nNGVjf9r7St 2i7dG2xHp44U8Si2/XvtcJ2iIs9JlajFlzTCWcViSsOgfVs4VdNZERxU1EQejH4UuAYM0A MSl4nxCfwu42t60sbbAkfRQmZJhHWCuHtXqFf2bRNHB4WD5sw1Ej/DuR6FW06Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0Gb2Btjz1Rb7; Mon, 21 Oct 2024 02:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qciY083911; Mon, 21 Oct 2024 02:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qcbg083908; Mon, 21 Oct 2024 02:52:38 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:38 GMT Message-Id: <202410210252.49L2qcbg083908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: ec9c40ce9be9 - stable/14 - bsd-family-tree: fix macOS 11 release date List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ec9c40ce9be9dd7ecc548fa2300742a36fab56db Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=ec9c40ce9be9dd7ecc548fa2300742a36fab56db commit ec9c40ce9be9dd7ecc548fa2300742a36fab56db Author: Wolfram Schneider AuthorDate: 2024-08-20 14:35:29 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:50:25 +0000 bsd-family-tree: fix macOS 11 release date (cherry picked from commit b49aec04f073de02b03b44503feffeb52cbbdd51) --- share/misc/bsd-family-tree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index a04e96c832aa..2f1cf914d693 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -869,7 +869,7 @@ DragonFly 5.8.3 2020-09-24 [DFB] OpenBSD 6.8 2020-10-18 [OBD] NetBSD 9.1 2020-10-18 [NBD] FreeBSD 12.2 2020-10-27 [FBD] -macOS 11 2020-11-19 [APL] +macOS 11 2020-11-12 [APL] FreeBSD 13.0 2021-04-13 [FBD] OpenBSD 6.9 2021-05-01 [OBD] DragonFly 6.0 2021-05-08 [DFB] From nobody Mon Oct 21 02:52: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 4XX0Gb3QvCz5b5p4; Mon, 21 Oct 2024 02:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0GZ2548z43B0; Mon, 21 Oct 2024 02:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c13HoV4T3U0kusI2REpB+iu4sQ5u/vxot7dIvap7KrY=; b=xWkqT55DnoS1Jhl+v09+TD8NldjpiXbJpUP2AFdRN/aCGpl8KEm/ay/+aZigJpaC6NjRod B+Ae/znO++uh6YmhLrF8ErRHwyGPTuxtzpXauzZT36UuB+DATfzEuPdgNk0HxPiFlPWkHl ovCBTTLbH5lx7lP4e9hOt1r4h+52swPHr1IEdkKZdA/6CMKzEX39oI1rZPZ0UgLuEXtNEx miMSwlQMqo7Tk4WSehAGWdKUoEOZ0/loa8S6eBkSn9S8sIx7OhwBE6uak395E+bM4sINna LB+0FUK0WzTMhAcnsIO0E428q0SiQWf1huiMMbETd1VFoV40+uXxvy1QfEwGMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c13HoV4T3U0kusI2REpB+iu4sQ5u/vxot7dIvap7KrY=; b=i6YlvnzLntUexS3GpG+JfH0scFhCSz5SRHYH9vUhDqMFGnSP15+Ca72mgPUeDWn78WA0Ol Jf9riAN0umwpiDhwdwGt3qh71StyVcW6AlImVLoRlgVPxXdYjeJ+jaGcL3sTXuKYGUg1xO kkIEoRQL771Ox2JvoyQvvCEa6lmVU5GNPa0TovP0831FoDv7JcXB7TmUKtvlpqveuN7K9Q 1WiRfmOUXM9qFt5xXwLNURXBNkeVeKNgWRXlztTNV2KYi+2Ap1PjZgxqs/zS1Csa/cS2Ov 9LBO8nTcKVgb1w5Qd7Z8mV03Jm7gpsoyh5cCcH4IabF9Hm4v+yld84lugpQqHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479158; a=rsa-sha256; cv=none; b=tgRr3uMXEY647V648g4O3Uc8YOpKVua39SJWe+0MsqzH75cLmmFOOPEhMu5BPSTUPXZCLq tw5ZqI44Avy9Uji43TFv/fwq1CZ2JBQPlctD8tpnyTlC2F36m1r3tvguebHM4h1QP1ZFD4 RR9rbvJKnaKtN/r6NS5zSxPoJ8HiCfhC3nbjdD6Vo47Ke9ks3RDb7X5dLekssocgwpvfch aOPppcqxp48Kv1em7VhbbORmLYeXW8pg5eoQuKigfrzipP7ew9VtXAXIBcEiWJc6HEgsKF A6NT9+gZG4QEZfC6XBXjpbrCqy7nnxTXHIwWy0Ob5IaPZL3mGemqbrQbyA5Xug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0GY6bCkz1R5Y; Mon, 21 Oct 2024 02:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qbFg083863; Mon, 21 Oct 2024 02:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qbmv083860; Mon, 21 Oct 2024 02:52:37 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:37 GMT Message-Id: <202410210252.49L2qbmv083860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: cdac5377113c - stable/14 - bsd-family-tree: shorter URLs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cdac5377113c670001522cd949f01946111cc215 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=cdac5377113c670001522cd949f01946111cc215 commit cdac5377113c670001522cd949f01946111cc215 Author: Wolfram Schneider AuthorDate: 2024-08-20 13:29:18 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:49:49 +0000 bsd-family-tree: shorter URLs (cherry picked from commit d4a4d1e742852b00427f723f59534b42718628de) --- share/misc/bsd-family-tree | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index a2dd40c7ce8e..a04e96c832aa 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -485,18 +485,18 @@ was the announcement in Usenet or if it was available as tape. Volume 11, Info 4, April, 1987. [KKK] Mike Karels, Kirk McKusick, and Keith Bostic. tahoe announcement. comp.bugs.4bsd.ucb-fixes, June 15, 1988. -[KSJ] Michael J. Karels, Carl F. Smith, and William F. Jolitz. - Changes in the Kernel in 2.9BSD. Second Berkeley Software - Distribution UNIX Version 2.9, July, 1983. -[NBD] NetBSD Project, The. -[OBD] OpenBSD Project, The. -[QCU] Salus, Peter H. A quarter century of UNIX. ISBN 0201547775, - EAN 9780201547771 -[SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11. -[TUHS] The Unix Historical Society. https://minnie.tuhs.org/Unix_History/. -[USE] Usenet announcement. -[WRS] Wind River Systems, Inc. -[dmr] Dennis Ritchie, via E-Mail +[KSJ] Michael J. Karels, Carl F. Smith, and William F. Jolitz. Changes in the + Kernel in 2.9BSD. Second Berkeley Software Distribution UNIX Version 2.9, + July, 1983. +[NBD] NetBSD Project, The. +[OBD] OpenBSD Project, The. +[QCU] Salus, Peter H. A quarter century of UNIX. ISBN 0201547775, EAN + 9780201547771 +[SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11. +[TUHS] The Unix Historical Society. https://minnie.tuhs.org/Unix_History/ +[USE] Usenet announcement. +[WRS] Wind River Systems, Inc. +[dmr] Dennis Ritchie, via E-Mail Multics 1965 UNIX Summer 1969 @@ -942,7 +942,7 @@ FreeBSD Documentation Archive URL: https://docs-archive.freebsd.org/doc/ UNIX history graphing project -URL: https://minnie.tuhs.org/Unix_History/index.html +URL: https://minnie.tuhs.org/Unix_History/ UNIX history URL: https://www.levenez.com/unix/ From nobody Mon Oct 21 02:52: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 4XX0Gc47krz5b63v; Mon, 21 Oct 2024 02:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Gc2RRjz43F2; Mon, 21 Oct 2024 02:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zFbtJqhXJmBCaCpEcIhcNtbMO31R5wvJeuqz4vpH3s=; b=Fo3jKE0zDeJsOIVHVO8suDisFgDVxJLNrHDmxpXIAdwVHsA2liOgyMAp+RV4FhbSxmDZBy bGbk4gxRkAuMMOj5aBw61j4MUFP9TaPCmdXbD10N3YyyCPJNrFBD+wpSqMEIit1zaf1Srv QZau8pdQ5kznH1uZtn5KSczzsFweE1nw/G4vA/RWGPsmlfKbbU9LVjvu3DwYpqM0qSayN+ 4Scu6htdMsRgpozq9ZgHNMO9KEfGy+ZI7ZGuGti08c2+J+Wnz2zBCIJSOwX9eflTf7vq4c oMnz9kcPZ+aY2vWw5v6s+IrEpedp2QMls5T68tt84fUNCqjXbhCPfitqsnlCSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zFbtJqhXJmBCaCpEcIhcNtbMO31R5wvJeuqz4vpH3s=; b=D+qXTTZxpj9n0FxmG6dw4JFukAQDp2MLQl95+ts0DydWC0co5V2o8n9XKt1rnbr6w4lt+3 YHPv+3Z+crzK1ox27CpDVY0bmcLGrDKWveJa7Jo0eP4u4B29FXKW4qw+AgQQfw6fBp3f2e rkn271UQPRTUD+LXq6dYsaNx5B4n9vm9mjekq6tT6EiCNS2z2WNhPrQqtqZ1uUVVOpbJNX r+PCuF8pAj4JoXWWOa3geCz9ZpBacOgdxCSTfLZiH1kyKeCDAAsJh+8p1LzabW+hoOAOlB EmMSmg2XHV7phYOjLk9sXj/rPIHebPVh7oV5QnyNKraqBMvLIJH1VRAsSlJFbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479160; a=rsa-sha256; cv=none; b=O9redqTqxKr0Y75Y6xrt+/zJkEM0MKG1MwkgBppoKP0tbM28lVGmVysW8UZelL9BDeJZyg UtJlaHzM5grYv7C7q+UyQlw5dGMUBRwcLTcIhv6Bydx8cfm7WLlLC4vtgQm5Kof//ovksD 3g/9hvAxcHkTPZ+4mQ4YrNRFUfy6FIMtpdRqtNxqiCOmFCiBObRtqhZuwSMxM1TyhTCwjJ Y7DRz+DbbhxRV10bVJvfWpHma5Aeoz7k4gV6kWlT40QQIl7Vl9vW2FYt1IlBVKNUAMBLqM QUSa0k6iDB5un4HCKK+bkB+drc1IxUYDUbGSUsZPzYOsMZ2Ipmdy4HX3Q6i3hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0Gc1VbCz1RNQ; Mon, 21 Oct 2024 02:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qeio083953; Mon, 21 Oct 2024 02:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qeQC083950; Mon, 21 Oct 2024 02:52:40 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:40 GMT Message-Id: <202410210252.49L2qeQC083950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: a69b43986406 - stable/14 - bsd-family-tree: NetBSD 8.3 added List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a69b43986406478a678b76248b138968c647651d Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=a69b43986406478a678b76248b138968c647651d commit a69b43986406478a678b76248b138968c647651d Author: Maxim Konovalov AuthorDate: 2024-08-22 00:29:36 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:50:50 +0000 bsd-family-tree: NetBSD 8.3 added PR: 280983 (cherry picked from commit d399c791b223953d230423eff1d56fb45a1be77c) --- share/misc/bsd-family-tree | 99 ++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 2f1cf914d693..510ca204ca56 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -413,54 +413,56 @@ FreeBSD 5.2 | | | | | | | | | | | | DragonFly 5.6.3 | | | | | | NetBSD | | | | | | | | 8.2 | | - | | | | | | | DragonFly 5.8.1 - | | | | | | OpenBSD 6.7 | - | | FreeBSD | | | | | - | | 11.4 | | | | | - | | | | | | DragonFly 5.8.2 - | | | | | | DragonFly 5.8.3 - | | | | NetBSD 9.1 OpenBSD 6.8 | - | FreeBSD macOS | | | | - | 12.2 11 | | | | - | | | | | | | - | `------. | | | | | - | | | | | | | - *--FreeBSD | | | | | | - | 13.0 | | | NetBSD 9.2 OpenBSD 6.9 DragonFly 6.0.0 - | | | | | | | | - | | | | | | | DragonFly 6.0.1 - | | | | | | | | - | | FreeBSD macOS | | OpenBSD 7.0 | - | | 12.3 12 | | | | - | | | | | | | DragonFly 6.2.1 - | | | | | | OpenBSD 7.1 | - | FreeBSD | | | | | | - | 13.1 | | | | | | - | | | | | | | DragonFly 6.2.2 - | | | | | NetBSD 9.3 | | - | | | macOS | | OpenBSD 7.2 | - | | | 13 | | | | - | | FreeBSD | | | | | - | | 12.4 | | | | | - | | | | | | DragonFly 6.4.0 - | | | | | OpenBSD 7.3 | - | FreeBSD | | | | | - | 13.2 | | | | | - | | | | | | | - | `------. | | | | | - | | macOS | | | | - | | 14 | | | | - | | | | | OpenBSD 7.4 | - *--FreeBSD | | | | | | - | 14.0 | | | | | | - | | | | | | | | - | | FreeBSD | | NetBSD 9.4 | | - | | 13.3 | | | | - | | | *--NetBSD | | - | | | | 10.0 | | - | | | | | | - | | | | OpenBSD 7.5 | - | FreeBSD | | | | + | | | | | | | | DragonFly 5.8.1 + | | | | | | | OpenBSD 6.7 | + | | FreeBSD | | | | | | + | | 11.4 | | | | | | + | | | | | | | DragonFly 5.8.2 + | | | | | | | DragonFly 5.8.3 + | | | | NetBSD | OpenBSD 6.8 | + | FreeBSD macOS | 9.1 | | | + | 12.2 11 | | | | | + | | | | | | | | + | `------. | | | | | | + | | | | | | | | + *--FreeBSD | | | | | | | + | 13.0 | | | NetBSD | OpenBSD 6.9 DragonFly 6.0.0 + | | | | | 9.2 | | | + | | | | | | | | DragonFly 6.0.1 + | | | | | | | | | + | | FreeBSD macOS | | | OpenBSD 7.0 | + | | 12.3 12 | | | | | + | | | | | | | | DragonFly 6.2.1 + | | | | | | | OpenBSD 7.1 | + | FreeBSD | | | | | | | + | 13.1 | | | | | | | + | | | | | | | | DragonFly 6.2.2 + | | | | | NetBSD | | | + | | | macOS | 9.3 | OpenBSD 7.2 | + | | | 13 | | | | | + | | FreeBSD | | | | | | + | | 12.4 | | | | | | + | | | | | | | DragonFly 6.4.0 + | | | | | | OpenBSD 7.3 | + | FreeBSD | | | | | | + | 13.2 | | | | | | + | | | | | | | | + | `------. | | | | | | + | | macOS | | | | | + | | 14 | | | | | + | | | | | | OpenBSD 7.4 | + *--FreeBSD | | | | | | | + | 14.0 | | | | | | | + | | | | | | | | | + | | FreeBSD | | NetBSD | | | + | | 13.3 | | 9.4 | | | + | | | | | | | + | | | *--NetBSD | | | + | | | | 10.0 | | | + | | | | | | | + | | | | | OpenBSD 7.5 | + | | | | NetBSD | | + | FreeBSD | | 8.3 | | | 14.1 | | | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current @@ -896,6 +898,7 @@ FreeBSD 13.3 2024-03-05 [FBD] NetBSD 10.0 2024-03-28 [NBD] OpenBSD 7.5 2024-04-05 [OBD] NetBSD 9.4 2024-04-20 [NBD] +NetBSD 8.3 2024-05-04 [NBD] FreeBSD 14.1 2024-06-04 [FBD] Bibliography From nobody Mon Oct 21 02:52: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 4XX0Gg0CKpz5b5Nb; Mon, 21 Oct 2024 02:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Gf4cYHz436C; Mon, 21 Oct 2024 02:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CV4vBxvF7+f5wkdlQOs74bWPBeyZrWabbrtRnZt1t7Y=; b=pkZtm6LN4p1X7u8dyza8XptflSgzNx1tB1AgXeUtCNLAv01UC18irIODGMjvgQf8U58Yms ztLGUfGpGHhQE8oJXZr88FQPqeRYzINrHWhCucxefiZZZy9uNtmlAvrc+WIKkNdYoldl+b DI2eks/INTNOMPipxpYrjioWmnnfrM4o488ZrDhCl9i2yWNcYpcVSCZ/1voZBWvZzIOZC0 yQeIobgzqpyaUTCr42CC2MGrGZrSTzv0bEm0UtUYvKkDiBpLpiTsVtDrZDuBgrSTVKtBm8 RXxjMThNwhS/eDFCqwpiXmzCpXE9ROicinZSK/wlXCgTrbrfDQ45u754zb4gGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CV4vBxvF7+f5wkdlQOs74bWPBeyZrWabbrtRnZt1t7Y=; b=hw1GuFHR5/4MNf2Iid3RWUPyvrYi/fxhRvl70mOODAMo7UXmh3L5EjRJSNQ2gEQMq1Yv1T Rii4uP+i7FZ0kbVbkmHpEcNdo0iPhRhNlLYFIyNwc4Vwf9EaBkqOF9kFNUsYNcCiVm2fd/ IdQPVD/TAYynEkyAvt2Uft51BMBPZtEBywrWs307F3JjNhSk05gm+sHSeML8v59m1A5+Lr dnhHsBJHa+hXZniC++QzTsei9vu2VX3Ylg5ysUnKwePIg7Yf+4vYWSVPBQzoY+umCQUebq 4VHn1yAOx7alcX+ufVd47jbYheE17nHkIlqIZx7rqK7UB+Vj9xQZMiN66XZQUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479162; a=rsa-sha256; cv=none; b=K1Jv4Kf72dUClY1EdDuf0eLPfkNmcXTCaZNkQKXPxNh1k2GDqim3liuElVCWVnVi0GPozE ok6Kbz4FiKGurz3cwcaGs+XmxQWRNQ8T8/WxvB53JFiR0MpARDgZNHOfdz3pIfLmUosxwf OzfAAOJ83a/03pQyb9fGLcwW6dOXgG2ZD+r+Ert33w8Z5Oj/UCBk+oCMyjsDnxeojcX8P9 2n1herDYmn9eixDapv/S8+ko0Y5XyhZvfF2kqOYGE1PZaUIf/wzdLNgz36wI3EAwNkMGbV 7WSWTdnntD2Ri7XGxY+6vpkJ3i2gXj0rG2NBWrJO9RcnptopMy7VwCOto5ujEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0Gf39K4z1RnD; Mon, 21 Oct 2024 02:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qgW8084066; Mon, 21 Oct 2024 02:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qgL2084063; Mon, 21 Oct 2024 02:52:42 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:42 GMT Message-Id: <202410210252.49L2qgL2084063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 12ab751d415d - stable/14 - bsd-family-tree: add macOS 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 12ab751d415d6ce59c23895bdadbd4e2f0e157a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=12ab751d415d6ce59c23895bdadbd4e2f0e157a6 commit 12ab751d415d6ce59c23895bdadbd4e2f0e157a6 Author: Sergey A. Osokin AuthorDate: 2024-10-16 00:52:01 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:51:31 +0000 bsd-family-tree: add macOS 15 While I'm here fix whitespaces for recent OpenBSD releases. (cherry picked from commit bdbf50660c51534d7a25569349bcdf2d4e460f50) --- share/misc/bsd-family-tree | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 3a841e03a6e4..b9d76552db08 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -465,6 +465,8 @@ FreeBSD 5.2 | | | | | | | | | 8.3 | | | FreeBSD | | | | | | 14.1 | | | | | + | | macOS | | | + | | 15 | | | | FreeBSD | | | | | 13.4 | | OpenBSD 7.6 | | | | | | @@ -899,12 +901,13 @@ OpenBSD 7.4 2023-10-16 [OBD] FreeBSD 14.0 2023-11-20 [FBD] FreeBSD 13.3 2024-03-05 [FBD] NetBSD 10.0 2024-03-28 [NBD] -OpenBSD 7.5 2024-04-05 [OBD] +OpenBSD 7.5 2024-04-05 [OBD] NetBSD 9.4 2024-04-20 [NBD] NetBSD 8.3 2024-05-04 [NBD] FreeBSD 14.1 2024-06-04 [FBD] +macOS 15 2024-09-16 [APL] FreeBSD 13.4 2024-09-17 [FBD] -OpenBSD 7.6 2024-10-08 [OBD] +OpenBSD 7.6 2024-10-08 [OBD] Bibliography ------------------------ From nobody Mon Oct 21 02:52: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 4XX0Gd6FSxz5b5NZ; Mon, 21 Oct 2024 02:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Gd2vw7z43FG; Mon, 21 Oct 2024 02:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWENL8TKjO7PQxZ3EUAxUR+FygjgHeOLO+VZUOI7YIE=; b=DDHFhoB9QtiC6ke4WSh/pZsjbE0VSHQPm9OI8vTtt0L6mCSw/av6w6WySghgUnIcr1bp3W hP8RfVDj5bZ7qRowBt1t5b2KqJrwyYWu4751uiuI4XG/KDcG6RLye6w9jFR8OXBy6z4cYd YzqaMhRnuYwA1q+NRGPTvxhmvsfM7eEpvTV3IfLOsuUVyHpS6N16yIQCWFth8p1X5IFfpJ 9rZcjphRyWHWpBLCuDhIJdoUhbDXa0iaycx5m9prrcnvzlindvAjKUZi1IofMMk3pEAyEw QxlHZo01kyTBmdJmn07aKWNtAjGmGtWxsfTS9O54F5f83wrBLkVTOA0otaM3uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWENL8TKjO7PQxZ3EUAxUR+FygjgHeOLO+VZUOI7YIE=; b=hPI+2r+aCQPpwtfxPKgZhWb7lsqM6ZuHn3uLhWhZFUPon4351TYoRkcZNp6FcvFW2GHoyV kv6iUCMk1ersDueXgxEOvWiC4fbG50e9oF1IHefuzf3ofc+0n7izbr1sEpFUKBnCdSBZux i6vGtyZlALUq+sJqewRGiHyhNsx4sFaIImcNFItvf1WnCE9mjxJAf9SrQb8IFR+WZjLQKf TzGunLdQG7/SHmK5PEFr4rTGCHqtRHOw1VZ8md4StqsmURoYNYrcPMA3ojJNK3o8BkkUUG CvaRSbU6q3eiIidxYFe/H/1BnquYXe4M+EO2nBMoZJ6vQKSv/SsZI6q5LnAnkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479161; a=rsa-sha256; cv=none; b=yGVQitCkJVsVRonbPebg33CKrBewS7rf2D/TlD3KDD7RqB23v4IWLX0Ba30MQE/Rg5xf6D 5WAaW5/FFmmGdwluJ8CmOV7tktWkkktirY87MdKZJGgnnH0YPoyDsmsBKBGgIoQPfd54LP T51dDXeZKTsAEpV9iPR0Excyx2iDzpct4d2v3Hld906ISIgTfXe3q19qOHLffnTvcA27uT YTjMWsdjMhw0YwfbVHy0Mr6jTpfsoqvRO8GeSDeJ/Mg65mzsrDUXUYjxxOeqYtaHlfsHCX 7X4K9KnNdY8kjk6ZEqRRBxT1UFpp/KJcHOAMZG83vp+Tn82CLTcT+EGppEZh/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 4XX0Gd29Fmz1RnC; Mon, 21 Oct 2024 02:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2qfxc084020; Mon, 21 Oct 2024 02:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2qfkw084017; Mon, 21 Oct 2024 02:52:41 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:52:41 GMT Message-Id: <202410210252.49L2qfkw084017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Sergey A. Osokin" Subject: git: e3cf164e9ae7 - stable/14 - bsd-family-tree: FreeBSD 13.4 and OpenBSD 7.6 added List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e3cf164e9ae785f1924517ffe89894bcb9658570 Auto-Submitted: auto-generated The branch stable/14 has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=e3cf164e9ae785f1924517ffe89894bcb9658570 commit e3cf164e9ae785f1924517ffe89894bcb9658570 Author: Maxim Konovalov AuthorDate: 2024-10-07 21:16:19 +0000 Commit: Sergey A. Osokin CommitDate: 2024-10-21 02:51:11 +0000 bsd-family-tree: FreeBSD 13.4 and OpenBSD 7.6 added (cherry picked from commit 3ebb738a93139fd2f8826a62b5f282480f2e19d5) --- share/misc/bsd-family-tree | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 510ca204ca56..3a841e03a6e4 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -456,14 +456,17 @@ FreeBSD 5.2 | | | | | | | | | | | | | | | FreeBSD | | NetBSD | | | | | 13.3 | | 9.4 | | | - | | | | | | | - | | | *--NetBSD | | | - | | | | 10.0 | | | - | | | | | | | - | | | | | OpenBSD 7.5 | - | | | | NetBSD | | - | FreeBSD | | 8.3 | | - | 14.1 | | | | + | | | | | | | | + | | | | *--NetBSD | | | + | | | | | 10.0 | | | + | | | | | | | | + | | | | | | OpenBSD 7.5 | + | | | | | NetBSD | | + | | | | | 8.3 | | + | FreeBSD | | | | | + | 14.1 | | | | | + | FreeBSD | | | | + | 13.4 | | OpenBSD 7.6 | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -900,6 +903,8 @@ OpenBSD 7.5 2024-04-05 [OBD] NetBSD 9.4 2024-04-20 [NBD] NetBSD 8.3 2024-05-04 [NBD] FreeBSD 14.1 2024-06-04 [FBD] +FreeBSD 13.4 2024-09-17 [FBD] +OpenBSD 7.6 2024-10-08 [OBD] Bibliography ------------------------ From nobody Mon Oct 21 02:58: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 4XX0Pk0mJkz5b6Dq; Mon, 21 Oct 2024 02:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Pk0DBcz45Cr; Mon, 21 Oct 2024 02:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/gUhYdjavDRKCeFNB0zZkj5xpRexaeqdgh5xkzZ1z8=; b=XVfy1k95R81Emyy+rxrqCwxn0N2WzVc4qhfOfzxw243U2u5mfFRptEfcXDBNx9UyEkyQtA 9888AH7aMjFE+SI+5kfZPtAg5LLCYHpUR+J09hCsHJbU6Jbk4KHnYhtCss1i6gf6Yo570L fI6ClLEcGharJSxJBH4bEAIuoqyJI8NNcV/tZZp7Ua8/b7ulnkrmF0FybcXfNCugctZE4n pW8IKt6bd75pWerndX2+N95Eufw4HkQhpNEYz0+hfhpUFilL8boUPa9qMaKHgD62FyF+K+ vqObIachsIXoHc/CS7gEc0X11HmuuQ7FctmZOq07Zvs7MrB96HPKw3kADTggEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/gUhYdjavDRKCeFNB0zZkj5xpRexaeqdgh5xkzZ1z8=; b=c6A2gdl520UUv49OC5JzmNCrUBfWFQ9EwH8MYzNHTANTTljjMkGfGTgVgxkyV7h9nEo34L B5i4SVLCKYSG4vMF06/7dZ0zYLL//+PD7hlErAe3TaOwxC9omAq5rOVzTGzUqaRJcrlDxP lXRcC6lpFblu4V5O8bxxNz2ToUcdvnsWn8Q/8DBo23U6Md+xquhKDaZGKnU4muJ1FSyDuQ DDNAyO9qnCwbR730u9mtZxfpmTolSmzxHA7jbaK+ZOCguTSS2FiMoZxuUuAnz+I9drqjd5 eyhGrBlpvrp+neunMm/dlHRslpi6bKhW22Tx0E/Tq+m2Cf9G7Jfr7N8sfPGKww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479530; a=rsa-sha256; cv=none; b=LPHdRfveGEskrqfTxF0ubxw79ed582LWyPBX0XKE04HtCf1VrOfznCOxWEeAmPt9soAUtk mTbjl2BOEbgP0DmB7M7oRE41zYUL0ktXZDlftuIct6BbNcQzWZzYNkvvBjrG1K9/mhEOk5 fDu0y+6SAxUaIDmuW3hkfNAI8cnF9qi3KlyDqdf+63XYZOEuZ/0iJKKjc/r76XgWJjw3CE WHlCnoEXBE5EHlBYXvOERx1lMta+oBNjRoyi6Npy+NVNoXaLAO/g6aPm8DEdlAXSR8V2El PO5aDVrmoGqUxKFDpbNYYTqc6oRMcA9bo17NhkqOlVBhnhvU3Jx5R2klSd66+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 4XX0Pj6p1wz1RwZ; Mon, 21 Oct 2024 02:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2wnfC086134; Mon, 21 Oct 2024 02:58:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2wnkW086131; Mon, 21 Oct 2024 02:58:49 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:58:49 GMT Message-Id: <202410210258.49L2wnkW086131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 630077a84186 - stable/14 - Move support of Realtek 8156/8156B from cdce(4) to ure(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 630077a841862ae0156780ce834898a97735a484 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=630077a841862ae0156780ce834898a97735a484 commit 630077a841862ae0156780ce834898a97735a484 Author: Li-Wen Hsu AuthorDate: 2024-08-12 04:04:05 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 02:58:35 +0000 Move support of Realtek 8156/8156B from cdce(4) to ure(4) Reviewed by: kevlo, imp, hrs MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45088 (cherry picked from commit 6ea4d95f6c76aa64d2db5c04c87e68dc299544df) --- share/man/man4/cdce.4 | 6 +----- share/man/man4/ure.4 | 5 +++++ sys/dev/usb/net/if_cdce.c | 1 - sys/dev/usb/net/if_ure.c | 2 +- sys/dev/usb/quirk/usb_quirk.c | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index 6768c7bbf517..9d842e475d85 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\" -.Dd February 10, 2023 +.Dd May 3, 2024 .Dt CDCE 4 .Os .Sh NAME @@ -107,10 +107,6 @@ Sharp Zaurus PDA .It Terayon TJ-715 DOCSIS Cable Modem .It -Realtek RTL8156 USB GBE/2.5G Ethernet Family Controller -.It -Planex USB-LAN2500R -.It Huawei 3G/4G LTE (eg. E3372, E5573) and other mobile network devices .El .Sh DIAGNOSTICS diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index 773fa7a2426b..8cc798ab4393 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -97,6 +97,11 @@ Set 1000baseTX (Gigabit Ethernet) operation over twisted pair. The RealTek gigE chips support 1000Mbps in .Cm full-duplex mode only. +.It Cm 2500base-T +Set 2500Base-T operation over twisted pair. +The RealTek 8156/8156B chips support 2500Mbps in +.Cm full-duplex +mode only. .El .Pp The diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index d53d861cfb00..cbb6ae76ef0c 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -281,7 +281,6 @@ static const STRUCT_USB_HOST_ID cdce_host_devs[] = { {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, - {USB_VPI(USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8156, 0)}, {USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR), USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x16), diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c index 55444030869c..ee7fd04e38c3 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -481,7 +481,7 @@ done: } /* - * Probe for a RTL8152/RTL8153 chip. + * Probe for a RTL8152/RTL8153/RTL8156 chip. */ static int ure_probe(device_t dev) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index eaf3851bbbca..21fbd3d9d70a 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -100,7 +100,6 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(ELSA, MODEM1, 0x0000, 0xffff, UQ_CFG_INDEX_1), USB_QUIRK(PLANEX2, MZKUE150N, 0x0000, 0xffff, UQ_CFG_INDEX_1), USB_QUIRK(CISCOLINKSYS, USB3GIGV1, 0x0000, 0xffff, UQ_CFG_INDEX_1), - USB_QUIRK(REALTEK, RTL8156, 0x0000, 0xffff, UQ_CFG_INDEX_2), /* Quirks for printer devices */ USB_QUIRK(HP, 895C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), USB_QUIRK(HP, 880C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), From nobody Mon Oct 21 02:59: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 4XX0Qr6pxHz5b65q; Mon, 21 Oct 2024 02:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Qr664bz45f7; Mon, 21 Oct 2024 02:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXSEOuW/G4LKPnAgG5zhtnstjMUy+YV9QP5q3mbjMiU=; b=uh26uwAEyiVnOdCAAZxbIILG9CHwaEvozKYuU6TGdW52hzLfME4ud7T1iwHH3HIenNhQqk 8FxZr5TxNXFBLNN2ZHYQ0HjDpm8RJM8koBuOfuXL6FCycC2NZr81lhaeGJfV2rTb0WTczz oD+e1IYSY/dzNW/UZ+wOCN1enDkuXOhMgVC39h9OJMAQWFVTWg8aTbu2dkI+l4u+YkDOH+ dgBMVQTYMepuyyPqlm7XGlxyT2+OUCCtNeyLayQOTQR+lE3J2eDPukp+72f0NBfmJMjwKh vbzCCNjI55k971fTssuSNJi7BAZTg0FaQ6HKuJrI6yV4YioiIweACwDvoxSpfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXSEOuW/G4LKPnAgG5zhtnstjMUy+YV9QP5q3mbjMiU=; b=x0fcsA4T9ZhNzLmPBqIwNJJUjCoTjjNKe4JFROw0dezNzul3uasCd7lacb4bGc4wfxw4oe aFAnWtcMq8SIgIhAAz5cdbYAItAKVMbbGaVRz6cOz7edrTi4ls6ASjRa44jBB2vxVwuILG kr+YoBFGzVFrcGnzba7lVKxJ4LEc9PXsc6KRJ/bw67hN8D53uzKQge4OT7jHXjW+4Kyukx UfOdQdovL8DK5ECii5MK+j6b0/PzglbgrlkOhDPjmTtykLDgIA9yItVGu7XSjf4GH0kfTy 4WszSIWEhy6i6V+q+F8kHljXLp9tHwIzPZVg1qIvhBjqm6HJ251S8G5uw9dVEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479588; a=rsa-sha256; cv=none; b=NvqkR0Bq9QwBf50C/xCTt6njjmttZAqGGBoApwhSOycXwoHI/qihYuwHIb0Sz9DfyeyT7C mAmgs8ipaOagfBUDZpHsb7heb5X+22TjL0rs5cHTJEZorahG2+Plf+j5rt2mqmHswM5fkz tIQZWA3J7/Nif7GSlehjkioregBJVUuVZpRIl+SXupBYSH1HpkfafjTAojUaWJsWDYvLQV THrDuS2MIde8WpLKt/f1Zu8R9MB65NfnmDpIbwgeUi+HBJ/HUplOKneLrO/KbjUlyE9d5i q9nBfDpLCmGD4Z3RK49ako5DscPEEYODoBOxbs2DiIbSDru2I5AifovLGmL6QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0Qr5Y9Qz1Rqp; Mon, 21 Oct 2024 02:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L2xm4i086563; Mon, 21 Oct 2024 02:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L2xmtV086560; Mon, 21 Oct 2024 02:59:48 GMT (envelope-from git) Date: Mon, 21 Oct 2024 02:59:48 GMT Message-Id: <202410210259.49L2xmtV086560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 1b0af7617e6c - stable/13 - Move support of Realtek 8156/8156B from cdce(4) to ure(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b0af7617e6cd25a1fc205f00636c19cbe6f541d Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0af7617e6cd25a1fc205f00636c19cbe6f541d commit 1b0af7617e6cd25a1fc205f00636c19cbe6f541d Author: Li-Wen Hsu AuthorDate: 2024-08-12 04:04:05 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 02:59:36 +0000 Move support of Realtek 8156/8156B from cdce(4) to ure(4) Reviewed by: kevlo, imp, hrs MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45088 (cherry picked from commit 6ea4d95f6c76aa64d2db5c04c87e68dc299544df) --- share/man/man4/cdce.4 | 6 +----- share/man/man4/ure.4 | 9 +++++++-- sys/dev/usb/net/if_cdce.c | 1 - sys/dev/usb/net/if_ure.c | 2 +- sys/dev/usb/quirk/usb_quirk.c | 1 - 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index ec968ea6a0d5..8139546ba3a9 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\" -.Dd February 10, 2023 +.Dd May 3, 2024 .Dt CDCE 4 .Os .Sh NAME @@ -103,10 +103,6 @@ Sharp Zaurus PDA .It Terayon TJ-715 DOCSIS Cable Modem .It -Realtek RTL8156 USB GBE/2.5G Ethernet Family Controller -.It -Planex USB-LAN2500R -.It Huawei 3G/4G LTE (eg. E3372, E5573) and other mobile network devices .El .Sh DIAGNOSTICS diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index 18b68ec9bc8a..942764109dd8 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -23,12 +23,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 31, 2016 +.Dd May 3, 2024 .Dt URE 4 .Os .Sh NAME .Nm ure -.Nd "RealTek RTL8152/RTL8153 USB to Ethernet controller driver" +.Nd "RealTek RTL8152/RTL8153/RTL8153B/RTL8156/RTL8156B USB to Ethernet controller driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -90,6 +90,11 @@ Set 1000baseTX operation over twisted pair. The RealTek gigE chips support 1000Mbps in .Cm full-duplex mode only. +.It Cm 2500base-T +Set 2500Base-T operation over twisted pair. +The RealTek 8156/8156B chips support 2500Mbps in +.Cm full-duplex +mode only. .El .Pp The diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index 1aa658df3283..69103a690cac 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -282,7 +282,6 @@ static const STRUCT_USB_HOST_ID cdce_host_devs[] = { {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, - {USB_VPI(USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8156, 0)}, {USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR), USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x16), diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c index 1104798b1c4d..6a4a108985f5 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -483,7 +483,7 @@ done: } /* - * Probe for a RTL8152/RTL8153 chip. + * Probe for a RTL8152/RTL8153/RTL8156 chip. */ static int ure_probe(device_t dev) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 91d47935221f..587543c3e43e 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -100,7 +100,6 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(ELSA, MODEM1, 0x0000, 0xffff, UQ_CFG_INDEX_1), USB_QUIRK(PLANEX2, MZKUE150N, 0x0000, 0xffff, UQ_CFG_INDEX_1), USB_QUIRK(CISCOLINKSYS, USB3GIGV1, 0x0000, 0xffff, UQ_CFG_INDEX_1), - USB_QUIRK(REALTEK, RTL8156, 0x0000, 0xffff, UQ_CFG_INDEX_2), /* Quirks for printer devices */ USB_QUIRK(HP, 895C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), USB_QUIRK(HP, 880C, 0x0000, 0xffff, UQ_BROKEN_BIDIR), From nobody Mon Oct 21 03:01: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 4XX0Sc5QPmz5b6Hl; Mon, 21 Oct 2024 03:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Sc4xkfz45pG; Mon, 21 Oct 2024 03:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57Hu9ZGNVPRbXLytXg/3XGDOz23oW7KPKNni9om2fM0=; b=ZzGP8zUmr6Duzukd4oLZoYs5+5RW5cgEyx1UY94DOjHCCjny/v275GEcN3wMgQmu2PTU3i r4YlgUTnBYRdLAQ1CbwxIlQSUZFjGurqDAkrmoVhrKzfu7BOK6WWG/ZvByLMLcRb/Q8n+V BRuUzCHoJNBJ7E06UNWGXJ5sliF5yU0ZHZe6I9FlPSVwvfYHYxVFKuM49QSuYdeChMAsKx hYBgbnpNcH31CrF5Ch5tC5Lq7oDrCaHJdoWooklCuLc+SbpW24HPBOe1tEHnwIRVLgwPJm 8UbBEb2NgOn35qr8dnFHuxz+kLVDU2S+5+UNhWUhvYlV8irdfhQhuRuuWDrcJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57Hu9ZGNVPRbXLytXg/3XGDOz23oW7KPKNni9om2fM0=; b=ystZYZznZ0wrVegCGNjf7XAwJVjdZQ81sroiZPPDrbqSFy7BpgZYFh7b7sziYNEjpN1BXQ 2fAJGURDdbY1kWVnE6b9AbCR6EL03q0s5oX2nolwNQYq94rL04HLlv/mpUkoFDR+wUrESR RtYNP/LEvB0YfLBpHc8KPuu8IamDrNtlRQfDJPu9t0s94jh6BR2UHnbevs4aHz1qxdxZpt N1/zkeYCIpCk2qEiKp4XeBkWXf7sTrlFMSqDDb7zRZUOGuQLXHXhFegLuPZ2AK81g/2N93 lZ4t93UEtUiIT6FZAbe/bh/ABsYitw16R6Cv3Ppu1UuIAP2a6iUvVly0Utw5IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479680; a=rsa-sha256; cv=none; b=sEIHXEaPs8EfmpwcCp28wnUUeYJ9Pibz+cAPRRlAeTU5Dsv0C7uxlpzIaGb3IImaV1Xi2o Ju0ZoLqbID7mes0XqLTtgfOwCuYN5tRuIWrrZR+wWRth0i6ITKhVKRJgQbGQ1484jWy+Si 6jo56N6S1jPXeguhAbdILIhK7JJvK4krjfr+8Ox2gzUOyduFGyTUgx0n73nEKMMYuT7bQs avw6cyAWHbCIKmJU7u7IXYbcNhbooLpe+YL14D1Au9yeMbIiIl258EQu6nNFC2BgDOwoSX 7U4kQ7FFTdZUf3EJCBncAqBAQMXJK9lzr1zT/7L42jnkJkFvsFy++II6rzZ30Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0Sc4YN7z1Rwq; Mon, 21 Oct 2024 03:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L31KIi000042; Mon, 21 Oct 2024 03:01:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L31KAK000039; Mon, 21 Oct 2024 03:01:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:01:20 GMT Message-Id: <202410210301.49L31KAK000039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 8303373e398d - stable/14 - msun: Fix typo in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8303373e398d843b859644c6cce0f67f0af96b88 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=8303373e398d843b859644c6cce0f67f0af96b88 commit 8303373e398d843b859644c6cce0f67f0af96b88 Author: Steve Kargl AuthorDate: 2024-08-21 06:59:07 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:00:49 +0000 msun: Fix typo in comment PR: 280965 MFC after: 3 days (cherry picked from commit 213eb102aeec50b8c236aac1d8f0e0a3f9a99449) --- lib/msun/src/math_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index eae2a2a317b4..bdf45a9035bc 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -406,7 +406,7 @@ do { \ * any extra precision into the type of 'a' -- 'a' should have type float_t, * double_t or long double. b's type should be no larger than 'a's type. * Callers should use these types with scopes as large as possible, to - * reduce their own extra-precision and efficiciency problems. In + * reduce their own extra-precision and efficiency problems. In * particular, they shouldn't convert back and forth just to call here. */ #ifdef DEBUG From nobody Mon Oct 21 03:01: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 4XX0Sf4ZTwz5b6Ql; Mon, 21 Oct 2024 03:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX0Sf3kh2z46KD; Mon, 21 Oct 2024 03:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHbwU7a8U/0e5D+RgchCo/4TZHROHcHlIsjOTmd5E3k=; b=Uefid8QlJluBGOoQXOUcgPXkJJMJx+6PS7oJqJSsqWnH0Lzt1VmRw6P0K6Nq2lBfAOiGLo xS0BxAeuRP7BYm8ay8qiqq2134zAVNInYSM9vZPGTkFkHpCh3bc9RUIUtw5YfbivvZwFXx kF3q+HOOR2AMNiluNempGqIUHV98DYqh7y3LMyG6p9BRloqgpB7NRrvkqrNS032x2cI8LF TD+f5gEZZMo6dtLRZKtV9HuQz/+bU9NdQTZSkRhckdYd+JLamIZHRpSTJjaUk8R8+jr6FH qojMY/YISABvNoWxYEEPYvwURD0GICAdlqqjGBaNIGo6vhZAAtfOw1VRA6vrcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729479682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHbwU7a8U/0e5D+RgchCo/4TZHROHcHlIsjOTmd5E3k=; b=nzJwKI2FVr56FQq5wIb408o7aE1hSdmoohFN43rhk1lxoJ0NmpWfAd6dHhCUhTzOqJ6sKh URmBvYvFGEW/uz45WEk8FZuGUeOudlaF91ivbH2lkHigKF7Ixo/Jd0n0CeTTe4Z00soXdx C8Q/yeqmVafqBZcu8rdftlyMAtfL0uPaePPIRLLNmboD35CXtDtR2O54AvVzJuywfD2GNm wzqiOkMK01VNzmwMttKNRZSJf4Nbdwk4QE3JmivVAHO/k+FRps7J+LO+QUxlPPV+B1H75a eHRGhm/fo/lRw1c+Tv3u1Gyn54zjStFczF64aDFei11AvTR3newPRfz/Eas5yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729479682; a=rsa-sha256; cv=none; b=ozr4b4Xyp0dBZOl8sI63+o67F8ZkZ7TTsOgFhpAYeVxLC7XNc/EKGwrd19nRp7KQwraVqw EN2foIGy5w0Cwbs6DiJjy8muuEM2PviVyWRMlXlDIRl1VL2dvWju73H3l4LbCtCGglrKmL 9Rpx0xXY5fz9QJ1tOYbp8GISUNoZeVq2YpvhNUg9TYWbT1UQXKjo/eHf3y602ILmij2lfs fRG+l4yDVSoW2cRjHys6/M3go7an0OqBPFF2I4s/5Gp+e1JWgT+ju4kTPHIv61oHSeZfvN uIlWWnxByM6zsmR5TFbB59jSC0LsY8FrnO6dcUY5gQ0Dv4gIY1yR1nAwkpov4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX0Sf3L7Kz1RPj; Mon, 21 Oct 2024 03:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L31MBF000172; Mon, 21 Oct 2024 03:01:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L31MqG000169; Mon, 21 Oct 2024 03:01:22 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:01:22 GMT Message-Id: <202410210301.49L31MqG000169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 851b781251bb - stable/13 - msun: Fix typo in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 851b781251bb7ef96c0f753d5ab9a667471d399b Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=851b781251bb7ef96c0f753d5ab9a667471d399b commit 851b781251bb7ef96c0f753d5ab9a667471d399b Author: Steve Kargl AuthorDate: 2024-08-21 06:59:07 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:01:01 +0000 msun: Fix typo in comment PR: 280965 MFC after: 3 days (cherry picked from commit 213eb102aeec50b8c236aac1d8f0e0a3f9a99449) --- lib/msun/src/math_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 7d76ffdb8ff4..b71a8d03c0a1 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -406,7 +406,7 @@ do { \ * any extra precision into the type of 'a' -- 'a' should have type float_t, * double_t or long double. b's type should be no larger than 'a's type. * Callers should use these types with scopes as large as possible, to - * reduce their own extra-precision and efficiciency problems. In + * reduce their own extra-precision and efficiency problems. In * particular, they shouldn't convert back and forth just to call here. */ #ifdef DEBUG From nobody Mon Oct 21 03:32: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 4XX19628HWz5b7PR; Mon, 21 Oct 2024 03:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1961fcjz48d5; Mon, 21 Oct 2024 03:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729481578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LmWBvaTvyuzQxZnQ9HV/v/hAh49LMpFoywsqjmSKqmU=; b=tFsX4vVxeyBja0W6+QtqZcbHu0PUk3fRgQfpcMHbWjdKWI/6uvd1ZQOTDUIQg/m2Ylf7fW Ho6zixfZ0WVLZbeYzKAnYPikk9GTpKyCVMaDhWklx8Uz9OUNcX6M15O2iDpP7u+4R+o4X8 qtVKd8XkK88kY1tIql/2RYHRK8hma5mSOAnmypbiaONe9ASN6w/qaX4QLEiDEdy35fAtrA nrZQvTgyiaq419CLw6C0tB4mrZzNqJWzVECox2xFAFNbb4CUuxXVjdDAnA0KN9Fe7hOSY5 9d4TO8sK4XBwN52bzZxI4yfeMTSSoJQm0boGsm27b/bzOGcsni679o843Og1Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729481578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LmWBvaTvyuzQxZnQ9HV/v/hAh49LMpFoywsqjmSKqmU=; b=T1CHFoqvROd5xXN9R8GuJ8DvyVrvVEwANyi/FJgQVpmZosqm7wVIWjARr45tPpr7B9Jzlu iYbZeuzawF59BvEwEur+rOjTaHO6DsdJPWCnk0GC6rrZj+gBbYyAn2EBnE8zgj6IZKWc7Q QK1z9OAdhWXY5NqY9U/3DsyK8KSzfW06o4g0IdUlDrDj2CZIBQCz01wuVxOWUkRE1empHP C2TJjKpLDxEiVSA4ZAThe5Wur4BuBa92ux/6PrL84xYOWh8mAO8Hw7t3WafX66EdWIMM7b pDeSGz6A0GtaBne5hCzT9/U8DulUZLk+8OvxLU34oDBce0+j40/aG6aHUqlEzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729481578; a=rsa-sha256; cv=none; b=SBfu7AH7rkzGbg3p46OfmSPHsKs75M/2KfTAwhRpIb12gFOBYGwDMioEW0UkzemCa0A61S 8SFA9B7114CUlCIVXpgnBVw/frygJeAYcwGLf6bgW2M6Es8UVQsQayROObURVtWqafLUDB s12c50f7JRfC/SRvJG9E+jgpcFK9BY//n/yon3i+hrOAJlRuYHxfqxeVAdrKMbQX0gtxO9 cL0aknhcz31tO4nRuKeILt2WXOC4zHX87Zy0whxpgaNB5rFcQcL585frQSHRvlaoT8Bwy1 eWumUtzqz7amkI4xegRniNKky6vxoJF3XtiOFjNhH4Nf7uO+OyfZ8gQ6unEHbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1961FfLzDkg; Mon, 21 Oct 2024 03:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3WwVA060880; Mon, 21 Oct 2024 03:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3Ww1e060877; Mon, 21 Oct 2024 03:32:58 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:32:58 GMT Message-Id: <202410210332.49L3Ww1e060877@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: 45b0537f0ecf - stable/14 - membarrier: Add 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 45b0537f0ecf6ea3663f7180ad50fcd8170426ab Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=45b0537f0ecf6ea3663f7180ad50fcd8170426ab commit 45b0537f0ecf6ea3663f7180ad50fcd8170426ab Author: Ed Maste AuthorDate: 2024-10-06 17:47:34 +0000 Commit: Ed Maste CommitDate: 2024-10-21 03:32:46 +0000 membarrier: Add manual page Add a minimal membarrier man page that documents the available cmd values and errors that can be returned. We can add more information and iterate on it in the tree. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46967 (cherry picked from commit 1fc766e3b41d0cdbd166ef95258434069a90ca52) (cherry picked from commit 92cd5abb64dd70c305535c9504c6a2b73552147f) (cherry picked from commit 8b41e693fc3956385d5771d60ee93e18001a5a0d) --- lib/libc/sys/Makefile.inc | 1 + lib/libc/sys/membarrier.2 | 151 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 33c0b9711d46..e964e3dcff26 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -244,6 +244,7 @@ MAN+= abort2.2 \ listen.2 \ lseek.2 \ madvise.2 \ + membarrier.2 \ mincore.2 \ minherit.2 \ mkdir.2 \ diff --git a/lib/libc/sys/membarrier.2 b/lib/libc/sys/membarrier.2 new file mode 100644 index 000000000000..87db620975ef --- /dev/null +++ b/lib/libc/sys/membarrier.2 @@ -0,0 +1,151 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" This documentation was written by Ed Maste +.\" 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 October 6, 2024 +.Dt MEMBARRIER 2 +.Os +.Sh NAME +.Nm membarrier +.Nd memory barrier +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/membarrier.h +.Ft int +.Fn membarrier "int cmd" "unsigned flags" "int cpu_id" +.Sh DESCRIPTION +The +.Nm +system call provides a memory barrier, ensuring ordering between memory +accesses performed by different threads or processes within the same address +space. +.Pp +The following values for +.Fa cmd +may be specified: +.Bl -tag -width Dv +.It Dv MEMBARRIER_CMD_QUERY +Query supported commands. +A bitmask of commands supported by the kernel is returned. +.It Dv MEMBARRIER_CMD_GLOBAL +Issue a memory barrier for all threads from all processes. +.It Dv MEMBARRIER_CMD_SHARED +This is an alias for +.Dv MEMBARRIER_CMD_GLOBAL . +.It Dv MEMBARRIER_CMD_GLOBAL_EXPEDITED +Execute a memory barrier on all running threads of all processes registered +with +.Dv MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED . +.It Dv MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED +Register the process to receive +.Dv MEMBARRIER_CMD_GLOBAL_EXPEDITED +memory barriers. +.It Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED +Execute a memory barrier on each running thread belonging to the same process +as the thread calling +.Nm . +.It Dv MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED +Register the process to receive +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED +memory barriers. +.It Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +In addition to the guarantees provided by +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED +it also executes machine-specific serialization instructions, which +ensures that all possible speculative and out-of-order activities on the target +CPU are fenced. +.It Dv MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE +Register the process to receive +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +memory barriers. +.El +.Pp +The following +.Fa cmd +values are defined for source compatibility but are not yet supported: +.Pp +.Bl -tag -width Dv -compact +.It Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ +.It Dv MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ +.El +.Pp +The +.Fa flags +argument must be 0. +The +.Fa cpu_id +argument is ignored. +.Sh RETURN VALUES +If the +.Fa cmd +is +.Dv MEMBARRIER_CMD_QUERY +a bitmask of supported commands is returned. +Otherwise, on success, +.Nm +returns 0. +On error, -1 is returned and +.Va errno +is set to indicate the error. +.Sh ERRORS +.Nm +may fail with the following errors: +.Bl -tag -width Er +.It Bq Er EINVAL +.Fa cmd +does not specify a valid command. +.It Bq Er EINVAL +.Fa flags +is not 0. +.It Bq Er EPERM +An attempt was made to use +.Dv MEMBARRIER_CMD_GLOBAL_EXPEDITED , +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED , +or +.Dv MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE +by a process that did not previously register use with the corresponding +.Dv MEMBARRIER_CMD_REGISTER_* +.Fa cmd . +.El +.\" .Sh SEE ALSO +.Sh STANDARDS +The +.Nm +system call originated in Linux. +This implementation aims to be source-compatible with the Linux implementation. +Certain +.Fa cmd +and +.Fa flags +values are currently not supported by +.Fx . +.Sh HISTORY +The +.Nm +function was introduced in +.Fx 14.1 . From nobody Mon Oct 21 03:51: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 4XX1Zr0mdYz5b8Jm; Mon, 21 Oct 2024 03:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1Zr0Fy9z49nT; Mon, 21 Oct 2024 03:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnPGnKGv/eIlCdGMqh5kEmEDbUQchaf1onq8T17Zm8Q=; b=ZOo5CRuGFTvt4eL99cvY2wAPq3/JmL1BOBSPB1QG0tTWNbp694Ri/xlCPCK6Inn+A+nI+W YC6Gst8UWSeWogoBXXvoVR2w/tmxvuBqfalHazg9XYxlyVvo3ZyqF1dwUD7laHeGEEtxQW /xmqK85A0fx8LZRnXybke2vvNRGuNicUb1UB77smzOUk/43B69IxPkeQ6rEYkrYrtz9yD0 sF+tPD7l3uwzR3+pVfOrn4pA621HuAyFOCbAhUIDq2w9hhzC2gCo7P/4FiDBV+M85liA+s /XkMGn0I3GMj/qctb4IaRgVgALNMwiGmakRlgeQ2JXL5KlTDRRVAWjQLJN/4yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnPGnKGv/eIlCdGMqh5kEmEDbUQchaf1onq8T17Zm8Q=; b=m9l06w5AhuEASAtMSZ15jiHHqab595UaFbiK4ltsZHq3/+ecH05II1z6XxnV2EPm3JjjpV gOfh9yk+Mh9cblhoEYjZkgxL3LDYjNHnx5lEKmyWylciNlrwOwlWVI1iOue+GYT/unRxqo ccyXtzZ6hwfbUgRK0xOMpqdKXEzMW+APRMIoxBBU7Z2k+3TV+iSNT6nJqRicp5sSnTTU7p ccov7wR+5MtgCoQROaUxYvVBMGaH/Bd3go4YlPrO+1NKvREfSuHeYeoXiOuLOrOruszaXp xI3ajjpmN3nYpMBLz2iMpcPFVP8VUTN1bth40SId4pLjGUFc5IpUH8pfvsr+kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482708; a=rsa-sha256; cv=none; b=VyIV5+03GLPrFmlzKxBjhOk4HvntW7RMQw7AJ5lE+XWwDEtyFiwqgFbXB6ZesB94FJ57iM zc01MjTwgCiGON+ySX/egmN858rIumCrjHA7mBGfKQsqGyy00NebmQgosi81wiNenjiyRu tEK2Mos6lLjclHF6zBZ2zg0L7na/tS3dcCO4k2QzVncW1trsXr8In+w5cfAee4WpJKUj3J IyKcXIkKMPQSlhJkyXYwFJytu0EvX4mBu+mrulPH/Ux7A6D3EL0jPoqOVa9vAc5z/ZE99D b/AeFFfrxaofh3sUnYj7snePMt6ZLajFbwPJGlV8BfkHzYrAvT2zoB4Gddbycg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1Zq6z80zFMZ; Mon, 21 Oct 2024 03:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3plNx091417; Mon, 21 Oct 2024 03:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3pl42091414; Mon, 21 Oct 2024 03:51:47 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:51:47 GMT Message-Id: <202410210351.49L3pl42091414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: b50ddfd6ea7a - stable/13 - acpidump(8) Fix typo in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b50ddfd6ea7a2348b3e2e8bac77b3c89b7081a34 Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b50ddfd6ea7a2348b3e2e8bac77b3c89b7081a34 commit b50ddfd6ea7a2348b3e2e8bac77b3c89b7081a34 Author: SHENG-YI HONG AuthorDate: 2024-04-02 17:24:46 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:51:23 +0000 acpidump(8) Fix typo in error message acpidump(8) uses iasl(8) to parse acpi information. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44596 (cherry picked from commit 861f5b95b39fd8a6b10b7bddf29e284e5ba2c49a) --- usr.sbin/acpi/acpidump/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 5005c4bbe630..477edd892483 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -2233,7 +2233,7 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt, ACPI_TABLE_HEADER *dsdp) goto out; } if (status != 0) { - fprintf(stderr, "iast exit status = %d\n", status); + fprintf(stderr, "iasl exit status = %d\n", status); } /* Dump iasl's output to stdout */ From nobody Mon Oct 21 03:52: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 4XX1bC3qssz5b8Lq; Mon, 21 Oct 2024 03:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1bC3Dqzz4CS3; Mon, 21 Oct 2024 03:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIlPrMYtOc3eMAad09MZjhJGzeMhp6LSDF06KZMUROQ=; b=OVKsA9mjI38yR0bnPbzdW3KOjzX5oyeuQwh6gUAdkJGhcc2kijGOqs8y/doirq3zjSbUTJ Xrz/Rxhpu1BSjZuqClZhkkC8McgFiFQVYdVh2LpPjupkZI3Wi5SUcOPp63Vm7MNdpLIeV4 u2Fe+WtXjjSYgvylmX3LE+APG7zAA8YwzMg+VEZGi0Y1U/GqMxqh2YlBdxEt2+kSIKDEpu SJQQqK2howmGWiR2xpMxORdYHyG74GDyXHgAhFbYLammPXj7ocTBrmLO9/CmTf4U2nYvCh AA3kXDOEow65/iUask+yx7tm6yGDIhp6kD5PaXFchavswBGc+NCqk4xYHS3Ynw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIlPrMYtOc3eMAad09MZjhJGzeMhp6LSDF06KZMUROQ=; b=rriL5CXLCdKPRXR3xpbBWJX7GUZiRVc1cfwa6HttOTRE2CJC8CbW26/eDKhyEC2B9rRIq8 7lDOsNoiCzccvTajf7IOH796W2INkcoARYSB8NA0QF7kraOD/4HnPaNLx14CK0bizZFqPl ZnPPN6K9CvBTlnqCLXeU3YcbG4ruZvO401iu0jkmIfpDCk07uqsUtS+p3LMg/N/gACihN2 x4inF1eXbRmx1J5hFqKZnSc73+tqA3Y50UqcLMzxMlDHknRXLsUt80t4OCCaEDrfgDYurh Pc+a1PR3+VsaF6r4xCMrLW90e2AQrM5bm1flD0p29yakQVxNbXmh6SGbNtJc/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482727; a=rsa-sha256; cv=none; b=ozwm/Dyma0f/yOC718xuFwCZ+ZGJJgjG/PDjDqNMaliTiq2j0ZgI7xdDbk88ywxa5X3yep GsEOHCvesCrvx0JS/IMz8Dk3PiXMFN0paIB3Ei2cHF51i04CztOs+EoTICsGmihU/EuKlV l5O2xsXkcNsAb31ZMvrZrIOVsi58vY+/PbYroaTe3cuhrh/XNo6StNM8cKZglwUB1o7XCX UsjN0q5NaCOxLkM60SlIVskl+OtQHdLzD1rTeq+RGPirsUumelqjDBYJUfzHut8LnNXgOW FMIDn1AlfGGpCPh0NnoEPyN3q/5W++BytnHjP0e8y+pFAVafy9xetViuBFYtgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1bC2rHWzF9W; Mon, 21 Oct 2024 03:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3q7qa093929; Mon, 21 Oct 2024 03:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3q7ua093926; Mon, 21 Oct 2024 03:52:07 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:52:07 GMT Message-Id: <202410210352.49L3q7ua093926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 883dd0a0853c - stable/14 - acpidump(8) Fix typo in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 883dd0a0853c5dbc86bf1f319d387e089954a0eb Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=883dd0a0853c5dbc86bf1f319d387e089954a0eb commit 883dd0a0853c5dbc86bf1f319d387e089954a0eb Author: SHENG-YI HONG AuthorDate: 2024-04-02 17:24:46 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:51:57 +0000 acpidump(8) Fix typo in error message acpidump(8) uses iasl(8) to parse acpi information. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44596 (cherry picked from commit 861f5b95b39fd8a6b10b7bddf29e284e5ba2c49a) --- usr.sbin/acpi/acpidump/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 7b2e0c5e4d12..af0068649fbb 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -2619,7 +2619,7 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt, ACPI_TABLE_HEADER *dsdp) goto out; } if (status != 0) { - fprintf(stderr, "iast exit status = %d\n", status); + fprintf(stderr, "iasl exit status = %d\n", status); } /* Dump iasl's output to stdout */ From nobody Mon Oct 21 03:54: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 4XX1dV5KXbz5b8SP; Mon, 21 Oct 2024 03:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1dV4mmYz4Cbv; Mon, 21 Oct 2024 03:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yl9bajjQ8DIBGqoWiDhbKmUK8nYyq35m1FcebsLAPT4=; b=slLYUapVTkQCaRVlDRkHi0u9IIK9cT1aGDNrdSTvmShARv9h7Ah8dqhM1qf1IXvVsHnY17 7sqeKhPkcvRzO3Vwd7CEhF+WFWVejoRYfT7GTkPJm1ZxnKLDDxyCduWfYMIfgEdw9cOpIW zrHpAmvFD481z58MyicvwI11UnmnkOf2xB5o9Sdxu96DlKySJ/fb1T4sSEjQklRfPjIVKO +KULhhJFN+UPOe67pOTqL3BG/UD8oMnE+Y7jSgNLPhDUyEujMz9rEMrZ1HTKn4PB9j2Vj6 adKgujHqbiXpEzN9Nqk5umB+jKnoS9j1ac+PrqX1QeW4sJKpGOAm/CvRDKF+Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yl9bajjQ8DIBGqoWiDhbKmUK8nYyq35m1FcebsLAPT4=; b=l6njBrcMwnhQqQEaNZLYYUPAeAEacdXF8J1E22QB1lMo7GrBnGfKVS7tN3lUtcRfnsv0bb 5ueN4MTm7JDNNa2GjH7dlNMzww2vU0Xr2gVr0U9oJEqCkuqpG09tpaO68FFAunEv1kV93A BG9yVs9bwnxbLTDQ0IV12OWgQasjEZb8sjRczPLEfELf32eoXKEuSwNKZGERlG6npevD+K eX5Mr8EiV8lY4EdOAdgw+P7SKBQxfH7HL175HM1XWZjnmfpxSTM1T98y8H5x4QGalAIISW FQdkD09kJX6yKh79mCi91pbuzfvYhdw6f338WnbOaNRGwcxc+x7T9gu04CUVFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482846; a=rsa-sha256; cv=none; b=DHmWfdCLJsfOUhRCJol1aaDZ26yMy/C11UORci6pVzaZzAJcLhJIJ36Q9z+OdiCKoElJ0c 7z8gSbgX9PtjhpW4v0GgGtipaGla+WqgrWYhqC9k5hz+I8RJ7PNJXNy6seTQUNWsMhmVVR kmx7CC4B07NzZFyjMQbA+bXZhNRFfEaPTFn/kv8qjlbegVJTobUWPfsXsWJRJyM+dy9rgt ZsckG00PnjEysJf6mPm1Assa6hS6sYPoFPZ88I5r7th/VN02wb4dKzMPWxW4WEhB+XNHjL gTFW+RLrVhwHkxAonnR6VuzgHZoQibIO1HZlS9GnfyvZWUec/q6LKw7gPXFUyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1dV4HWrzDcZ; Mon, 21 Oct 2024 03:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3s60a098685; Mon, 21 Oct 2024 03:54:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3s6kB098682; Mon, 21 Oct 2024 03:54:06 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:54:06 GMT Message-Id: <202410210354.49L3s6kB098682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 26325c26eb6a - stable/14 - mt(1): Fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26325c26eb6a90c3e35bd3b3af5bf639687360cf Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=26325c26eb6a90c3e35bd3b3af5bf639687360cf commit 26325c26eb6a90c3e35bd3b3af5bf639687360cf Author: Yu-Hsun Chen AuthorDate: 2023-12-13 11:31:32 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:53:44 +0000 mt(1): Fix typo This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/931 (cherry picked from commit 452c3e9514cbaaced8997458e34bb07b51c29bc9) --- usr.bin/mt/mt.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1 index 5eb584336b2a..fe5506107c99 100644 --- a/usr.bin/mt/mt.1 +++ b/usr.bin/mt/mt.1 @@ -341,7 +341,7 @@ For example, specifying .Fl w Ar 0 will enable all settings except for LBP_W. .It Fl l -List available protection parmeters and their current settings. +List available protection parameters and their current settings. .It Fl L Ar len Set the length of the protection information in bytes. For Reed-Solomon CRC, the protection information length should be 4 bytes. From nobody Mon Oct 21 03:54: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 4XX1dc1M2qz5b8kX; Mon, 21 Oct 2024 03:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1dc0dctz4Cwm; Mon, 21 Oct 2024 03:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRbGWKGtuvmZv4KeN+KK60R9hYxUsGsyx4bUMT0WFRI=; b=ZKiwHKYxqMadOwQZbMNT2hCZQoPeG/GC7D8yrVNeqo3Mu3q1EmkiXkrcOCOJ0DirviC7cM Hd6yV00ibJ65HXyAe2SY+VWo8KCD8J4L1TfFpq2yGVkZj4joAJTvo1djLMbSeIAY/rpSLC Q0/5YtoRuMhvt2IpZoCbjvPvKYF3fuwS47kKWX5GnVS0h0tJrNUAyXe+haWPbTkDKKwY6y OUzC1ivQdLJExHMGmSwuuuqa8IG4GBGdTFcB4Mvj/17icoOwelFf5sykZ6Mpzwn+hitETX v7NQwJ5rbBH5+r4JIJmm27ymMu0VTusMucWh1b7ninoaMDVVR8AIzkSuHHEAyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRbGWKGtuvmZv4KeN+KK60R9hYxUsGsyx4bUMT0WFRI=; b=Rqxp3HslIJUdHuBKcmj5R8LUe024V9krkjI8zn9g9pI67SFAi94PXHTxPNaAZl7M2ats5r mpi0gpXOFoaOgrhIK78kqnlJZnz3gPo+iWdxo3L6AmkFS9PDNt6v5uZ1ohkMUYwYHHxEfQ Iz55WB+Otb1Efeo6Z0gC8s04eyOhHixCqldtOgeQDxrHtz6xlwb6xiinIBkrZCmahrYTTn Q5zEzWji0V84GYXz73uv58smwfmh4c0bDLDY64Wjr8kJ3vhw2GyD3Ir6URTt3axXS6dpmE X2n4dZTftPHXwxmS9CRuzIZZPEUtCxtwTkcsShIWdlBsQ3PpTxQ2vGjEK6i+vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482852; a=rsa-sha256; cv=none; b=L2G2bkJUdlNSJbg/+zwJOYQ/9q4gThFd8WiI+Lbx26kZJCcmD1JM/glmWS//Iks0YN5V3+ EiFmvRGJqCAvJNFKN0M7r43XvGwrNCSAYkIbcFtE+l9MURYV1Gmem4Tbd40+IQaF2DsKJf /9A4MS6je1AeyFZH/hY1ZPtH3mLfAo7pjG+Vbu82al4lQck3lITMu5Hu4njGfr6/zM6Y+x YtTRR9XdafrELiJKVdu3DjtAHLB4jEBMkbj0WRKQIcc/0Z5Eyr1DRgaOMgp3S0mmCy5URZ 2gihWRzQuJu+EmjUMnZOgAcotF40eyMHhi3NeT+Nau3dr4GwRs0O6qcxVzf15Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1dc0DMzzDjQ; Mon, 21 Oct 2024 03:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3sBja098824; Mon, 21 Oct 2024 03:54:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3sBJT098821; Mon, 21 Oct 2024 03:54:11 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:54:11 GMT Message-Id: <202410210354.49L3sBJT098821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 7bf9f37da071 - stable/13 - mt(1): Fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7bf9f37da071cc8fcc6e29ec82b4514d9376afda Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=7bf9f37da071cc8fcc6e29ec82b4514d9376afda commit 7bf9f37da071cc8fcc6e29ec82b4514d9376afda Author: Yu-Hsun Chen AuthorDate: 2023-12-13 11:31:32 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:53:49 +0000 mt(1): Fix typo This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/931 (cherry picked from commit 452c3e9514cbaaced8997458e34bb07b51c29bc9) --- usr.bin/mt/mt.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1 index 5eb584336b2a..fe5506107c99 100644 --- a/usr.bin/mt/mt.1 +++ b/usr.bin/mt/mt.1 @@ -341,7 +341,7 @@ For example, specifying .Fl w Ar 0 will enable all settings except for LBP_W. .It Fl l -List available protection parmeters and their current settings. +List available protection parameters and their current settings. .It Fl L Ar len Set the length of the protection information in bytes. For Reed-Solomon CRC, the protection information length should be 4 bytes. From nobody Mon Oct 21 03:55: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 4XX1fY2ccVz5b8kl; Mon, 21 Oct 2024 03:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1fY1z7jz4DB9; Mon, 21 Oct 2024 03:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZ279tx3ZoCvGwLpTklCChnIFtm3oMZD+ZbbDpSKM8I=; b=dLkG7qGLwD96nL05Ht9NRBW9ELyy88Im2v+VWYqFL472ejhUMajf47emlpDhfSyGbEU4lm +sJsduO9tm0p+6k8niHHiszgRhS9xh64zFVqr3RIhOVYJ+DD+JNJt6/eTV8mtjQYLRvt5r qpUwJCSWEH9hR8CyFLgGlX+njIgV/VxRj4CdA+Fmk84B6EQRQmE8ney8lPNRoluclxxQyv f85NNQA41EcmXVIxWenfmRAB9rglMEfsvEePTFHrU/P7TJNIsjm6R/2GYkDwN+6yKFLuP+ bNhOgYmlkAm9SEqOKLp1AoMhMeMbpRimnK/dAnrd/TQyvAn+nsWc/pDE8bAm3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZ279tx3ZoCvGwLpTklCChnIFtm3oMZD+ZbbDpSKM8I=; b=xFtZxzKif//I4JMcqZMNQryxB6pVw/HHNKccotJ0rsxGaAGf4Yg3vF1zkgCh3FsAEzB5n2 e+L4kZ4rJGELG85eqHjrnEiAIqtK6kC7yVY7mpiYmkguRNzLkaf8IYzuD1Yi1URZNRPfTb rGQemnUv9Vdg3pjmD2bcqwo557AZD4bPY+UiFORoDOLWN6nZxEJV4OYxQFwwWSLPmS4BPL rHBUg5aFHwRDL/cld7HiXbrHvF/85K646kLIeDAR9Rp/3tBU+uXWztfrzR4n3LQgdN7S7V GpsvQvjrnEbefPS6aCX0JJt/R1hN6r57IK6H6JBQ445KxOOvyZIe9ttzdZC0qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482901; a=rsa-sha256; cv=none; b=QBbmLZEhCc9PAcWOnc7tsIYLl1CVsCHwKlL3kWa2eAWXFgp8yZ2jOGi4jVzV0/IxiunydL Ukz4xx8GzFjapZgJ9ruBu7yf+2X2bOOOXEUiMwN5tv0DG8bgOscnCVywR8lFkQwendl/42 B79BcWPmhKIwF2rMtl0BfHjN9zzXlqq4Fcq8X3vFocJEjlIJ/NnHhT58gaUlCEBpE5JksD TzQWVVV/FfSsy0rQcsN4MPox8mrrQH/GmwnNeTXt16x2dj1jN1YdqKon8GddtmkUNzxVMQ 4NgC9ysnR/kBoXtCVHXhRoCmklUnzJiXT+duICP8BK9w3CwaBKl9QfSfZlcGQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1fY1NgQzFQJ; Mon, 21 Oct 2024 03:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3t19l099233; Mon, 21 Oct 2024 03:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3t14N099230; Mon, 21 Oct 2024 03:55:01 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:55:01 GMT Message-Id: <202410210355.49L3t14N099230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 5d12c7fca205 - stable/14 - mkimg(1): Fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5d12c7fca2053c813ac2007d2e442cc400824c64 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=5d12c7fca2053c813ac2007d2e442cc400824c64 commit 5d12c7fca2053c813ac2007d2e442cc400824c64 Author: Yu-Hsun Chen AuthorDate: 2023-12-13 11:15:06 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:54:44 +0000 mkimg(1): Fix typo This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/930 (cherry picked from commit 1a35ead682408aaf5276ded49aa0c6daa7e10672) --- usr.bin/mkimg/mkimg.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index 333b8b8a5ecb..82bbee53a267 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -224,7 +224,7 @@ The preferred file extension is ".qcow" and ".qcow2" for QCOW and QCOW2 This file format is a sector by sector representation of an actual disk. There is no extra information that describes or relates to the format itself. The size of the file is the size of the (virtual) disk. -This file format is suitable for being copyied onto a disk with utilities +This file format is suitable for being copied onto a disk with utilities like .Nm dd . To write a raw disk file, either omit the From nobody Mon Oct 21 03:55: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 4XX1fh2NqHz5b8VY; Mon, 21 Oct 2024 03:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1fh1ghtz4DWF; Mon, 21 Oct 2024 03:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqHTJfTz6dIqxMmw8LdGHJSnhmp663ZcrPSoRz6uw38=; b=NwRvAx9TqR7KR/jdm7B3iX3XPAjrnBEkdpSe6g+bNmIa40/gNNvZ9C6jQ/JYthxaltTH7T ea27xYRy9RvQHuadY+XLgBt7I0qlC/iTlFM52UgVYPjDg/pAwIGXgk1ZviPbUXcB9WUcen ZPStxcntNef6SomtXdEaQHXWgWDb4Vyh6Nm88Au/f9+PX2JkuX+Ystsh8pqfWXaNMLzz+V RIHiffqnCad17zwrcgIupiQgQLzAq4yPiC5/5EyZUteNL939Pq8GjrMdydOyJs0N9djKVa qi/3uGJXryKtwmVmAUTbiPkVQzJblTqv9dRMvZ4TvE22kHi8XGrgtRCapavJPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqHTJfTz6dIqxMmw8LdGHJSnhmp663ZcrPSoRz6uw38=; b=Lg4ZGb2XP3sLhrVNvY0/HCFYmqFRUGZna3Tsqtjy3GVbvK/iE9WUymqlWFcj7AYTZHANNQ X/Mff5EQLjaRdiRJJkunGxUWWPFOuZNKfA9Q2S8aq/93mJ3IH3dUvb26Ohvf9znGgbH0do q5Hh9iClPzn9foG7HxxDIYdtsV1M6FXzNkvXbXQD13tpLEd9pSoJmy1owEvyZxwcmy3Q2y /+R6p1c1sE6w/T/LOhsl2kvciTwjiJmep/vZPSKpnyXc1kGDY811OGCnbL0hobXc0KvGri EFhrDfb5739Z4aevJBEAxrT8Gu5wsxU1g1krMKIM6PyihQymXMjenIV9xjZtGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482908; a=rsa-sha256; cv=none; b=hlpy86n2tXDdYx7dTUQci2GJT3FK6X8Iz/o5KqvhAlaUBJl68VSWrW5bgJsdmRseeNe40o T7ZhYGLX9SOQN9kpj+Bu0gJ8OyaEzYRsWLe4WNv7dBpsh7HmmCiM6rj6VB9D3/wejlbJYv C4jDBqBx0SZWzRRAFxEtOBiowlSOV8m+f4iQ2GR8zotl4z0J9D0wUJQxJsLriLZf3Pa/VF 1ePBNoY5EyRMhf6VWkaEN2fb+O0QN83VtuuL92mN2tFGv/kRCOueSiqpXr4S6pEGa5a1U2 bdmT3Sdzvy0Ef/Kh8DpqVNE8u10J+yVeGBHX7kXsZMeNNV+SUaAeMcWAhoSEJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1fg6t7lzFBH; Mon, 21 Oct 2024 03:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3t7mO099386; Mon, 21 Oct 2024 03:55:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3t7uu099383; Mon, 21 Oct 2024 03:55:07 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:55:07 GMT Message-Id: <202410210355.49L3t7uu099383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 6dd7668e77c8 - stable/13 - mkimg(1): Fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6dd7668e77c80d6328a1d4a49cb4dd535c2cbb0e Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=6dd7668e77c80d6328a1d4a49cb4dd535c2cbb0e commit 6dd7668e77c80d6328a1d4a49cb4dd535c2cbb0e Author: Yu-Hsun Chen AuthorDate: 2023-12-13 11:15:06 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:54:50 +0000 mkimg(1): Fix typo This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/930 (cherry picked from commit 1a35ead682408aaf5276ded49aa0c6daa7e10672) --- usr.bin/mkimg/mkimg.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index 333b8b8a5ecb..82bbee53a267 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -224,7 +224,7 @@ The preferred file extension is ".qcow" and ".qcow2" for QCOW and QCOW2 This file format is a sector by sector representation of an actual disk. There is no extra information that describes or relates to the format itself. The size of the file is the size of the (virtual) disk. -This file format is suitable for being copyied onto a disk with utilities +This file format is suitable for being copied onto a disk with utilities like .Nm dd . To write a raw disk file, either omit the From nobody Mon Oct 21 03:55: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 4XX1gX5Nrxz5b8Vd; Mon, 21 Oct 2024 03:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1gX4wBfz4DmK; Mon, 21 Oct 2024 03:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PyB6LeVOrOFpo0Wq9yHHyrj+0vlBcWXnWpq1bMNP/l4=; b=P40SSfD8ouCBwTjLgHObFXHUPuDF+A9JhjuhE2kYr5xww+YLLpsyysvuKe51RnBPwpd5Mx 2fUA6e2Jc0oZ+ZHZFbfvqvrKMKEe6oCZj5gle6dMYQSDsJDMB+oa6Ou6d75OvR+O1sYcCK ThBuDt2RLSuysvEe5TiRs+6DDwT044QbmD0L0P6p+FD3SD8q7H40YOmmx06mM0kZIJDXv2 Bm6Jo1X2Deb2ZodrmZ1iwcOxiHA4LM+G0wyQHt5taUhOs65DIQgZsrCs9bxhrDBmEIEzn9 AjMsBZ2euWZA9g+ZpOVvfn3n1GpRVeX7eFVAfE77BQBBKzkhyf3b9ko9b9tG9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PyB6LeVOrOFpo0Wq9yHHyrj+0vlBcWXnWpq1bMNP/l4=; b=gihaaGjW+wQKDpuMr6MPCmO1/vLxvY58RSj9HI6dho5aBBEKOB5/lSGK/Imr158RPYa5n/ /NmV/pJNa2UdRyGcJYgs56PEciXq/2WsmGDkPdFPfNCCSNdA/nn0ok/px3a2JR2Lw6JOfc F8PaBzamNL7P3lIgEPcwSAWqsdkzKWmnWlie9KmOHSoBZJJ5hFCSd701R02Bn3lbHgs9tf QCFhFL5SW2mQjvmIjVlq0bTmWOC1bgcBtCFs+LlCfY0KUqvGrSp336GPcUdA4rz6vk70GS 0TnRLWZ8yKJuDMoGM4OzTGT9N7Du/B/K29qvUJugxwsM0jffF1yrXKXctD3PQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482952; a=rsa-sha256; cv=none; b=IE/MYifGtn2z8RuOlDkp33Kb3Vw2ZTYEKUJqh1ORYiC0ISsaCvYItZWOYo3f4B861vmo55 17BagPhx+/ayn+o/J+3RXRO34q33kHtJd1BHQpn1/CNa6mDnEqhKjh3ePfVD3nPjcAe74T alUP9fSyFDTL1HzdIKxqLbDfk8Cav05i5Zhc1GMCLSPo2ROzwLI59h5KA11bs028i/ogs3 lO3HkNKWtw7RO47AtPAbNlkEgHLGFW2tv86A2Z5lgNdWV8/4JNCyTWTneTGjmJubFPf3D6 qx5mWersx4tCy4Vi7D7sJPj0K68pmxBl3NlHcEb3NuuVsku1RdnkICknVvhTVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1gX4NVJzDmD; Mon, 21 Oct 2024 03:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3tqDM099769; Mon, 21 Oct 2024 03:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3tqgI099766; Mon, 21 Oct 2024 03:55:52 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:55:52 GMT Message-Id: <202410210355.49L3tqgI099766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 9ce6e243d62a - stable/14 - fstat(1): Fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ce6e243d62a231dff1619dc3a7663cb9ee4e209 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=9ce6e243d62a231dff1619dc3a7663cb9ee4e209 commit 9ce6e243d62a231dff1619dc3a7663cb9ee4e209 Author: Yu-Hsun Chen AuthorDate: 2023-12-13 08:42:22 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:55:41 +0000 fstat(1): Fix typo This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/929 (cherry picked from commit 0ba51e3b638424597add4212958524c9b750dd7b) --- usr.bin/fstat/fstat.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1 index 62307c7d51bf..313454c2a9ef 100644 --- a/usr.bin/fstat/fstat.1 +++ b/usr.bin/fstat/fstat.1 @@ -312,7 +312,7 @@ $ fstat . | awk 'NR > 1 {printf "%d%s(%s) ", $3, $4, $1;}' 2133wd(alice) 2132wd(alice) 1991wd(alice) .Ed .Pp -Create a list of processes sorted by number of opened files in desdencing order: +Create a list of processes sorted by number of opened files in descending order: .Bd -literal -offset indent $ fstat | awk 'NR > 1 {print $2;}' | sort | uniq -c | sort -r 728 firefox From nobody Mon Oct 21 03:55: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 4XX1gd5YK7z5b8jq; Mon, 21 Oct 2024 03:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1gd53Rnz4F1h; Mon, 21 Oct 2024 03:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkkbOU74Myb3v4esbEJT9nY4coMKqXsWXhv4xdUjDyE=; b=CS3Ksx1IjY2omiYORcsAVUOiCTSmw0Pe24xV5vSLeOUM3CgfKLYdlFmHuaRxhWP2WRS2od ltJBcrXf837x43eUR8Vl1n8dF871MZXGqN+7zL1j1L2CGkGVLScDz6Jch22BUy3JeBJpxM XG1N0e9pGy8z34LwMmUq7UE2gXCQAmtvWWetz4rZgpq2tSGdWUWY5eTjIw3bq7pKF7ojzi isG86GVhr4bqNlrns7GsYW/cA3ldk7q4I0/2vKOC2lvlaY/Li/vLOrDMoZLJrZ3JinHYGt 6y/JXbaVxY0ZUHskbbHV0MYQUmDGY3P9y21D7DevnFEtnd3L+PQssQSZtI693w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkkbOU74Myb3v4esbEJT9nY4coMKqXsWXhv4xdUjDyE=; b=sCmO8A3vaLx9rEGerChtXXFsfN+qHpC8vw72NQi5NSUSbVBxNm9lewbwAnm9/PCFCjAXbd sbmQlf10oE2oEu+34EQsDGbackIvhDR7dBVvcAFhvHaHKOifGO8+w2FJb0vIynAC5oZ7Uv rrF11R/zTXUIOqTVlom0P3mhWFGuDcloO6f+uzQMcD22vuBI469e6V9UueZFr9+mf31QJX n9Wwa1YvY2baK1WLhUqkAo9Ro09+Kbat9T+Z48JCknMycRsEwo32241tFxKUKAEoueYY8Z huvqiFDa5y73NPeEWeobA5wQ03ruEeOIB/u9z7lXxmEDPW6HXbqIhuAKzBkSzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482957; a=rsa-sha256; cv=none; b=dofY5uVdKY+tbzESG1S5tzPHFWtXLFCSMmpSHwMTFsjH6y/ynEnvagXS+EEG3UhtQhI6rd YjOZyEWtiqofVKn42sDJQfKko53VYRe449YHV0LsmF8Pb5DVAWHqyw0MAhPN3ao2IByuHO 2zloqcghBuN1vLbuqZWvoorz1QTlGP1jkyvUsJ/yVQj6RN2eUm9UNaiXWHZhq6BNd7ysvl q6CG4cKJaT4cPgcLVdIQ21IMCPYxniDR/u0V1piAemEcINohhvlOALt+4IfiB0zgh+HfTc MbhGDcb7pOI6YuBSSvoPhabRjjxpZIWb7MXbXyRmbpDyMMJrKxQboyiZ7tpwuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1gd4V8pzDmF; Mon, 21 Oct 2024 03:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3tvTJ099908; Mon, 21 Oct 2024 03:55:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3tvZh099905; Mon, 21 Oct 2024 03:55:57 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:55:57 GMT Message-Id: <202410210355.49L3tvZh099905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 6f8784e27e21 - stable/13 - fstat(1): Fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6f8784e27e21378372f532f65cbdfc346ef322fe Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=6f8784e27e21378372f532f65cbdfc346ef322fe commit 6f8784e27e21378372f532f65cbdfc346ef322fe Author: Yu-Hsun Chen AuthorDate: 2023-12-13 08:42:22 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:55:45 +0000 fstat(1): Fix typo This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/929 (cherry picked from commit 0ba51e3b638424597add4212958524c9b750dd7b) --- usr.bin/fstat/fstat.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1 index 62307c7d51bf..313454c2a9ef 100644 --- a/usr.bin/fstat/fstat.1 +++ b/usr.bin/fstat/fstat.1 @@ -312,7 +312,7 @@ $ fstat . | awk 'NR > 1 {printf "%d%s(%s) ", $3, $4, $1;}' 2133wd(alice) 2132wd(alice) 1991wd(alice) .Ed .Pp -Create a list of processes sorted by number of opened files in desdencing order: +Create a list of processes sorted by number of opened files in descending order: .Bd -literal -offset indent $ fstat | awk 'NR > 1 {print $2;}' | sort | uniq -c | sort -r 728 firefox From nobody Mon Oct 21 03:56: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 4XX1hF47hDz5b8Yk; Mon, 21 Oct 2024 03:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1hF3hl5z4FK1; Mon, 21 Oct 2024 03:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sUOtw1VFAXrTM21fvT3w887O4Q8J8R1GCw2l+F8ClUU=; b=P6+EJ79jYKNUDZGjeiMF/RUv/AuHcUVMgKK5uX09Sr2vaFb+8h8DwpijXctXCpT1u7Hclb ei0sU5PIqsd7ddopzoxz2F7qrlF3rNPMIjSU7o4lZfTOi4RYfuQSj60QUM3cFMKv3hqc7y JauzwuG9brlyIYtVj9dSuJIZpe/ewFLbEbe6jm2RRVkU8N51fnSedRoJg8GICzcqihJWJy AjH/zJemRi7U4VdG1yrc6m80591gR+RQNMg/3lc8NfpFJlZaUDWZP7vUJZYDQH/RA515p+ pcF+R3DFxun00k2Dbdji7WIfvx21R8Vdy4DhnTobH4Q10zyeIhcQm0On+JksSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729482989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sUOtw1VFAXrTM21fvT3w887O4Q8J8R1GCw2l+F8ClUU=; b=her4kil2E+wPyVbXYLGMNBaEXW45be/9jQxpcNG4AHXYhss8XE46p0/YAVCrQgtvZfYhwh UPMqLBwIEEpg5qkXx5g6EaU25BwLxAgFCf2xVI5egnQDG1yo3hz0b6bDxs/RAF7/C0Isku sykTbyRA9For9nx+hbZOfuW9M9O7cix0it3UQhaKVxdDqzMMkI3NM7Bib04bdeOonTk+6z t1FhR/mHyzExDnPnRhQYLKfOE95KbQko/E8kSHsNVKQjBs4wDq1FpnDziH+vG/6oWPVNwu fdMyN+cLNRytRDH12v719SrObCEPSCSXE/7r+3kuWfmNU/8nqjWVq4mzODiBZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729482989; a=rsa-sha256; cv=none; b=XdsmkbuN1OuwHTPIASWsaJww++VuVD1fRjuVCnPUZFRQLYkUbR9+Kf4yKS1t2ZOZA+jIjS iEBr5fgh5Acd9GMPVVfeqLHKWYGGdG9jCyFNPUkO4CCLJzLP9QmoIBZewrmxWe9cROrg4C W8sW81IpZLZtlOxelXPF23ZjmBs6/M8I7P51Y0mvk1vDmJJJVqjZMb3wF84vWLPn+wwEga W3+HW2Z9m0UzqxIw+e1zOlexCBsPxBPOuZWE8ti928KDS7T7414xQOrEJss836R+/cqSVa vQWXJbmi/Y9LQgmwOWRsKgROjR/JujEIqGpQ+zxgP+tyMTicOF7D/UMIKfHlPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1hF1qzrzFQL; Mon, 21 Oct 2024 03:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3uTnw000239; Mon, 21 Oct 2024 03:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3uTM6000236; Mon, 21 Oct 2024 03:56:29 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:56:29 GMT Message-Id: <202410210356.49L3uTM6000236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: d09fad5ca58f - stable/14 - awk(1): Fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d09fad5ca58f5cb56973b248fb43ec7eaa6c64e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=d09fad5ca58f5cb56973b248fb43ec7eaa6c64e5 commit d09fad5ca58f5cb56973b248fb43ec7eaa6c64e5 Author: Yu-Hsun Chen AuthorDate: 2023-12-13 08:40:08 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:56:18 +0000 awk(1): Fix typo This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/928 (cherry picked from commit a2ee3070d80ce06eefe3682f453605422cfbf5b6) --- usr.bin/awk/awk.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1 index 34fba1dce57e..65c91738966b 100644 --- a/usr.bin/awk/awk.1 +++ b/usr.bin/awk/awk.1 @@ -811,7 +811,7 @@ to it. The scope rules for variables in functions are a botch; the syntax is worse. .Sh DEPRECATED BEHAVIOR -One True Awk has accpeted +One True Awk has accepted .Fl F Ar t to mean the same as .Fl F Ar From nobody Mon Oct 21 03:57: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 4XX1jL2hsXz5b8qb; Mon, 21 Oct 2024 03:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1jK6ccQz4FVd; Mon, 21 Oct 2024 03:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729483045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwDhRV3abvO+pVAnicngSPGQlPEe/pKlXDZtKyKU2wI=; b=psEf8YEAC12Gr+PIsKiTdKHLefJHEA/6yWiWHVew6JxgEzbGgS3iVjd+GZJc7TQVS4WlMl wB+FDNcd40ndui8zBAzi6N0oOZBJI7i6yQN9R3xgPKvnSFec3nIZaJh1Zh/DfiptLNu9nx 7e0jENh+YxZoRshpGvjLMxhwv69fjxlEcuBYXtGtLQg/Z/SlNOhVujGBFaY0tgjlcVTksH DYVWhYX9GyalBdf/anEmPn9VvX+Zd492K57AbpPOdOErN1JaRfSBiXbRPw1yWhR62x5Te/ 3uhCn3WCPE/57ix7rAQRWycIMiutyyeIxtWrjBcgdPY1j1XJYZDeW1LJSI5Zsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729483045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwDhRV3abvO+pVAnicngSPGQlPEe/pKlXDZtKyKU2wI=; b=HmyFD/2+bTZrdL9d054d+qrQzLTsejq6NRrXo4qVnEs03Wj2p0eqPxRWtnAB8mFlVXWpAX YmBSKEqEghekH+g1lnJDomneVTTkp744FzfC8zCuaMD3Et9Ie5WESrAzsRKs6JPz4vC1Ck 2DmvTfmENXg1tIjYXb4gr3+Eps91vB0+nvE3PEnrB23FlNXXZG8Gqb24qaKblbT7kSySAQ J5Jjg0jlj6SEIOG+aP9EwIgMbR6FwBiLVnGjBIUJmhc+7yccCYLBn1mIE3BMQlFfQPcedj 4HpztCAwZxXys5fNj0Z91/Tr4AcSHp5fO0Fd229udZq4CbOaxaFZRPsByzppgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729483045; a=rsa-sha256; cv=none; b=aHT7Q8RcWsMiHwHV4ogscDzgrgluBJ5fnGW9CC7BkAiH2MG7bjldK0om8y0dcYBE9zS+62 H5K7ZXzlV38ijrfNnQrodmFymDw1oEhSjLEKrp2tcZTbrAzk+cXr/BzjJrm+GbvYuA+3TD pPFTm+7o5u8G8L3+bWbrYJn5TtzBpzhW8owyNS2/CnmrO+VB0UOgJ1hgYTSnCETbPR4emV AASK2c0x3DkLJILxgc9aCRD/XkJN72w5KGzTwPcmS1AeSbwYrKgxfIMcDK7D+pmZFHDtnD 3ifuIKBnMrqCu+QqyoZ8y989cEWSkSf77/M8KQGsS/RwTeLI2bN4CW4OluWDLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1jK65mvzFQM; Mon, 21 Oct 2024 03:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3vPhm000629; Mon, 21 Oct 2024 03:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3vP1X000626; Mon, 21 Oct 2024 03:57:25 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:57:25 GMT Message-Id: <202410210357.49L3vP1X000626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 4f7562588931 - stable/14 - look(1): Correct the example's 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f7562588931ab0b7822c15ba1b6e36ab54cebed Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=4f7562588931ab0b7822c15ba1b6e36ab54cebed commit 4f7562588931ab0b7822c15ba1b6e36ab54cebed Author: Raghu Ranganathan AuthorDate: 2023-11-30 12:57:35 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:57:01 +0000 look(1): Correct the example's description Remove an extra 'e' in the example command. It is a prefix, not a typo. This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/913 (cherry picked from commit 7df526eb10c9095e4988e77900f60ba00c42b095) --- usr.bin/look/look.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1 index aa0cb771fea7..94506a504e34 100644 --- a/usr.bin/look/look.1 +++ b/usr.bin/look/look.1 @@ -97,7 +97,7 @@ utility exits 0 if one or more lines were found and displayed, 1 if no lines were found, and >1 if an error occurred. .Sh EXAMPLES Look for lines starting with -.Ql xylene +.Ql xylen in the file .Pa /usr/share/dict/words : .Bd -literal -offset indent From nobody Mon Oct 21 03:57: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 4XX1jN5YJqz5b8Yw; Mon, 21 Oct 2024 03:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX1jN4zCGz4Fc1; Mon, 21 Oct 2024 03:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729483048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2dr8u7t4mKBZx/VGw7KrFIRlfSsWpB5QjSdhZcKV0/g=; b=q7jbmLK71kBGbMhr/jtC79sR9wuj+Ms/Igip2YsbrwjcbxPL3nJy+hCfNifOMDpyGLP9OE B4gjxZcBLecH2QFGIdYyd1EW4quC6BeSoV2psZo8G3tylQPgSyuUNgsCGwFa8hthv/Iei9 dxedxC8h3q234rUkOWXsAKP8mJpqdBAeiXEVxVO7RNwindb1LV+eajLXP3kSskTWcnqNBA DkuEvR1gToo4UiSbDueCwr6yNZexth0ONMKRHOhrJdbuGnzYkaK1HHBc/o/ipBWiDwQ7q4 k1ZCtTEUK9j+4miEvMWDRGn/R7ReME993kEpTaTh8bMlcqXmeVaDn/GHeOSrVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729483048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2dr8u7t4mKBZx/VGw7KrFIRlfSsWpB5QjSdhZcKV0/g=; b=XVKPZ9LZkCxnKaKBgNxH4wg+upF/UUZU/1zhczamatTWkK3DLvP6VXYNaHpxpQS/Pu4I6R 27WHXXpqLKeVZTpiWagy17/0uRNHQl/27dFalFkndgWQALHgYXys3q5J48lPRMcVoTDVvp rvCsKGiqIH5R57664bVkKvpPH1Jy6TlViXWSvFFQ9gXHe2n6YK2hZymFBp3ixyN0JdIhuJ 6S++Zf9C+R9IIsuYF5i3xn2bZHUfMWg1nHr1RPOt5oFgQAcvr9kUC1mL1jf6Ek/gZhRQbs 0eF5JzrmN/EUm6fRc0zosQ1mxUou8pgq2qOfi658kL7ACESa//G5UUlNZuHdzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729483048; a=rsa-sha256; cv=none; b=kgICXJodlaUZz3ylvqCe13okGZyaBTZBFv8NcJ8eSmRmbah/JSau29K37835Qs+N6mONJV WWUc7zYlhSh8VS4JBGE+1jge6MFLu4HiR4KjEudPCbvHYUfqSX+TQjuFehNiXI4FuGrSr5 YoJCY76pqCL7X+vL9xCSemanayZvwjoCg9YyO6mSWtviTXrF8duI5YkM2ltNLqQRVxfQho AK/Nm5SQn4E0TlPb5AD0PSlQ9VMGfSWxbsqmgOrmQPFjfHCAMt2nkYwCM/E5bYERlb8/SX UALjdn8j52z9sNKUUZrmzxwVD3zWx+dsBbxMqJtOeDAFfFkobLVkLCq41xbeCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX1jN4Qh9zDcd; Mon, 21 Oct 2024 03:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L3vSE9000776; Mon, 21 Oct 2024 03:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L3vSdc000773; Mon, 21 Oct 2024 03:57:28 GMT (envelope-from git) Date: Mon, 21 Oct 2024 03:57:28 GMT Message-Id: <202410210357.49L3vSdc000773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: ee5f0d0b8c2e - stable/13 - look(1): Correct the example's 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee5f0d0b8c2eb77572037c72275cd28692befa55 Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ee5f0d0b8c2eb77572037c72275cd28692befa55 commit ee5f0d0b8c2eb77572037c72275cd28692befa55 Author: Raghu Ranganathan AuthorDate: 2023-11-30 12:57:35 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 03:57:08 +0000 look(1): Correct the example's description Remove an extra 'e' in the example command. It is a prefix, not a typo. This is from the Advanced UNIX Programming Course (Fall’23) at NTHU. MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/913 (cherry picked from commit 7df526eb10c9095e4988e77900f60ba00c42b095) --- usr.bin/look/look.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1 index aa0cb771fea7..94506a504e34 100644 --- a/usr.bin/look/look.1 +++ b/usr.bin/look/look.1 @@ -97,7 +97,7 @@ utility exits 0 if one or more lines were found and displayed, 1 if no lines were found, and >1 if an error occurred. .Sh EXAMPLES Look for lines starting with -.Ql xylene +.Ql xylen in the file .Pa /usr/share/dict/words : .Bd -literal -offset indent From nobody Mon Oct 21 04:25: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 4XX2KL2QBnz5b9dn; Mon, 21 Oct 2024 04:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX2KL1w3dz4J5Q; Mon, 21 Oct 2024 04:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729484710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSQkSj0gGE+RlcyBZcic0d8OhJ2hWFD3IxKx7CkMdYU=; b=u6H35NKya+P9+0vf67webGPC8/ueJKhjY+0DTkhnbus3pWuVAB1CSSEgwzUf88LLwtQMLM DZg7zBfkdY8My5BPGEDoUKFOfgh1egCx6MUrlESSj7WRwy6KzFIoFEsZPlGaCfhU7lsMLm n1PgIo3fpQOiExpZ2DxD1rQ8/bVbOabJBowukvBGwLoPfQYC/MdRPO6bodYV6RsoXNcr8J ACIvA/oHhAOKAqByQyNOFtoEKop5xuh4DPHXnWMHYkkG33KhCfAFKaAMrVKzlToaFgc+V5 h5AJEV529lsFA8N2mULObbnjOzvNN/LY53dh5q30gAwfaIisHCkx6Y59h6TKfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729484710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pSQkSj0gGE+RlcyBZcic0d8OhJ2hWFD3IxKx7CkMdYU=; b=kyO+3RPNJXejunKD5Oga1R0hnwOreNr6NRXlepgtgKGqW/ck80ub5j8DgRV1ylGENnhL2D lpZajPmVOQQrlKB0Zy9q6AfYzvxIHatGZRcG98NHJyzEyoqZybZUdEjzXRPhBuFl995Gyr Z9hvJvTb7hyX6Uygtlo/EQmJi3xraC6Tbgxr6n7wic/7IOJDA5suK6Kvpk3htR+WHAVqE4 SNZT9PaYEcKYCjGmp9W61mq2N3ysymU9Da1LYEhd0Xw55yBQWpoB1Hbbj9b3idHT/efVIR bGoaD11aN/1DxYFjI0LDvj8M/79T0LT5N+qLWvAcA3oHin1z4hql//JO8fp5pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729484710; a=rsa-sha256; cv=none; b=viB0k1AOfRl+oXhwfYCksFg3YkssbYT11WI5B6KfArzVOfJ9Ei1DBTEgZaE/n9Rqjd54/1 VQkE8/k7iwKnQ2nCFvzAkbM9kwgsZvT1u4kogEc1prm0oPVshY3Ly1JxGjit7+DiGbcmm4 NvgH6hYn5+GBPTQ5fWIaZh7pUqpybsOHosp5jMYTIp5Evslqr07saYHT+ZW7EOxcd1OpQE 8uJOkMHZTeim4VCI1LI35A6eb1yT3HyqCJG/BlRbD/jk9mMRMEy1SmFagjIGw2kfHs+XXO 9X1TBMuyAk+N7RN3ikKA4RKjb6tljN6FpXrv32+bnFVdK03xdlsIVMz+JyADyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX2KL1WWxzG1l; Mon, 21 Oct 2024 04:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L4PAnu055799; Mon, 21 Oct 2024 04:25:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L4PA38055796; Mon, 21 Oct 2024 04:25:10 GMT (envelope-from git) Date: Mon, 21 Oct 2024 04:25:10 GMT Message-Id: <202410210425.49L4PA38055796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: adfd9150b92e - stable/14 - ctypedef: Remove `|| true` from localedef command to reveal error sooner List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: adfd9150b92e4f716db302b5ad78788cb5e745a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=adfd9150b92e4f716db302b5ad78788cb5e745a4 commit adfd9150b92e4f716db302b5ad78788cb5e745a4 Author: Li-Wen Hsu AuthorDate: 2024-10-15 10:39:31 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-21 04:24:17 +0000 ctypedef: Remove `|| true` from localedef command to reveal error sooner Reviewed by: bapt MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47111 (cherry picked from commit 6abd77142153cc0f5ce49f3ffb38bc91f3444fae) --- share/ctypedef/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 62b3a719fe57..57b145ed94db 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -14,7 +14,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps .src.LC_CTYPE: localedef ${LOCALEDEF_ENDIAN} -D -U -c -w ${MAPLOC}/widths.txt \ -f ${MAPLOC}/map.${.IMPSRC:T:R:E} \ - -i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R} || true + -i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R} LOCALES+= C.UTF-8 .if ${MK_LOCALES} != no @@ -255,7 +255,7 @@ SYMPAIRS+= be_BY.CP1131.src ru_RU.KOI8-R.src ${t:S/src$/LC_CTYPE/}: $s localedef ${LOCALEDEF_ENDIAN} -D -U -c -w ${MAPLOC}/widths.txt \ -f ${MAPLOC}/map.${.TARGET:T:R:C/^.*\.//} \ - -i ${.ALLSRC} ${.OBJDIR}/${.TARGET:T:R} || true + -i ${.ALLSRC} ${.OBJDIR}/${.TARGET:T:R} .endfor .include From nobody Mon Oct 21 06:46: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 4XX5S40Z01z5YYy7; Mon, 21 Oct 2024 06:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX5S35St5z4RTR; Mon, 21 Oct 2024 06:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729493171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cpjWdoJBlmWmdptmYbEw0hhIdG+Y55rQCiN2sBSqhxI=; b=gPOAp+CDPvEf3jXx+hZmaZykcmBb4mKI1GDOFRMWescT6zcsn2Oa3ichJlIUtSkPt7YNwb o/QHVNTzbKm3//FADkNBn3JSnacjmH07jaTWQ2NFHRJPiDdsGTvf0UU0SnBPf8xMB2YhE8 oYN/JfDZuQ/XhT2cEmKciUeRlTowmCHI94N30b7ObXAg+0Sj+4zWCEcyMeev5xR8bJp2eq geJx7bgedtzOk3/8uqPR/MA3PVgOsbfh7tuE9IOholARYJZYcJ96oXGWZHW+f8fnUvD5rU qL9Ck/y95X5smckCsJt6pFYrc3btr3W2e6WUqdT+QpwdpVKlvmrkkT3LQ41w+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729493171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cpjWdoJBlmWmdptmYbEw0hhIdG+Y55rQCiN2sBSqhxI=; b=nkbTQxxRKOxDFcHOy969Mit9WKf6tL6PJBF66Lu8F5xTOMWnwVDZF7RyWFegy6oFycnJjM KWYyUj5QbSm5zdFtbICi4/aJAq9GlmvQKLXq822c1XYwgYbRxiRSRQrYTqOENUwGh8wgzg XTG+CrjbdSCZ31yJIQdphv8cLbueNT7SXcBZcgED7qarAWNH6qplae4Rv25rOMIYBVNB9Q 46s6tQ2PyH1CRdXcc8X4SpZNkUzZuO5x6jrzVtG+EDncFV2zaA5TvvatjG4EzmQhpe9uQM FVEQPySqX33UE8qYXqmbf0H5Xk3beD57PQ0LxEWG6327xDZdBz0WouWDivn3xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729493171; a=rsa-sha256; cv=none; b=pedGOHVArCWQITtFIYyAnR4WupXB9rf5npJW9GhmHg/JNl4EudLMAPuDg+l6U/nsASbQRt khezzXeNTTV4MkMbsSY43HZTPYWcl0pfjLkg8RyAp+A6xI8ad8JVywIEMswJxC3XI5o2/9 tXd5XMrtNCoa58wiSyzeiR4/ArZjSLGVPJQzxhvt9uSw8FvN0nZKxDBym1rCxrAboWmuy+ +cnGbl+OKmSyMWSoKqYXEG3odjvXQROEHetuBc3gxcjtFeFwlwcrqH9G8N3D8+gIVmkr2F V/G6cnUmgGNLTjNV6pGcGF4rIBMs6p3IqG8PeZkiDhkExpdWZ071Y1b8hQyE+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 4XX5S34yN4zJxr; Mon, 21 Oct 2024 06:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L6kBdc013312; Mon, 21 Oct 2024 06:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L6kBYJ013309; Mon, 21 Oct 2024 06:46:11 GMT (envelope-from git) Date: Mon, 21 Oct 2024 06:46:11 GMT Message-Id: <202410210646.49L6kBYJ013309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 525a177c1657 - main - mkuzip: drop support for executable uzip 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 525a177c165740fc697df3de5b92e58b3b41477c Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=525a177c165740fc697df3de5b92e58b3b41477c commit 525a177c165740fc697df3de5b92e58b3b41477c Author: Robert Wing AuthorDate: 2024-10-21 06:43:41 +0000 Commit: Robert Wing CommitDate: 2024-10-21 06:45:09 +0000 mkuzip: drop support for executable uzip images A uzip image has a 128-byte header, historically, this header could be executed as a shell script to mount the uzip image to a user provided mountpoint. The embedded shell commands only work for uzip images that were created with zlib or zstd compression that contained an ISO-9660 file system. Given the limited space available in the uzip header, it is not practical to extend this feature to include other file systems or to provide sensible error handling and error messages to the user. For these reasons, abandon the embedded shell script in the uzip image header. To maintain backwards compatibility, the shebang and shell must reside in the 128-byte header. This change of behavior is documented in mkuzip(8) and an example has been provided for creating/mounting uzip images. PR: 276174 --- usr.bin/mkuzip/mkuz_lzma.h | 12 +++--------- usr.bin/mkuzip/mkuz_zlib.h | 4 +--- usr.bin/mkuzip/mkuz_zstd.h | 4 +--- usr.bin/mkuzip/mkuzip.8 | 45 ++++++++++++++++++++++++++++----------------- usr.bin/mkuzip/mkuzip.c | 2 +- 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/usr.bin/mkuzip/mkuz_lzma.h b/usr.bin/mkuzip/mkuz_lzma.h index abdcc996e4c3..de7633c395ca 100644 --- a/usr.bin/mkuzip/mkuz_lzma.h +++ b/usr.bin/mkuzip/mkuz_lzma.h @@ -25,17 +25,11 @@ * SUCH DAMAGE. */ -/* Format L3.0, since we move to XZ API */ -#define CLOOP_MAGIC_LZMA \ - "#!/bin/sh\n" \ - "#L3.0\n" \ - "n=uncompress\n" \ - "m=geom_$n\n" \ - "(kldstat -m $m 2>&-||kldload $m)>&-&&" \ - "mount_cd9660 /dev/`mdconfig -af $0`.$n $1\n" \ - "exit $?\n" #define DEFAULT_SUFX_LZMA ".ulzma" +/* Format L3.0, since we move to XZ API */ +#define CLOOP_MAGIC_LZMA "#!/bin/sh\n#L3.0\n" + size_t mkuz_lzma_cbound(size_t); void *mkuz_lzma_init(int *); void mkuz_lzma_compress(void *, const struct mkuz_blk *, struct mkuz_blk *); diff --git a/usr.bin/mkuzip/mkuz_zlib.h b/usr.bin/mkuzip/mkuz_zlib.h index 88e68343a27d..5ecf77bb7284 100644 --- a/usr.bin/mkuzip/mkuz_zlib.h +++ b/usr.bin/mkuzip/mkuz_zlib.h @@ -26,9 +26,7 @@ #define DEFAULT_SUFX_ZLIB ".uzip" -#define CLOOP_MAGIC_ZLIB "#!/bin/sh\n#V2.0 Format\n" \ - "(kldstat -qm g_uzip||kldload geom_uzip)>&-&&" \ - "mount_cd9660 /dev/`mdconfig -af $0`.uzip $1\nexit $?\n" +#define CLOOP_MAGIC_ZLIB "#!/bin/sh\n#V2.0 Format\n" size_t mkuz_zlib_cbound(size_t); void *mkuz_zlib_init(int *); diff --git a/usr.bin/mkuzip/mkuz_zstd.h b/usr.bin/mkuzip/mkuz_zstd.h index b434afe61eee..ca62d3afd417 100644 --- a/usr.bin/mkuzip/mkuz_zstd.h +++ b/usr.bin/mkuzip/mkuz_zstd.h @@ -27,9 +27,7 @@ #define DEFAULT_SUFX_ZSTD ".uzst" -#define CLOOP_MAGIC_ZSTD "#!/bin/sh\n#Z4.0 Format\n" \ - "(kldstat -qm g_uzip||kldload geom_uzip)>&-&&" \ - "mount_cd9660 /dev/`mdconfig -af $0`.uzip $1\nexit $?\n" +#define CLOOP_MAGIC_ZSTD "#!/bin/sh\n#Z4.0 Format\n" size_t mkuz_zstd_cbound(size_t); void *mkuz_zstd_init(int *); diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8 index 6f7495ce5418..3b3afc626633 100644 --- a/usr.bin/mkuzip/mkuzip.8 +++ b/usr.bin/mkuzip/mkuzip.8 @@ -207,23 +207,6 @@ The same tradeoff continues to apply: reads in .Xr geom_uzip 4 become more expensive the greater the cluster size. .Pp -The -.Nm -utility -inserts a short shell script at the beginning of the generated image, -which makes it possible to -.Dq run -the image just like any other shell script. -The script tries to load the -.Xr geom_uzip 4 -class if it is not loaded, configure the image as an -.Xr md 4 -disk device using -.Xr mdconfig 8 , -and automatically mount it using -.Xr mount_cd9660 8 -on the mount point provided as the first argument to the script. -.Pp The de-duplication is a .Fx specific feature and while it does not require any changes to on-disk @@ -247,6 +230,34 @@ for .Dq 1 . .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +.Pp +The following describes how to create and mount a uzip image. +.Pp +Create a file system image: +.Bd -literal -offset indent +makefs /src.img /usr/src +.Ed +.Pp +Create the uzip image, the output file will be named src.img.uzip: +.Bd -literal -offset indent +mkuzip /src.img +.Ed +.Pp +Ensure geom_uzip is loaded: +.Bd -literal -offset indent +kldload geom_uzip +.Ed +.Pp +Create an MD device backed by the uzip image: +.Bd -literal -offset indent +mdconfig -f /src.img.uzip +.Ed +.Pp +Mount the uzip image: +.Bd -literal -offset indent +mount -o ro /dev/md0.uzip /mnt +.Ed .Sh SEE ALSO .Xr gzip 1 , .Xr xz 1 , diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c index f627562af7df..5d2aa9a48a98 100644 --- a/usr.bin/mkuzip/mkuzip.c +++ b/usr.bin/mkuzip/mkuzip.c @@ -298,7 +298,7 @@ int main(int argc, char **argv) toc[hdr.nblocks] = 0; cfs.fdw = open(oname, (cfs.en_dedup ? O_RDWR : O_WRONLY) | O_TRUNC | O_CREAT, - S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (cfs.fdw < 0) { err(1, "open(%s)", oname); /* Not reached */ From nobody Mon Oct 21 10:00: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 4XX9m05339z5Yn8j; Mon, 21 Oct 2024 10:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX9m04JL5z4vTx; Mon, 21 Oct 2024 10:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729504816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgP6lxZgo6fKf6SNvD6OWsVicrWvmfBBKbLOmAwrNhM=; b=Lr39fxOcLeTiIuJ6FJ4JgfL9obfs4mmzSL6zVVBjdu0F/t6INE4CksDoUfAU5WFJRR/fWO 98wGemYLkm/vVpR14p6mNoVkYTAg6jDPIPWRmcd4u0swRmnSoky0H5Hq8ZZYybyH3rAlhq e8rlqq1DcIMFrELe/pbbXN3qVk6x7RXn0SdBsBULoh/5iH+CA2eLXh5NjCW1LR85TCmRTv wd8TrdEj10EOWhBhUgjGmw5NIHMgcE3jjwVFyiza/IH17LZmw2IhRpdQ/AUNORLuX8FmJH 7iZJat5SrztLPIceMKozDySOMvY+LdbTgfs9JOW0z6y6pXD8Yspbjubg43foTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729504816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tgP6lxZgo6fKf6SNvD6OWsVicrWvmfBBKbLOmAwrNhM=; b=ye8QRT21W9hsLPOre+lPQpyK6GzdkLP6FQB/EnI9gpTCrEx1Sg9PMFvQb07bjhvjyl3SKA yA+mEMNf2fURE1kd6zkKhrGwMEpgx19Xz9n3YIvJBRdZAYL2odncVFYh+xiYcWuJBkjnVz oUTqmIQaiKR7N+2sKVi2rkRl1A8QP2ondzH5bhuUx2gKHq1Voqz4ursBqoNFaSIInipxyU UsyagIAIisPqA3jBdDvQsgG7STMlB3dgdybGVjnxVNyGyrB9oG8E5FFX/48zkKWM5HG/sz oPYFbIykXREaz/u2LfFEsyyCfQHC6xNlYo4bmOd5hRLpsnfErfu8/IINz334uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729504816; a=rsa-sha256; cv=none; b=ZHgFExKy6gIlq/Q/ZSgWbNELXynNURFeBCSrY8R8rq1JCQlAYFw0uwgQdZCYD8G8UivfeY s15i2HH90Qomay1G6klOYoIM9eP98wnd9fhWtZpXiTVRE6/uKeOwpAOJwuv0G2Bur6X1xc ks92LeKW4cjSzpSn9P99SQAmork9r3abznL3/w6lLIp/HA53SvJRDwJ6mfwC5o3n9DEgJZ phTT5F8BCKiz8oc9ucyhV47vbMClyajQCHGoyvRVPjq4D2gvQID3pToPByipL+FlUNUyNz +jIzkSeUofg7pmTN+YUuGQt+F01SLDRdTKqLlGC2aUXZ3QRzhpskrAtWyFZFPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XX9m03w2JzPcr; Mon, 21 Oct 2024 10:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LA0G5T080067; Mon, 21 Oct 2024 10:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LA0GBd080058; Mon, 21 Oct 2024 10:00:16 GMT (envelope-from git) Date: Mon, 21 Oct 2024 10:00:16 GMT Message-Id: <202410211000.49LA0GBd080058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 025535f94525 - stable/14 - rc/tests: Skip oomprotect tests in a jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 025535f94525c78202d829eb45d8f1ba7253ba46 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=025535f94525c78202d829eb45d8f1ba7253ba46 commit 025535f94525c78202d829eb45d8f1ba7253ba46 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-14 10:28:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-21 09:59:16 +0000 rc/tests: Skip oomprotect tests in a jail oomprotect cannot be used in a jail. Reviewed by: bnovkov, christos, markj Approved by: bnovkov (mentor), christos (mentor), markj (mentor) MFC after: 1 week (cherry picked from commit 6fa42b91ca3f481912af98c4d49c44507eb1b8e1) --- libexec/rc/tests/rc_subr_test.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index 90306de9a8a7..f004354fe52e 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -35,6 +35,10 @@ oomprotect_all_head() oomprotect_all_body() { + if [ "$(sysctl -n security.jail.jailed)" != 0 ]; then + atf_skip "protect(1) cannot be used in a jail" + fi + __name="$(atf_get ident)" __pidfile="$(mktemp -t "${__name}.pid")" __childpidfile="$(mktemp -t "${__name}.childpid")" @@ -72,6 +76,10 @@ oomprotect_yes_head() oomprotect_yes_body() { + if [ "$(sysctl -n security.jail.jailed)" != 0 ]; then + atf_skip "protect(1) cannot be used in a jail" + fi + __name="$(atf_get ident)" __pidfile="$(mktemp -t "${__name}.pid")" __script=$(mktemp -t "${__name}.script") From nobody Mon Oct 21 10:40: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 4XXBfM6Khlz5Ypbw; Mon, 21 Oct 2024 10:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXBfM5Yk3z40xQ; Mon, 21 Oct 2024 10:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729507227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DkbtYVL7EgU3+rxQGTqDNHoqTH28jFpBdtRUlUOkRrU=; b=p4KYH1oKNMip17YiQ9cSO0xoueKFsyZZVipTWyIpwjlmLSPK7S01f/V5UpK0cN8iq6UC9f s9mQJlQR+xFLmtY1pIPgTzjVhy7Tgs9UrzCUD44fy74NqwDZsqoq9RrsysAn/ypdbeZied eNNc08vj056llOOF7G6zUWVlmxt2sP1pUsCOafxSFsCLxH6r2PVhF/otL1U84riH/LaHna ectpo68dVxBROaBMNhYDrwLkpw18QcCLLhC1GTLm+CMo7LdBIOtSOf3ls1c98kswrilnuK RUKVKdQjE774/g1f1UotT/Qq0vOgPluUbBwzk10Cpb9WOc25Et0CPxOxW6DefA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729507227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DkbtYVL7EgU3+rxQGTqDNHoqTH28jFpBdtRUlUOkRrU=; b=TIPxQWh+iu19lTRE58soTcQAxX7qbdjKoL5Y627Q+sMkMzCtjuvSNc0aE2IcFGmge2PZFh ThM/xU95F2w/Ck3AZvtdbztsDAzX6lqkmaTjs7m/NpKPb9cD+rP6Oc6kN4AOemhApi8F+2 LXO+CMSREynLOtws/z/EdJwSnpB0ZYAcdye35tioNVaat2M/zDSVmjBE2XV+zham0IfK08 Y0bM1Ok7s4axIDvyQ4ty2ed0NOcMmX1PjCe7q5HNNAI94GZ2JPldeoCYhOBaBJc918FhMM +5WXQET/7VbvGAyFoFwbVpAqNj9QvosbTwpfp3TIv1R3sAx5EFJgYhvpxWNMWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729507227; a=rsa-sha256; cv=none; b=KLvvPs7mJQ7dFOPE3gsiVYaEpaQzAp4+LJ4+Kow9N/ArpvYO2EYHuFHIXeOdB37FXHG8yt Fx4HOh96vmvb9X0C4gAvF1KEEjc1+JkI2Ko1DsyeBj8naOO3WmQtMeuvt16520ZI8tG3SP wbhSLhLqw5iJ+4/+4SS3TRzO8Yd6igUJixrTPEbjxeYzL3coZlZb/WhgJiGeB66BeEWBfU 86CQhbCcY1UTrrrXrPjeqkx9I4z2rlI2HfYjrymcrKMHtMYK0sQ8Ow8y4QNFqzghIdYbTK z8FRW1qZHF3aHSY1zIoFDNrGBWbu0rcbt4MBmyFhc/oQGZ1HVRGABX5YvU5xkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXBfM52SWzRKh; Mon, 21 Oct 2024 10:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LAeR2i054853; Mon, 21 Oct 2024 10:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LAeRil054850; Mon, 21 Oct 2024 10:40:27 GMT (envelope-from git) Date: Mon, 21 Oct 2024 10:40:27 GMT Message-Id: <202410211040.49LAeRil054850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 31eec6fe1aea - main - linux: support IUTF8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31eec6fe1aea614e89060af0554abe1a98d8d8ed Auto-Submitted: auto-generated The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=31eec6fe1aea614e89060af0554abe1a98d8d8ed commit 31eec6fe1aea614e89060af0554abe1a98d8d8ed Author: Edward Tomasz Napierala AuthorDate: 2024-10-09 14:45:13 +0000 Commit: Edward Tomasz Napierala CommitDate: 2024-10-21 08:22:50 +0000 linux: support IUTF8 Make Linuxulator support the recently added IUTF8 termios(4) flag. Reviewed By: dchagin, emaste, imp Differential Revision: https://reviews.freebsd.org/D44525 --- sys/compat/linux/linux_ioctl.c | 4 ++++ sys/compat/linux/linux_ioctl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index aa2c9ce7f273..ceb17bd040b5 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -421,6 +421,8 @@ bsd_to_linux_termios(struct termios *bios, struct linux_termios *lios) lios->c_iflag |= LINUX_IXOFF; if (bios->c_iflag & IMAXBEL) lios->c_iflag |= LINUX_IMAXBEL; + if (bios->c_iflag & IUTF8) + lios->c_iflag |= LINUX_IUTF8; lios->c_oflag = 0; if (bios->c_oflag & OPOST) @@ -538,6 +540,8 @@ linux_to_bsd_termios(struct linux_termios *lios, struct termios *bios) bios->c_iflag |= IXOFF; if (lios->c_iflag & LINUX_IMAXBEL) bios->c_iflag |= IMAXBEL; + if (lios->c_iflag & LINUX_IUTF8) + bios->c_iflag |= IUTF8; bios->c_oflag = 0; if (lios->c_oflag & LINUX_OPOST) diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 4ef6d4f40830..ccc25bc919ab 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -462,6 +462,7 @@ #define LINUX_IXOFF 0x0001000 #define LINUX_IMAXBEL 0x0002000 +#define LINUX_IUTF8 0x0004000 /* Linux c_oflag masks */ #define LINUX_OPOST 0x0000001 From nobody Mon Oct 21 11:01: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 4XXC6s0mbpz5Yr8L for ; Mon, 21 Oct 2024 11:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXC6s0KRjz433J; Mon, 21 Oct 2024 11:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729508501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HfHxhVMu+0S7CwmrlGkEzwKzfXLeC9u0Hsu/yXJyW0=; b=m3r4MGMtx1MsXpCuzXyJ0M5Etm55aPDCO06IZ6lUin7+mmYCXoOliG/k/M7dZLmLXQFECf r7ve5b8g9q3OWNQIPJNxvtS/iofNKdQx7dM2C6sSl+SBeQoszXAUUuSiEtvbqMpaAkZJj5 dEdm1Bp3bHgMYng5jri1Rgx2uQfl/hEipJpnCrzkeHahI7sIpnz0pz0ny2pj/Yi/F2MgSa CGyVkuGr2t8JVdy6JD5bSw9Nu/cs8zIhHVuUTb+dY46tqqDtkUodP5L/jbgKfvLg9fJ1JB 5ixoz6GmLo5Ywru9jG7d4C/TtwQtCgShSHEmzo+MhQ51mkXwTgteskv5x/eqWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729508501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HfHxhVMu+0S7CwmrlGkEzwKzfXLeC9u0Hsu/yXJyW0=; b=TfFE2Cj3qfGK9muvJeu7LlgRlWuaOfcHm13QsWGv5I2NNVAKSe0VcX63F3E8UX+krUS9eQ 4uRIfSezrq5LsJcS6CQMNEh7rDrumOwga2zrpP+6TZfRROmhgSxfE0WqYArd0dJZtFnaef lE7LtJ1RIYAJGIwb74hzgHUU6+NG3IlHQGr0dpt17qjkN0GxQG0J3MiGgGch5TRaL8FV7U CL1Vx5HTgIYnrlEKN0U25BS4LXA5TZhxblBlo8an98v3Dpx6go7Uuoa9Bw2zjGm96a3Zh/ OgTIwXSfvic7wAbgPKbQ9PqamkCE4T/SO16Utx85mjanM/E2Kcm7AgSNDsz0iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729508501; a=rsa-sha256; cv=none; b=Yf8vlXwpWWi5hg7o7gpeQfNWcLUa1vaCjEcjfROiYfRSbPPOLJI+BNYz0K/K2hVWMFWM2j meWSLBahZhWTuhdTr8NjG46dikUU5uc6Mx6624/J56PB3BSaMXua3ons2M010vDnlw5F2y fFnBWQE95vRTJygBgTf7y9dUA0fyMux1ej9ODg2H1KqKtGiB4sA+0jM1AL5qT4l+xhJLpl Rkt5QfyWnWMguEMEb/Z437dwlAid+7CWPPDf6/nocNKglWcpF+/QpgH0/jiw2OF9QPPHsb emXIWvnjibDZxfE6Ll6wknlZLSq6EtMHbs/hknYGqB7KCcJ2vABNkBgPco11wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXC6r6lkbzSLS; Mon, 21 Oct 2024 11:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LB1eKa097231; Mon, 21 Oct 2024 11:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LB1eAi097216; Mon, 21 Oct 2024 11:01:40 GMT (envelope-from git) Date: Mon, 21 Oct 2024 11:01:40 GMT Message-Id: <202410211101.49LB1eAi097216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 0370629593a6..e6b732792813 - vendor/llvm-project/release-19.x - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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-19.x X-Git-Reftype: branch X-Git-Commit: e6b732792813cf49a23ba2f780c55f8d3279183e X-Git-Oldrev: 0370629593a68f2e04a9710d201d120a2ce437d4 X-Git-Newrev: e6b732792813cf49a23ba2f780c55f8d3279183e Auto-Submitted: auto-generated The branch vendor/llvm-project/release-19.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=0370629593a6..e6b732792813 e6b732792813 Vendor import of llvm-project branch release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, a.k.a. 19.1.2 release. From nobody Mon Oct 21 11:01: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 4XXC6s3y8fz5YrbN for ; Mon, 21 Oct 2024 11:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXC6s0pHgz438P; Mon, 21 Oct 2024 11:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729508501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJrHOzdRoxK+pY7S8R4qHb51Y7SfaR33SJ2y2duuP0Y=; b=GtjD22vEe1mPbUcW/BIKLrSSiX0gDDBcgXW8I5mcFBA/mMTB3FchzxzYXrkW73q3JYZEUo GJeL+CdiDTR8zceOIOeFnFv9+vL7l0B4+FAXwUFoCjLGgtIbMxTmL/qeAHFww8S1dct1A6 Bx7L2zIYF05GauVoDNWU0oXrQXtEtNuJ1N/aNjABwTFr2TawyUysS5ouea3hrKS5zqKWH5 rk7vltB3AGUerWf3sPO0/aJSjuL/vC0vnPH8qCRdaH0uIf4Y0vayL98ywIUVgTORC9DKyf hgaxv64+nIZY5+xbg6tEnyqoWiBPoJmqZy1j41+oDUaK12eU4UGCpJiZGLZmpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729508501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJrHOzdRoxK+pY7S8R4qHb51Y7SfaR33SJ2y2duuP0Y=; b=FDKV9x1RTajSnwjBecTIJAODiIn46DKbDrtbJf/58pjeb12r110UVQ9bEB+m0ttjEOBSHk ITEfw2dlw7DnTNM09m6CsUmtRF4crzyYN06J6i02/RUVUGcGfX7Te3IaDszUg6LwT4vqZM 279Q4r/F7q5GzJuFD2pivqrAQGJT+6wtTkdmMt+eK2wPQpqQXkT4uKJ/+3CSwGJ8Kckjmw JJJYYSTrhv6ZzPkcLSJ92w+Ous1mUByiVeIjcsn28KBSQbAfEJFF+3Ed5Iq5KLfGmOrxTw qYW87eaAAGIVPBfjipgyXrSKhnb/63QmomRu53wKYaVbfMWqNsXRTnMBN5W9HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729508501; a=rsa-sha256; cv=none; b=ELCCmKMoDAIsClt6FJjWH/cRoh2TICBxuFnRvouVRkTwRQAYgwp0nrTJoQn0/+DTI66Ca0 zayefvtVCGTkk5hdoFj8atUSMQY14nHqaTOkWyohW1Djmej5a5hwhG+lt5mKGl7+WEWFbm XqWMTppXtCkt4a1qb9Mt50a9l1dnA2W5nlIWZmTtlW6dZcXmYotYY2FMdcN0ZCYztHTU7q mg1hZAGu6TtM2QZh9cpbaLuJRpn8U3nFlkjDiM7HHhBMM5bQlyqBn/gorwgWrxTFdL4LaV xPCnG9Nh+O9EFErAticOIZ/4f65Zovqf+6tm2euMILpiM8jF5L3DTyvyNn51Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXC6s0PpmzSJQ; Mon, 21 Oct 2024 11:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LB1ewB097344; Mon, 21 Oct 2024 11:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LB1em4097331; Mon, 21 Oct 2024 11:01:40 GMT (envelope-from git) Date: Mon, 21 Oct 2024 11:01:40 GMT Message-Id: <202410211101.49LB1em4097331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 4e797ba10566 - Create tag vendor/llvm-project/llvmorg-19.1.2-0-g7ba7d8e2f7b6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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-19.1.2-0-g7ba7d8e2f7b6 X-Git-Reftype: annotated tag X-Git-Commit: 4e797ba105666b526344a49c4523a9b19c829be8 Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-19.1.2-0-g7ba7d8e2f7b6 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-19.1.2-0-g7ba7d8e2f7b6 tag vendor/llvm-project/llvmorg-19.1.2-0-g7ba7d8e2f7b6 Tagger: Dimitry Andric TaggerDate: 2024-10-21 11:01:17 +0000 Tag llvm-project branch release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, a.k.a. 19.1.2 release. commit e6b732792813cf49a23ba2f780c55f8d3279183e Author: Dimitry Andric AuthorDate: 2024-10-21 11:01:02 +0000 Commit: Dimitry Andric CommitDate: 2024-10-21 11:01:02 +0000 Vendor import of llvm-project branch release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, a.k.a. 19.1.2 release. From nobody Mon Oct 21 11:21: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 4XXCYg3mGvz5Ys7C; Mon, 21 Oct 2024 11:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXCYg37lmz44tC; Mon, 21 Oct 2024 11:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729509687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Av2a6Vs44NIy8kvaBrFS2uZ2OMYWPXMyHY/cWcrxpJM=; b=arB8PMIWq5wLkzKumpWTKyBfIa7uG/miPDvUaDG2gglYGxSYvgXWuhdKlWVuMGOfUDXbWn Dpe4v9drN2P2Q+xyLxqQPXCNWBIT7N4MmSZg5iD36c42KrwboLgWdhvgYAFvS+fSHmoW74 Ezu2Xmn+3Q5P6RB9AcW8tgAu8Kn3pGPU8s/kBj8M7UEnhenb/jhf3deGpAB11u1eMFDxNN aNC5u8Rt78K48Gzy2nsfZhn7NcqSBQWBj/zr5ObRZiFx+HeWApP5Wl/+60rZFRr1yxT76a NpZSIUJsQgHKuLXrfrLO6YWxNEeyKqOXh9keIpUsHMCptw67DFJncq7PVSEHxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729509687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Av2a6Vs44NIy8kvaBrFS2uZ2OMYWPXMyHY/cWcrxpJM=; b=Oxk/K4eN0LdGldMvkA3/MTPA6U+1aGT8uRv8ZrN9EhVBW0JtNPk/BJu9anJJ3UpUF/Fswo 1ncmSWNkorxhEBleSVmTWCE5weZmkkcNb9Yqafl6g4O2QjVz8NTHWqL/oZjmtwY/BhySPs 7OzQnmrxvI/1N2RNXzkCIrFm5anCxPdXHLOPxpjuZt+sCK8J6YT+7UXOLiuugu/DcvRoCM 8cGobXsv1qFOUkIhk74dqQYvcuy0fO7YInZvyiRz+W1eFGOkxP/dTYUivRTOzUNeIZz/tB eiXaKPq+GhTsDLync7wha30TQ5uLCG5+nBgQrLSv91uld4yCH8WOc/ERrpsGew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729509687; a=rsa-sha256; cv=none; b=WCg+bX1+/x68VPtJIZ8YIByH71rzRPoX6ziHN7prZMGgvwhL/suMXznKdmDCbGjh2NH/nL +vOaIvpZlxI3msCmZJlcSWYxsFFfJHG0km8bfAEMo6ZZliO+fGCF75dOLMABnfXKc4Lvoh UMfduh/X5uhPVLl4EtLOOgcUhcN6M2KsFkGPkHOEkNQ7Evf2QSfpi8dE/P7F66ITTSWxPJ uaEIul05khSOOPmK1qHQNCt6TA6/QyyJHrpGjLbCvWUph5Z/E7/qcHY38TZfPxW+2D0R1Y mL//1OlGbk35PYaCXmYqynm4g+0sZZN/wz2Ing+ggMN+Mt9puhWiVRyAm+UpCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXCYg2kbzzSbs; Mon, 21 Oct 2024 11:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LBLRtF031636; Mon, 21 Oct 2024 11:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LBLR52031622; Mon, 21 Oct 2024 11:21:27 GMT (envelope-from git) Date: Mon, 21 Oct 2024 11:21:27 GMT Message-Id: <202410211121.49LBLR52031622@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: f50d2fced24f - main - Give usbdump a '-u' option for unbuffered 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f50d2fced24f4dbffc1cc414da48ea7ef7b84d1e Auto-Submitted: auto-generated The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=f50d2fced24f4dbffc1cc414da48ea7ef7b84d1e commit f50d2fced24f4dbffc1cc414da48ea7ef7b84d1e Author: Poul-Henning Kamp AuthorDate: 2024-10-21 11:21:05 +0000 Commit: Poul-Henning Kamp CommitDate: 2024-10-21 11:21:05 +0000 Give usbdump a '-u' option for unbuffered output. --- usr.sbin/usbdump/usbdump.8 | 3 +++ usr.sbin/usbdump/usbdump.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/usbdump/usbdump.8 b/usr.sbin/usbdump/usbdump.8 index 33b759e3406d..96be9f738e2d 100644 --- a/usr.sbin/usbdump/usbdump.8 +++ b/usr.sbin/usbdump/usbdump.8 @@ -37,6 +37,7 @@ .Op Fl i Ar ifname .Op Fl r Ar file .Op Fl s Ar snaplen +.Op Fl u .Op Fl v .Op Fl w Ar file .Op Fl f Ar filter @@ -89,6 +90,8 @@ This option also works with the -f option. Snapshot .Ar snaplen bytes from each packet. +.It Fl u +Unbuffered output. .It Fl v Enable debugging messages. When defined multiple times the verbosity level increases. diff --git a/usr.sbin/usbdump/usbdump.c b/usr.sbin/usbdump/usbdump.c index 9c4b6c67c07d..887e2baeed26 100644 --- a/usr.sbin/usbdump/usbdump.c +++ b/usr.sbin/usbdump/usbdump.c @@ -829,7 +829,7 @@ main(int argc, char *argv[]) const char *optstring; char *pp; - optstring = "b:d:hi:r:s:vw:f:"; + optstring = "b:d:hi:r:s:uvw:f:"; while ((o = getopt(argc, argv, optstring)) != -1) { switch (o) { case 'b': @@ -899,6 +899,10 @@ main(int argc, char *argv[]) if (snapshot == 0) snapshot = -1; break; + case 'u': + setbuf(stdout, NULL); + setbuf(stderr, NULL); + break; case 'v': verbose++; break; From nobody Mon Oct 21 12:24: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 4XXDy45mGwz5YwnL; Mon, 21 Oct 2024 12:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDy44zwdz4DVD; Mon, 21 Oct 2024 12:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZwFxGKu4EOZEbcEsSvZqp+BDx7Vt2g7qnHqZqTOjYLU=; b=gB3aV+7hkuAe9FkvMdevSt0y1TYJ1mpR31y150jo7VloT3kT7E8B2PN2QDfpzPD18GcXPV P+6t8ylfmoAidiEdpFpQxS0CsaaqAisox+RsYZQeKIgXsz+d5Pjc+GW/65a74hO1APNobs Uc6GWPFp3iApk1K0bWlwkHT7p5L4fGNOdh/jflIdbiPtmX0Xr5YYyHv8uedNd/J4RKgNUp FK7csZGJRLX3xS1ABZLfjqvvA3th9S9tyzrGPoERNc5ink8PCwjNfr/SOMCnDZukviHxwh HjAl+ftxSjZWXvWh/TZsdpq6Qay2LBtIz/R+AcBkOJFpbXScI96XSSeIncoigw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZwFxGKu4EOZEbcEsSvZqp+BDx7Vt2g7qnHqZqTOjYLU=; b=fOlHXtvVdI3lfWqtxPMHhEowDZIj9zH5T0WeAVNpfmQtjHD/aifqFGzliAiDReO1Ug7pw6 FaBdKwDZvQpPc6rCwydpHto2QdBmVFC7SyNYDgR2p7vFOx6Cgg/O5W8IWtpSmrxfEJXgZj 11rb3kWP+ntqH4byDJDsfcU6V1MG04Lx6HySARDWXEwOVw8otgBKjY0GUgJxCulKpmg0Dg 0Y48U+2TWKz5vjudLXbQHevCz6Ajbp0z69poMkwHnMZmVNGcGjpEgZ1/WSqfN3w6/VCyXn gHRlV1uBbMj45vcAWe7nfQNIviCqq45kM/A0t0jfNTWmCnu5r1EFXPNmJrItRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513452; a=rsa-sha256; cv=none; b=cNdYwX3qpBrDn09GTpbNsv8UH+iJDFOdKqZosPR85nbCN2sENCHVQEMZvFTn0jMiS1RijI p7FjnO1VfVpiDNHe3ZRq/DfIbsAxQy14fjdSovGEaYlWhI+sTpTbY/uZ0aIxZsB3ZbCXOy cAMqPpHmO64qbQOidrDd4UDWoo7qgenV03B069vl/fh5xUI2Jp/GFui3+57pvao+CU0Sd2 1sT2ALUlwmqKCoDH9nNz3dTXdVDpcNcu3NyqXxlBgF9aR2Uesxded01eeMjQ0L0r3uUPSK 0XSGpLX2IdGKpbHnYQ3YXtLlkEy45EhL/NZbOr/R7SAa52D0R4NKAq8lobbojg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDy44HJkzVr3; Mon, 21 Oct 2024 12:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOCV4048736; Mon, 21 Oct 2024 12:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOCtp048733; Mon, 21 Oct 2024 12:24:12 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:12 GMT Message-Id: <202410211224.49LCOCtp048733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 9d3dc1e5e0b0 - main - arm64: Remove VPIPT I-cache support from pmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d3dc1e5e0b0c59e1cc473953a8c509779685c2a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9d3dc1e5e0b0c59e1cc473953a8c509779685c2a commit 9d3dc1e5e0b0c59e1cc473953a8c509779685c2a Author: Andrew Turner AuthorDate: 2024-10-18 09:15:43 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Remove VPIPT I-cache support from pmap The VPIPT I-cache policy has been removed from the architecture. Remove support for it from pmap. The vmm side was not imported so calls to pmap_invalidate_vpipt_icache would cause the kernel to branch to a NULL pointer. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47116 --- sys/arm64/arm64/pmap.c | 25 ++++++++++--------------- sys/arm64/include/pmap.h | 1 - 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 10aa7f6bfb5c..17e34888282a 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -409,7 +409,6 @@ SYSCTL_INT(_vm_pmap_vmid, OID_AUTO, epoch, CTLFLAG_RD, &vmids.asid_epoch, 0, "The current epoch number"); void (*pmap_clean_stage2_tlbi)(void); -void (*pmap_invalidate_vpipt_icache)(void); void (*pmap_stage2_invalidate_range)(uint64_t, vm_offset_t, vm_offset_t, bool); void (*pmap_stage2_invalidate_all)(uint64_t); @@ -9076,20 +9075,16 @@ pmap_stage2_fault(pmap_t pmap, uint64_t esr, uint64_t far) ptep = pmap_pte(pmap, far, &lvl); fault_exec: if (ptep != NULL && (pte = pmap_load(ptep)) != 0) { - if (icache_vmid) { - pmap_invalidate_vpipt_icache(); - } else { - /* - * If accessing an executable page invalidate - * the I-cache so it will be valid when we - * continue execution in the guest. The D-cache - * is assumed to already be clean to the Point - * of Coherency. - */ - if ((pte & ATTR_S2_XN_MASK) != - ATTR_S2_XN(ATTR_S2_XN_NONE)) { - invalidate_icache(); - } + /* + * If accessing an executable page invalidate + * the I-cache so it will be valid when we + * continue execution in the guest. The D-cache + * is assumed to already be clean to the Point + * of Coherency. + */ + if ((pte & ATTR_S2_XN_MASK) != + ATTR_S2_XN(ATTR_S2_XN_NONE)) { + invalidate_icache(); } pmap_set_bits(ptep, ATTR_AF | ATTR_DESCR_VALID); rv = KERN_SUCCESS; diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index c9552ebc326a..8bdb4cf025e3 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -172,7 +172,6 @@ int pmap_fault(pmap_t, uint64_t, uint64_t); struct pcb *pmap_switch(struct thread *); extern void (*pmap_clean_stage2_tlbi)(void); -extern void (*pmap_invalidate_vpipt_icache)(void); extern void (*pmap_stage2_invalidate_range)(uint64_t, vm_offset_t, vm_offset_t, bool); extern void (*pmap_stage2_invalidate_all)(uint64_t); From nobody Mon Oct 21 12:24: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 4XXDy56BZHz5Ywrn; Mon, 21 Oct 2024 12:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDy55dzLz4DZJ; Mon, 21 Oct 2024 12:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zIGKJkINRok9lnb4oxKieDS5KJbA3Bh8LYGc06wK/Cg=; b=OxoB5yR7A9zdshxMZAW1QQMr97JeMizD/YtY/srjikdeR1KF2GrtsrOyOyNy5FNv2d8Uug wYpQ8yhNnnbVHtAkdmVxcQc4F0pmUGuxboms5O5RJ6yvnbFB5ZMIRWoC3S1jGSs/D29pNF mUfeuNQsh+UoJBdQpoM4W0DS5k/4nPKyyXvMbwW3qvBraBVS9otgnXwV/3ywcT6IxEBDCh bMTyHbWibn5G9BQqR+csse+LH66wR7y4Thhps+q0ju1NS2F305ccLinMa0Krmq6Um+KMPB KYcSUtC3Vk9xf/HoV2ZgX25fU2VtghSxCAu83xd8X/QMm40KlUoxriRqST9bYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zIGKJkINRok9lnb4oxKieDS5KJbA3Bh8LYGc06wK/Cg=; b=YC8eSLFQNFaq/BagaXiA+cBJ3RhYhHivpD4KheFebT5aoklUzW1+I4SFkEo11gnhD8x0cx I4bBrVgwntXi/t8klsEYBUjJwkr7xRI4ZSVTccnysZXKpk+lytaStjZdLPMJbOkLQorDVH 9otoKV9N7sDg2Odp0oFGDAWnF5RPlCzUZJAnVvpcwJ/MyP6gn1BK/opRg8FTXJCAd0dYri ++lx0gWMTFpw8jm/j89JuQZvKyDBTD/jKkv+NM+CzXip1Vft3Ebf014fWPUhOBsqFkHjzS iDy/KLrbLa3Kz6Ct8Fv5Qik/bZ2xLO8Nb/sb4MgoHuSuHvEzDp2QIFvIhxbsVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513453; a=rsa-sha256; cv=none; b=ZTcGuFZH7YkuijlDdsm4PrA6b+IPS3DPFQcGAZRcl/I7KRucN1tpuem+7XywDLanQRIVaH AahFEKCMWcEeQjFw37K2+R+3EOL4fGd80teZ6I3SSYBzLL7IY/iFCT54goiVq0T+q72QOP REMEvh13UZUlSyUojWZ5n46qZTXcPl5FGdux784JFduIA9Z1JbKJ7UYCdKbAqG7Dhhiq1Q XK7Mtr28m27MsDI9ciPN3n7qldu5XhoMxQHtsmhjrRRHHSFjrQ4KSBjpPBwF+T0QYLYv22 e0LSp9IMZDDNGuI3ZmXeqQysBfxxY6GJCfviYb8fKwZ9WeSr6uZVYxbgbBLZ8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDy55FF9zW64; Mon, 21 Oct 2024 12:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOD55048784; Mon, 21 Oct 2024 12:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCODkE048781; Mon, 21 Oct 2024 12:24:13 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:13 GMT Message-Id: <202410211224.49LCODkE048781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2b3d9ac8907f - main - arm64: Remove old I-Cache 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b3d9ac8907fecbeb873cfb9e0d03f2c7dc18bc4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b3d9ac8907fecbeb873cfb9e0d03f2c7dc18bc4 commit 2b3d9ac8907fecbeb873cfb9e0d03f2c7dc18bc4 Author: Andrew Turner AuthorDate: 2024-10-18 09:15:52 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Remove old I-Cache types The VPIPT and AIVIVT cache types are reserved from Armv8.0. Remove them as nothing will report these values. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47117 --- sys/arm64/arm64/identcpu.c | 9 --------- sys/arm64/include/armreg.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 0e82381a9ac6..0f2104419aad 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2441,12 +2441,6 @@ print_ctr_fields(struct sbuf *sb, uint64_t reg, const void *arg __unused) reg &= ~(CTR_DLINE_MASK | CTR_ILINE_MASK); switch(CTR_L1IP_VAL(reg)) { - case CTR_L1IP_VPIPT: - sbuf_printf(sb, "VPIPT"); - break; - case CTR_L1IP_AIVIVT: - sbuf_printf(sb, "AIVIVT"); - break; case CTR_L1IP_VIPT: sbuf_printf(sb, "VIPT"); break; @@ -2817,9 +2811,6 @@ identify_cache(uint64_t ctr) switch (CTR_L1IP_VAL(ctr)) { case CTR_L1IP_PIPT: break; - case CTR_L1IP_VPIPT: - icache_vmid = true; - break; default: case CTR_L1IP_VIPT: icache_aliasing = true; diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 08a046762a58..b48441f2b413 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -388,8 +388,6 @@ #define CTR_L1IP_SHIFT 14 #define CTR_L1IP_MASK (0x3 << CTR_L1IP_SHIFT) #define CTR_L1IP_VAL(reg) ((reg) & CTR_L1IP_MASK) -#define CTR_L1IP_VPIPT (0 << CTR_L1IP_SHIFT) -#define CTR_L1IP_AIVIVT (1 << CTR_L1IP_SHIFT) #define CTR_L1IP_VIPT (2 << CTR_L1IP_SHIFT) #define CTR_L1IP_PIPT (3 << CTR_L1IP_SHIFT) #define CTR_ILINE_SHIFT 0 From nobody Mon Oct 21 12:24: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 4XXDy72cbGz5YwX3; Mon, 21 Oct 2024 12:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDy66Tt7z4DWt; Mon, 21 Oct 2024 12:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r7P4Aab9Z1ooznHnL995e6OCZQ+Wtymh6smfE2ggrMI=; b=l2plJcXLUGy1EeVKiurUR45BYSeWA+jRVx1wXcdXjwBmxajtAZu/FBtHdkRBs+2mbyVToC pcaenbvsFtcfsnVkbqy+UlQapGxtrFQtDry7oyxMGFoimX9UetJO2CU9RIvp8iswz44f+E Qo/apvhCu4RYHKnflT1w1aPYFyb38Pz3ULJkTHFTmPZYhsS7aDsh3inpg/rXivp509tcsc 8AJmslloidRLhcPPgfpatdtHhynzh2KAJlPdA/cl1GE/5StIL120joUyABciyRfQd26m4i q3JTkAHLBunaJsAmuU6sqWLVZDPnzHee/R6G1fvogkIp+SQz2pka+KM0F7H5ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r7P4Aab9Z1ooznHnL995e6OCZQ+Wtymh6smfE2ggrMI=; b=RekbWGN0VNFec60Pbj6kBnrXMfP0+6RQE4TGxNq3oOXPW1wcdluuQwfmjGUOtfr0gHa8qp 45dBhosAJdh50Lmsl+Cud6CouLp5Owknus36mYaz3zFtBe3S/FP1qVjyG2HKdKzu/n79dp 9IkWsyulM9D3EP8Bs9+BjOMJnDGBNeADGBdi0RYuGBZmAfpYOwjgLbK+aqUvtUlueoMOkx kHpw4pirBoGOmsgxWMFuiem7KRoEMZIpFD8PZl+vooYiyAczW2JC5FVBCPVqJ3iAzTG1oz uz3g8Js4OlN7b/1EHWooB7eVRIhqlxFm6m/EPIWuvLmWmP4mM87/6RNWLzdf9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513454; a=rsa-sha256; cv=none; b=F7KMjmAlz4PKkoxuDeGho2slGbGdw0JvPz9xlTN5bzVE1p43zWNgMObmJcQS7yBXqsWY4/ js5r70EA+r+H4uFWe2Tml5cfleLlliFMnwFhk1CgDgD6S9VG2E9ljuVuoPj5EMPP1Fn6jc jfS/AEu5GOJ8mcy8iuohGU8PYqz3TUy4NbRZqtYNDNMD6QEvawUTPtYrmyQcJJuC4E+FVx wojFUqPgSdJbUjvgaD4nIpY0Q6HbAR1jmx0fiFxVi8pI5HjKW2B+4P9gZKH+8S0khonaxM WKjl9TA/4mCFrT709vTQ/Z9ipkEN4rZl1ZBAadtiDnkeHOrx4VpN4eZVnE3gig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDy6639pzTMT; Mon, 21 Oct 2024 12:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOEI2048837; Mon, 21 Oct 2024 12:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOEkO048834; Mon, 21 Oct 2024 12:24:14 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:14 GMT Message-Id: <202410211224.49LCOEkO048834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 590c32321df3 - main - arm64: Add ID register field width values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 590c32321df3792a3063ec22c0e009f911eaae55 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=590c32321df3792a3063ec22c0e009f911eaae55 commit 590c32321df3792a3063ec22c0e009f911eaae55 Author: Andrew Turner AuthorDate: 2024-10-18 09:16:01 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Add ID register field width values In preperation for supporting non-4 bit field width to identcpu.c, e.g. for ctr_el0, add the width of the existing ID register fields. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47118 --- sys/arm64/include/armreg.h | 157 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b48441f2b413..7d2fffb28779 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -769,6 +769,7 @@ #define ID_AA64DFR0_EL1_CRm 5 #define ID_AA64DFR0_EL1_op2 0 #define ID_AA64DFR0_DebugVer_SHIFT 0 +#define ID_AA64DFR0_DebugVer_WIDTH 4 #define ID_AA64DFR0_DebugVer_MASK (UL(0xf) << ID_AA64DFR0_DebugVer_SHIFT) #define ID_AA64DFR0_DebugVer_VAL(x) ((x) & ID_AA64DFR0_DebugVer_MASK) #define ID_AA64DFR0_DebugVer_8 (UL(0x6) << ID_AA64DFR0_DebugVer_SHIFT) @@ -777,11 +778,13 @@ #define ID_AA64DFR0_DebugVer_8_4 (UL(0x9) << ID_AA64DFR0_DebugVer_SHIFT) #define ID_AA64DFR0_DebugVer_8_8 (UL(0xa) << ID_AA64DFR0_DebugVer_SHIFT) #define ID_AA64DFR0_TraceVer_SHIFT 4 +#define ID_AA64DFR0_TraceVer_WIDTH 4 #define ID_AA64DFR0_TraceVer_MASK (UL(0xf) << ID_AA64DFR0_TraceVer_SHIFT) #define ID_AA64DFR0_TraceVer_VAL(x) ((x) & ID_AA64DFR0_TraceVer_MASK) #define ID_AA64DFR0_TraceVer_NONE (UL(0x0) << ID_AA64DFR0_TraceVer_SHIFT) #define ID_AA64DFR0_TraceVer_IMPL (UL(0x1) << ID_AA64DFR0_TraceVer_SHIFT) #define ID_AA64DFR0_PMUVer_SHIFT 8 +#define ID_AA64DFR0_PMUVer_WIDTH 4 #define ID_AA64DFR0_PMUVer_MASK (UL(0xf) << ID_AA64DFR0_PMUVer_SHIFT) #define ID_AA64DFR0_PMUVer_VAL(x) ((x) & ID_AA64DFR0_PMUVer_MASK) #define ID_AA64DFR0_PMUVer_NONE (UL(0x0) << ID_AA64DFR0_PMUVer_SHIFT) @@ -793,23 +796,28 @@ #define ID_AA64DFR0_PMUVer_3_8 (UL(0x8) << ID_AA64DFR0_PMUVer_SHIFT) #define ID_AA64DFR0_PMUVer_IMPL (UL(0xf) << ID_AA64DFR0_PMUVer_SHIFT) #define ID_AA64DFR0_BRPs_SHIFT 12 +#define ID_AA64DFR0_BRPs_WIDTH 4 #define ID_AA64DFR0_BRPs_MASK (UL(0xf) << ID_AA64DFR0_BRPs_SHIFT) #define ID_AA64DFR0_BRPs_VAL(x) \ ((((x) >> ID_AA64DFR0_BRPs_SHIFT) & 0xf) + 1) #define ID_AA64DFR0_PMSS_SHIFT 16 +#define ID_AA64DFR0_PMSS_WIDTH 4 #define ID_AA64DFR0_PMSS_MASK (UL(0xf) << ID_AA64DFR0_PMSS_SHIFT) #define ID_AA64DFR0_PMSS_VAL(x) ((x) & ID_AA64DFR0_PMSS_MASK) #define ID_AA64DFR0_PMSS_NONE (UL(0x0) << ID_AA64DFR0_PMSS_SHIFT) #define ID_AA64DFR0_PMSS_IMPL (UL(0x1) << ID_AA64DFR0_PMSS_SHIFT) #define ID_AA64DFR0_WRPs_SHIFT 20 +#define ID_AA64DFR0_WRPs_WIDTH 4 #define ID_AA64DFR0_WRPs_MASK (UL(0xf) << ID_AA64DFR0_WRPs_SHIFT) #define ID_AA64DFR0_WRPs_VAL(x) \ ((((x) >> ID_AA64DFR0_WRPs_SHIFT) & 0xf) + 1) #define ID_AA64DFR0_CTX_CMPs_SHIFT 28 +#define ID_AA64DFR0_CTX_CMPs_WIDTH 4 #define ID_AA64DFR0_CTX_CMPs_MASK (UL(0xf) << ID_AA64DFR0_CTX_CMPs_SHIFT) #define ID_AA64DFR0_CTX_CMPs_VAL(x) \ ((((x) >> ID_AA64DFR0_CTX_CMPs_SHIFT) & 0xf) + 1) #define ID_AA64DFR0_PMSVer_SHIFT 32 +#define ID_AA64DFR0_PMSVer_WIDTH 4 #define ID_AA64DFR0_PMSVer_MASK (UL(0xf) << ID_AA64DFR0_PMSVer_SHIFT) #define ID_AA64DFR0_PMSVer_VAL(x) ((x) & ID_AA64DFR0_PMSVer_MASK) #define ID_AA64DFR0_PMSVer_NONE (UL(0x0) << ID_AA64DFR0_PMSVer_SHIFT) @@ -818,33 +826,39 @@ #define ID_AA64DFR0_PMSVer_SPE_1_2 (UL(0x3) << ID_AA64DFR0_PMSVer_SHIFT) #define ID_AA64DFR0_PMSVer_SPE_1_3 (UL(0x4) << ID_AA64DFR0_PMSVer_SHIFT) #define ID_AA64DFR0_DoubleLock_SHIFT 36 +#define ID_AA64DFR0_DoubleLock_WIDTH 4 #define ID_AA64DFR0_DoubleLock_MASK (UL(0xf) << ID_AA64DFR0_DoubleLock_SHIFT) #define ID_AA64DFR0_DoubleLock_VAL(x) ((x) & ID_AA64DFR0_DoubleLock_MASK) #define ID_AA64DFR0_DoubleLock_IMPL (UL(0x0) << ID_AA64DFR0_DoubleLock_SHIFT) #define ID_AA64DFR0_DoubleLock_NONE (UL(0xf) << ID_AA64DFR0_DoubleLock_SHIFT) #define ID_AA64DFR0_TraceFilt_SHIFT 40 +#define ID_AA64DFR0_TraceFilt_WIDTH 4 #define ID_AA64DFR0_TraceFilt_MASK (UL(0xf) << ID_AA64DFR0_TraceFilt_SHIFT) #define ID_AA64DFR0_TraceFilt_VAL(x) ((x) & ID_AA64DFR0_TraceFilt_MASK) #define ID_AA64DFR0_TraceFilt_NONE (UL(0x0) << ID_AA64DFR0_TraceFilt_SHIFT) #define ID_AA64DFR0_TraceFilt_8_4 (UL(0x1) << ID_AA64DFR0_TraceFilt_SHIFT) #define ID_AA64DFR0_TraceBuffer_SHIFT 44 +#define ID_AA64DFR0_TraceBuffer_WIDTH 4 #define ID_AA64DFR0_TraceBuffer_MASK (UL(0xf) << ID_AA64DFR0_TraceBuffer_SHIFT) #define ID_AA64DFR0_TraceBuffer_VAL(x) ((x) & ID_AA64DFR0_TraceBuffer_MASK) #define ID_AA64DFR0_TraceBuffer_NONE (UL(0x0) << ID_AA64DFR0_TraceBuffer_SHIFT) #define ID_AA64DFR0_TraceBuffer_IMPL (UL(0x1) << ID_AA64DFR0_TraceBuffer_SHIFT) #define ID_AA64DFR0_MTPMU_SHIFT 48 +#define ID_AA64DFR0_MTPMU_WIDTH 4 #define ID_AA64DFR0_MTPMU_MASK (UL(0xf) << ID_AA64DFR0_MTPMU_SHIFT) #define ID_AA64DFR0_MTPMU_VAL(x) ((x) & ID_AA64DFR0_MTPMU_MASK) #define ID_AA64DFR0_MTPMU_NONE (UL(0x0) << ID_AA64DFR0_MTPMU_SHIFT) #define ID_AA64DFR0_MTPMU_IMPL (UL(0x1) << ID_AA64DFR0_MTPMU_SHIFT) #define ID_AA64DFR0_MTPMU_NONE_MT_RES0 (UL(0xf) << ID_AA64DFR0_MTPMU_SHIFT) #define ID_AA64DFR0_BRBE_SHIFT 52 +#define ID_AA64DFR0_BRBE_WIDTH 4 #define ID_AA64DFR0_BRBE_MASK (UL(0xf) << ID_AA64DFR0_BRBE_SHIFT) #define ID_AA64DFR0_BRBE_VAL(x) ((x) & ID_AA64DFR0_BRBE_MASK) #define ID_AA64DFR0_BRBE_NONE (UL(0x0) << ID_AA64DFR0_BRBE_SHIFT) #define ID_AA64DFR0_BRBE_IMPL (UL(0x1) << ID_AA64DFR0_BRBE_SHIFT) #define ID_AA64DFR0_BRBE_EL3 (UL(0x2) << ID_AA64DFR0_BRBE_SHIFT) #define ID_AA64DFR0_HPMN0_SHIFT 60 +#define ID_AA64DFR0_HPMN0_WIDTH 4 #define ID_AA64DFR0_HPMN0_MASK (UL(0xf) << ID_AA64DFR0_HPMN0_SHIFT) #define ID_AA64DFR0_HPMN0_VAL(x) ((x) & ID_AA64DFR0_HPMN0_MASK) #define ID_AA64DFR0_HPMN0_CONSTR (UL(0x0) << ID_AA64DFR0_HPMN0_SHIFT) @@ -868,79 +882,94 @@ #define ID_AA64ISAR0_EL1_CRm 6 #define ID_AA64ISAR0_EL1_op2 0 #define ID_AA64ISAR0_AES_SHIFT 4 +#define ID_AA64ISAR0_AES_WIDTH 4 #define ID_AA64ISAR0_AES_MASK (UL(0xf) << ID_AA64ISAR0_AES_SHIFT) #define ID_AA64ISAR0_AES_VAL(x) ((x) & ID_AA64ISAR0_AES_MASK) #define ID_AA64ISAR0_AES_NONE (UL(0x0) << ID_AA64ISAR0_AES_SHIFT) #define ID_AA64ISAR0_AES_BASE (UL(0x1) << ID_AA64ISAR0_AES_SHIFT) #define ID_AA64ISAR0_AES_PMULL (UL(0x2) << ID_AA64ISAR0_AES_SHIFT) #define ID_AA64ISAR0_SHA1_SHIFT 8 +#define ID_AA64ISAR0_SHA1_WIDTH 4 #define ID_AA64ISAR0_SHA1_MASK (UL(0xf) << ID_AA64ISAR0_SHA1_SHIFT) #define ID_AA64ISAR0_SHA1_VAL(x) ((x) & ID_AA64ISAR0_SHA1_MASK) #define ID_AA64ISAR0_SHA1_NONE (UL(0x0) << ID_AA64ISAR0_SHA1_SHIFT) #define ID_AA64ISAR0_SHA1_BASE (UL(0x1) << ID_AA64ISAR0_SHA1_SHIFT) #define ID_AA64ISAR0_SHA2_SHIFT 12 +#define ID_AA64ISAR0_SHA2_WIDTH 4 #define ID_AA64ISAR0_SHA2_MASK (UL(0xf) << ID_AA64ISAR0_SHA2_SHIFT) #define ID_AA64ISAR0_SHA2_VAL(x) ((x) & ID_AA64ISAR0_SHA2_MASK) #define ID_AA64ISAR0_SHA2_NONE (UL(0x0) << ID_AA64ISAR0_SHA2_SHIFT) #define ID_AA64ISAR0_SHA2_BASE (UL(0x1) << ID_AA64ISAR0_SHA2_SHIFT) #define ID_AA64ISAR0_SHA2_512 (UL(0x2) << ID_AA64ISAR0_SHA2_SHIFT) #define ID_AA64ISAR0_CRC32_SHIFT 16 +#define ID_AA64ISAR0_CRC32_WIDTH 4 #define ID_AA64ISAR0_CRC32_MASK (UL(0xf) << ID_AA64ISAR0_CRC32_SHIFT) #define ID_AA64ISAR0_CRC32_VAL(x) ((x) & ID_AA64ISAR0_CRC32_MASK) #define ID_AA64ISAR0_CRC32_NONE (UL(0x0) << ID_AA64ISAR0_CRC32_SHIFT) #define ID_AA64ISAR0_CRC32_BASE (UL(0x1) << ID_AA64ISAR0_CRC32_SHIFT) #define ID_AA64ISAR0_Atomic_SHIFT 20 +#define ID_AA64ISAR0_Atomic_WIDTH 4 #define ID_AA64ISAR0_Atomic_MASK (UL(0xf) << ID_AA64ISAR0_Atomic_SHIFT) #define ID_AA64ISAR0_Atomic_VAL(x) ((x) & ID_AA64ISAR0_Atomic_MASK) #define ID_AA64ISAR0_Atomic_NONE (UL(0x0) << ID_AA64ISAR0_Atomic_SHIFT) #define ID_AA64ISAR0_Atomic_IMPL (UL(0x2) << ID_AA64ISAR0_Atomic_SHIFT) #define ID_AA64ISAR0_TME_SHIFT 24 +#define ID_AA64ISAR0_TME_WIDTH 4 #define ID_AA64ISAR0_TME_MASK (UL(0xf) << ID_AA64ISAR0_TME_SHIFT) #define ID_AA64ISAR0_TME_NONE (UL(0x0) << ID_AA64ISAR0_TME_SHIFT) #define ID_AA64ISAR0_TME_IMPL (UL(0x1) << ID_AA64ISAR0_TME_SHIFT) #define ID_AA64ISAR0_RDM_SHIFT 28 +#define ID_AA64ISAR0_RDM_WIDTH 4 #define ID_AA64ISAR0_RDM_MASK (UL(0xf) << ID_AA64ISAR0_RDM_SHIFT) #define ID_AA64ISAR0_RDM_VAL(x) ((x) & ID_AA64ISAR0_RDM_MASK) #define ID_AA64ISAR0_RDM_NONE (UL(0x0) << ID_AA64ISAR0_RDM_SHIFT) #define ID_AA64ISAR0_RDM_IMPL (UL(0x1) << ID_AA64ISAR0_RDM_SHIFT) #define ID_AA64ISAR0_SHA3_SHIFT 32 +#define ID_AA64ISAR0_SHA3_WIDTH 4 #define ID_AA64ISAR0_SHA3_MASK (UL(0xf) << ID_AA64ISAR0_SHA3_SHIFT) #define ID_AA64ISAR0_SHA3_VAL(x) ((x) & ID_AA64ISAR0_SHA3_MASK) #define ID_AA64ISAR0_SHA3_NONE (UL(0x0) << ID_AA64ISAR0_SHA3_SHIFT) #define ID_AA64ISAR0_SHA3_IMPL (UL(0x1) << ID_AA64ISAR0_SHA3_SHIFT) #define ID_AA64ISAR0_SM3_SHIFT 36 +#define ID_AA64ISAR0_SM3_WIDTH 4 #define ID_AA64ISAR0_SM3_MASK (UL(0xf) << ID_AA64ISAR0_SM3_SHIFT) #define ID_AA64ISAR0_SM3_VAL(x) ((x) & ID_AA64ISAR0_SM3_MASK) #define ID_AA64ISAR0_SM3_NONE (UL(0x0) << ID_AA64ISAR0_SM3_SHIFT) #define ID_AA64ISAR0_SM3_IMPL (UL(0x1) << ID_AA64ISAR0_SM3_SHIFT) #define ID_AA64ISAR0_SM4_SHIFT 40 +#define ID_AA64ISAR0_SM4_WIDTH 4 #define ID_AA64ISAR0_SM4_MASK (UL(0xf) << ID_AA64ISAR0_SM4_SHIFT) #define ID_AA64ISAR0_SM4_VAL(x) ((x) & ID_AA64ISAR0_SM4_MASK) #define ID_AA64ISAR0_SM4_NONE (UL(0x0) << ID_AA64ISAR0_SM4_SHIFT) #define ID_AA64ISAR0_SM4_IMPL (UL(0x1) << ID_AA64ISAR0_SM4_SHIFT) #define ID_AA64ISAR0_DP_SHIFT 44 +#define ID_AA64ISAR0_DP_WIDTH 4 #define ID_AA64ISAR0_DP_MASK (UL(0xf) << ID_AA64ISAR0_DP_SHIFT) #define ID_AA64ISAR0_DP_VAL(x) ((x) & ID_AA64ISAR0_DP_MASK) #define ID_AA64ISAR0_DP_NONE (UL(0x0) << ID_AA64ISAR0_DP_SHIFT) #define ID_AA64ISAR0_DP_IMPL (UL(0x1) << ID_AA64ISAR0_DP_SHIFT) #define ID_AA64ISAR0_FHM_SHIFT 48 +#define ID_AA64ISAR0_FHM_WIDTH 4 #define ID_AA64ISAR0_FHM_MASK (UL(0xf) << ID_AA64ISAR0_FHM_SHIFT) #define ID_AA64ISAR0_FHM_VAL(x) ((x) & ID_AA64ISAR0_FHM_MASK) #define ID_AA64ISAR0_FHM_NONE (UL(0x0) << ID_AA64ISAR0_FHM_SHIFT) #define ID_AA64ISAR0_FHM_IMPL (UL(0x1) << ID_AA64ISAR0_FHM_SHIFT) #define ID_AA64ISAR0_TS_SHIFT 52 +#define ID_AA64ISAR0_TS_WIDTH 4 #define ID_AA64ISAR0_TS_MASK (UL(0xf) << ID_AA64ISAR0_TS_SHIFT) #define ID_AA64ISAR0_TS_VAL(x) ((x) & ID_AA64ISAR0_TS_MASK) #define ID_AA64ISAR0_TS_NONE (UL(0x0) << ID_AA64ISAR0_TS_SHIFT) #define ID_AA64ISAR0_TS_CondM_8_4 (UL(0x1) << ID_AA64ISAR0_TS_SHIFT) #define ID_AA64ISAR0_TS_CondM_8_5 (UL(0x2) << ID_AA64ISAR0_TS_SHIFT) #define ID_AA64ISAR0_TLB_SHIFT 56 +#define ID_AA64ISAR0_TLB_WIDTH 4 #define ID_AA64ISAR0_TLB_MASK (UL(0xf) << ID_AA64ISAR0_TLB_SHIFT) #define ID_AA64ISAR0_TLB_VAL(x) ((x) & ID_AA64ISAR0_TLB_MASK) #define ID_AA64ISAR0_TLB_NONE (UL(0x0) << ID_AA64ISAR0_TLB_SHIFT) #define ID_AA64ISAR0_TLB_TLBIOS (UL(0x1) << ID_AA64ISAR0_TLB_SHIFT) #define ID_AA64ISAR0_TLB_TLBIOSR (UL(0x2) << ID_AA64ISAR0_TLB_SHIFT) #define ID_AA64ISAR0_RNDR_SHIFT 60 +#define ID_AA64ISAR0_RNDR_WIDTH 4 #define ID_AA64ISAR0_RNDR_MASK (UL(0xf) << ID_AA64ISAR0_RNDR_SHIFT) #define ID_AA64ISAR0_RNDR_VAL(x) ((x) & ID_AA64ISAR0_RNDR_MASK) #define ID_AA64ISAR0_RNDR_NONE (UL(0x0) << ID_AA64ISAR0_RNDR_SHIFT) @@ -955,12 +984,14 @@ #define ID_AA64ISAR1_EL1_CRm 6 #define ID_AA64ISAR1_EL1_op2 1 #define ID_AA64ISAR1_DPB_SHIFT 0 +#define ID_AA64ISAR1_DPB_WIDTH 4 #define ID_AA64ISAR1_DPB_MASK (UL(0xf) << ID_AA64ISAR1_DPB_SHIFT) #define ID_AA64ISAR1_DPB_VAL(x) ((x) & ID_AA64ISAR1_DPB_MASK) #define ID_AA64ISAR1_DPB_NONE (UL(0x0) << ID_AA64ISAR1_DPB_SHIFT) #define ID_AA64ISAR1_DPB_DCCVAP (UL(0x1) << ID_AA64ISAR1_DPB_SHIFT) #define ID_AA64ISAR1_DPB_DCCVADP (UL(0x2) << ID_AA64ISAR1_DPB_SHIFT) #define ID_AA64ISAR1_APA_SHIFT 4 +#define ID_AA64ISAR1_APA_WIDTH 4 #define ID_AA64ISAR1_APA_MASK (UL(0xf) << ID_AA64ISAR1_APA_SHIFT) #define ID_AA64ISAR1_APA_VAL(x) ((x) & ID_AA64ISAR1_APA_MASK) #define ID_AA64ISAR1_APA_NONE (UL(0x0) << ID_AA64ISAR1_APA_SHIFT) @@ -970,6 +1001,7 @@ #define ID_AA64ISAR1_APA_FPAC (UL(0x4) << ID_AA64ISAR1_APA_SHIFT) #define ID_AA64ISAR1_APA_FPAC_COMBINED (UL(0x5) << ID_AA64ISAR1_APA_SHIFT) #define ID_AA64ISAR1_API_SHIFT 8 +#define ID_AA64ISAR1_API_WIDTH 4 #define ID_AA64ISAR1_API_MASK (UL(0xf) << ID_AA64ISAR1_API_SHIFT) #define ID_AA64ISAR1_API_VAL(x) ((x) & ID_AA64ISAR1_API_MASK) #define ID_AA64ISAR1_API_NONE (UL(0x0) << ID_AA64ISAR1_API_SHIFT) @@ -979,68 +1011,81 @@ #define ID_AA64ISAR1_API_FPAC (UL(0x4) << ID_AA64ISAR1_API_SHIFT) #define ID_AA64ISAR1_API_FPAC_COMBINED (UL(0x5) << ID_AA64ISAR1_API_SHIFT) #define ID_AA64ISAR1_JSCVT_SHIFT 12 +#define ID_AA64ISAR1_JSCVT_WIDTH 4 #define ID_AA64ISAR1_JSCVT_MASK (UL(0xf) << ID_AA64ISAR1_JSCVT_SHIFT) #define ID_AA64ISAR1_JSCVT_VAL(x) ((x) & ID_AA64ISAR1_JSCVT_MASK) #define ID_AA64ISAR1_JSCVT_NONE (UL(0x0) << ID_AA64ISAR1_JSCVT_SHIFT) #define ID_AA64ISAR1_JSCVT_IMPL (UL(0x1) << ID_AA64ISAR1_JSCVT_SHIFT) #define ID_AA64ISAR1_FCMA_SHIFT 16 +#define ID_AA64ISAR1_FCMA_WIDTH 4 #define ID_AA64ISAR1_FCMA_MASK (UL(0xf) << ID_AA64ISAR1_FCMA_SHIFT) #define ID_AA64ISAR1_FCMA_VAL(x) ((x) & ID_AA64ISAR1_FCMA_MASK) #define ID_AA64ISAR1_FCMA_NONE (UL(0x0) << ID_AA64ISAR1_FCMA_SHIFT) #define ID_AA64ISAR1_FCMA_IMPL (UL(0x1) << ID_AA64ISAR1_FCMA_SHIFT) #define ID_AA64ISAR1_LRCPC_SHIFT 20 +#define ID_AA64ISAR1_LRCPC_WIDTH 4 #define ID_AA64ISAR1_LRCPC_MASK (UL(0xf) << ID_AA64ISAR1_LRCPC_SHIFT) #define ID_AA64ISAR1_LRCPC_VAL(x) ((x) & ID_AA64ISAR1_LRCPC_MASK) #define ID_AA64ISAR1_LRCPC_NONE (UL(0x0) << ID_AA64ISAR1_LRCPC_SHIFT) #define ID_AA64ISAR1_LRCPC_RCPC_8_3 (UL(0x1) << ID_AA64ISAR1_LRCPC_SHIFT) #define ID_AA64ISAR1_LRCPC_RCPC_8_4 (UL(0x2) << ID_AA64ISAR1_LRCPC_SHIFT) #define ID_AA64ISAR1_GPA_SHIFT 24 +#define ID_AA64ISAR1_GPA_WIDTH 4 #define ID_AA64ISAR1_GPA_MASK (UL(0xf) << ID_AA64ISAR1_GPA_SHIFT) #define ID_AA64ISAR1_GPA_VAL(x) ((x) & ID_AA64ISAR1_GPA_MASK) #define ID_AA64ISAR1_GPA_NONE (UL(0x0) << ID_AA64ISAR1_GPA_SHIFT) #define ID_AA64ISAR1_GPA_IMPL (UL(0x1) << ID_AA64ISAR1_GPA_SHIFT) #define ID_AA64ISAR1_GPI_SHIFT 28 +#define ID_AA64ISAR1_GPI_WIDTH 4 #define ID_AA64ISAR1_GPI_MASK (UL(0xf) << ID_AA64ISAR1_GPI_SHIFT) #define ID_AA64ISAR1_GPI_VAL(x) ((x) & ID_AA64ISAR1_GPI_MASK) #define ID_AA64ISAR1_GPI_NONE (UL(0x0) << ID_AA64ISAR1_GPI_SHIFT) #define ID_AA64ISAR1_GPI_IMPL (UL(0x1) << ID_AA64ISAR1_GPI_SHIFT) #define ID_AA64ISAR1_FRINTTS_SHIFT 32 +#define ID_AA64ISAR1_FRINTTS_WIDTH 4 #define ID_AA64ISAR1_FRINTTS_MASK (UL(0xf) << ID_AA64ISAR1_FRINTTS_SHIFT) #define ID_AA64ISAR1_FRINTTS_VAL(x) ((x) & ID_AA64ISAR1_FRINTTS_MASK) #define ID_AA64ISAR1_FRINTTS_NONE (UL(0x0) << ID_AA64ISAR1_FRINTTS_SHIFT) #define ID_AA64ISAR1_FRINTTS_IMPL (UL(0x1) << ID_AA64ISAR1_FRINTTS_SHIFT) #define ID_AA64ISAR1_SB_SHIFT 36 +#define ID_AA64ISAR1_SB_WIDTH 4 #define ID_AA64ISAR1_SB_MASK (UL(0xf) << ID_AA64ISAR1_SB_SHIFT) #define ID_AA64ISAR1_SB_VAL(x) ((x) & ID_AA64ISAR1_SB_MASK) #define ID_AA64ISAR1_SB_NONE (UL(0x0) << ID_AA64ISAR1_SB_SHIFT) #define ID_AA64ISAR1_SB_IMPL (UL(0x1) << ID_AA64ISAR1_SB_SHIFT) #define ID_AA64ISAR1_SPECRES_SHIFT 40 +#define ID_AA64ISAR1_SPECRES_WIDTH 4 #define ID_AA64ISAR1_SPECRES_MASK (UL(0xf) << ID_AA64ISAR1_SPECRES_SHIFT) #define ID_AA64ISAR1_SPECRES_VAL(x) ((x) & ID_AA64ISAR1_SPECRES_MASK) #define ID_AA64ISAR1_SPECRES_NONE (UL(0x0) << ID_AA64ISAR1_SPECRES_SHIFT) #define ID_AA64ISAR1_SPECRES_IMPL (UL(0x1) << ID_AA64ISAR1_SPECRES_SHIFT) #define ID_AA64ISAR1_BF16_SHIFT 44 +#define ID_AA64ISAR1_BF16_WIDTH 4 #define ID_AA64ISAR1_BF16_MASK (UL(0xf) << ID_AA64ISAR1_BF16_SHIFT) #define ID_AA64ISAR1_BF16_VAL(x) ((x) & ID_AA64ISAR1_BF16_MASK) #define ID_AA64ISAR1_BF16_NONE (UL(0x0) << ID_AA64ISAR1_BF16_SHIFT) #define ID_AA64ISAR1_BF16_IMPL (UL(0x1) << ID_AA64ISAR1_BF16_SHIFT) #define ID_AA64ISAR1_BF16_EBF (UL(0x2) << ID_AA64ISAR1_BF16_SHIFT) #define ID_AA64ISAR1_DGH_SHIFT 48 +#define ID_AA64ISAR1_DGH_WIDTH 4 #define ID_AA64ISAR1_DGH_MASK (UL(0xf) << ID_AA64ISAR1_DGH_SHIFT) #define ID_AA64ISAR1_DGH_VAL(x) ((x) & ID_AA64ISAR1_DGH_MASK) #define ID_AA64ISAR1_DGH_NONE (UL(0x0) << ID_AA64ISAR1_DGH_SHIFT) #define ID_AA64ISAR1_DGH_IMPL (UL(0x1) << ID_AA64ISAR1_DGH_SHIFT) #define ID_AA64ISAR1_I8MM_SHIFT 52 +#define ID_AA64ISAR1_I8MM_WIDTH 4 #define ID_AA64ISAR1_I8MM_MASK (UL(0xf) << ID_AA64ISAR1_I8MM_SHIFT) #define ID_AA64ISAR1_I8MM_VAL(x) ((x) & ID_AA64ISAR1_I8MM_MASK) #define ID_AA64ISAR1_I8MM_NONE (UL(0x0) << ID_AA64ISAR1_I8MM_SHIFT) #define ID_AA64ISAR1_I8MM_IMPL (UL(0x1) << ID_AA64ISAR1_I8MM_SHIFT) #define ID_AA64ISAR1_XS_SHIFT 56 +#define ID_AA64ISAR1_XS_WIDTH 4 #define ID_AA64ISAR1_XS_MASK (UL(0xf) << ID_AA64ISAR1_XS_SHIFT) #define ID_AA64ISAR1_XS_VAL(x) ((x) & ID_AA64ISAR1_XS_MASK) #define ID_AA64ISAR1_XS_NONE (UL(0x0) << ID_AA64ISAR1_XS_SHIFT) #define ID_AA64ISAR1_XS_IMPL (UL(0x1) << ID_AA64ISAR1_XS_SHIFT) #define ID_AA64ISAR1_LS64_SHIFT 60 +#define ID_AA64ISAR1_LS64_WIDTH 4 #define ID_AA64ISAR1_LS64_MASK (UL(0xf) << ID_AA64ISAR1_LS64_SHIFT) #define ID_AA64ISAR1_LS64_VAL(x) ((x) & ID_AA64ISAR1_LS64_MASK) #define ID_AA64ISAR1_LS64_NONE (UL(0x0) << ID_AA64ISAR1_LS64_SHIFT) @@ -1057,21 +1102,25 @@ #define ID_AA64ISAR2_EL1_CRm 6 #define ID_AA64ISAR2_EL1_op2 2 #define ID_AA64ISAR2_WFxT_SHIFT 0 +#define ID_AA64ISAR2_WFxT_WIDTH 4 #define ID_AA64ISAR2_WFxT_MASK (UL(0xf) << ID_AA64ISAR2_WFxT_SHIFT) #define ID_AA64ISAR2_WFxT_VAL(x) ((x) & ID_AA64ISAR2_WFxT_MASK) #define ID_AA64ISAR2_WFxT_NONE (UL(0x0) << ID_AA64ISAR2_WFxT_SHIFT) #define ID_AA64ISAR2_WFxT_IMPL (UL(0x1) << ID_AA64ISAR2_WFxT_SHIFT) #define ID_AA64ISAR2_RPRES_SHIFT 4 +#define ID_AA64ISAR2_RPRES_WIDTH 4 #define ID_AA64ISAR2_RPRES_MASK (UL(0xf) << ID_AA64ISAR2_RPRES_SHIFT) #define ID_AA64ISAR2_RPRES_VAL(x) ((x) & ID_AA64ISAR2_RPRES_MASK) #define ID_AA64ISAR2_RPRES_NONE (UL(0x0) << ID_AA64ISAR2_RPRES_SHIFT) #define ID_AA64ISAR2_RPRES_IMPL (UL(0x1) << ID_AA64ISAR2_RPRES_SHIFT) #define ID_AA64ISAR2_GPA3_SHIFT 8 +#define ID_AA64ISAR2_GPA3_WIDTH 4 #define ID_AA64ISAR2_GPA3_MASK (UL(0xf) << ID_AA64ISAR2_GPA3_SHIFT) #define ID_AA64ISAR2_GPA3_VAL(x) ((x) & ID_AA64ISAR2_GPA3_MASK) #define ID_AA64ISAR2_GPA3_NONE (UL(0x0) << ID_AA64ISAR2_GPA3_SHIFT) #define ID_AA64ISAR2_GPA3_IMPL (UL(0x1) << ID_AA64ISAR2_GPA3_SHIFT) #define ID_AA64ISAR2_APA3_SHIFT 12 +#define ID_AA64ISAR2_APA3_WIDTH 4 #define ID_AA64ISAR2_APA3_MASK (UL(0xf) << ID_AA64ISAR2_APA3_SHIFT) #define ID_AA64ISAR2_APA3_VAL(x) ((x) & ID_AA64ISAR2_APA3_MASK) #define ID_AA64ISAR2_APA3_NONE (UL(0x0) << ID_AA64ISAR2_APA3_SHIFT) @@ -1081,16 +1130,19 @@ #define ID_AA64ISAR2_APA3_FPAC (UL(0x4) << ID_AA64ISAR2_APA3_SHIFT) #define ID_AA64ISAR2_APA3_FPAC_COMBINED (UL(0x5) << ID_AA64ISAR2_APA3_SHIFT) #define ID_AA64ISAR2_MOPS_SHIFT 16 +#define ID_AA64ISAR2_MOPS_WIDTH 4 #define ID_AA64ISAR2_MOPS_MASK (UL(0xf) << ID_AA64ISAR2_MOPS_SHIFT) #define ID_AA64ISAR2_MOPS_VAL(x) ((x) & ID_AA64ISAR2_MOPS_MASK) #define ID_AA64ISAR2_MOPS_NONE (UL(0x0) << ID_AA64ISAR2_MOPS_SHIFT) #define ID_AA64ISAR2_MOPS_IMPL (UL(0x1) << ID_AA64ISAR2_MOPS_SHIFT) #define ID_AA64ISAR2_BC_SHIFT 20 +#define ID_AA64ISAR2_BC_WIDTH 4 #define ID_AA64ISAR2_BC_MASK (UL(0xf) << ID_AA64ISAR2_BC_SHIFT) #define ID_AA64ISAR2_BC_VAL(x) ((x) & ID_AA64ISAR2_BC_MASK) #define ID_AA64ISAR2_BC_NONE (UL(0x0) << ID_AA64ISAR2_BC_SHIFT) #define ID_AA64ISAR2_BC_IMPL (UL(0x1) << ID_AA64ISAR2_BC_SHIFT) #define ID_AA64ISAR2_PAC_frac_SHIFT 28 +#define ID_AA64ISAR2_PAC_frac_WIDTH 4 #define ID_AA64ISAR2_PAC_frac_MASK (UL(0xf) << ID_AA64ISAR2_PAC_frac_SHIFT) #define ID_AA64ISAR2_PAC_frac_VAL(x) ((x) & ID_AA64ISAR2_PAC_frac_MASK) #define ID_AA64ISAR2_PAC_frac_NONE (UL(0x0) << ID_AA64ISAR2_PAC_frac_SHIFT) @@ -1105,6 +1157,7 @@ #define ID_AA64MMFR0_EL1_CRm 7 #define ID_AA64MMFR0_EL1_op2 0 #define ID_AA64MMFR0_PARange_SHIFT 0 +#define ID_AA64MMFR0_PARange_WIDTH 4 #define ID_AA64MMFR0_PARange_MASK (UL(0xf) << ID_AA64MMFR0_PARange_SHIFT) #define ID_AA64MMFR0_PARange_VAL(x) ((x) & ID_AA64MMFR0_PARange_MASK) #define ID_AA64MMFR0_PARange_4G (UL(0x0) << ID_AA64MMFR0_PARange_SHIFT) @@ -1115,43 +1168,51 @@ #define ID_AA64MMFR0_PARange_256T (UL(0x5) << ID_AA64MMFR0_PARange_SHIFT) #define ID_AA64MMFR0_PARange_4P (UL(0x6) << ID_AA64MMFR0_PARange_SHIFT) #define ID_AA64MMFR0_ASIDBits_SHIFT 4 +#define ID_AA64MMFR0_ASIDBits_WIDTH 4 #define ID_AA64MMFR0_ASIDBits_MASK (UL(0xf) << ID_AA64MMFR0_ASIDBits_SHIFT) #define ID_AA64MMFR0_ASIDBits_VAL(x) ((x) & ID_AA64MMFR0_ASIDBits_MASK) #define ID_AA64MMFR0_ASIDBits_8 (UL(0x0) << ID_AA64MMFR0_ASIDBits_SHIFT) #define ID_AA64MMFR0_ASIDBits_16 (UL(0x2) << ID_AA64MMFR0_ASIDBits_SHIFT) #define ID_AA64MMFR0_BigEnd_SHIFT 8 +#define ID_AA64MMFR0_BigEnd_WIDTH 4 #define ID_AA64MMFR0_BigEnd_MASK (UL(0xf) << ID_AA64MMFR0_BigEnd_SHIFT) #define ID_AA64MMFR0_BigEnd_VAL(x) ((x) & ID_AA64MMFR0_BigEnd_MASK) #define ID_AA64MMFR0_BigEnd_FIXED (UL(0x0) << ID_AA64MMFR0_BigEnd_SHIFT) #define ID_AA64MMFR0_BigEnd_MIXED (UL(0x1) << ID_AA64MMFR0_BigEnd_SHIFT) #define ID_AA64MMFR0_SNSMem_SHIFT 12 +#define ID_AA64MMFR0_SNSMem_WIDTH 4 #define ID_AA64MMFR0_SNSMem_MASK (UL(0xf) << ID_AA64MMFR0_SNSMem_SHIFT) #define ID_AA64MMFR0_SNSMem_VAL(x) ((x) & ID_AA64MMFR0_SNSMem_MASK) #define ID_AA64MMFR0_SNSMem_NONE (UL(0x0) << ID_AA64MMFR0_SNSMem_SHIFT) #define ID_AA64MMFR0_SNSMem_DISTINCT (UL(0x1) << ID_AA64MMFR0_SNSMem_SHIFT) #define ID_AA64MMFR0_BigEndEL0_SHIFT 16 +#define ID_AA64MMFR0_BigEndEL0_WIDTH 4 #define ID_AA64MMFR0_BigEndEL0_MASK (UL(0xf) << ID_AA64MMFR0_BigEndEL0_SHIFT) #define ID_AA64MMFR0_BigEndEL0_VAL(x) ((x) & ID_AA64MMFR0_BigEndEL0_MASK) #define ID_AA64MMFR0_BigEndEL0_FIXED (UL(0x0) << ID_AA64MMFR0_BigEndEL0_SHIFT) #define ID_AA64MMFR0_BigEndEL0_MIXED (UL(0x1) << ID_AA64MMFR0_BigEndEL0_SHIFT) #define ID_AA64MMFR0_TGran16_SHIFT 20 +#define ID_AA64MMFR0_TGran16_WIDTH 4 #define ID_AA64MMFR0_TGran16_MASK (UL(0xf) << ID_AA64MMFR0_TGran16_SHIFT) #define ID_AA64MMFR0_TGran16_VAL(x) ((x) & ID_AA64MMFR0_TGran16_MASK) #define ID_AA64MMFR0_TGran16_NONE (UL(0x0) << ID_AA64MMFR0_TGran16_SHIFT) #define ID_AA64MMFR0_TGran16_IMPL (UL(0x1) << ID_AA64MMFR0_TGran16_SHIFT) #define ID_AA64MMFR0_TGran16_LPA2 (UL(0x2) << ID_AA64MMFR0_TGran16_SHIFT) #define ID_AA64MMFR0_TGran64_SHIFT 24 +#define ID_AA64MMFR0_TGran64_WIDTH 4 #define ID_AA64MMFR0_TGran64_MASK (UL(0xf) << ID_AA64MMFR0_TGran64_SHIFT) #define ID_AA64MMFR0_TGran64_VAL(x) ((x) & ID_AA64MMFR0_TGran64_MASK) #define ID_AA64MMFR0_TGran64_IMPL (UL(0x0) << ID_AA64MMFR0_TGran64_SHIFT) #define ID_AA64MMFR0_TGran64_NONE (UL(0xf) << ID_AA64MMFR0_TGran64_SHIFT) #define ID_AA64MMFR0_TGran4_SHIFT 28 +#define ID_AA64MMFR0_TGran4_WIDTH 4 #define ID_AA64MMFR0_TGran4_MASK (UL(0xf) << ID_AA64MMFR0_TGran4_SHIFT) #define ID_AA64MMFR0_TGran4_VAL(x) ((x) & ID_AA64MMFR0_TGran4_MASK) #define ID_AA64MMFR0_TGran4_IMPL (UL(0x0) << ID_AA64MMFR0_TGran4_SHIFT) #define ID_AA64MMFR0_TGran4_LPA2 (UL(0x1) << ID_AA64MMFR0_TGran4_SHIFT) #define ID_AA64MMFR0_TGran4_NONE (UL(0xf) << ID_AA64MMFR0_TGran4_SHIFT) #define ID_AA64MMFR0_TGran16_2_SHIFT 32 +#define ID_AA64MMFR0_TGran16_2_WIDTH 4 #define ID_AA64MMFR0_TGran16_2_MASK (UL(0xf) << ID_AA64MMFR0_TGran16_2_SHIFT) #define ID_AA64MMFR0_TGran16_2_VAL(x) ((x) & ID_AA64MMFR0_TGran16_2_MASK) #define ID_AA64MMFR0_TGran16_2_TGran16 (UL(0x0) << ID_AA64MMFR0_TGran16_2_SHIFT) @@ -1159,12 +1220,14 @@ #define ID_AA64MMFR0_TGran16_2_IMPL (UL(0x2) << ID_AA64MMFR0_TGran16_2_SHIFT) #define ID_AA64MMFR0_TGran16_2_LPA2 (UL(0x3) << ID_AA64MMFR0_TGran16_2_SHIFT) #define ID_AA64MMFR0_TGran64_2_SHIFT 36 +#define ID_AA64MMFR0_TGran64_2_WIDTH 4 #define ID_AA64MMFR0_TGran64_2_MASK (UL(0xf) << ID_AA64MMFR0_TGran64_2_SHIFT) #define ID_AA64MMFR0_TGran64_2_VAL(x) ((x) & ID_AA64MMFR0_TGran64_2_MASK) #define ID_AA64MMFR0_TGran64_2_TGran64 (UL(0x0) << ID_AA64MMFR0_TGran64_2_SHIFT) #define ID_AA64MMFR0_TGran64_2_NONE (UL(0x1) << ID_AA64MMFR0_TGran64_2_SHIFT) #define ID_AA64MMFR0_TGran64_2_IMPL (UL(0x2) << ID_AA64MMFR0_TGran64_2_SHIFT) #define ID_AA64MMFR0_TGran4_2_SHIFT 40 +#define ID_AA64MMFR0_TGran4_2_WIDTH 4 #define ID_AA64MMFR0_TGran4_2_MASK (UL(0xf) << ID_AA64MMFR0_TGran4_2_SHIFT) #define ID_AA64MMFR0_TGran4_2_VAL(x) ((x) & ID_AA64MMFR0_TGran4_2_MASK) #define ID_AA64MMFR0_TGran4_2_TGran4 (UL(0x0) << ID_AA64MMFR0_TGran4_2_SHIFT) @@ -1172,16 +1235,19 @@ #define ID_AA64MMFR0_TGran4_2_IMPL (UL(0x2) << ID_AA64MMFR0_TGran4_2_SHIFT) #define ID_AA64MMFR0_TGran4_2_LPA2 (UL(0x3) << ID_AA64MMFR0_TGran4_2_SHIFT) #define ID_AA64MMFR0_ExS_SHIFT 44 +#define ID_AA64MMFR0_ExS_WIDTH 4 #define ID_AA64MMFR0_ExS_MASK (UL(0xf) << ID_AA64MMFR0_ExS_SHIFT) #define ID_AA64MMFR0_ExS_VAL(x) ((x) & ID_AA64MMFR0_ExS_MASK) #define ID_AA64MMFR0_ExS_ALL (UL(0x0) << ID_AA64MMFR0_ExS_SHIFT) #define ID_AA64MMFR0_ExS_IMPL (UL(0x1) << ID_AA64MMFR0_ExS_SHIFT) #define ID_AA64MMFR0_FGT_SHIFT 56 +#define ID_AA64MMFR0_FGT_WIDTH 4 #define ID_AA64MMFR0_FGT_MASK (UL(0xf) << ID_AA64MMFR0_FGT_SHIFT) #define ID_AA64MMFR0_FGT_VAL(x) ((x) & ID_AA64MMFR0_FGT_MASK) #define ID_AA64MMFR0_FGT_NONE (UL(0x0) << ID_AA64MMFR0_FGT_SHIFT) #define ID_AA64MMFR0_FGT_IMPL (UL(0x1) << ID_AA64MMFR0_FGT_SHIFT) #define ID_AA64MMFR0_ECV_SHIFT 60 +#define ID_AA64MMFR0_ECV_WIDTH 4 #define ID_AA64MMFR0_ECV_MASK (UL(0xf) << ID_AA64MMFR0_ECV_SHIFT) #define ID_AA64MMFR0_ECV_VAL(x) ((x) & ID_AA64MMFR0_ECV_MASK) #define ID_AA64MMFR0_ECV_NONE (UL(0x0) << ID_AA64MMFR0_ECV_SHIFT) @@ -1197,33 +1263,39 @@ #define ID_AA64MMFR1_EL1_CRm 7 #define ID_AA64MMFR1_EL1_op2 1 #define ID_AA64MMFR1_HAFDBS_SHIFT 0 +#define ID_AA64MMFR1_HAFDBS_WIDTH 4 #define ID_AA64MMFR1_HAFDBS_MASK (UL(0xf) << ID_AA64MMFR1_HAFDBS_SHIFT) #define ID_AA64MMFR1_HAFDBS_VAL(x) ((x) & ID_AA64MMFR1_HAFDBS_MASK) #define ID_AA64MMFR1_HAFDBS_NONE (UL(0x0) << ID_AA64MMFR1_HAFDBS_SHIFT) #define ID_AA64MMFR1_HAFDBS_AF (UL(0x1) << ID_AA64MMFR1_HAFDBS_SHIFT) #define ID_AA64MMFR1_HAFDBS_AF_DBS (UL(0x2) << ID_AA64MMFR1_HAFDBS_SHIFT) #define ID_AA64MMFR1_VMIDBits_SHIFT 4 +#define ID_AA64MMFR1_VMIDBits_WIDTH 4 #define ID_AA64MMFR1_VMIDBits_MASK (UL(0xf) << ID_AA64MMFR1_VMIDBits_SHIFT) #define ID_AA64MMFR1_VMIDBits_VAL(x) ((x) & ID_AA64MMFR1_VMIDBits_MASK) #define ID_AA64MMFR1_VMIDBits_8 (UL(0x0) << ID_AA64MMFR1_VMIDBits_SHIFT) #define ID_AA64MMFR1_VMIDBits_16 (UL(0x2) << ID_AA64MMFR1_VMIDBits_SHIFT) #define ID_AA64MMFR1_VH_SHIFT 8 +#define ID_AA64MMFR1_VH_WIDTH 4 #define ID_AA64MMFR1_VH_MASK (UL(0xf) << ID_AA64MMFR1_VH_SHIFT) #define ID_AA64MMFR1_VH_VAL(x) ((x) & ID_AA64MMFR1_VH_MASK) #define ID_AA64MMFR1_VH_NONE (UL(0x0) << ID_AA64MMFR1_VH_SHIFT) #define ID_AA64MMFR1_VH_IMPL (UL(0x1) << ID_AA64MMFR1_VH_SHIFT) #define ID_AA64MMFR1_HPDS_SHIFT 12 +#define ID_AA64MMFR1_HPDS_WIDTH 4 #define ID_AA64MMFR1_HPDS_MASK (UL(0xf) << ID_AA64MMFR1_HPDS_SHIFT) #define ID_AA64MMFR1_HPDS_VAL(x) ((x) & ID_AA64MMFR1_HPDS_MASK) #define ID_AA64MMFR1_HPDS_NONE (UL(0x0) << ID_AA64MMFR1_HPDS_SHIFT) #define ID_AA64MMFR1_HPDS_HPD (UL(0x1) << ID_AA64MMFR1_HPDS_SHIFT) #define ID_AA64MMFR1_HPDS_TTPBHA (UL(0x2) << ID_AA64MMFR1_HPDS_SHIFT) #define ID_AA64MMFR1_LO_SHIFT 16 +#define ID_AA64MMFR1_LO_WIDTH 4 #define ID_AA64MMFR1_LO_MASK (UL(0xf) << ID_AA64MMFR1_LO_SHIFT) #define ID_AA64MMFR1_LO_VAL(x) ((x) & ID_AA64MMFR1_LO_MASK) #define ID_AA64MMFR1_LO_NONE (UL(0x0) << ID_AA64MMFR1_LO_SHIFT) #define ID_AA64MMFR1_LO_IMPL (UL(0x1) << ID_AA64MMFR1_LO_SHIFT) #define ID_AA64MMFR1_PAN_SHIFT 20 +#define ID_AA64MMFR1_PAN_WIDTH 4 #define ID_AA64MMFR1_PAN_MASK (UL(0xf) << ID_AA64MMFR1_PAN_SHIFT) #define ID_AA64MMFR1_PAN_VAL(x) ((x) & ID_AA64MMFR1_PAN_MASK) #define ID_AA64MMFR1_PAN_NONE (UL(0x0) << ID_AA64MMFR1_PAN_SHIFT) @@ -1231,46 +1303,55 @@ #define ID_AA64MMFR1_PAN_ATS1E1 (UL(0x2) << ID_AA64MMFR1_PAN_SHIFT) #define ID_AA64MMFR1_PAN_EPAN (UL(0x2) << ID_AA64MMFR1_PAN_SHIFT) #define ID_AA64MMFR1_SpecSEI_SHIFT 24 +#define ID_AA64MMFR1_SpecSEI_WIDTH 4 #define ID_AA64MMFR1_SpecSEI_MASK (UL(0xf) << ID_AA64MMFR1_SpecSEI_SHIFT) #define ID_AA64MMFR1_SpecSEI_VAL(x) ((x) & ID_AA64MMFR1_SpecSEI_MASK) #define ID_AA64MMFR1_SpecSEI_NONE (UL(0x0) << ID_AA64MMFR1_SpecSEI_SHIFT) #define ID_AA64MMFR1_SpecSEI_IMPL (UL(0x1) << ID_AA64MMFR1_SpecSEI_SHIFT) #define ID_AA64MMFR1_XNX_SHIFT 28 +#define ID_AA64MMFR1_XNX_WIDTH 4 #define ID_AA64MMFR1_XNX_MASK (UL(0xf) << ID_AA64MMFR1_XNX_SHIFT) #define ID_AA64MMFR1_XNX_VAL(x) ((x) & ID_AA64MMFR1_XNX_MASK) #define ID_AA64MMFR1_XNX_NONE (UL(0x0) << ID_AA64MMFR1_XNX_SHIFT) #define ID_AA64MMFR1_XNX_IMPL (UL(0x1) << ID_AA64MMFR1_XNX_SHIFT) #define ID_AA64MMFR1_TWED_SHIFT 32 +#define ID_AA64MMFR1_TWED_WIDTH 4 #define ID_AA64MMFR1_TWED_MASK (UL(0xf) << ID_AA64MMFR1_TWED_SHIFT) #define ID_AA64MMFR1_TWED_VAL(x) ((x) & ID_AA64MMFR1_TWED_MASK) #define ID_AA64MMFR1_TWED_NONE (UL(0x0) << ID_AA64MMFR1_TWED_SHIFT) #define ID_AA64MMFR1_TWED_IMPL (UL(0x1) << ID_AA64MMFR1_TWED_SHIFT) #define ID_AA64MMFR1_ETS_SHIFT 36 +#define ID_AA64MMFR1_ETS_WIDTH 4 #define ID_AA64MMFR1_ETS_MASK (UL(0xf) << ID_AA64MMFR1_ETS_SHIFT) #define ID_AA64MMFR1_ETS_VAL(x) ((x) & ID_AA64MMFR1_ETS_MASK) #define ID_AA64MMFR1_ETS_NONE (UL(0x0) << ID_AA64MMFR1_ETS_SHIFT) #define ID_AA64MMFR1_ETS_IMPL (UL(0x1) << ID_AA64MMFR1_ETS_SHIFT) #define ID_AA64MMFR1_HCX_SHIFT 40 +#define ID_AA64MMFR1_HCX_WIDTH 4 #define ID_AA64MMFR1_HCX_MASK (UL(0xf) << ID_AA64MMFR1_HCX_SHIFT) #define ID_AA64MMFR1_HCX_VAL(x) ((x) & ID_AA64MMFR1_HCX_MASK) #define ID_AA64MMFR1_HCX_NONE (UL(0x0) << ID_AA64MMFR1_HCX_SHIFT) #define ID_AA64MMFR1_HCX_IMPL (UL(0x1) << ID_AA64MMFR1_HCX_SHIFT) #define ID_AA64MMFR1_AFP_SHIFT 44 +#define ID_AA64MMFR1_AFP_WIDTH 4 #define ID_AA64MMFR1_AFP_MASK (UL(0xf) << ID_AA64MMFR1_AFP_SHIFT) #define ID_AA64MMFR1_AFP_VAL(x) ((x) & ID_AA64MMFR1_AFP_MASK) #define ID_AA64MMFR1_AFP_NONE (UL(0x0) << ID_AA64MMFR1_AFP_SHIFT) #define ID_AA64MMFR1_AFP_IMPL (UL(0x1) << ID_AA64MMFR1_AFP_SHIFT) #define ID_AA64MMFR1_nTLBPA_SHIFT 48 +#define ID_AA64MMFR1_nTLBPA_WIDTH 4 #define ID_AA64MMFR1_nTLBPA_MASK (UL(0xf) << ID_AA64MMFR1_nTLBPA_SHIFT) #define ID_AA64MMFR1_nTLBPA_VAL(x) ((x) & ID_AA64MMFR1_nTLBPA_MASK) #define ID_AA64MMFR1_nTLBPA_NONE (UL(0x0) << ID_AA64MMFR1_nTLBPA_SHIFT) #define ID_AA64MMFR1_nTLBPA_IMPL (UL(0x1) << ID_AA64MMFR1_nTLBPA_SHIFT) #define ID_AA64MMFR1_TIDCP1_SHIFT 52 +#define ID_AA64MMFR1_TIDCP1_WIDTH 4 #define ID_AA64MMFR1_TIDCP1_MASK (UL(0xf) << ID_AA64MMFR1_TIDCP1_SHIFT) #define ID_AA64MMFR1_TIDCP1_VAL(x) ((x) & ID_AA64MMFR1_TIDCP1_MASK) #define ID_AA64MMFR1_TIDCP1_NONE (UL(0x0) << ID_AA64MMFR1_TIDCP1_SHIFT) #define ID_AA64MMFR1_TIDCP1_IMPL (UL(0x1) << ID_AA64MMFR1_TIDCP1_SHIFT) #define ID_AA64MMFR1_CMOVW_SHIFT 56 +#define ID_AA64MMFR1_CMOVW_WIDTH 4 #define ID_AA64MMFR1_CMOVW_MASK (UL(0xf) << ID_AA64MMFR1_CMOVW_SHIFT) #define ID_AA64MMFR1_CMOVW_VAL(x) ((x) & ID_AA64MMFR1_CMOVW_MASK) #define ID_AA64MMFR1_CMOVW_NONE (UL(0x0) << ID_AA64MMFR1_CMOVW_SHIFT) @@ -1285,79 +1366,94 @@ #define ID_AA64MMFR2_EL1_CRm 7 #define ID_AA64MMFR2_EL1_op2 2 #define ID_AA64MMFR2_CnP_SHIFT 0 +#define ID_AA64MMFR2_CnP_WIDTH 4 #define ID_AA64MMFR2_CnP_MASK (UL(0xf) << ID_AA64MMFR2_CnP_SHIFT) #define ID_AA64MMFR2_CnP_VAL(x) ((x) & ID_AA64MMFR2_CnP_MASK) #define ID_AA64MMFR2_CnP_NONE (UL(0x0) << ID_AA64MMFR2_CnP_SHIFT) #define ID_AA64MMFR2_CnP_IMPL (UL(0x1) << ID_AA64MMFR2_CnP_SHIFT) #define ID_AA64MMFR2_UAO_SHIFT 4 +#define ID_AA64MMFR2_UAO_WIDTH 4 #define ID_AA64MMFR2_UAO_MASK (UL(0xf) << ID_AA64MMFR2_UAO_SHIFT) #define ID_AA64MMFR2_UAO_VAL(x) ((x) & ID_AA64MMFR2_UAO_MASK) #define ID_AA64MMFR2_UAO_NONE (UL(0x0) << ID_AA64MMFR2_UAO_SHIFT) #define ID_AA64MMFR2_UAO_IMPL (UL(0x1) << ID_AA64MMFR2_UAO_SHIFT) #define ID_AA64MMFR2_LSM_SHIFT 8 +#define ID_AA64MMFR2_LSM_WIDTH 4 #define ID_AA64MMFR2_LSM_MASK (UL(0xf) << ID_AA64MMFR2_LSM_SHIFT) #define ID_AA64MMFR2_LSM_VAL(x) ((x) & ID_AA64MMFR2_LSM_MASK) #define ID_AA64MMFR2_LSM_NONE (UL(0x0) << ID_AA64MMFR2_LSM_SHIFT) #define ID_AA64MMFR2_LSM_IMPL (UL(0x1) << ID_AA64MMFR2_LSM_SHIFT) #define ID_AA64MMFR2_IESB_SHIFT 12 +#define ID_AA64MMFR2_IESB_WIDTH 4 #define ID_AA64MMFR2_IESB_MASK (UL(0xf) << ID_AA64MMFR2_IESB_SHIFT) #define ID_AA64MMFR2_IESB_VAL(x) ((x) & ID_AA64MMFR2_IESB_MASK) #define ID_AA64MMFR2_IESB_NONE (UL(0x0) << ID_AA64MMFR2_IESB_SHIFT) #define ID_AA64MMFR2_IESB_IMPL (UL(0x1) << ID_AA64MMFR2_IESB_SHIFT) #define ID_AA64MMFR2_VARange_SHIFT 16 +#define ID_AA64MMFR2_VARange_WIDTH 4 #define ID_AA64MMFR2_VARange_MASK (UL(0xf) << ID_AA64MMFR2_VARange_SHIFT) #define ID_AA64MMFR2_VARange_VAL(x) ((x) & ID_AA64MMFR2_VARange_MASK) #define ID_AA64MMFR2_VARange_48 (UL(0x0) << ID_AA64MMFR2_VARange_SHIFT) #define ID_AA64MMFR2_VARange_52 (UL(0x1) << ID_AA64MMFR2_VARange_SHIFT) #define ID_AA64MMFR2_CCIDX_SHIFT 20 +#define ID_AA64MMFR2_CCIDX_WIDTH 4 #define ID_AA64MMFR2_CCIDX_MASK (UL(0xf) << ID_AA64MMFR2_CCIDX_SHIFT) #define ID_AA64MMFR2_CCIDX_VAL(x) ((x) & ID_AA64MMFR2_CCIDX_MASK) #define ID_AA64MMFR2_CCIDX_32 (UL(0x0) << ID_AA64MMFR2_CCIDX_SHIFT) #define ID_AA64MMFR2_CCIDX_64 (UL(0x1) << ID_AA64MMFR2_CCIDX_SHIFT) #define ID_AA64MMFR2_NV_SHIFT 24 +#define ID_AA64MMFR2_NV_WIDTH 4 #define ID_AA64MMFR2_NV_MASK (UL(0xf) << ID_AA64MMFR2_NV_SHIFT) #define ID_AA64MMFR2_NV_VAL(x) ((x) & ID_AA64MMFR2_NV_MASK) #define ID_AA64MMFR2_NV_NONE (UL(0x0) << ID_AA64MMFR2_NV_SHIFT) #define ID_AA64MMFR2_NV_8_3 (UL(0x1) << ID_AA64MMFR2_NV_SHIFT) #define ID_AA64MMFR2_NV_8_4 (UL(0x2) << ID_AA64MMFR2_NV_SHIFT) #define ID_AA64MMFR2_ST_SHIFT 28 +#define ID_AA64MMFR2_ST_WIDTH 4 #define ID_AA64MMFR2_ST_MASK (UL(0xf) << ID_AA64MMFR2_ST_SHIFT) #define ID_AA64MMFR2_ST_VAL(x) ((x) & ID_AA64MMFR2_ST_MASK) #define ID_AA64MMFR2_ST_NONE (UL(0x0) << ID_AA64MMFR2_ST_SHIFT) #define ID_AA64MMFR2_ST_IMPL (UL(0x1) << ID_AA64MMFR2_ST_SHIFT) #define ID_AA64MMFR2_AT_SHIFT 32 +#define ID_AA64MMFR2_AT_WIDTH 4 #define ID_AA64MMFR2_AT_MASK (UL(0xf) << ID_AA64MMFR2_AT_SHIFT) #define ID_AA64MMFR2_AT_VAL(x) ((x) & ID_AA64MMFR2_AT_MASK) #define ID_AA64MMFR2_AT_NONE (UL(0x0) << ID_AA64MMFR2_AT_SHIFT) #define ID_AA64MMFR2_AT_IMPL (UL(0x1) << ID_AA64MMFR2_AT_SHIFT) #define ID_AA64MMFR2_IDS_SHIFT 36 +#define ID_AA64MMFR2_IDS_WIDTH 4 #define ID_AA64MMFR2_IDS_MASK (UL(0xf) << ID_AA64MMFR2_IDS_SHIFT) #define ID_AA64MMFR2_IDS_VAL(x) ((x) & ID_AA64MMFR2_IDS_MASK) #define ID_AA64MMFR2_IDS_NONE (UL(0x0) << ID_AA64MMFR2_IDS_SHIFT) #define ID_AA64MMFR2_IDS_IMPL (UL(0x1) << ID_AA64MMFR2_IDS_SHIFT) #define ID_AA64MMFR2_FWB_SHIFT 40 +#define ID_AA64MMFR2_FWB_WIDTH 4 #define ID_AA64MMFR2_FWB_MASK (UL(0xf) << ID_AA64MMFR2_FWB_SHIFT) #define ID_AA64MMFR2_FWB_VAL(x) ((x) & ID_AA64MMFR2_FWB_MASK) #define ID_AA64MMFR2_FWB_NONE (UL(0x0) << ID_AA64MMFR2_FWB_SHIFT) #define ID_AA64MMFR2_FWB_IMPL (UL(0x1) << ID_AA64MMFR2_FWB_SHIFT) #define ID_AA64MMFR2_TTL_SHIFT 48 +#define ID_AA64MMFR2_TTL_WIDTH 4 #define ID_AA64MMFR2_TTL_MASK (UL(0xf) << ID_AA64MMFR2_TTL_SHIFT) #define ID_AA64MMFR2_TTL_VAL(x) ((x) & ID_AA64MMFR2_TTL_MASK) #define ID_AA64MMFR2_TTL_NONE (UL(0x0) << ID_AA64MMFR2_TTL_SHIFT) #define ID_AA64MMFR2_TTL_IMPL (UL(0x1) << ID_AA64MMFR2_TTL_SHIFT) #define ID_AA64MMFR2_BBM_SHIFT 52 +#define ID_AA64MMFR2_BBM_WIDTH 4 #define ID_AA64MMFR2_BBM_MASK (UL(0xf) << ID_AA64MMFR2_BBM_SHIFT) #define ID_AA64MMFR2_BBM_VAL(x) ((x) & ID_AA64MMFR2_BBM_MASK) #define ID_AA64MMFR2_BBM_LEVEL0 (UL(0x0) << ID_AA64MMFR2_BBM_SHIFT) #define ID_AA64MMFR2_BBM_LEVEL1 (UL(0x1) << ID_AA64MMFR2_BBM_SHIFT) #define ID_AA64MMFR2_BBM_LEVEL2 (UL(0x2) << ID_AA64MMFR2_BBM_SHIFT) #define ID_AA64MMFR2_EVT_SHIFT 56 +#define ID_AA64MMFR2_EVT_WIDTH 4 #define ID_AA64MMFR2_EVT_MASK (UL(0xf) << ID_AA64MMFR2_EVT_SHIFT) #define ID_AA64MMFR2_EVT_VAL(x) ((x) & ID_AA64MMFR2_EVT_MASK) #define ID_AA64MMFR2_EVT_NONE (UL(0x0) << ID_AA64MMFR2_EVT_SHIFT) #define ID_AA64MMFR2_EVT_8_2 (UL(0x1) << ID_AA64MMFR2_EVT_SHIFT) #define ID_AA64MMFR2_EVT_8_5 (UL(0x2) << ID_AA64MMFR2_EVT_SHIFT) #define ID_AA64MMFR2_E0PD_SHIFT 60 +#define ID_AA64MMFR2_E0PD_WIDTH 4 #define ID_AA64MMFR2_E0PD_MASK (UL(0xf) << ID_AA64MMFR2_E0PD_SHIFT) #define ID_AA64MMFR2_E0PD_VAL(x) ((x) & ID_AA64MMFR2_E0PD_MASK) #define ID_AA64MMFR2_E0PD_NONE (UL(0x0) << ID_AA64MMFR2_E0PD_SHIFT) @@ -1372,21 +1468,25 @@ #define ID_AA64MMFR3_EL1_CRm 7 #define ID_AA64MMFR3_EL1_op2 3 #define ID_AA64MMFR3_TCRX_SHIFT 0 +#define ID_AA64MMFR3_TCRX_WIDTH 4 #define ID_AA64MMFR3_TCRX_MASK (UL(0xf) << ID_AA64MMFR3_TCRX_SHIFT) #define ID_AA64MMFR3_TCRX_VAL(x) ((x) & ID_AA64MMFR3_TCRX_MASK) #define ID_AA64MMFR3_TCRX_NONE (UL(0x0) << ID_AA64MMFR3_TCRX_SHIFT) #define ID_AA64MMFR3_TCRX_IMPL (UL(0x1) << ID_AA64MMFR3_TCRX_SHIFT) #define ID_AA64MMFR3_SCTLRX_SHIFT 4 +#define ID_AA64MMFR3_SCTLRX_WIDTH 4 #define ID_AA64MMFR3_SCTLRX_MASK (UL(0xf) << ID_AA64MMFR3_SCTLRX_SHIFT) #define ID_AA64MMFR3_SCTLRX_VAL(x) ((x) & ID_AA64MMFR3_SCTLRX_MASK) #define ID_AA64MMFR3_SCTLRX_NONE (UL(0x0) << ID_AA64MMFR3_SCTLRX_SHIFT) #define ID_AA64MMFR3_SCTLRX_IMPL (UL(0x1) << ID_AA64MMFR3_SCTLRX_SHIFT) #define ID_AA64MMFR3_MEC_SHIFT 28 +#define ID_AA64MMFR3_MEC_WIDTH 4 #define ID_AA64MMFR3_MEC_MASK (UL(0xf) << ID_AA64MMFR3_MEC_SHIFT) #define ID_AA64MMFR3_MEC_VAL(x) ((x) & ID_AA64MMFR3_MEC_MASK) #define ID_AA64MMFR3_MEC_NONE (UL(0x0) << ID_AA64MMFR3_MEC_SHIFT) #define ID_AA64MMFR3_MEC_IMPL (UL(0x1) << ID_AA64MMFR3_MEC_SHIFT) #define ID_AA64MMFR3_Spec_FPACC_SHIFT 60 +#define ID_AA64MMFR3_Spec_FPACC_WIDTH 4 #define ID_AA64MMFR3_Spec_FPACC_MASK (UL(0xf) << ID_AA64MMFR3_Spec_FPACC_SHIFT) #define ID_AA64MMFR3_Spec_FPACC_VAL(x) ((x) & ID_AA64MMFR3_Spec_FPACC_MASK) #define ID_AA64MMFR3_Spec_FPACC_NONE (UL(0x0) << ID_AA64MMFR3_Spec_FPACC_SHIFT) @@ -1410,34 +1510,40 @@ #define ID_AA64PFR0_EL1_CRm 4 #define ID_AA64PFR0_EL1_op2 0 #define ID_AA64PFR0_EL0_SHIFT 0 +#define ID_AA64PFR0_EL0_WIDTH 4 #define ID_AA64PFR0_EL0_MASK (UL(0xf) << ID_AA64PFR0_EL0_SHIFT) #define ID_AA64PFR0_EL0_VAL(x) ((x) & ID_AA64PFR0_EL0_MASK) #define ID_AA64PFR0_EL0_64 (UL(0x1) << ID_AA64PFR0_EL0_SHIFT) #define ID_AA64PFR0_EL0_64_32 (UL(0x2) << ID_AA64PFR0_EL0_SHIFT) #define ID_AA64PFR0_EL1_SHIFT 4 +#define ID_AA64PFR0_EL1_WIDTH 4 #define ID_AA64PFR0_EL1_MASK (UL(0xf) << ID_AA64PFR0_EL1_SHIFT) #define ID_AA64PFR0_EL1_VAL(x) ((x) & ID_AA64PFR0_EL1_MASK) #define ID_AA64PFR0_EL1_64 (UL(0x1) << ID_AA64PFR0_EL1_SHIFT) #define ID_AA64PFR0_EL1_64_32 (UL(0x2) << ID_AA64PFR0_EL1_SHIFT) #define ID_AA64PFR0_EL2_SHIFT 8 +#define ID_AA64PFR0_EL2_WIDTH 4 #define ID_AA64PFR0_EL2_MASK (UL(0xf) << ID_AA64PFR0_EL2_SHIFT) #define ID_AA64PFR0_EL2_VAL(x) ((x) & ID_AA64PFR0_EL2_MASK) #define ID_AA64PFR0_EL2_NONE (UL(0x0) << ID_AA64PFR0_EL2_SHIFT) #define ID_AA64PFR0_EL2_64 (UL(0x1) << ID_AA64PFR0_EL2_SHIFT) #define ID_AA64PFR0_EL2_64_32 (UL(0x2) << ID_AA64PFR0_EL2_SHIFT) #define ID_AA64PFR0_EL3_SHIFT 12 +#define ID_AA64PFR0_EL3_WIDTH 4 #define ID_AA64PFR0_EL3_MASK (UL(0xf) << ID_AA64PFR0_EL3_SHIFT) #define ID_AA64PFR0_EL3_VAL(x) ((x) & ID_AA64PFR0_EL3_MASK) #define ID_AA64PFR0_EL3_NONE (UL(0x0) << ID_AA64PFR0_EL3_SHIFT) #define ID_AA64PFR0_EL3_64 (UL(0x1) << ID_AA64PFR0_EL3_SHIFT) #define ID_AA64PFR0_EL3_64_32 (UL(0x2) << ID_AA64PFR0_EL3_SHIFT) #define ID_AA64PFR0_FP_SHIFT 16 +#define ID_AA64PFR0_FP_WIDTH 4 #define ID_AA64PFR0_FP_MASK (UL(0xf) << ID_AA64PFR0_FP_SHIFT) #define ID_AA64PFR0_FP_VAL(x) ((x) & ID_AA64PFR0_FP_MASK) #define ID_AA64PFR0_FP_IMPL (UL(0x0) << ID_AA64PFR0_FP_SHIFT) #define ID_AA64PFR0_FP_HP (UL(0x1) << ID_AA64PFR0_FP_SHIFT) #define ID_AA64PFR0_FP_NONE (UL(0xf) << ID_AA64PFR0_FP_SHIFT) #define ID_AA64PFR0_AdvSIMD_SHIFT 20 +#define ID_AA64PFR0_AdvSIMD_WIDTH 4 #define ID_AA64PFR0_AdvSIMD_MASK (UL(0xf) << ID_AA64PFR0_AdvSIMD_SHIFT) #define ID_AA64PFR0_AdvSIMD_VAL(x) ((x) & ID_AA64PFR0_AdvSIMD_MASK) #define ID_AA64PFR0_AdvSIMD_IMPL (UL(0x0) << ID_AA64PFR0_AdvSIMD_SHIFT) @@ -1445,49 +1551,58 @@ #define ID_AA64PFR0_AdvSIMD_NONE (UL(0xf) << ID_AA64PFR0_AdvSIMD_SHIFT) #define ID_AA64PFR0_GIC_BITS 0x4 /* Number of bits in GIC field */ #define ID_AA64PFR0_GIC_SHIFT 24 +#define ID_AA64PFR0_GIC_WIDTH 4 #define ID_AA64PFR0_GIC_MASK (UL(0xf) << ID_AA64PFR0_GIC_SHIFT) #define ID_AA64PFR0_GIC_VAL(x) ((x) & ID_AA64PFR0_GIC_MASK) #define ID_AA64PFR0_GIC_CPUIF_NONE (UL(0x0) << ID_AA64PFR0_GIC_SHIFT) #define ID_AA64PFR0_GIC_CPUIF_EN (UL(0x1) << ID_AA64PFR0_GIC_SHIFT) #define ID_AA64PFR0_GIC_CPUIF_4_1 (UL(0x3) << ID_AA64PFR0_GIC_SHIFT) #define ID_AA64PFR0_RAS_SHIFT 28 +#define ID_AA64PFR0_RAS_WIDTH 4 #define ID_AA64PFR0_RAS_MASK (UL(0xf) << ID_AA64PFR0_RAS_SHIFT) #define ID_AA64PFR0_RAS_VAL(x) ((x) & ID_AA64PFR0_RAS_MASK) #define ID_AA64PFR0_RAS_NONE (UL(0x0) << ID_AA64PFR0_RAS_SHIFT) #define ID_AA64PFR0_RAS_IMPL (UL(0x1) << ID_AA64PFR0_RAS_SHIFT) #define ID_AA64PFR0_RAS_8_4 (UL(0x2) << ID_AA64PFR0_RAS_SHIFT) #define ID_AA64PFR0_SVE_SHIFT 32 +#define ID_AA64PFR0_SVE_WIDTH 4 #define ID_AA64PFR0_SVE_MASK (UL(0xf) << ID_AA64PFR0_SVE_SHIFT) #define ID_AA64PFR0_SVE_VAL(x) ((x) & ID_AA64PFR0_SVE_MASK) #define ID_AA64PFR0_SVE_NONE (UL(0x0) << ID_AA64PFR0_SVE_SHIFT) #define ID_AA64PFR0_SVE_IMPL (UL(0x1) << ID_AA64PFR0_SVE_SHIFT) #define ID_AA64PFR0_SEL2_SHIFT 36 +#define ID_AA64PFR0_SEL2_WIDTH 4 #define ID_AA64PFR0_SEL2_MASK (UL(0xf) << ID_AA64PFR0_SEL2_SHIFT) #define ID_AA64PFR0_SEL2_VAL(x) ((x) & ID_AA64PFR0_SEL2_MASK) #define ID_AA64PFR0_SEL2_NONE (UL(0x0) << ID_AA64PFR0_SEL2_SHIFT) #define ID_AA64PFR0_SEL2_IMPL (UL(0x1) << ID_AA64PFR0_SEL2_SHIFT) #define ID_AA64PFR0_MPAM_SHIFT 40 +#define ID_AA64PFR0_MPAM_WIDTH 4 #define ID_AA64PFR0_MPAM_MASK (UL(0xf) << ID_AA64PFR0_MPAM_SHIFT) #define ID_AA64PFR0_MPAM_VAL(x) ((x) & ID_AA64PFR0_MPAM_MASK) #define ID_AA64PFR0_MPAM_NONE (UL(0x0) << ID_AA64PFR0_MPAM_SHIFT) #define ID_AA64PFR0_MPAM_IMPL (UL(0x1) << ID_AA64PFR0_MPAM_SHIFT) #define ID_AA64PFR0_AMU_SHIFT 44 +#define ID_AA64PFR0_AMU_WIDTH 4 #define ID_AA64PFR0_AMU_MASK (UL(0xf) << ID_AA64PFR0_AMU_SHIFT) #define ID_AA64PFR0_AMU_VAL(x) ((x) & ID_AA64PFR0_AMU_MASK) #define ID_AA64PFR0_AMU_NONE (UL(0x0) << ID_AA64PFR0_AMU_SHIFT) #define ID_AA64PFR0_AMU_V1 (UL(0x1) << ID_AA64PFR0_AMU_SHIFT) #define ID_AA64PFR0_AMU_V1_1 (UL(0x2) << ID_AA64PFR0_AMU_SHIFT) #define ID_AA64PFR0_DIT_SHIFT 48 +#define ID_AA64PFR0_DIT_WIDTH 4 #define ID_AA64PFR0_DIT_MASK (UL(0xf) << ID_AA64PFR0_DIT_SHIFT) #define ID_AA64PFR0_DIT_VAL(x) ((x) & ID_AA64PFR0_DIT_MASK) #define ID_AA64PFR0_DIT_NONE (UL(0x0) << ID_AA64PFR0_DIT_SHIFT) #define ID_AA64PFR0_DIT_PSTATE (UL(0x1) << ID_AA64PFR0_DIT_SHIFT) #define ID_AA64PFR0_RME_SHIFT 52 +#define ID_AA64PFR0_RME_WIDTH 4 #define ID_AA64PFR0_RME_MASK (UL(0xf) << ID_AA64PFR0_RME_SHIFT) #define ID_AA64PFR0_RME_VAL(x) ((x) & ID_AA64PFR0_RME_MASK) #define ID_AA64PFR0_RME_NONE (UL(0x0) << ID_AA64PFR0_RME_SHIFT) #define ID_AA64PFR0_RME_IMPL (UL(0x1) << ID_AA64PFR0_RME_SHIFT) #define ID_AA64PFR0_CSV2_SHIFT 56 +#define ID_AA64PFR0_CSV2_WIDTH 4 #define ID_AA64PFR0_CSV2_MASK (UL(0xf) << ID_AA64PFR0_CSV2_SHIFT) #define ID_AA64PFR0_CSV2_VAL(x) ((x) & ID_AA64PFR0_CSV2_MASK) #define ID_AA64PFR0_CSV2_NONE (UL(0x0) << ID_AA64PFR0_CSV2_SHIFT) @@ -1495,6 +1610,7 @@ #define ID_AA64PFR0_CSV2_SCXTNUM (UL(0x2) << ID_AA64PFR0_CSV2_SHIFT) #define ID_AA64PFR0_CSV2_3 (UL(0x3) << ID_AA64PFR0_CSV2_SHIFT) #define ID_AA64PFR0_CSV3_SHIFT 60 +#define ID_AA64PFR0_CSV3_WIDTH 4 #define ID_AA64PFR0_CSV3_MASK (UL(0xf) << ID_AA64PFR0_CSV3_SHIFT) #define ID_AA64PFR0_CSV3_VAL(x) ((x) & ID_AA64PFR0_CSV3_MASK) #define ID_AA64PFR0_CSV3_NONE (UL(0x0) << ID_AA64PFR0_CSV3_SHIFT) @@ -1509,17 +1625,20 @@ #define ID_AA64PFR1_EL1_CRm 4 #define ID_AA64PFR1_EL1_op2 1 #define ID_AA64PFR1_BT_SHIFT 0 +#define ID_AA64PFR1_BT_WIDTH 4 #define ID_AA64PFR1_BT_MASK (UL(0xf) << ID_AA64PFR1_BT_SHIFT) #define ID_AA64PFR1_BT_VAL(x) ((x) & ID_AA64PFR1_BT_MASK) #define ID_AA64PFR1_BT_NONE (UL(0x0) << ID_AA64PFR1_BT_SHIFT) #define ID_AA64PFR1_BT_IMPL (UL(0x1) << ID_AA64PFR1_BT_SHIFT) #define ID_AA64PFR1_SSBS_SHIFT 4 +#define ID_AA64PFR1_SSBS_WIDTH 4 #define ID_AA64PFR1_SSBS_MASK (UL(0xf) << ID_AA64PFR1_SSBS_SHIFT) #define ID_AA64PFR1_SSBS_VAL(x) ((x) & ID_AA64PFR1_SSBS_MASK) #define ID_AA64PFR1_SSBS_NONE (UL(0x0) << ID_AA64PFR1_SSBS_SHIFT) #define ID_AA64PFR1_SSBS_PSTATE (UL(0x1) << ID_AA64PFR1_SSBS_SHIFT) #define ID_AA64PFR1_SSBS_PSTATE_MSR (UL(0x2) << ID_AA64PFR1_SSBS_SHIFT) #define ID_AA64PFR1_MTE_SHIFT 8 +#define ID_AA64PFR1_MTE_WIDTH 4 #define ID_AA64PFR1_MTE_MASK (UL(0xf) << ID_AA64PFR1_MTE_SHIFT) #define ID_AA64PFR1_MTE_VAL(x) ((x) & ID_AA64PFR1_MTE_MASK) #define ID_AA64PFR1_MTE_NONE (UL(0x0) << ID_AA64PFR1_MTE_SHIFT) @@ -1527,33 +1646,39 @@ #define ID_AA64PFR1_MTE_MTE2 (UL(0x2) << ID_AA64PFR1_MTE_SHIFT) #define ID_AA64PFR1_MTE_MTE3 (UL(0x3) << ID_AA64PFR1_MTE_SHIFT) #define ID_AA64PFR1_RAS_frac_SHIFT 12 +#define ID_AA64PFR1_RAS_frac_WIDTH 4 #define ID_AA64PFR1_RAS_frac_MASK (UL(0xf) << ID_AA64PFR1_RAS_frac_SHIFT) #define ID_AA64PFR1_RAS_frac_VAL(x) ((x) & ID_AA64PFR1_RAS_frac_MASK) #define ID_AA64PFR1_RAS_frac_p0 (UL(0x0) << ID_AA64PFR1_RAS_frac_SHIFT) #define ID_AA64PFR1_RAS_frac_p1 (UL(0x1) << ID_AA64PFR1_RAS_frac_SHIFT) #define ID_AA64PFR1_MPAM_frac_SHIFT 16 +#define ID_AA64PFR1_MPAM_frac_WIDTH 4 #define ID_AA64PFR1_MPAM_frac_MASK (UL(0xf) << ID_AA64PFR1_MPAM_frac_SHIFT) #define ID_AA64PFR1_MPAM_frac_VAL(x) ((x) & ID_AA64PFR1_MPAM_frac_MASK) #define ID_AA64PFR1_MPAM_frac_p0 (UL(0x0) << ID_AA64PFR1_MPAM_frac_SHIFT) #define ID_AA64PFR1_MPAM_frac_p1 (UL(0x1) << ID_AA64PFR1_MPAM_frac_SHIFT) #define ID_AA64PFR1_SME_SHIFT 24 +#define ID_AA64PFR1_SME_WIDTH 4 #define ID_AA64PFR1_SME_MASK (UL(0xf) << ID_AA64PFR1_SME_SHIFT) #define ID_AA64PFR1_SME_VAL(x) ((x) & ID_AA64PFR1_SME_MASK) #define ID_AA64PFR1_SME_NONE (UL(0x0) << ID_AA64PFR1_SME_SHIFT) #define ID_AA64PFR1_SME_SME (UL(0x1) << ID_AA64PFR1_SME_SHIFT) #define ID_AA64PFR1_SME_SME2 (UL(0x2) << ID_AA64PFR1_SME_SHIFT) #define ID_AA64PFR1_RNDR_trap_SHIFT 28 +#define ID_AA64PFR1_RNDR_trap_WIDTH 4 #define ID_AA64PFR1_RNDR_trap_MASK (UL(0xf) << ID_AA64PFR1_RNDR_trap_SHIFT) #define ID_AA64PFR1_RNDR_trap_VAL(x) ((x) & ID_AA64PFR1_RNDR_trap_MASK) #define ID_AA64PFR1_RNDR_trap_NONE (UL(0x0) << ID_AA64PFR1_RNDR_trap_SHIFT) #define ID_AA64PFR1_RNDR_trap_IMPL (UL(0x1) << ID_AA64PFR1_RNDR_trap_SHIFT) #define ID_AA64PFR1_CSV2_frac_SHIFT 32 +#define ID_AA64PFR1_CSV2_frac_WIDTH 4 #define ID_AA64PFR1_CSV2_frac_MASK (UL(0xf) << ID_AA64PFR1_CSV2_frac_SHIFT) #define ID_AA64PFR1_CSV2_frac_VAL(x) ((x) & ID_AA64PFR1_CSV2_frac_MASK) #define ID_AA64PFR1_CSV2_frac_p0 (UL(0x0) << ID_AA64PFR1_CSV2_frac_SHIFT) #define ID_AA64PFR1_CSV2_frac_p1 (UL(0x1) << ID_AA64PFR1_CSV2_frac_SHIFT) #define ID_AA64PFR1_CSV2_frac_p2 (UL(0x2) << ID_AA64PFR1_CSV2_frac_SHIFT) #define ID_AA64PFR1_NMI_SHIFT 36 +#define ID_AA64PFR1_NMI_WIDTH 4 #define ID_AA64PFR1_NMI_MASK (UL(0xf) << ID_AA64PFR1_NMI_SHIFT) #define ID_AA64PFR1_NMI_VAL(x) ((x) & ID_AA64PFR1_NMI_MASK) #define ID_AA64PFR1_NMI_NONE (UL(0x0) << ID_AA64PFR1_NMI_SHIFT) @@ -1577,49 +1702,58 @@ #define ID_AA64ZFR0_EL1_CRm 4 #define ID_AA64ZFR0_EL1_op2 4 #define ID_AA64ZFR0_SVEver_SHIFT 0 +#define ID_AA64ZFR0_SVEver_WIDTH 4 #define ID_AA64ZFR0_SVEver_MASK (UL(0xf) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_SVEver_VAL(x) ((x) & ID_AA64ZFR0_SVEver_MASK #define ID_AA64ZFR0_SVEver_SVE1 (UL(0x0) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_SVEver_SVE2 (UL(0x1) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_SVEver_SVE2P1 (UL(0x2) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_AES_SHIFT 4 +#define ID_AA64ZFR0_AES_WIDTH 4 #define ID_AA64ZFR0_AES_MASK (UL(0xf) << ID_AA64ZFR0_AES_SHIFT) #define ID_AA64ZFR0_AES_VAL(x) ((x) & ID_AA64ZFR0_AES_MASK #define ID_AA64ZFR0_AES_NONE (UL(0x0) << ID_AA64ZFR0_AES_SHIFT) #define ID_AA64ZFR0_AES_BASE (UL(0x1) << ID_AA64ZFR0_AES_SHIFT) #define ID_AA64ZFR0_AES_PMULL (UL(0x2) << ID_AA64ZFR0_AES_SHIFT) #define ID_AA64ZFR0_BitPerm_SHIFT 16 +#define ID_AA64ZFR0_BitPerm_WIDTH 4 #define ID_AA64ZFR0_BitPerm_MASK (UL(0xf) << ID_AA64ZFR0_BitPerm_SHIFT) #define ID_AA64ZFR0_BitPerm_VAL(x) ((x) & ID_AA64ZFR0_BitPerm_MASK #define ID_AA64ZFR0_BitPerm_NONE (UL(0x0) << ID_AA64ZFR0_BitPerm_SHIFT) #define ID_AA64ZFR0_BitPerm_IMPL (UL(0x1) << ID_AA64ZFR0_BitPerm_SHIFT) #define ID_AA64ZFR0_BF16_SHIFT 20 +#define ID_AA64ZFR0_BF16_WIDTH 4 #define ID_AA64ZFR0_BF16_MASK (UL(0xf) << ID_AA64ZFR0_BF16_SHIFT) #define ID_AA64ZFR0_BF16_VAL(x) ((x) & ID_AA64ZFR0_BF16_MASK #define ID_AA64ZFR0_BF16_NONE (UL(0x0) << ID_AA64ZFR0_BF16_SHIFT) #define ID_AA64ZFR0_BF16_BASE (UL(0x1) << ID_AA64ZFR0_BF16_SHIFT) #define ID_AA64ZFR0_BF16_EBF (UL(0x1) << ID_AA64ZFR0_BF16_SHIFT) #define ID_AA64ZFR0_SHA3_SHIFT 32 +#define ID_AA64ZFR0_SHA3_WIDTH 4 #define ID_AA64ZFR0_SHA3_MASK (UL(0xf) << ID_AA64ZFR0_SHA3_SHIFT) #define ID_AA64ZFR0_SHA3_VAL(x) ((x) & ID_AA64ZFR0_SHA3_MASK #define ID_AA64ZFR0_SHA3_NONE (UL(0x0) << ID_AA64ZFR0_SHA3_SHIFT) #define ID_AA64ZFR0_SHA3_IMPL (UL(0x1) << ID_AA64ZFR0_SHA3_SHIFT) #define ID_AA64ZFR0_SM4_SHIFT 40 +#define ID_AA64ZFR0_SM4_WIDTH 4 #define ID_AA64ZFR0_SM4_MASK (UL(0xf) << ID_AA64ZFR0_SM4_SHIFT) #define ID_AA64ZFR0_SM4_VAL(x) ((x) & ID_AA64ZFR0_SM4_MASK #define ID_AA64ZFR0_SM4_NONE (UL(0x0) << ID_AA64ZFR0_SM4_SHIFT) #define ID_AA64ZFR0_SM4_IMPL (UL(0x1) << ID_AA64ZFR0_SM4_SHIFT) #define ID_AA64ZFR0_I8MM_SHIFT 44 +#define ID_AA64ZFR0_I8MM_WIDTH 4 #define ID_AA64ZFR0_I8MM_MASK (UL(0xf) << ID_AA64ZFR0_I8MM_SHIFT) #define ID_AA64ZFR0_I8MM_VAL(x) ((x) & ID_AA64ZFR0_I8MM_MASK #define ID_AA64ZFR0_I8MM_NONE (UL(0x0) << ID_AA64ZFR0_I8MM_SHIFT) #define ID_AA64ZFR0_I8MM_IMPL (UL(0x1) << ID_AA64ZFR0_I8MM_SHIFT) #define ID_AA64ZFR0_F32MM_SHIFT 52 +#define ID_AA64ZFR0_F32MM_WIDTH 4 #define ID_AA64ZFR0_F32MM_MASK (UL(0xf) << ID_AA64ZFR0_F32MM_SHIFT) #define ID_AA64ZFR0_F32MM_VAL(x) ((x) & ID_AA64ZFR0_F32MM_MASK #define ID_AA64ZFR0_F32MM_NONE (UL(0x0) << ID_AA64ZFR0_F32MM_SHIFT) #define ID_AA64ZFR0_F32MM_IMPL (UL(0x1) << ID_AA64ZFR0_F32MM_SHIFT) #define ID_AA64ZFR0_F64MM_SHIFT 56 +#define ID_AA64ZFR0_F64MM_WIDTH 4 #define ID_AA64ZFR0_F64MM_MASK (UL(0xf) << ID_AA64ZFR0_F64MM_SHIFT) #define ID_AA64ZFR0_F64MM_VAL(x) ((x) & ID_AA64ZFR0_F64MM_MASK #define ID_AA64ZFR0_F64MM_NONE (UL(0x0) << ID_AA64ZFR0_F64MM_SHIFT) @@ -1633,37 +1767,44 @@ #define ID_ISAR5_EL1_CRm 0x2 #define ID_ISAR5_EL1_op2 0x5 #define ID_ISAR5_SEVL_SHIFT 0 +#define ID_ISAR5_SEVL_WIDTH 4 #define ID_ISAR5_SEVL_MASK (UL(0xf) << ID_ISAR5_SEVL_SHIFT) #define ID_ISAR5_SEVL_VAL(x) ((x) & ID_ISAR5_SEVL_MASK) #define ID_ISAR5_SEVL_NOP (UL(0x0) << ID_ISAR5_SEVL_SHIFT) #define ID_ISAR5_SEVL_IMPL (UL(0x1) << ID_ISAR5_SEVL_SHIFT) #define ID_ISAR5_AES_SHIFT 4 +#define ID_ISAR5_AES_WIDTH 4 #define ID_ISAR5_AES_MASK (UL(0xf) << ID_ISAR5_AES_SHIFT) #define ID_ISAR5_AES_VAL(x) ((x) & ID_ISAR5_AES_MASK) #define ID_ISAR5_AES_NONE (UL(0x0) << ID_ISAR5_AES_SHIFT) #define ID_ISAR5_AES_BASE (UL(0x1) << ID_ISAR5_AES_SHIFT) #define ID_ISAR5_AES_VMULL (UL(0x2) << ID_ISAR5_AES_SHIFT) #define ID_ISAR5_SHA1_SHIFT 8 +#define ID_ISAR5_SHA1_WIDTH 4 #define ID_ISAR5_SHA1_MASK (UL(0xf) << ID_ISAR5_SHA1_SHIFT) #define ID_ISAR5_SHA1_VAL(x) ((x) & ID_ISAR5_SHA1_MASK) #define ID_ISAR5_SHA1_NONE (UL(0x0) << ID_ISAR5_SHA1_SHIFT) #define ID_ISAR5_SHA1_IMPL (UL(0x1) << ID_ISAR5_SHA1_SHIFT) #define ID_ISAR5_SHA2_SHIFT 12 +#define ID_ISAR5_SHA2_WIDTH 4 #define ID_ISAR5_SHA2_MASK (UL(0xf) << ID_ISAR5_SHA2_SHIFT) #define ID_ISAR5_SHA2_VAL(x) ((x) & ID_ISAR5_SHA2_MASK) #define ID_ISAR5_SHA2_NONE (UL(0x0) << ID_ISAR5_SHA2_SHIFT) #define ID_ISAR5_SHA2_IMPL (UL(0x1) << ID_ISAR5_SHA2_SHIFT) #define ID_ISAR5_CRC32_SHIFT 16 +#define ID_ISAR5_CRC32_WIDTH 4 #define ID_ISAR5_CRC32_MASK (UL(0xf) << ID_ISAR5_CRC32_SHIFT) #define ID_ISAR5_CRC32_VAL(x) ((x) & ID_ISAR5_CRC32_MASK) #define ID_ISAR5_CRC32_NONE (UL(0x0) << ID_ISAR5_CRC32_SHIFT) #define ID_ISAR5_CRC32_IMPL (UL(0x1) << ID_ISAR5_CRC32_SHIFT) #define ID_ISAR5_RDM_SHIFT 24 +#define ID_ISAR5_RDM_WIDTH 4 #define ID_ISAR5_RDM_MASK (UL(0xf) << ID_ISAR5_RDM_SHIFT) #define ID_ISAR5_RDM_VAL(x) ((x) & ID_ISAR5_RDM_MASK) #define ID_ISAR5_RDM_NONE (UL(0x0) << ID_ISAR5_RDM_SHIFT) #define ID_ISAR5_RDM_IMPL (UL(0x1) << ID_ISAR5_RDM_SHIFT) #define ID_ISAR5_VCMA_SHIFT 28 +#define ID_ISAR5_VCMA_WIDTH 4 #define ID_ISAR5_VCMA_MASK (UL(0xf) << ID_ISAR5_VCMA_SHIFT) #define ID_ISAR5_VCMA_VAL(x) ((x) & ID_ISAR5_VCMA_MASK) #define ID_ISAR5_VCMA_NONE (UL(0x0) << ID_ISAR5_VCMA_SHIFT) @@ -1762,44 +1903,52 @@ #define MVFR0_EL1_CRm 0x3 #define MVFR0_EL1_op2 0x0 #define MVFR0_SIMDReg_SHIFT 0 +#define MVFR0_SIMDReg_WIDTH 4 #define MVFR0_SIMDReg_MASK (UL(0xf) << MVFR0_SIMDReg_SHIFT) #define MVFR0_SIMDReg_VAL(x) ((x) & MVFR0_SIMDReg_MASK) #define MVFR0_SIMDReg_NONE (UL(0x0) << MVFR0_SIMDReg_SHIFT) #define MVFR0_SIMDReg_FP (UL(0x1) << MVFR0_SIMDReg_SHIFT) #define MVFR0_SIMDReg_AdvSIMD (UL(0x2) << MVFR0_SIMDReg_SHIFT) #define MVFR0_FPSP_SHIFT 4 +#define MVFR0_FPSP_WIDTH 4 #define MVFR0_FPSP_MASK (UL(0xf) << MVFR0_FPSP_SHIFT) #define MVFR0_FPSP_VAL(x) ((x) & MVFR0_FPSP_MASK) #define MVFR0_FPSP_NONE (UL(0x0) << MVFR0_FPSP_SHIFT) #define MVFR0_FPSP_VFP_v2 (UL(0x1) << MVFR0_FPSP_SHIFT) #define MVFR0_FPSP_VFP_v3_v4 (UL(0x2) << MVFR0_FPSP_SHIFT) #define MVFR0_FPDP_SHIFT 8 +#define MVFR0_FPDP_WIDTH 4 #define MVFR0_FPDP_MASK (UL(0xf) << MVFR0_FPDP_SHIFT) #define MVFR0_FPDP_VAL(x) ((x) & MVFR0_FPDP_MASK) #define MVFR0_FPDP_NONE (UL(0x0) << MVFR0_FPDP_SHIFT) #define MVFR0_FPDP_VFP_v2 (UL(0x1) << MVFR0_FPDP_SHIFT) #define MVFR0_FPDP_VFP_v3_v4 (UL(0x2) << MVFR0_FPDP_SHIFT) #define MVFR0_FPTrap_SHIFT 12 +#define MVFR0_FPTrap_WIDTH 4 #define MVFR0_FPTrap_MASK (UL(0xf) << MVFR0_FPTrap_SHIFT) #define MVFR0_FPTrap_VAL(x) ((x) & MVFR0_FPTrap_MASK) #define MVFR0_FPTrap_NONE (UL(0x0) << MVFR0_FPTrap_SHIFT) #define MVFR0_FPTrap_IMPL (UL(0x1) << MVFR0_FPTrap_SHIFT) #define MVFR0_FPDivide_SHIFT 16 +#define MVFR0_FPDivide_WIDTH 4 #define MVFR0_FPDivide_MASK (UL(0xf) << MVFR0_FPDivide_SHIFT) #define MVFR0_FPDivide_VAL(x) ((x) & MVFR0_FPDivide_MASK) #define MVFR0_FPDivide_NONE (UL(0x0) << MVFR0_FPDivide_SHIFT) #define MVFR0_FPDivide_IMPL (UL(0x1) << MVFR0_FPDivide_SHIFT) #define MVFR0_FPSqrt_SHIFT 20 +#define MVFR0_FPSqrt_WIDTH 4 *** 68 LINES SKIPPED *** From nobody Mon Oct 21 12:24: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 4XXDy85TNZz5Ywnn; Mon, 21 Oct 2024 12:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDy80MWkz4DZf; Mon, 21 Oct 2024 12:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gpv4XKHwXQ24a3GqXmpATkbGkYc/bgIEEj/Q3PBPM80=; b=kLR7HxtFrnGSXw7pol73KNOGwIlGikH7wbJMzdF5B7X7yenGChqVp09SQawx0KdF04SKva n+DQgZ7BOKuvtSyow28yDKew4xmyvYJVuRlKpd93XgA5026gTxKTxEFHF0UMcfAuv54HOq QDWkmkA1iwZLiEY+hzvQbA6MT1SXTEhTiGPmEqm4G4m2HnsW38IZZt3oC3CgyfDdqCP/2u wF6WmFWcWqVrfhd3R0Jffa3wBggHvtFusUEOeoDooeudaDwKULvDGjcyK4j4f8dSK+DykH vF5b1kQPX/zyeVnEiIkrCI2EFEdQKekMBbd+dWXDBDGR7E215cjcHd/9A280og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gpv4XKHwXQ24a3GqXmpATkbGkYc/bgIEEj/Q3PBPM80=; b=FzhvJNpiivAJsadDRRaH0DcTjT41mgnCvZKlfPTOD0qjEB6JxhKOWYtcsf8S6vUNi96Lnp y/+MLSpJvOcsXjEjCQZGEdJ2+r2PZzno5mv/E5hbQu41TIe0HAgScehvC1oN1NU5YEvqoI gRdrn5n9hau67S2Sh5AkMt3buM7Of0HsCsvANA9s6Wy+qfpq5pRQKkMtqi0PbsKof6tHFE uqrvhrx8mm9rLA9mkcyl8xs4e8an9wd94YJiEYT+H2NF7IZ8LTjp0ilerL8wdVSvrawppi Kq7dfy5jSUWikN5RJNyGT/4APZ/EMksfQ9mO0mOjMhvHXWfQhB99lEV1gDovXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513456; a=rsa-sha256; cv=none; b=EZNh/yXkD99745tqRR4cVgvW4uarmx3ZNKSTGP6j2w3x9jUf2DrkVhvED7w9A02B7c3Wkl Lj7+YKfBQpwi1X7QnMwGExXFld4S81HfZdpFJ4PLQDc1hN1sWwJ9RMt1UUEjSHEm7coY5L IWaD7U1D/ZYo7b1k7vcTCXDr2lG1L+CDc4maKUNDXOHyR6MUQAWG4WelrX9A4MBhR5VYBg iyPjQ6bnaYDEamnb7T69BAT/J8KcJzH9zq8FICUcnuD0FwhAqYoMKa0M/kt2nEwD8wICN3 qxkuI5ow71PMa4UWJGCq6+m/wVoNpnA7rBJIJEnM2PbUrwP5Jf96dIyKaD653g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDy772WZzVr4; Mon, 21 Oct 2024 12:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOFJf048889; Mon, 21 Oct 2024 12:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOFqk048886; Mon, 21 Oct 2024 12:24:15 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:15 GMT Message-Id: <202410211224.49LCOFqk048886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: aa760039c6eb - main - arm64: Support non-4 bit ID reg 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa760039c6ebdfe86171e3afb89e00f3f9ec45f9 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aa760039c6ebdfe86171e3afb89e00f3f9ec45f9 commit aa760039c6ebdfe86171e3afb89e00f3f9ec45f9 Author: Andrew Turner AuthorDate: 2024-10-18 09:16:10 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Support non-4 bit ID reg fields In preparation for using the ID register decode with the cache type register support a non-4 bit field width. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47119 --- sys/arm64/arm64/identcpu.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 0f2104419aad..1627515361f7 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -355,6 +355,7 @@ struct mrs_field { uint64_t mask; bool sign; u_int type; + u_int width; u_int shift; }; @@ -365,6 +366,7 @@ struct mrs_field { .sign = (_sign), \ .type = ((_fbsd_type) << MRS_TYPE_FBSD_SHIFT) | \ ((_lnx_type) << MRS_TYPE_LNX_SHIFT), \ + .width = _register ## _ ## _name ## _WIDTH, \ .shift = _register ## _ ## _name ## _SHIFT, \ .mask = _register ## _ ## _name ## _MASK, \ .values = (_values), \ @@ -2138,7 +2140,8 @@ get_kernel_reg_masked(u_int reg, uint64_t *valp, uint64_t mask) fields = user_regs[i].fields; for (int j = 0; fields[j].type != 0; j++) { mask = update_lower_register(mask, val, - fields[j].shift, 4, fields[j].sign); + fields[j].shift, fields[j].width, + fields[j].sign); } *valp = mask; return (true); @@ -2150,7 +2153,7 @@ get_kernel_reg_masked(u_int reg, uint64_t *valp, uint64_t mask) static uint64_t update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, - u_int shift, bool sign) + u_int width, u_int shift, bool sign) { switch (type & MRS_TYPE_MASK) { case MRS_EXACT: @@ -2158,7 +2161,7 @@ update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, user_reg |= (uint64_t)MRS_EXACT_FIELD(type) << shift; break; case MRS_LOWER: - user_reg = update_lower_register(user_reg, value, shift, 4, + user_reg = update_lower_register(user_reg, value, shift, width, sign); break; default: @@ -2206,16 +2209,16 @@ update_special_regs(u_int cpu) /* Update the FreeBSD userspace ID register view */ user_reg = update_special_reg_field(user_reg, fields[j].type >> MRS_TYPE_FBSD_SHIFT, value, - fields[j].shift, fields[j].sign); + fields[j].width, fields[j].shift, fields[j].sign); /* Update the Linux userspace ID register view */ l_user_reg = update_special_reg_field(l_user_reg, fields[j].type >> MRS_TYPE_LNX_SHIFT, value, - fields[j].shift, fields[j].sign); + fields[j].width, fields[j].shift, fields[j].sign); /* Update the kernel ID register view */ kern_reg = update_lower_register(kern_reg, value, - fields[j].shift, 4, fields[j].sign); + fields[j].shift, fields[j].width, fields[j].sign); } CPU_DESC_FIELD(kern_cpu_desc, i) = kern_reg; @@ -2510,7 +2513,7 @@ print_id_fields(struct sbuf *sb, uint64_t reg, const void *arg) sbuf_printf(sb, "%sUnknown %s(%x)", SEP_STR, fields[i].name, field); - reg &= ~(0xful << fields[i].shift); + reg &= ~(((1ul << fields[i].width) - 1) << fields[i].shift); } if (reg != 0) From nobody Mon Oct 21 12:24: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 4XXDy92Gcmz5YwY8; Mon, 21 Oct 2024 12:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDy90zs3z4DXS; Mon, 21 Oct 2024 12:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pXWwTY0FoECZkmq0agyX4o6T+zZUK5vmPeH6x8Epy8=; b=epc3R08XKTAJ0F+HEQrlKyl9rD5AYooAq4UBtbici8wvYr78rRDkmiFkeKGnUs6PNqvRoa rprhar540XRbrg0wD5aiUB/JCYHKKDLW8iat77rEFwhjfyG808k5ZbYh2uJhvdyYOSP9Zk rYiPZaLQ1FTfOmcWOmHUghap5XE3z0e5J/VFQRA78ytqouzoag/LS4RF96ABBqzTez20Rc 0jELZqV1erbpCFU9m+ZyT6/wTYLsfzDaeH4XltKkfedANgUo5gNMTclDa9uYzIK5VloFSA NZ2+Vza5YVfglimHDstaq7VgE9v11BTYDivPUfzFYjLJmfEIjspHMWPMwW/9Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pXWwTY0FoECZkmq0agyX4o6T+zZUK5vmPeH6x8Epy8=; b=YIzeD9SFEwjyKrACMWqD3rByJJ749BQj3pBMBCOLw9rBitCxexkrFAGSFBn2yaSmMDd4gC lAt+WmZ/CUc+hB1zwTuhqrYruMcdBLVAM5RFCEo7MBq7yJl/jxs1jl1hjCaN33XvCQfNxd JSbwuMXuiW5CGUs/UY+8R14CJMCKaMvMBSHHOqz3Pc4K1MEPIiYF9oEVq5n9BNAAP2T9Yi s3met98PwfJ3Z1fyTq21XSr+DoGW/oINgh7j0bJhrOTe5AFSkaSUCUmZ6bMIAZebo6D4Tj +uFw6NwK7/K+dgqti/KUlX2kG2qYGu9cWuLD1Aex8yQdkPMKI/mFy6S385/ssw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513457; a=rsa-sha256; cv=none; b=a0gSCVvXOL/5UWgOTq8Cz9ImQFOdZMXH29TMS/kutNE0uE/z0k/pEOfZqf1lUJH0N5EHx0 ccOXgOoatBrKZCopJY7B66JJMYG5kFZQ79HQ7GsTedyhY+IYh5q0AW0P5ugeom6Y7lCJFk sibN4YVlmgu1VkGRKGeYr914OOTWGCx0nVQlGY1K18V6RlUAl+OiEWeh/q9W4r+zEQmw3R wY+A8Vh8HrkkpCrokurj0jWwRoDsaLdcMIQTnwStpn4EEr1mVEST+2ddMHJowF8A7gBY9w Y498n/tuNFxY5yszkqn09P9pmmAJRqCz0XNGEdqbw89ZRVKtNcURL75Kr7QBiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDy90bpszVr6; Mon, 21 Oct 2024 12:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOGff048951; Mon, 21 Oct 2024 12:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOG8T048948; Mon, 21 Oct 2024 12:24:16 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:16 GMT Message-Id: <202410211224.49LCOG8T048948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ffdf9db281f5 - main - arm64: Add MRS_SAFE to hold a safe ID field 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffdf9db281f5cb8edfd819fec1e1c696e52d042c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ffdf9db281f5cb8edfd819fec1e1c696e52d042c commit ffdf9db281f5cb8edfd819fec1e1c696e52d042c Author: Andrew Turner AuthorDate: 2024-10-18 09:16:18 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Add MRS_SAFE to hold a safe ID field value To support reworking the arm64 CPU ID code to add CTR_EL0, the cache type register, start to move the safe value to be encoded as a named field rather than part of MRS_EXACT. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47120 --- sys/arm64/arm64/identcpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 1627515361f7..c36428cfa1d6 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -294,9 +294,11 @@ const struct cpu_implementers cpu_implementers[] = { #define MRS_TYPE_LNX_SHIFT 8 #define MRS_INVALID 0 #define MRS_EXACT 1 -#define MRS_EXACT_VAL(x) (MRS_EXACT | ((x) << 4)) -#define MRS_EXACT_FIELD(x) (((x) >> 4) & 0xf) #define MRS_LOWER 2 +#define MRS_SAFE_SHIFT 4 +#define MRS_SAFE_MASK (0xfu << MRS_SAFE_SHIFT) +#define MRS_SAFE(x) (((x) << MRS_SAFE_SHIFT) & MRS_SAFE_MASK) +#define MRS_SAFE_VAL(x) (((x) & MRS_SAFE_MASK) >> MRS_SAFE_SHIFT) struct mrs_field_value { uint64_t value; @@ -498,7 +500,7 @@ static const struct mrs_field id_aa64dfr0_fields[] = { MRS_FIELD(ID_AA64DFR0, PMUVer, false, MRS_EXACT, id_aa64dfr0_pmuver), MRS_FIELD(ID_AA64DFR0, TraceVer, false, MRS_EXACT, id_aa64dfr0_tracever), - MRS_FIELD(ID_AA64DFR0, DebugVer, false, MRS_EXACT_VAL(0x6), + MRS_FIELD(ID_AA64DFR0, DebugVer, false, MRS_EXACT | MRS_SAFE(0x6), id_aa64dfr0_debugver), MRS_FIELD_END, }; @@ -2158,7 +2160,7 @@ update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, switch (type & MRS_TYPE_MASK) { case MRS_EXACT: user_reg &= ~(0xful << shift); - user_reg |= (uint64_t)MRS_EXACT_FIELD(type) << shift; + user_reg |= (uint64_t)MRS_SAFE(type) << shift; break; case MRS_LOWER: user_reg = update_lower_register(user_reg, value, shift, width, From nobody Mon Oct 21 12:24: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 4XXDyB2DSfz5Ywnv; Mon, 21 Oct 2024 12:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyB1nY8z4DjN; Mon, 21 Oct 2024 12:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513458; h=from:from:reply-to:subject:subject: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/boFrrGAipBYiUf4DxDmG2X3N3++LVe1Dy0tzW8dfs=; b=tIs0CVtn1B7j/MuwrpsVTDTDWzXXgxq/7D5Hu3l0ErJWfK6h3mBzD1+dJFsyj3N5EqM4SL Z4YxiMA4HuXtQwil3Zq3rcrjWFIczUY5e5c1beCrSg2saBnGshTf7UxzCXqzGxcq5iPpnX ldmmDEA8eKKok3rl+xxc7JU4z+3UTQ4gmNwAv3ClyXO1JRp+ZueU4EcRQMmB2zOqX1HDuf zzNvYm5pO/i9qExeVZJJm3HqG+ZG3lavgdlyQQvdIQb2ZCX7W4KPLhkqwvfo1wt5mBKqWk BgmDj0Z18663aH72qTYkpwrXD0mBXmkbkKME5QTaLiHQaio4e05Vn/1zFHWQzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513458; h=from:from:reply-to:subject:subject: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/boFrrGAipBYiUf4DxDmG2X3N3++LVe1Dy0tzW8dfs=; b=WJp81WW4DzGgN+ZcI47tVnc66fWcImf/FTIoQWEXGRirsBHu/esYe7cy8l8kacaLys9dN4 r0HbiRG9GQYh/R6DcWCeAPNSoxdseqevD0JupZAKOAM9qZEy+VQOc1aKGJpKnDAP2Nmjhf dgel/wlNuWWFn4rvN1yyYEIikZlOdsdQZBbRSOMVsgYVooVWmQrfV3j7W1u+Qgy+TDCbjh vNYTTU3e11dqUxjIgilxeFArXQESFhE8r/i00LPu8jPe3LC5JLeco8Wqf2lzny1aNOMWaG nxIruNYKuYgV4tVwroLvM2jGtMGMgDfDMh50PAfWjbA4Td6Lag+aR0SylbNW8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513458; a=rsa-sha256; cv=none; b=jRH2+YVzGYFod/eRurYQBMTSUGhzPKTIEWr1QXgYZp7xg5sd8rJxWxjgE/UDsfkizIDKjC TzafrV+mkepnANRVpX3xesGuX4QkK3pFlq2EWMOwGQImf49RU3XaJAPbCCPJ/b2UzSYW6e ETbNReOnD1TcpS9Ze3Eofr9cilvUDDqt7h9lyg6PxKn69Wx0wMRgTPxSkBHmFsFl5o4h88 3p+7upWnTV+FAUaCyj3+vno8av9crxxsuZmg2aHCfW+vtFOC3hZMzMEv6K/m9Kbi7nljp3 VX0jxCno/27kUHnYIY9XWbpytTLlfjs1wFeGL52Ddyg7vrGggNNJPQyvrYUtNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyB1P75zW8Q; Mon, 21 Oct 2024 12:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOIZk049009; Mon, 21 Oct 2024 12:24:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOIjT049006; Mon, 21 Oct 2024 12:24:18 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:18 GMT Message-Id: <202410211224.49LCOIjT049006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f03149940554 - main - arm64: Use a bit to hold userspace ID reg exports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f031499405544933038e50ebd84a400218082b77 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f031499405544933038e50ebd84a400218082b77 commit f031499405544933038e50ebd84a400218082b77 Author: Andrew Turner AuthorDate: 2024-10-18 09:16:31 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Use a bit to hold userspace ID reg exports When exporting ID registers to userspace we should either adjust them the same way for FreeBSD and Linux binaries, or export the Linux field values to a safe value, e.g. when a needed syscall is missing. To allow for this, and to clean up ID register handling in the kernel move to using a bit per userspace ABI. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47121 --- sys/arm64/arm64/identcpu.c | 438 ++++++++++++++++++++++++--------------------- 1 file changed, 232 insertions(+), 206 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index c36428cfa1d6..83d934af345e 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -290,8 +290,6 @@ const struct cpu_implementers cpu_implementers[] = { }; #define MRS_TYPE_MASK 0xf -#define MRS_TYPE_FBSD_SHIFT 0 -#define MRS_TYPE_LNX_SHIFT 8 #define MRS_INVALID 0 #define MRS_EXACT 1 #define MRS_LOWER 2 @@ -299,6 +297,9 @@ const struct cpu_implementers cpu_implementers[] = { #define MRS_SAFE_MASK (0xfu << MRS_SAFE_SHIFT) #define MRS_SAFE(x) (((x) << MRS_SAFE_SHIFT) & MRS_SAFE_MASK) #define MRS_SAFE_VAL(x) (((x) & MRS_SAFE_MASK) >> MRS_SAFE_SHIFT) +#define MRS_FREEBSD (1u << 8) +#define MRS_LINUX (1u << 9) +#define MRS_USERSPACE (MRS_FREEBSD | MRS_LINUX) struct mrs_field_value { uint64_t value; @@ -361,13 +362,12 @@ struct mrs_field { u_int shift; }; -#define MRS_FIELD_HWCAP_SPLIT(_register, _name, _sign, _fbsd_type, \ - _lnx_type, _values, _hwcap) \ +#define MRS_FIELD_HWCAP(_register, _name, _sign, _type, _visibility, \ + _values, _hwcap) \ { \ .name = #_name, \ .sign = (_sign), \ - .type = ((_fbsd_type) << MRS_TYPE_FBSD_SHIFT) | \ - ((_lnx_type) << MRS_TYPE_LNX_SHIFT), \ + .type = ((_type) | (_visibility)), \ .width = _register ## _ ## _name ## _WIDTH, \ .shift = _register ## _ ## _name ## _SHIFT, \ .mask = _register ## _ ## _name ## _MASK, \ @@ -375,15 +375,13 @@ struct mrs_field { .hwcaps = (_hwcap), \ } -#define MRS_FIELD_HWCAP(_register, _name, _sign, _type, _values, _hwcap) \ - MRS_FIELD_HWCAP_SPLIT(_register, _name, _sign, _type, _type, \ - _values, _hwcap) - -#define MRS_FIELD(_register, _name, _sign, _type, _values) \ - MRS_FIELD_HWCAP(_register, _name, _sign, _type, _values, NULL) +#define MRS_FIELD(_register, _name, _sign, _type, _visibility, _values) \ + MRS_FIELD_HWCAP(_register, _name, _sign, _type, _visibility, \ + _values, NULL) #define MRS_FIELD_END { .type = MRS_INVALID, } + /* ID_AA64AFR0_EL1 */ static const struct mrs_field id_aa64afr0_fields[] = { MRS_FIELD_END, @@ -483,24 +481,26 @@ static const struct mrs_field_value id_aa64dfr0_debugver[] = { }; static const struct mrs_field id_aa64dfr0_fields[] = { - MRS_FIELD(ID_AA64DFR0, HPMN0, false, MRS_EXACT, id_aa64dfr0_hpmn0), - MRS_FIELD(ID_AA64DFR0, BRBE, false, MRS_EXACT, id_aa64dfr0_brbe), - MRS_FIELD(ID_AA64DFR0, MTPMU, true, MRS_EXACT, id_aa64dfr0_mtpmu), - MRS_FIELD(ID_AA64DFR0, TraceBuffer, false, MRS_EXACT, + MRS_FIELD(ID_AA64DFR0, HPMN0, false, MRS_LOWER, 0, id_aa64dfr0_hpmn0), + MRS_FIELD(ID_AA64DFR0, BRBE, false, MRS_LOWER, 0, id_aa64dfr0_brbe), + MRS_FIELD(ID_AA64DFR0, MTPMU, true, MRS_LOWER, 0, id_aa64dfr0_mtpmu), + MRS_FIELD(ID_AA64DFR0, TraceBuffer, false, MRS_LOWER, 0, id_aa64dfr0_tracebuffer), - MRS_FIELD(ID_AA64DFR0, TraceFilt, false, MRS_EXACT, + MRS_FIELD(ID_AA64DFR0, TraceFilt, false, MRS_LOWER, 0, id_aa64dfr0_tracefilt), - MRS_FIELD(ID_AA64DFR0, DoubleLock, false, MRS_EXACT, + MRS_FIELD(ID_AA64DFR0, DoubleLock, false, MRS_LOWER, 0, id_aa64dfr0_doublelock), - MRS_FIELD(ID_AA64DFR0, PMSVer, false, MRS_EXACT, id_aa64dfr0_pmsver), - MRS_FIELD(ID_AA64DFR0, CTX_CMPs, false, MRS_EXACT, + MRS_FIELD(ID_AA64DFR0, PMSVer, false, MRS_LOWER, 0, id_aa64dfr0_pmsver), + MRS_FIELD(ID_AA64DFR0, CTX_CMPs, false, MRS_LOWER, 0, id_aa64dfr0_ctx_cmps), - MRS_FIELD(ID_AA64DFR0, WRPs, false, MRS_LOWER, id_aa64dfr0_wrps), - MRS_FIELD(ID_AA64DFR0, BRPs, false, MRS_LOWER, id_aa64dfr0_brps), - MRS_FIELD(ID_AA64DFR0, PMUVer, false, MRS_EXACT, id_aa64dfr0_pmuver), - MRS_FIELD(ID_AA64DFR0, TraceVer, false, MRS_EXACT, + MRS_FIELD(ID_AA64DFR0, WRPs, false, MRS_LOWER, MRS_USERSPACE, + id_aa64dfr0_wrps), + MRS_FIELD(ID_AA64DFR0, BRPs, false, MRS_LOWER, MRS_USERSPACE, + id_aa64dfr0_brps), + MRS_FIELD(ID_AA64DFR0, PMUVer, false, MRS_LOWER, 0, id_aa64dfr0_pmuver), + MRS_FIELD(ID_AA64DFR0, TraceVer, false, MRS_LOWER, 0, id_aa64dfr0_tracever), - MRS_FIELD(ID_AA64DFR0, DebugVer, false, MRS_EXACT | MRS_SAFE(0x6), + MRS_FIELD(ID_AA64DFR0, DebugVer, false, MRS_LOWER | MRS_SAFE(0x6), 0, id_aa64dfr0_debugver), MRS_FIELD_END, }; @@ -664,34 +664,34 @@ static const struct mrs_field_hwcap id_aa64isar0_aes_caps[] = { }; static const struct mrs_field id_aa64isar0_fields[] = { - MRS_FIELD_HWCAP(ID_AA64ISAR0, RNDR, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR0, RNDR, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar0_rndr, id_aa64isar0_rndr_caps), - MRS_FIELD(ID_AA64ISAR0, TLB, false, MRS_EXACT, id_aa64isar0_tlb), - MRS_FIELD_HWCAP(ID_AA64ISAR0, TS, false, MRS_LOWER, id_aa64isar0_ts, - id_aa64isar0_ts_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, FHM, false, MRS_LOWER, id_aa64isar0_fhm, - id_aa64isar0_fhm_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, DP, false, MRS_LOWER, id_aa64isar0_dp, - id_aa64isar0_dp_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, SM4, false, MRS_LOWER, id_aa64isar0_sm4, - id_aa64isar0_sm4_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, SM3, false, MRS_LOWER, id_aa64isar0_sm3, - id_aa64isar0_sm3_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, SHA3, false, MRS_LOWER, id_aa64isar0_sha3, - id_aa64isar0_sha3_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, RDM, false, MRS_LOWER, id_aa64isar0_rdm, - id_aa64isar0_rdm_caps), - MRS_FIELD(ID_AA64ISAR0, TME, false, MRS_EXACT, id_aa64isar0_tme), - MRS_FIELD_HWCAP(ID_AA64ISAR0, Atomic, false, MRS_LOWER, + MRS_FIELD(ID_AA64ISAR0, TLB, false, MRS_LOWER, 0, id_aa64isar0_tlb), + MRS_FIELD_HWCAP(ID_AA64ISAR0, TS, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_ts, id_aa64isar0_ts_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, FHM, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_fhm, id_aa64isar0_fhm_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, DP, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_dp, id_aa64isar0_dp_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, SM4, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_sm4, id_aa64isar0_sm4_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, SM3, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_sm3, id_aa64isar0_sm3_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, SHA3, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_sha3, id_aa64isar0_sha3_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, RDM, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_rdm, id_aa64isar0_rdm_caps), + MRS_FIELD(ID_AA64ISAR0, TME, false, MRS_LOWER, 0, id_aa64isar0_tme), + MRS_FIELD_HWCAP(ID_AA64ISAR0, Atomic, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar0_atomic, id_aa64isar0_atomic_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, CRC32, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR0, CRC32, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar0_crc32, id_aa64isar0_crc32_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, SHA2, false, MRS_LOWER, id_aa64isar0_sha2, - id_aa64isar0_sha2_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, SHA1, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR0, SHA2, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_sha2, id_aa64isar0_sha2_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, SHA1, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar0_sha1, id_aa64isar0_sha1_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR0, AES, false, MRS_LOWER, id_aa64isar0_aes, - id_aa64isar0_aes_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR0, AES, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar0_aes, id_aa64isar0_aes_caps), MRS_FIELD_END, }; @@ -865,36 +865,36 @@ static const struct mrs_field_hwcap id_aa64isar1_dpb_caps[] = { }; static const struct mrs_field id_aa64isar1_fields[] = { - MRS_FIELD(ID_AA64ISAR1, LS64, false, MRS_EXACT, id_aa64isar1_ls64), - MRS_FIELD(ID_AA64ISAR1, XS, false, MRS_EXACT, id_aa64isar1_xs), - MRS_FIELD_HWCAP(ID_AA64ISAR1, I8MM, false, MRS_LOWER, + MRS_FIELD(ID_AA64ISAR1, LS64, false, MRS_LOWER, 0, id_aa64isar1_ls64), + MRS_FIELD(ID_AA64ISAR1, XS, false, MRS_LOWER, 0, id_aa64isar1_xs), + MRS_FIELD_HWCAP(ID_AA64ISAR1, I8MM, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar1_i8mm, id_aa64isar1_i8mm_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, DGH, false, MRS_LOWER, id_aa64isar1_dgh, - id_aa64isar1_dgh_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, BF16, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR1, DGH, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar1_dgh, id_aa64isar1_dgh_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR1, BF16, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar1_bf16, id_aa64isar1_bf16_caps), - MRS_FIELD(ID_AA64ISAR1, SPECRES, false, MRS_EXACT, + MRS_FIELD(ID_AA64ISAR1, SPECRES, false, MRS_LOWER, 0, id_aa64isar1_specres), - MRS_FIELD_HWCAP(ID_AA64ISAR1, SB, false, MRS_LOWER, id_aa64isar1_sb, - id_aa64isar1_sb_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, FRINTTS, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR1, SB, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar1_sb, id_aa64isar1_sb_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR1, FRINTTS, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar1_frintts, id_aa64isar1_frintts_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, GPI, false, MRS_EXACT, id_aa64isar1_gpi, - id_aa64isar1_gpi_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, GPA, false, MRS_EXACT, id_aa64isar1_gpa, - id_aa64isar1_gpa_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, LRCPC, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR1, GPI, false, MRS_LOWER, 0, + id_aa64isar1_gpi, id_aa64isar1_gpi_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR1, GPA, false, MRS_LOWER, 0, + id_aa64isar1_gpa, id_aa64isar1_gpa_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR1, LRCPC, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar1_lrcpc, id_aa64isar1_lrcpc_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, FCMA, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR1, FCMA, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar1_fcma, id_aa64isar1_fcma_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, JSCVT, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR1, JSCVT, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar1_jscvt, id_aa64isar1_jscvt_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, API, false, MRS_EXACT, id_aa64isar1_api, - id_aa64isar1_api_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, APA, false, MRS_EXACT, id_aa64isar1_apa, - id_aa64isar1_apa_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR1, DPB, false, MRS_LOWER, id_aa64isar1_dpb, - id_aa64isar1_dpb_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR1, API, false, MRS_LOWER, 0, + id_aa64isar1_api, id_aa64isar1_api_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR1, APA, false, MRS_LOWER, 0, + id_aa64isar1_apa, id_aa64isar1_apa_caps), + MRS_FIELD_HWCAP(ID_AA64ISAR1, DPB, false, MRS_LOWER, MRS_USERSPACE, + id_aa64isar1_dpb, id_aa64isar1_dpb_caps), MRS_FIELD_END, }; @@ -957,17 +957,17 @@ static const struct mrs_field_value id_aa64isar2_wfxt[] = { }; static const struct mrs_field id_aa64isar2_fields[] = { - MRS_FIELD(ID_AA64ISAR2, PAC_frac, false, MRS_EXACT, + MRS_FIELD(ID_AA64ISAR2, PAC_frac, false, MRS_LOWER, 0, id_aa64isar2_pac_frac), - MRS_FIELD(ID_AA64ISAR2, BC, false, MRS_EXACT, id_aa64isar2_bc), - MRS_FIELD(ID_AA64ISAR2, MOPS, false, MRS_EXACT, id_aa64isar2_mops), - MRS_FIELD_HWCAP(ID_AA64ISAR2, APA3, false, MRS_EXACT, + MRS_FIELD(ID_AA64ISAR2, BC, false, MRS_LOWER, 0, id_aa64isar2_bc), + MRS_FIELD(ID_AA64ISAR2, MOPS, false, MRS_LOWER, 0, id_aa64isar2_mops), + MRS_FIELD_HWCAP(ID_AA64ISAR2, APA3, false, MRS_LOWER, 0, id_aa64isar2_apa3, id_aa64isar2_apa3_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR2, GPA3, false, MRS_EXACT, + MRS_FIELD_HWCAP(ID_AA64ISAR2, GPA3, false, MRS_LOWER, 0, id_aa64isar2_gpa3, id_aa64isar2_gpa3_caps), - MRS_FIELD_HWCAP(ID_AA64ISAR2, RPRES, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ISAR2, RPRES, false, MRS_LOWER, MRS_USERSPACE, id_aa64isar2_rpres, id_aa64isar2_rpres_caps), - MRS_FIELD(ID_AA64ISAR2, WFxT, false, MRS_EXACT, id_aa64isar2_wfxt), + MRS_FIELD(ID_AA64ISAR2, WFxT, false, MRS_LOWER, 0, id_aa64isar2_wfxt), MRS_FIELD_END, }; @@ -1062,27 +1062,30 @@ static const struct mrs_field_value id_aa64mmfr0_parange[] = { }; static const struct mrs_field id_aa64mmfr0_fields[] = { - MRS_FIELD(ID_AA64MMFR0, ECV, false, MRS_EXACT, id_aa64mmfr0_ecv), - MRS_FIELD(ID_AA64MMFR0, FGT, false, MRS_EXACT, id_aa64mmfr0_fgt), - MRS_FIELD(ID_AA64MMFR0, ExS, false, MRS_EXACT, id_aa64mmfr0_exs), - MRS_FIELD(ID_AA64MMFR0, TGran4_2, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, ECV, false, MRS_LOWER, 0, id_aa64mmfr0_ecv), + MRS_FIELD(ID_AA64MMFR0, FGT, false, MRS_LOWER, 0, id_aa64mmfr0_fgt), + MRS_FIELD(ID_AA64MMFR0, ExS, false, MRS_LOWER, 0, id_aa64mmfr0_exs), + MRS_FIELD(ID_AA64MMFR0, TGran4_2, false, MRS_LOWER, 0, id_aa64mmfr0_tgran4_2), - MRS_FIELD(ID_AA64MMFR0, TGran64_2, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, TGran64_2, false, MRS_LOWER, 0, id_aa64mmfr0_tgran64_2), - MRS_FIELD(ID_AA64MMFR0, TGran16_2, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, TGran16_2, false, MRS_LOWER, 0, id_aa64mmfr0_tgran16_2), - MRS_FIELD(ID_AA64MMFR0, TGran4, false, MRS_EXACT, id_aa64mmfr0_tgran4), - MRS_FIELD(ID_AA64MMFR0, TGran64, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, TGran4, false, MRS_LOWER, 0, + id_aa64mmfr0_tgran4), + MRS_FIELD(ID_AA64MMFR0, TGran64, false, MRS_LOWER, 0, id_aa64mmfr0_tgran64), - MRS_FIELD(ID_AA64MMFR0, TGran16, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, TGran16, false, MRS_LOWER, 0, id_aa64mmfr0_tgran16), - MRS_FIELD(ID_AA64MMFR0, BigEndEL0, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, BigEndEL0, false, MRS_LOWER, 0, id_aa64mmfr0_bigendel0), - MRS_FIELD(ID_AA64MMFR0, SNSMem, false, MRS_EXACT, id_aa64mmfr0_snsmem), - MRS_FIELD(ID_AA64MMFR0, BigEnd, false, MRS_EXACT, id_aa64mmfr0_bigend), - MRS_FIELD(ID_AA64MMFR0, ASIDBits, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, SNSMem, false, MRS_LOWER, 0, + id_aa64mmfr0_snsmem), + MRS_FIELD(ID_AA64MMFR0, BigEnd, false, MRS_LOWER, 0, + id_aa64mmfr0_bigend), + MRS_FIELD(ID_AA64MMFR0, ASIDBits, false, MRS_LOWER, 0, id_aa64mmfr0_asidbits), - MRS_FIELD(ID_AA64MMFR0, PARange, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR0, PARange, false, MRS_LOWER, 0, id_aa64mmfr0_parange), MRS_FIELD_END, }; @@ -1177,24 +1180,26 @@ static const struct mrs_field_value id_aa64mmfr1_hafdbs[] = { }; static const struct mrs_field id_aa64mmfr1_fields[] = { - MRS_FIELD(ID_AA64MMFR1, CMOVW, false, MRS_EXACT, id_aa64mmfr1_cmovw), - MRS_FIELD(ID_AA64MMFR1, TIDCP1, false, MRS_EXACT, id_aa64mmfr1_tidcp1), - MRS_FIELD(ID_AA64MMFR1, nTLBPA, false, MRS_EXACT, id_aa64mmfr1_ntlbpa), - MRS_FIELD_HWCAP(ID_AA64MMFR1, AFP, false, MRS_LOWER, id_aa64mmfr1_afp, - id_aa64mmfr1_afp_caps), - MRS_FIELD(ID_AA64MMFR1, HCX, false, MRS_EXACT, id_aa64mmfr1_hcx), - MRS_FIELD(ID_AA64MMFR1, ETS, false, MRS_EXACT, id_aa64mmfr1_ets), - MRS_FIELD(ID_AA64MMFR1, TWED, false, MRS_EXACT, id_aa64mmfr1_twed), - MRS_FIELD(ID_AA64MMFR1, XNX, false, MRS_EXACT, id_aa64mmfr1_xnx), - MRS_FIELD(ID_AA64MMFR1, SpecSEI, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR1, CMOVW, false, MRS_LOWER, 0, id_aa64mmfr1_cmovw), + MRS_FIELD(ID_AA64MMFR1, TIDCP1, false, MRS_LOWER, 0, + id_aa64mmfr1_tidcp1), + MRS_FIELD(ID_AA64MMFR1, nTLBPA, false, MRS_LOWER, 0, + id_aa64mmfr1_ntlbpa), + MRS_FIELD_HWCAP(ID_AA64MMFR1, AFP, false, MRS_LOWER, 0, + id_aa64mmfr1_afp, id_aa64mmfr1_afp_caps), + MRS_FIELD(ID_AA64MMFR1, HCX, false, MRS_LOWER, 0, id_aa64mmfr1_hcx), + MRS_FIELD(ID_AA64MMFR1, ETS, false, MRS_LOWER, 0, id_aa64mmfr1_ets), + MRS_FIELD(ID_AA64MMFR1, TWED, false, MRS_LOWER, 0, id_aa64mmfr1_twed), + MRS_FIELD(ID_AA64MMFR1, XNX, false, MRS_LOWER, 0, id_aa64mmfr1_xnx), + MRS_FIELD(ID_AA64MMFR1, SpecSEI, false, MRS_LOWER, 0, id_aa64mmfr1_specsei), - MRS_FIELD(ID_AA64MMFR1, PAN, false, MRS_EXACT, id_aa64mmfr1_pan), - MRS_FIELD(ID_AA64MMFR1, LO, false, MRS_EXACT, id_aa64mmfr1_lo), - MRS_FIELD(ID_AA64MMFR1, HPDS, false, MRS_EXACT, id_aa64mmfr1_hpds), - MRS_FIELD(ID_AA64MMFR1, VH, false, MRS_EXACT, id_aa64mmfr1_vh), - MRS_FIELD(ID_AA64MMFR1, VMIDBits, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR1, PAN, false, MRS_LOWER, 0, id_aa64mmfr1_pan), + MRS_FIELD(ID_AA64MMFR1, LO, false, MRS_LOWER, 0, id_aa64mmfr1_lo), + MRS_FIELD(ID_AA64MMFR1, HPDS, false, MRS_LOWER, 0, id_aa64mmfr1_hpds), + MRS_FIELD(ID_AA64MMFR1, VH, false, MRS_LOWER, 0, id_aa64mmfr1_vh), + MRS_FIELD(ID_AA64MMFR1, VMIDBits, false, MRS_LOWER, 0, id_aa64mmfr1_vmidbits), - MRS_FIELD(ID_AA64MMFR1, HAFDBS, false, MRS_EXACT, id_aa64mmfr1_hafdbs), + MRS_FIELD(ID_AA64MMFR1, HAFDBS, false, MRS_LOWER, 0, id_aa64mmfr1_hafdbs), MRS_FIELD_END, }; @@ -1288,23 +1293,23 @@ static const struct mrs_field_value id_aa64mmfr2_cnp[] = { }; static const struct mrs_field id_aa64mmfr2_fields[] = { - MRS_FIELD(ID_AA64MMFR2, E0PD, false, MRS_EXACT, id_aa64mmfr2_e0pd), - MRS_FIELD(ID_AA64MMFR2, EVT, false, MRS_EXACT, id_aa64mmfr2_evt), - MRS_FIELD(ID_AA64MMFR2, BBM, false, MRS_EXACT, id_aa64mmfr2_bbm), - MRS_FIELD(ID_AA64MMFR2, TTL, false, MRS_EXACT, id_aa64mmfr2_ttl), - MRS_FIELD(ID_AA64MMFR2, FWB, false, MRS_EXACT, id_aa64mmfr2_fwb), - MRS_FIELD(ID_AA64MMFR2, IDS, false, MRS_EXACT, id_aa64mmfr2_ids), - MRS_FIELD_HWCAP(ID_AA64MMFR2, AT, false, MRS_LOWER, id_aa64mmfr2_at, - id_aa64mmfr2_at_caps), - MRS_FIELD(ID_AA64MMFR2, ST, false, MRS_EXACT, id_aa64mmfr2_st), - MRS_FIELD(ID_AA64MMFR2, NV, false, MRS_EXACT, id_aa64mmfr2_nv), - MRS_FIELD(ID_AA64MMFR2, CCIDX, false, MRS_EXACT, id_aa64mmfr2_ccidx), - MRS_FIELD(ID_AA64MMFR2, VARange, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR2, E0PD, false, MRS_LOWER, 0, id_aa64mmfr2_e0pd), + MRS_FIELD(ID_AA64MMFR2, EVT, false, MRS_LOWER, 0, id_aa64mmfr2_evt), + MRS_FIELD(ID_AA64MMFR2, BBM, false, MRS_LOWER, 0, id_aa64mmfr2_bbm), + MRS_FIELD(ID_AA64MMFR2, TTL, false, MRS_LOWER, 0, id_aa64mmfr2_ttl), + MRS_FIELD(ID_AA64MMFR2, FWB, false, MRS_LOWER, 0, id_aa64mmfr2_fwb), + MRS_FIELD(ID_AA64MMFR2, IDS, false, MRS_LOWER, 0, id_aa64mmfr2_ids), + MRS_FIELD_HWCAP(ID_AA64MMFR2, AT, false, MRS_LOWER, MRS_USERSPACE, + id_aa64mmfr2_at, id_aa64mmfr2_at_caps), + MRS_FIELD(ID_AA64MMFR2, ST, false, MRS_LOWER, 0, id_aa64mmfr2_st), + MRS_FIELD(ID_AA64MMFR2, NV, false, MRS_LOWER, 0, id_aa64mmfr2_nv), + MRS_FIELD(ID_AA64MMFR2, CCIDX, false, MRS_LOWER, 0, id_aa64mmfr2_ccidx), + MRS_FIELD(ID_AA64MMFR2, VARange, false, MRS_LOWER, 0, id_aa64mmfr2_varange), - MRS_FIELD(ID_AA64MMFR2, IESB, false, MRS_EXACT, id_aa64mmfr2_iesb), - MRS_FIELD(ID_AA64MMFR2, LSM, false, MRS_EXACT, id_aa64mmfr2_lsm), - MRS_FIELD(ID_AA64MMFR2, UAO, false, MRS_EXACT, id_aa64mmfr2_uao), - MRS_FIELD(ID_AA64MMFR2, CnP, false, MRS_EXACT, id_aa64mmfr2_cnp), + MRS_FIELD(ID_AA64MMFR2, IESB, false, MRS_LOWER, 0, id_aa64mmfr2_iesb), + MRS_FIELD(ID_AA64MMFR2, LSM, false, MRS_LOWER, 0, id_aa64mmfr2_lsm), + MRS_FIELD(ID_AA64MMFR2, UAO, false, MRS_LOWER, 0, id_aa64mmfr2_uao), + MRS_FIELD(ID_AA64MMFR2, CnP, false, MRS_LOWER, 0, id_aa64mmfr2_cnp), MRS_FIELD_END, }; @@ -1331,11 +1336,12 @@ static const struct mrs_field_value id_aa64mmfr3_tcrx[] = { }; static const struct mrs_field id_aa64mmfr3_fields[] = { - MRS_FIELD(ID_AA64MMFR3, Spec_FPACC, false, MRS_EXACT, + MRS_FIELD(ID_AA64MMFR3, Spec_FPACC, false, MRS_LOWER, 0, id_aa64mmfr3_spec_fpacc), - MRS_FIELD(ID_AA64MMFR3, MEC, false, MRS_EXACT, id_aa64mmfr3_mec), - MRS_FIELD(ID_AA64MMFR3, SCTLRX, false, MRS_EXACT, id_aa64mmfr3_sctlrx), - MRS_FIELD(ID_AA64MMFR3, TCRX, false, MRS_EXACT, id_aa64mmfr3_tcrx), + MRS_FIELD(ID_AA64MMFR3, MEC, false, MRS_LOWER, 0, id_aa64mmfr3_mec), + MRS_FIELD(ID_AA64MMFR3, SCTLRX, false, MRS_LOWER, 0, + id_aa64mmfr3_sctlrx), + MRS_FIELD(ID_AA64MMFR3, TCRX, false, MRS_LOWER, 0, id_aa64mmfr3_tcrx), MRS_FIELD_END, }; @@ -1468,26 +1474,28 @@ static const struct mrs_field_value id_aa64pfr0_el0[] = { }; static const struct mrs_field id_aa64pfr0_fields[] = { - MRS_FIELD(ID_AA64PFR0, CSV3, false, MRS_EXACT, id_aa64pfr0_csv3), - MRS_FIELD(ID_AA64PFR0, CSV2, false, MRS_EXACT, id_aa64pfr0_csv2), - MRS_FIELD(ID_AA64PFR0, RME, false, MRS_EXACT, id_aa64pfr0_rme), - MRS_FIELD_HWCAP(ID_AA64PFR0, DIT, false, MRS_LOWER, id_aa64pfr0_dit, - id_aa64pfr0_dit_caps), - MRS_FIELD(ID_AA64PFR0, AMU, false, MRS_EXACT, id_aa64pfr0_amu), - MRS_FIELD(ID_AA64PFR0, MPAM, false, MRS_EXACT, id_aa64pfr0_mpam), - MRS_FIELD(ID_AA64PFR0, SEL2, false, MRS_EXACT, id_aa64pfr0_sel2), - MRS_FIELD_HWCAP_SPLIT(ID_AA64PFR0, SVE, false, MRS_LOWER, MRS_EXACT, - id_aa64pfr0_sve, id_aa64pfr0_sve_caps), - MRS_FIELD(ID_AA64PFR0, RAS, false, MRS_EXACT, id_aa64pfr0_ras), - MRS_FIELD(ID_AA64PFR0, GIC, false, MRS_EXACT, id_aa64pfr0_gic), - MRS_FIELD_HWCAP(ID_AA64PFR0, AdvSIMD, true, MRS_LOWER, + MRS_FIELD(ID_AA64PFR0, CSV3, false, MRS_LOWER, 0, id_aa64pfr0_csv3), + MRS_FIELD(ID_AA64PFR0, CSV2, false, MRS_LOWER, 0, id_aa64pfr0_csv2), + MRS_FIELD(ID_AA64PFR0, RME, false, MRS_LOWER, 0, id_aa64pfr0_rme), + MRS_FIELD_HWCAP(ID_AA64PFR0, DIT, false, MRS_LOWER, MRS_USERSPACE, + id_aa64pfr0_dit, id_aa64pfr0_dit_caps), + MRS_FIELD(ID_AA64PFR0, AMU, false, MRS_LOWER, 0, id_aa64pfr0_amu), + MRS_FIELD(ID_AA64PFR0, MPAM, false, MRS_LOWER, 0, id_aa64pfr0_mpam), + MRS_FIELD(ID_AA64PFR0, SEL2, false, MRS_LOWER, 0, id_aa64pfr0_sel2), + MRS_FIELD_HWCAP(ID_AA64PFR0, SVE, false, MRS_LOWER, + MRS_FREEBSD, id_aa64pfr0_sve, id_aa64pfr0_sve_caps), + MRS_FIELD(ID_AA64PFR0, RAS, false, MRS_LOWER, 0, id_aa64pfr0_ras), + MRS_FIELD(ID_AA64PFR0, GIC, false, MRS_LOWER, 0, id_aa64pfr0_gic), + MRS_FIELD_HWCAP(ID_AA64PFR0, AdvSIMD, true, MRS_LOWER, MRS_USERSPACE, id_aa64pfr0_advsimd, id_aa64pfr0_advsimd_caps), - MRS_FIELD_HWCAP(ID_AA64PFR0, FP, true, MRS_LOWER, id_aa64pfr0_fp, - id_aa64pfr0_fp_caps), - MRS_FIELD(ID_AA64PFR0, EL3, false, MRS_EXACT, id_aa64pfr0_el3), - MRS_FIELD(ID_AA64PFR0, EL2, false, MRS_EXACT, id_aa64pfr0_el2), - MRS_FIELD(ID_AA64PFR0, EL1, false, MRS_LOWER, id_aa64pfr0_el1), - MRS_FIELD(ID_AA64PFR0, EL0, false, MRS_LOWER, id_aa64pfr0_el0), + MRS_FIELD_HWCAP(ID_AA64PFR0, FP, true, MRS_LOWER, MRS_USERSPACE, + id_aa64pfr0_fp, id_aa64pfr0_fp_caps), + MRS_FIELD(ID_AA64PFR0, EL3, false, MRS_LOWER, 0, id_aa64pfr0_el3), + MRS_FIELD(ID_AA64PFR0, EL2, false, MRS_LOWER, 0, id_aa64pfr0_el2), + MRS_FIELD(ID_AA64PFR0, EL1, false, MRS_LOWER, MRS_USERSPACE, + id_aa64pfr0_el1), + MRS_FIELD(ID_AA64PFR0, EL0, false, MRS_LOWER, MRS_USERSPACE, + id_aa64pfr0_el0), MRS_FIELD_END, }; @@ -1561,21 +1569,21 @@ static const struct mrs_field_hwcap id_aa64pfr1_bt_caps[] = { }; static const struct mrs_field id_aa64pfr1_fields[] = { - MRS_FIELD(ID_AA64PFR1, NMI, false, MRS_EXACT, id_aa64pfr1_nmi), - MRS_FIELD(ID_AA64PFR1, CSV2_frac, false, MRS_EXACT, + MRS_FIELD(ID_AA64PFR1, NMI, false, MRS_LOWER, 0, id_aa64pfr1_nmi), + MRS_FIELD(ID_AA64PFR1, CSV2_frac, false, MRS_LOWER, 0, id_aa64pfr1_csv2_frac), - MRS_FIELD(ID_AA64PFR1, RNDR_trap, false, MRS_EXACT, + MRS_FIELD(ID_AA64PFR1, RNDR_trap, false, MRS_LOWER, 0, id_aa64pfr1_rndr_trap), - MRS_FIELD(ID_AA64PFR1, SME, false, MRS_EXACT, id_aa64pfr1_sme), - MRS_FIELD(ID_AA64PFR1, MPAM_frac, false, MRS_EXACT, + MRS_FIELD(ID_AA64PFR1, SME, false, MRS_LOWER, 0, id_aa64pfr1_sme), + MRS_FIELD(ID_AA64PFR1, MPAM_frac, false, MRS_LOWER, 0, id_aa64pfr1_mpam_frac), - MRS_FIELD(ID_AA64PFR1, RAS_frac, false, MRS_EXACT, + MRS_FIELD(ID_AA64PFR1, RAS_frac, false, MRS_LOWER, 0, id_aa64pfr1_ras_frac), - MRS_FIELD(ID_AA64PFR1, MTE, false, MRS_EXACT, id_aa64pfr1_mte), - MRS_FIELD_HWCAP(ID_AA64PFR1, SSBS, false, MRS_LOWER, id_aa64pfr1_ssbs, - id_aa64pfr1_ssbs_caps), - MRS_FIELD_HWCAP_SPLIT(ID_AA64PFR1, BT, false, MRS_LOWER, MRS_EXACT, - id_aa64pfr1_bt, id_aa64pfr1_bt_caps), + MRS_FIELD(ID_AA64PFR1, MTE, false, MRS_LOWER, 0, id_aa64pfr1_mte), + MRS_FIELD_HWCAP(ID_AA64PFR1, SSBS, false, MRS_LOWER, MRS_USERSPACE, + id_aa64pfr1_ssbs, id_aa64pfr1_ssbs_caps), + MRS_FIELD_HWCAP(ID_AA64PFR1, BT, false, MRS_LOWER, + MRS_FREEBSD, id_aa64pfr1_bt, id_aa64pfr1_bt_caps), MRS_FIELD_END, }; @@ -1685,23 +1693,23 @@ static const struct mrs_field_hwcap id_aa64zfr0_svever_caps[] = { }; static const struct mrs_field id_aa64zfr0_fields[] = { - MRS_FIELD_HWCAP(ID_AA64ZFR0, F64MM, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ZFR0, F64MM, false, MRS_LOWER, MRS_USERSPACE, id_aa64zfr0_f64mm, id_aa64zfr0_f64mm_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, F32MM, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ZFR0, F32MM, false, MRS_LOWER, MRS_USERSPACE, id_aa64zfr0_f32mm, id_aa64zfr0_f32mm_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, I8MM, false, MRS_LOWER, id_aa64zfr0_i8mm, - id_aa64zfr0_i8mm_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, SM4, false, MRS_LOWER, id_aa64zfr0_sm4, - id_aa64zfr0_sm4_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, SHA3, false, MRS_LOWER, id_aa64zfr0_sha3, - id_aa64zfr0_sha3_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, BF16, false, MRS_LOWER, id_aa64zfr0_bf16, - id_aa64zfr0_bf16_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, BitPerm, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ZFR0, I8MM, false, MRS_LOWER, MRS_USERSPACE, + id_aa64zfr0_i8mm, id_aa64zfr0_i8mm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SM4, false, MRS_LOWER, MRS_USERSPACE, + id_aa64zfr0_sm4, id_aa64zfr0_sm4_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SHA3, false, MRS_LOWER, MRS_USERSPACE, + id_aa64zfr0_sha3, id_aa64zfr0_sha3_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, BF16, false, MRS_LOWER, MRS_USERSPACE, + id_aa64zfr0_bf16, id_aa64zfr0_bf16_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, BitPerm, false, MRS_LOWER, MRS_USERSPACE, id_aa64zfr0_bitperm, id_aa64zfr0_bitperm_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, AES, false, MRS_LOWER, id_aa64zfr0_aes, - id_aa64zfr0_aes_caps), - MRS_FIELD_HWCAP(ID_AA64ZFR0, SVEver, false, MRS_LOWER, + MRS_FIELD_HWCAP(ID_AA64ZFR0, AES, false, MRS_LOWER, MRS_USERSPACE, + id_aa64zfr0_aes, id_aa64zfr0_aes_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SVEver, false, MRS_LOWER, MRS_USERSPACE, id_aa64zfr0_svever, id_aa64zfr0_svever_caps), MRS_FIELD_END, }; @@ -1767,17 +1775,19 @@ static const struct mrs_field_value id_isar5_sevl[] = { }; static const struct mrs_field id_isar5_fields[] = { - MRS_FIELD(ID_ISAR5, VCMA, false, MRS_LOWER, id_isar5_vcma), - MRS_FIELD(ID_ISAR5, RDM, false, MRS_LOWER, id_isar5_rdm), - MRS_FIELD_HWCAP(ID_ISAR5, CRC32, false, MRS_LOWER, id_isar5_crc32, - id_isar5_crc32_caps), - MRS_FIELD_HWCAP(ID_ISAR5, SHA2, false, MRS_LOWER, id_isar5_sha2, - id_isar5_sha2_caps), - MRS_FIELD_HWCAP(ID_ISAR5, SHA1, false, MRS_LOWER, id_isar5_sha1, - id_isar5_sha1_caps), - MRS_FIELD_HWCAP(ID_ISAR5, AES, false, MRS_LOWER, id_isar5_aes, - id_isar5_aes_caps), - MRS_FIELD(ID_ISAR5, SEVL, false, MRS_LOWER, id_isar5_sevl), + MRS_FIELD(ID_ISAR5, VCMA, false, MRS_LOWER,MRS_USERSPACE, + id_isar5_vcma), + MRS_FIELD(ID_ISAR5, RDM, false, MRS_LOWER, MRS_USERSPACE, id_isar5_rdm), + MRS_FIELD_HWCAP(ID_ISAR5, CRC32, false, MRS_LOWER, MRS_USERSPACE, + id_isar5_crc32, id_isar5_crc32_caps), + MRS_FIELD_HWCAP(ID_ISAR5, SHA2, false, MRS_LOWER, MRS_USERSPACE, + id_isar5_sha2, id_isar5_sha2_caps), + MRS_FIELD_HWCAP(ID_ISAR5, SHA1, false, MRS_LOWER, MRS_USERSPACE, + id_isar5_sha1, id_isar5_sha1_caps), + MRS_FIELD_HWCAP(ID_ISAR5, AES, false, MRS_LOWER, MRS_USERSPACE, + id_isar5_aes, id_isar5_aes_caps), + MRS_FIELD(ID_ISAR5, SEVL, false, MRS_LOWER, MRS_USERSPACE, + id_isar5_sevl), MRS_FIELD_END, }; @@ -1830,14 +1840,19 @@ static const struct mrs_field_value mvfr0_simdreg[] = { }; static const struct mrs_field mvfr0_fields[] = { - MRS_FIELD(MVFR0, FPRound, false, MRS_LOWER, mvfr0_fpround), - MRS_FIELD(MVFR0, FPSqrt, false, MRS_LOWER, mvfr0_fpsqrt), - MRS_FIELD(MVFR0, FPDivide, false, MRS_LOWER, mvfr0_fpdivide), - MRS_FIELD(MVFR0, FPTrap, false, MRS_LOWER, mvfr0_fptrap), - MRS_FIELD_HWCAP(MVFR0, FPDP, false, MRS_LOWER, mvfr0_fpdp, - mvfr0_fpdp_caps), - MRS_FIELD(MVFR0, FPSP, false, MRS_LOWER, mvfr0_fpsp), - MRS_FIELD(MVFR0, SIMDReg, false, MRS_LOWER, mvfr0_simdreg), + MRS_FIELD(MVFR0, FPRound, false, MRS_LOWER, MRS_USERSPACE, + mvfr0_fpround), + MRS_FIELD(MVFR0, FPSqrt, false, MRS_LOWER, MRS_USERSPACE, + mvfr0_fpsqrt), + MRS_FIELD(MVFR0, FPDivide, false, MRS_LOWER, MRS_USERSPACE, + mvfr0_fpdivide), + MRS_FIELD(MVFR0, FPTrap, false, MRS_LOWER, MRS_USERSPACE, + mvfr0_fptrap), + MRS_FIELD_HWCAP(MVFR0, FPDP, false, MRS_LOWER, MRS_USERSPACE, + mvfr0_fpdp, mvfr0_fpdp_caps), + MRS_FIELD(MVFR0, FPSP, false, MRS_LOWER, MRS_USERSPACE, mvfr0_fpsp), + MRS_FIELD(MVFR0, SIMDReg, false, MRS_LOWER, MRS_USERSPACE, + mvfr0_simdreg), MRS_FIELD_END, }; @@ -1898,16 +1913,19 @@ static const struct mrs_field_value mvfr1_fpftz[] = { }; static const struct mrs_field mvfr1_fields[] = { - MRS_FIELD_HWCAP(MVFR1, SIMDFMAC, false, MRS_LOWER, mvfr1_simdfmac, - mvfr1_simdfmac_caps), - MRS_FIELD(MVFR1, FPHP, false, MRS_LOWER, mvfr1_fphp), - MRS_FIELD(MVFR1, SIMDHP, false, MRS_LOWER, mvfr1_simdhp), - MRS_FIELD(MVFR1, SIMDSP, false, MRS_LOWER, mvfr1_simdsp), - MRS_FIELD(MVFR1, SIMDInt, false, MRS_LOWER, mvfr1_simdint), - MRS_FIELD_HWCAP(MVFR1, SIMDLS, false, MRS_LOWER, mvfr1_simdls, - mvfr1_simdls_caps), - MRS_FIELD(MVFR1, FPDNaN, false, MRS_LOWER, mvfr1_fpdnan), - MRS_FIELD(MVFR1, FPFtZ, false, MRS_LOWER, mvfr1_fpftz), + MRS_FIELD_HWCAP(MVFR1, SIMDFMAC, false, MRS_LOWER, MRS_USERSPACE, + mvfr1_simdfmac, mvfr1_simdfmac_caps), + MRS_FIELD(MVFR1, FPHP, false, MRS_LOWER, MRS_USERSPACE, mvfr1_fphp), + MRS_FIELD(MVFR1, SIMDHP, false, MRS_LOWER, MRS_USERSPACE, mvfr1_simdhp), + MRS_FIELD(MVFR1, SIMDSP, false, MRS_LOWER, MRS_USERSPACE, mvfr1_simdsp), + MRS_FIELD(MVFR1, SIMDInt, false, MRS_LOWER, MRS_USERSPACE, + mvfr1_simdint), + MRS_FIELD_HWCAP(MVFR1, SIMDLS, false, MRS_LOWER, MRS_USERSPACE, + mvfr1_simdls, mvfr1_simdls_caps), + MRS_FIELD(MVFR1, FPDNaN, false, MRS_LOWER, MRS_USERSPACE, + mvfr1_fpdnan), + MRS_FIELD(MVFR1, FPFtZ, false, MRS_LOWER, MRS_USERSPACE, + mvfr1_fpftz), MRS_FIELD_END, }; #endif /* COMPAT_FREEBSD32 */ @@ -2208,15 +2226,23 @@ update_special_regs(u_int cpu) fields = user_regs[i].fields; for (j = 0; fields[j].type != 0; j++) { + u_int type; + /* Update the FreeBSD userspace ID register view */ + type = ((fields[j].type & MRS_FREEBSD) != 0) ? + fields[j].type : + (MRS_EXACT | (fields[j].type & MRS_SAFE_MASK)); user_reg = update_special_reg_field(user_reg, - fields[j].type >> MRS_TYPE_FBSD_SHIFT, value, - fields[j].width, fields[j].shift, fields[j].sign); + type, value, fields[j].width, fields[j].shift, + fields[j].sign); /* Update the Linux userspace ID register view */ + type = ((fields[j].type & MRS_LINUX) != 0) ? + fields[j].type : + (MRS_EXACT | (fields[j].type & MRS_SAFE_MASK)); l_user_reg = update_special_reg_field(l_user_reg, - fields[j].type >> MRS_TYPE_LNX_SHIFT, value, - fields[j].width, fields[j].shift, fields[j].sign); + type, value, fields[j].width, fields[j].shift, + fields[j].sign); /* Update the kernel ID register view */ kern_reg = update_lower_register(kern_reg, value, From nobody Mon Oct 21 12:24: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 4XXDyC5JBvz5Yws1; Mon, 21 Oct 2024 12:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyC2fpcz4Dgj; Mon, 21 Oct 2024 12:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQ95Npofk0qjujo7o2oM+kS62hBex9p5DiYSfEULDEw=; b=QnZrNiZvAoE1C4BlOLlMhOSB9MDrAW5Us0OgfggTXOV9Wp9Lwnu/TdubDScQBDZyylmvxL pzqjOKVFfsSGtpEWB+KzO1AbYKnczIBt2VTht4i0nOVmQ4BTWN8tTzNHrFVx9tCsFV0+G1 EGnq5Llzi3dPbhByCpLK5WWgDfkJGeUsa3E9LUJm1Bp5HO0SS6dOHNxjf5qUbfoNQnBlkq CAXb5T3EoPqKT9x70BAGKP5qz7jm6up/E4G3qAGEZ4V/OmXfVF3iHw7oazdSCY+3Y6yA7D UvfIdzYjWeTpkUOKnCuFeWHosimc6b4c127Ur+ArYRqHztzMcrXhdDTMfvikKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQ95Npofk0qjujo7o2oM+kS62hBex9p5DiYSfEULDEw=; b=UZtGj+7XXdGSPqxI8jLcULtE560ujBdO+pN0208Ejxl6HT74ArETdPguqRFOjITXoxICgA W2w9qFzgAtg1DPGG65hWOucfk8w7igYJox/YdkgFbSgDz+bSam2/Xcgt33QwGwhktm77bz +dVNh8pR7LHrO6JReuD6CzEuIiOHbg1qnATQY4OqmjknUhMVboPJ/UBPgepyYqZRkT7HNQ 3v98B/k5UDIphOIeB+haX7DzDwwSjzNHmbO6faznfRjj4IClGtmFftiHeGlmJfSDgD6a1L xXAdShiaqpB6DzXfhM7Y59vp1efV8HgNIA3AF6/MjP4IjfKd4DRMYsT7Ad2USg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513459; a=rsa-sha256; cv=none; b=WFoEJJb2/jykre59sCbJoHQc3M1LEt9gPQlbrta3dpyj5706y9AwWpfZi6JGbWBEAb/LPj TbbV+nDVtdM546bZDpmoNg+BDvxVq/RV/tKLLMX5msAf/npQNTRwgRx8KXR0ySEEFg3Ncb 1WLUlaWdmw6imDKUwddcUvUmqhBEXMX2mGMm+Ml1G5NkQOtqqn54x6MKVjEWH7J6FG78Mf SXRskwv9M3vn8enYEEbUhKHbvJcrJ4hFWWDgkn1Ii0qEsE3E+YiZcHmYGZ5oFhhI0PYCAG BVZm3YoUjbkwby9Db4/p+6vruYEgkUbMutx6f2i94DiZEOtVLpG/GKuke3j24Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyC2Dw0zW66; Mon, 21 Oct 2024 12:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOJjP049064; Mon, 21 Oct 2024 12:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOJS8049061; Mon, 21 Oct 2024 12:24:19 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:19 GMT Message-Id: <202410211224.49LCOJS8049061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f1fb1d5c9017 - main - arm64: Support more ID register field 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1fb1d5c901797b80e17d5c1d2a38aee6b63fcd2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f1fb1d5c901797b80e17d5c1d2a38aee6b63fcd2 commit f1fb1d5c901797b80e17d5c1d2a38aee6b63fcd2 Author: Andrew Turner AuthorDate: 2024-10-18 09:16:41 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Support more ID register field types Add MRS_EXACT_IF_DIFFERENT, MRS_HIGHER_OR_ZERO, and MRS_HIGHER. These will be used to handle the cache CTR_EL0 register, and make some ID register values safer. They are: - MRS_EXACT_IF_DIFFERENT: If the field is the same on all CPUs then use this value, otherwise use the safe value. - MRS_HIGHER_OR_ZERO: Use the highest value, or zero if seen, - MRS_HIGHER: Use the highest value. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47122 --- sys/arm64/arm64/identcpu.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 83d934af345e..48ac5c59274d 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -292,7 +292,10 @@ const struct cpu_implementers cpu_implementers[] = { #define MRS_TYPE_MASK 0xf #define MRS_INVALID 0 #define MRS_EXACT 1 -#define MRS_LOWER 2 +#define MRS_EXACT_IF_DIFFERENT 2 +#define MRS_LOWER 3 +#define MRS_HIGHER_OR_ZERO 4 +#define MRS_HIGHER 5 #define MRS_SAFE_SHIFT 4 #define MRS_SAFE_MASK (0xfu << MRS_SAFE_SHIFT) #define MRS_SAFE(x) (((x) << MRS_SAFE_SHIFT) & MRS_SAFE_MASK) @@ -2175,19 +2178,41 @@ static uint64_t update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, u_int width, u_int shift, bool sign) { + uint64_t cur, mask, new_val; + + mask = ((1ul << width) - 1) << shift; + cur = user_reg & mask; + new_val = value & mask; + switch (type & MRS_TYPE_MASK) { + case MRS_EXACT_IF_DIFFERENT: + if (mrs_field_cmp(cur, new_val, shift, width, sign) != 0) + break; + /* FALLTHROUGH */ case MRS_EXACT: - user_reg &= ~(0xful << shift); - user_reg |= (uint64_t)MRS_SAFE(type) << shift; + cur = (uint64_t)MRS_SAFE_VAL(type) << shift; break; case MRS_LOWER: - user_reg = update_lower_register(user_reg, value, shift, width, - sign); + if (mrs_field_cmp(cur, new_val, shift, width, sign) < 0) + cur = new_val; + break; + case MRS_HIGHER_OR_ZERO: + if (cur == 0 || new_val == 0) { + cur = 0; + break; + } + /* FALLTHROUGH */ + case MRS_HIGHER: + if (mrs_field_cmp(cur, new_val, shift, width, sign) > 0) + cur = new_val; break; default: panic("Invalid field type: %d", type); } + user_reg &= ~mask; + user_reg |= cur; + return (user_reg); } From nobody Mon Oct 21 12:24: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 4XXDyF28Pkz5Yws8; Mon, 21 Oct 2024 12:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyD3lKVz4DYR; Mon, 21 Oct 2024 12:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3GJQi8toFhGzAEbZWXjnVs8FTwUqiqSUFh3Q1xwioM=; b=f9loeM8eHzkdkStzUapfv7KBMks36RJzHFDx7Y1DsMyO8nYKeQKRNWK9GgIlGPpLYT7CVj ljDm1vngjV9RmE1+zWqHkwooIBVG4/dYh+rPLXPIWkVJ5nfNXWqZpAa7PGFOeAlArbPTUi 2w4sTKx8LGk7K4K44QOfLsU6rb7BaRaolz995waObY0vHdnX6ctoAYGK8z8uEnu2sZUvSx GbHS27L3awxTipWvuNfc+XyK/eLN4QCHkuPvohXJdCHSAezVT1S73biDwPX+FzbfbCcFwV Cu5F6zciZBXPI4u2y/Az2Y5YcvqAeh9+L7jW7qN3Mryg+B3w7E865OsW5NmzaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3GJQi8toFhGzAEbZWXjnVs8FTwUqiqSUFh3Q1xwioM=; b=ynDI9EiWug0nse4bZQE+QCPxwYglhC98Jeic2tL9zdE7XJdgChaUTJnd10yPr2k2BU5bRs aQ58cIzbdeqmyHfEvN0jNV+6c2cVQhRUwF4ax44pWDAMkwxiBbXemKJtLKZivzkt+L0hEr XPd1LheS82BE2S3CzjnZ6dVhPKLIhE8WFySSsEPTG71ISPpxt+4riDx6Zjd9TJmjN9QkhS dJt5ykGLe8Y2gSGH6smrv336F1w9uMnKlcjp5AeVDWikaCi8YlGqJCeKtYj3Ba0DwUOfEf gm0mafFu6gtZnA91Oj8Jd3ZPe6fGi+JCyrCx1q1eAndsYBI0Z0byCDXYwaa26w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513460; a=rsa-sha256; cv=none; b=tQQur6ToJ802rGRkAtA5WrAttrCS3RMgAIw85m/QjF1YNKXouNAF6R22SPVxytBRdsqVqv KmaqnU5QgeSL7KHVtWwsWMUFfxZYHPCKaG6KeYrkta+5qD2b7RtVbmha6Wo+gCAdR0oIjp 8p4xvZXtLAld5tIf93anzb3fS/AMFZQoGME9huUNFbNpb6ui3YstUPxUqYKRYUmN6V06yL 3LUuCRsnUJf4fPhCCUc6ddGs4uHMgWrgHnP+4oCXQHUXmpOzuAPNtXtcFghUcEKFppxLr5 ySBze+7xGiRKC/0iddBt9LHk47sZoHq6FzlmgMLBhH2vZeP/lZb5sP5OdyrHMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyD3JGmzV67; Mon, 21 Oct 2024 12:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOK2I049113; Mon, 21 Oct 2024 12:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOKPB049110; Mon, 21 Oct 2024 12:24:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:20 GMT Message-Id: <202410211224.49LCOKPB049110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e5f33d429780 - main - arm64: Handle RES1 ID register 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5f33d429780f649635452ef4142e1072ed149c8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e5f33d429780f649635452ef4142e1072ed149c8 commit e5f33d429780f649635452ef4142e1072ed149c8 Author: Andrew Turner AuthorDate: 2024-10-18 09:17:01 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Handle RES1 ID register fields Some special registers we may want to emulate for userspace have fields that are reserved to be 1. Add support for these fields. As there is no value to print jump over printing them in print_id_fields. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47123 --- sys/arm64/arm64/identcpu.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 48ac5c59274d..126df01edfa3 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -365,6 +365,15 @@ struct mrs_field { u_int shift; }; +#define MRS_FIELD_RES1(_width, _shift) \ + { \ + .sign = false, \ + .type = MRS_EXACT | MRS_SAFE((1u << (_width)) - 1) | \ + MRS_USERSPACE, \ + .width = (_width), \ + .shift = (_shift), \ + } + #define MRS_FIELD_HWCAP(_register, _name, _sign, _type, _visibility, \ _values, _hwcap) \ { \ @@ -2549,9 +2558,8 @@ print_id_fields(struct sbuf *sb, uint64_t reg, const void *arg) for (i = 0; fields[i].type != 0; i++) { fv = fields[i].values; - /* TODO: Handle with an unknown message */ if (fv == NULL) - continue; + goto next; field = (reg & fields[i].mask) >> fields[i].shift; for (j = 0; fv[j].desc != NULL; j++) { @@ -2566,6 +2574,7 @@ print_id_fields(struct sbuf *sb, uint64_t reg, const void *arg) sbuf_printf(sb, "%sUnknown %s(%x)", SEP_STR, fields[i].name, field); +next: reg &= ~(((1ul << fields[i].width) - 1) << fields[i].shift); } From nobody Mon Oct 21 12:24: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 4XXDyH13Zjz5YwwH; Mon, 21 Oct 2024 12:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyG5tMrz4DqG; Mon, 21 Oct 2024 12:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=atdEdBb/mggeKgHa64HZLyGcZPLhb8nqzm3LsX0jU+s=; b=wdssz4rr1cijG6ejzWWoymEy/S1qos8M4yvLHH9oTL+csgczXU8lPnfWUvDqegZE3yfy+z Cey9yCKn+0wml8rNl4A8eDfx+6GZ6to9Gw4L9xXlRt2CaAfyOYvtmHrgT7Gzd4KGpAajPa YDWhZFU4RWpen/8CEbyMMRASrwrDURj9oxPzJsC85G9K2bFwxnvVOUcBDVoDR33szv8nXd YOn5YC/sie/mv//ZvXmkPNkgT/61dTY/9cW6ymeJffmA8GWL6dAWe59sgArjwk3nFceozZ 20dkKGkBV4WY3HW4KmSitK1Sz49ChysSpQbTcgF6BeHjfXj4zGcGQF6BTg/new== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=atdEdBb/mggeKgHa64HZLyGcZPLhb8nqzm3LsX0jU+s=; b=uY5v7jS25Mg/D6Oj1HS1TSUSeQ/hD0NQk9eJc7Xe5u+tYUDat62HNL09Kg2R1pRAclDfuH cvPrBsapmG5RwLMJsXsfwzzgSR7DTMueEgxT7imcgWM06SfOgK4hCfepRr8Xj4buMhc82M ETmGUVPG5p4LGdeNzKZmtqCBgY9ZtDEGRcHw4vm0vvnsUYNu3BQevtOEvtz9aIXKpShImG wpRrqFPYCK9pVRE6ZK561ZqDNq0ZpAN2bPlvmxlGO7iRfuZN4NJ0Bpa2sz/3dDostQe92m SZUQBj2wMCy2D1Obkzm0ONLAzFjfUOaYOXlD3pH5y5MY2zUVgALf7M8sC4aKqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513462; a=rsa-sha256; cv=none; b=UENBlPMcYSkLZCRrnNfX2j1CbXj5Sg8PrBJfgPKtt64dB+pwPjeWIjMXWt8R2/LGI/zCEX Ehw4P9CME5QSeTnJIVBGmMHjmZnjrKty/fpV2m+GUyFxmss3msgO/4Ks7AF35QCBRqaVPy XGoAElx8ZvgrmCrzHiLPWsaVnlbW3SmrLGOWt8doZYRhBj0TCJN2gwbCv8nhwfD/6jn1Ou wRJwFaqh7ZKr1+8dcPHSfM2KkL7mVUVwqEjXjuxIguJyW1PtqNe4DwVzjtdfXKkOprVOEX qVsJVDUbf7U/6YQmNnRfP86uzftq4zWaxMaxzLdFQq8hd0KnK7aRciYJ7j5jLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyG5TKczTMV; Mon, 21 Oct 2024 12:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOMli049217; Mon, 21 Oct 2024 12:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOM4E049214; Mon, 21 Oct 2024 12:24:22 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:22 GMT Message-Id: <202410211224.49LCOM4E049214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5727c249ad2a - main - arm64: Use register types to build kernel ID regs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5727c249ad2a94cf726c8db60841cf2112245cb3 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5727c249ad2a94cf726c8db60841cf2112245cb3 commit 5727c249ad2a94cf726c8db60841cf2112245cb3 Author: Andrew Turner AuthorDate: 2024-10-18 09:17:15 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Use register types to build kernel ID regs Use the ID register tables to find how to adjust the ID register fields in the kernel and vmm views. This allows us to use the same method to get a common view of CTR_EL0. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47125 --- sys/arm64/arm64/identcpu.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 7c5fdc04fdc7..834b0c5493b4 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -78,6 +78,8 @@ SYSCTL_INT(_machdep_cache, OID_AUTO, allow_idc, CTLFLAG_RDTUN, &allow_idc, 0, static void check_cpu_regs(u_int cpu, struct cpu_desc *desc, struct cpu_desc *prev_desc); +static uint64_t update_special_reg_field(uint64_t user_reg, u_int type, + uint64_t value, u_int width, u_int shift, bool sign); /* * The default implementation of I-cache sync assumes we have an @@ -2181,27 +2183,6 @@ mrs_field_cmp(uint64_t a, uint64_t b, u_int shift, int width, bool sign) return (a - b); } -static uint64_t -update_lower_register(uint64_t val, uint64_t new_val, u_int shift, - int width, bool sign) -{ - uint64_t mask; - - KASSERT(width > 0 && width < 64, ("%s: Invalid width %d", __func__, - width)); - - /* - * If the new value is less than the existing value update it. - */ - if (mrs_field_cmp(new_val, val, shift, width, sign) < 0) { - mask = (1ul << width) - 1; - val &= ~(mask << shift); - val |= new_val & (mask << shift); - } - - return (val); -} - bool extract_user_id_field(u_int reg, u_int field_shift, uint8_t *val) { @@ -2249,9 +2230,9 @@ get_kernel_reg_masked(u_int reg, uint64_t *valp, uint64_t mask) val = CPU_DESC_FIELD(kern_cpu_desc, i); fields = user_regs[i].fields; for (int j = 0; fields[j].type != 0; j++) { - mask = update_lower_register(mask, val, - fields[j].shift, fields[j].width, - fields[j].sign); + mask = update_special_reg_field(mask, + fields[j].type, val, fields[j].width, + fields[j].shift, fields[j].sign); } *valp = mask; return (true); @@ -2357,8 +2338,9 @@ update_special_regs(u_int cpu) fields[j].sign); /* Update the kernel ID register view */ - kern_reg = update_lower_register(kern_reg, value, - fields[j].shift, fields[j].width, fields[j].sign); + kern_reg = update_special_reg_field(kern_reg, + fields[j].type, value, fields[j].width, + fields[j].shift, fields[j].sign); } CPU_DESC_FIELD(kern_cpu_desc, i) = kern_reg; From nobody Mon Oct 21 12:24: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 4XXDyF5p69z5YwtG; Mon, 21 Oct 2024 12:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyF4cwcz4DYZ; Mon, 21 Oct 2024 12:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FovurKEwWI9abme7bA1Sid/+aH19aoz/MH//Ah0ILvY=; b=ARkcMzJciyvMBsoC0CGV1ENllMN+0kV+eqowhY5XHrhLmai+TFa0K4vR6RbjZf0h9CN4U2 PCZheB4x8CqwCo1zc4hpHTMGfpordOxwcx8gyDH8xfx9WouUTKFFU9t4KEaI2K9OSE2AVu B3lemSCUfAirB5uMST3y38b94Ckx0CEoBrnpe8K+Bps1SUUmn1XESD/Cz05sPC2y7pzmVs gZNpVD4JJYG9YPktcdZ6Df2cKw/D1HznUEpA8WIB32OSrRlw6pk3KAhLKkT3jMJJL0Nczi gtMG/0RCmWVQ3mg/az5YiWwlW9hF+GLYverjT1U8eKSONKOepGp7S5OkLS2B+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FovurKEwWI9abme7bA1Sid/+aH19aoz/MH//Ah0ILvY=; b=URgFuHXzvr1Cr6Nf3Dai9QRs6hkyzxOUk5gVk3IsiblB8koLXx8DbJ9fKxTD/0T6+74syi YFgSI9DYzQzkebA5O+Z865tI1GiTf7nx53UIr7XwqEyzp++MmHn8THo/1pClFjXZEe0PL5 XqXRCk1ZsJQ+0x5VQZUeQQcvXjARHu0FCls59ueEdfFrnDkhmV7THs8XebkfCGP96xkxUC 2zmhtCohZV1ukgngtdTPPaZu6TcxKaTHApTzL5aw4WLx15np0oHwJJI2Od69BO5m/pZsH0 mtC+JOk2sA3LLnVkZrPzvv9Ufad3Lg3W94AOXVPp0JEzc4pbUC9GYypX/LfafA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513461; a=rsa-sha256; cv=none; b=xO0Vhi82xM9IIAkFknCgvJMAWsIv6wHVajsnCALXNqdM3Lwjzk9iR0Cjk7LksZ2hlwJGLv efd1F4Ta4VbQkJ1x6bjGkIIrtR8ds/1jiOOeS0BFZV3wdUXN2dEPVqcacMtmOTfUX0somc bYUJPpgOTMYnABOFheGbk0UjZfRPdLs5WMPLn8Z877Zfe7FxgG2tRmL3dQQ/nXQvjA8wPg AQU5zR0Rnw1im14o3EoP/ZPH3dpwJSAXqUXsCERnHnVqeKavpaQFYRGNfTRckijQ6+coVa d6pgAExQVOScUwdI29W7lrlcywT23Dja8ZnzR4xotwlC+qEYhGQzyZo0MgZVbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyF466dzVr7; Mon, 21 Oct 2024 12:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOLXv049163; Mon, 21 Oct 2024 12:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOLUs049160; Mon, 21 Oct 2024 12:24:21 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:21 GMT Message-Id: <202410211224.49LCOLUs049160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a090372f38f1 - main - arm64: Decode CTR_EL0 via a table List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a090372f38f1cc136323599f92d0acecfca5b40e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a090372f38f1cc136323599f92d0acecfca5b40e commit a090372f38f1cc136323599f92d0acecfca5b40e Author: Andrew Turner AuthorDate: 2024-10-18 09:17:08 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Decode CTR_EL0 via a table Use the same method to decode CTR_EL0 as for the ID registers. This will allow us to create a common view over all CPUs. This will also allow us to create a common view for userspace and the kernel if we detect a difference on some CPUs, or to handle errata. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47124 --- sys/arm64/arm64/identcpu.c | 118 ++++++++++++++++++++++++++++++--------------- sys/arm64/include/armreg.h | 11 +++++ 2 files changed, 91 insertions(+), 38 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 126df01edfa3..7c5fdc04fdc7 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -337,6 +337,28 @@ struct mrs_field_value { MRS_FIELD_VALUE(14ul<< _reg ## _ ## _field ## _SHIFT, "15 "_desc "s"), \ MRS_FIELD_VALUE(15ul<< _reg ## _ ## _field ## _SHIFT, "16 "_desc "s") +/* + * Used for printing I/D cache line sizes & CWG/ERG, as 0 is a special case + * in some cases the decoded string needs to be passed in. + */ +#define MRS_FIELD_VALUE_CACHE(_reg, _field, _0desc, _desc) \ + MRS_FIELD_VALUE(0ul << _reg ## _ ## _field ## _SHIFT, _0desc), \ + MRS_FIELD_VALUE(1ul << _reg ## _ ## _field ## _SHIFT, "8 " _desc), \ + MRS_FIELD_VALUE(2ul << _reg ## _ ## _field ## _SHIFT, "16 " _desc), \ + MRS_FIELD_VALUE(3ul << _reg ## _ ## _field ## _SHIFT, "32 " _desc), \ + MRS_FIELD_VALUE(4ul << _reg ## _ ## _field ## _SHIFT, "64 " _desc), \ + MRS_FIELD_VALUE(5ul << _reg ## _ ## _field ## _SHIFT, "128 " _desc), \ + MRS_FIELD_VALUE(6ul << _reg ## _ ## _field ## _SHIFT, "256 " _desc), \ + MRS_FIELD_VALUE(7ul << _reg ## _ ## _field ## _SHIFT, "512 " _desc), \ + MRS_FIELD_VALUE(8ul << _reg ## _ ## _field ## _SHIFT, "1k " _desc), \ + MRS_FIELD_VALUE(9ul << _reg ## _ ## _field ## _SHIFT, "2k " _desc), \ + MRS_FIELD_VALUE(10ul<< _reg ## _ ## _field ## _SHIFT, "4k " _desc), \ + MRS_FIELD_VALUE(11ul<< _reg ## _ ## _field ## _SHIFT, "8k " _desc), \ + MRS_FIELD_VALUE(12ul<< _reg ## _ ## _field ## _SHIFT, "16k " _desc), \ + MRS_FIELD_VALUE(13ul<< _reg ## _ ## _field ## _SHIFT, "32k " _desc), \ + MRS_FIELD_VALUE(14ul<< _reg ## _ ## _field ## _SHIFT, "64k " _desc), \ + MRS_FIELD_VALUE(15ul<< _reg ## _ ## _field ## _SHIFT, "128k "_desc) + #define MRS_FIELD_VALUE_END { .desc = NULL } struct mrs_field_hwcap { @@ -393,6 +415,62 @@ struct mrs_field { #define MRS_FIELD_END { .type = MRS_INVALID, } +/* CTR_EL0 */ +static const struct mrs_field_value ctr_dic[] = { + MRS_FIELD_VALUE_NONE_IMPL(CTR, DIC, NONE, IMPL), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field_value ctr_idc[] = { + MRS_FIELD_VALUE_NONE_IMPL(CTR, IDC, NONE, IMPL), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field_value ctr_cwg[] = { + MRS_FIELD_VALUE_CACHE(CTR, CWG, "Unknown CWG", + "byte CWG"), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field_value ctr_erg[] = { + MRS_FIELD_VALUE_CACHE(CTR, ERG, "Unknown ERG", + "byte ERG"), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field_value ctr_dline[] = { + MRS_FIELD_VALUE_CACHE(CTR, DLINE, "4 byte D-cacheline", + "byte D-cacheline"), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field_value ctr_l1ip[] = { + MRS_FIELD_VALUE(CTR_L1IP_VIPT, "VIPT I-cache"), + MRS_FIELD_VALUE(CTR_L1IP_PIPT, "PIPT I-cache"), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field_value ctr_iline[] = { + MRS_FIELD_VALUE_CACHE(CTR, ILINE, "4 byte I-cacheline", + "byte I-cacheline"), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field ctr_fields[] = { + /* Bit 31 is RES1 */ + MRS_FIELD_RES1(1, 31), + MRS_FIELD(CTR, DIC, false, MRS_LOWER, MRS_USERSPACE, ctr_dic), + MRS_FIELD(CTR, IDC, false, MRS_LOWER, MRS_USERSPACE, ctr_idc), + MRS_FIELD(CTR, CWG, false, MRS_HIGHER_OR_ZERO, MRS_USERSPACE, ctr_cwg), + MRS_FIELD(CTR, ERG, false, MRS_HIGHER_OR_ZERO, MRS_USERSPACE, ctr_erg), + MRS_FIELD(CTR, DLINE, false, MRS_LOWER, MRS_USERSPACE, ctr_dline), + /* If the ICache types are different report the safe option */ + MRS_FIELD(CTR, L1IP, false, MRS_EXACT_IF_DIFFERENT | + MRS_SAFE(CTR_L1IP_VIPT >> CTR_L1IP_SHIFT), MRS_USERSPACE, + ctr_l1ip), + MRS_FIELD(CTR, ILINE, false, MRS_LOWER, MRS_USERSPACE, ctr_iline), + MRS_FIELD_END, +}; /* ID_AA64AFR0_EL1 */ static const struct mrs_field id_aa64afr0_fields[] = { @@ -2497,40 +2575,6 @@ parse_cpu_features_hwcap32(void) } #endif /* COMPAT_FREEBSD32 */ -static void -print_ctr_fields(struct sbuf *sb, uint64_t reg, const void *arg __unused) -{ - - sbuf_printf(sb, "%u byte D-cacheline,", CTR_DLINE_SIZE(reg)); - sbuf_printf(sb, "%u byte I-cacheline,", CTR_ILINE_SIZE(reg)); - reg &= ~(CTR_DLINE_MASK | CTR_ILINE_MASK); - - switch(CTR_L1IP_VAL(reg)) { - case CTR_L1IP_VIPT: - sbuf_printf(sb, "VIPT"); - break; - case CTR_L1IP_PIPT: - sbuf_printf(sb, "PIPT"); - break; - } - sbuf_printf(sb, " ICache,"); - reg &= ~CTR_L1IP_MASK; - - sbuf_printf(sb, "%d byte ERG,", CTR_ERG_SIZE(reg)); - sbuf_printf(sb, "%d byte CWG", CTR_CWG_SIZE(reg)); - reg &= ~(CTR_ERG_MASK | CTR_CWG_MASK); - - if (CTR_IDC_VAL(reg) != 0) - sbuf_printf(sb, ",IDC"); - if (CTR_DIC_VAL(reg) != 0) - sbuf_printf(sb, ",DIC"); - reg &= ~(CTR_IDC_MASK | CTR_DIC_MASK); - reg &= ~CTR_RES1; - - if (reg != 0) - sbuf_printf(sb, ",%lx", reg); -} - static void print_register(struct sbuf *sb, const char *reg_name, uint64_t reg, void (*print_fields)(struct sbuf *, uint64_t, const void *), @@ -2754,10 +2798,8 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, (prev_desc == NULL || desc->_reg != prev_desc->_reg) /* Cache Type Register */ - if (SHOULD_PRINT_REG(ctr)) { - print_register(sb, "Cache Type", - desc->ctr, print_ctr_fields, NULL); - } + if (SHOULD_PRINT_REG(ctr)) + print_id_register(sb, "Cache Type", desc->ctr, ctr_fields); /* AArch64 Instruction Set Attribute Register 0 */ if (SHOULD_PRINT_REG(id_aa64isar0)) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 7d2fffb28779..e26f9859947e 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -368,29 +368,40 @@ #define CTR_TminLine_MASK (UL(0x3f) << CTR_TminLine_SHIFT) #define CTR_TminLine_VAL(reg) ((reg) & CTR_TminLine_MASK) #define CTR_DIC_SHIFT 29 +#define CTR_DIC_WIDTH 1 #define CTR_DIC_MASK (0x1 << CTR_DIC_SHIFT) #define CTR_DIC_VAL(reg) ((reg) & CTR_DIC_MASK) +#define CTR_DIC_NONE (0x0 << CTR_DIC_SHIFT) +#define CTR_DIC_IMPL (0x1 << CTR_DIC_SHIFT) #define CTR_IDC_SHIFT 28 +#define CTR_IDC_WIDTH 1 #define CTR_IDC_MASK (0x1 << CTR_IDC_SHIFT) #define CTR_IDC_VAL(reg) ((reg) & CTR_IDC_MASK) +#define CTR_IDC_NONE (0x0 << CTR_IDC_SHIFT) +#define CTR_IDC_IMPL (0x1 << CTR_IDC_SHIFT) #define CTR_CWG_SHIFT 24 +#define CTR_CWG_WIDTH 4 #define CTR_CWG_MASK (0xf << CTR_CWG_SHIFT) #define CTR_CWG_VAL(reg) ((reg) & CTR_CWG_MASK) #define CTR_CWG_SIZE(reg) (4 << (CTR_CWG_VAL(reg) >> CTR_CWG_SHIFT)) #define CTR_ERG_SHIFT 20 +#define CTR_ERG_WIDTH 4 #define CTR_ERG_MASK (0xf << CTR_ERG_SHIFT) #define CTR_ERG_VAL(reg) ((reg) & CTR_ERG_MASK) #define CTR_ERG_SIZE(reg) (4 << (CTR_ERG_VAL(reg) >> CTR_ERG_SHIFT)) #define CTR_DLINE_SHIFT 16 +#define CTR_DLINE_WIDTH 4 #define CTR_DLINE_MASK (0xf << CTR_DLINE_SHIFT) #define CTR_DLINE_VAL(reg) ((reg) & CTR_DLINE_MASK) #define CTR_DLINE_SIZE(reg) (4 << (CTR_DLINE_VAL(reg) >> CTR_DLINE_SHIFT)) #define CTR_L1IP_SHIFT 14 +#define CTR_L1IP_WIDTH 2 #define CTR_L1IP_MASK (0x3 << CTR_L1IP_SHIFT) #define CTR_L1IP_VAL(reg) ((reg) & CTR_L1IP_MASK) #define CTR_L1IP_VIPT (2 << CTR_L1IP_SHIFT) #define CTR_L1IP_PIPT (3 << CTR_L1IP_SHIFT) #define CTR_ILINE_SHIFT 0 +#define CTR_ILINE_WIDTH 4 #define CTR_ILINE_MASK (0xf << CTR_ILINE_SHIFT) #define CTR_ILINE_VAL(reg) ((reg) & CTR_ILINE_MASK) #define CTR_ILINE_SIZE(reg) (4 << (CTR_ILINE_VAL(reg) >> CTR_ILINE_SHIFT)) From nobody Mon Oct 21 12:24: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 4XXDyJ1L7Hz5YwsB; Mon, 21 Oct 2024 12:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyH6N2Nz4Dn6; Mon, 21 Oct 2024 12:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WX2g6YyoVovWu2wZFtWOTrRg3p4CKQidLnYY8NfEQi0=; b=t2UlPs3N4SL12iNvqaKtbCCBnj/YvF1Y2pjHfTYLC6avD/8HVO9KSCM3TjESLpHXy+1I/c PuNYnKvy9FGJBiM4UNMv+k0qwVFhW41vMbulnhmGWyvGIZMTi5ls13srMande6ncAGbg1w h5rLttYdssloHswCfzv5dKOTgtHFiimTqedmj4kgHAS5ecG83kJUlhiK7BmtJHZO+CK4qS UN6hY3mjXZTHk3kS+jVfu69Nr1isfIKwwc6ZSVZG6+ZuMUgfr1Z/JuixaSxwQlWjqRvTM3 hTcdNRgpSAhjOchs7DNy3w+4KCrNOwvaOEORzeNxIpKc7/ul1cgdRZS1gQkFug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WX2g6YyoVovWu2wZFtWOTrRg3p4CKQidLnYY8NfEQi0=; b=k+z1700kFk7v5gvstpZudMrYH/7ePd7qLzY8VogMIjnfMccunTk1kRp2TtpSm+Njucan64 +LW+aQQpq+R544bQeHz1sBhuvwRBmf0x6JSqlBb49+LguR1T635goLpIrr6PgG2LR9zhCX yve+ZEFkcIujeFDDS1E0E5khPp/SxwG5PaPhYMJXpFvrYLMrcgsOwsISinJHjdHcFq882J D+3OYXu3LaKIIjfCPIrux/JvlavDBhObkzaPGS0X6RMmgcZi0eFEHwdlhGeLLC4Hqu+vRR 3fwFt8xAi6PX30caXl66xep/QbZgi2f1HhJaG2zzhAzM6ARc8UJulWoN/4M9tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513463; a=rsa-sha256; cv=none; b=GRkV3ArsO4RwWRryf59LjltTSS6NVi7KT29Q2Ye09xKN0r6v11xNVWNkv58506jbdmuePP iawYkoDV66bE+a/I4iONfI9jLXi+Na6F1toXvnX+A/6lumVs4ne3HaR0zz5QMEFqQobIna yPh4NObD/m8wZjkj/VfOUp3grUQjU9Uf3rjGxPK92waV8Vw+J/i4EI6q2pjmQ4qOT9snxx VGfjkmjLi5grdhrTL4sryYC05hXkEEsCkk99Ce8k9EeVRMGoM7B0bew4TaHAT8+UMs8hCm 1PlNliwjAB47NyM6o4/ZOA/2sdvuDUzE7cVr3TAfhgbIllGC4Q4j8TF32XPqKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyH60YZzVr8; Mon, 21 Oct 2024 12:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCONTq049262; Mon, 21 Oct 2024 12:24:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCON5S049259; Mon, 21 Oct 2024 12:24:23 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:23 GMT Message-Id: <202410211224.49LCON5S049259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ea6865bb78c5 - main - arm64: Update how we handle SpecSEI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea6865bb78c5ac007a50f3d06a8e745052f745a0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ea6865bb78c5ac007a50f3d06a8e745052f745a0 commit ea6865bb78c5ac007a50f3d06a8e745052f745a0 Author: Andrew Turner AuthorDate: 2024-10-18 09:17:22 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:16 +0000 arm64: Update how we handle SpecSEI The ID_AA64MMFR1_EL0.SpecSEI field needs to use MRS_HIGHER to get the largest value from all CPUs. This is because it indicates when an exception might happen when it's non-zero and can't happen when zero. As indicating something that might happen even when it can't is safer use MRS_HIGHER to handle this field. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47126 --- sys/arm64/arm64/identcpu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 834b0c5493b4..f4d297e7d9bc 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1283,7 +1283,14 @@ static const struct mrs_field id_aa64mmfr1_fields[] = { MRS_FIELD(ID_AA64MMFR1, ETS, false, MRS_LOWER, 0, id_aa64mmfr1_ets), MRS_FIELD(ID_AA64MMFR1, TWED, false, MRS_LOWER, 0, id_aa64mmfr1_twed), MRS_FIELD(ID_AA64MMFR1, XNX, false, MRS_LOWER, 0, id_aa64mmfr1_xnx), - MRS_FIELD(ID_AA64MMFR1, SpecSEI, false, MRS_LOWER, 0, + /* + * SpecSEI != 0 indicates the CPU might generate an external abort + * under speculation, while 0 indicates it can't happen. It's safer + * to incorrectly indicate it might happen when it can't rather than + * say it can't happen when it could. As such use the largest value + * found in the system. + */ + MRS_FIELD(ID_AA64MMFR1, SpecSEI, false, MRS_HIGHER, 0, id_aa64mmfr1_specsei), MRS_FIELD(ID_AA64MMFR1, PAN, false, MRS_LOWER, 0, id_aa64mmfr1_pan), MRS_FIELD(ID_AA64MMFR1, LO, false, MRS_LOWER, 0, id_aa64mmfr1_lo), From nobody Mon Oct 21 12:24: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 4XXDyK39yrz5YwYV; Mon, 21 Oct 2024 12:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyK0Ywlz4Dhn; Mon, 21 Oct 2024 12:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZMF2pPfKa8zmiW4znPPe9bYuZipf4FDn9biGvHtmN8=; b=tuWRji9IcCAPp8yBnZhrF3l/MZqRjv1m1poxIa81DeA8UOfUF2twir/rjuJaZVjGX491/J 2YtWlrIK68bIjISz0jDdFBCCTgZygK9OhiTAvuovdGHwlbpDTzAp646IonWM6mXq4Lpa3x Yxxw5lRxZDFJ7l1X4DW7RkdndXdr8sFKC87c15eAQQCMq2IHaEkvFQ01qSb/yNHmeEhqrU hRchP2dk5ZGPM8hI6rE7ncM4cTu6myyE2BX4hp5NmsMhl41uzT1QsySkmtZH+JSdg976Wf xRuLGE8dYGfamlZQLOem3SxZb82rNVZ3vgR2Dkt1+rQ70K7/BNSJznB944qlfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZMF2pPfKa8zmiW4znPPe9bYuZipf4FDn9biGvHtmN8=; b=h+pdeL+YFZHP1IgNjfaIraSQR74pL33j2oAvBSO5n7T/dSxO7KoV4vqweXVzjFjbUEPkw5 TTNbcwFNpmZ8yC+TJzhyJTUfGxKvSgKgGbCdvBNVbGRbHb18USaQ/wnXBVj4cXDRRXYxme i8Ez035U5tX3hN/l0Zw6w8g4mQ+fwnzgpvd9t3HEPtjku064/e94XQ2m5TkbTjChOzrGkH Lp49odk577u8hTGsZE81LS6TLQ79152D5eRtq3pyfOfcdESe6o2ANaekZQipcfBiEWu43u JFpxsK4BD69dbc+VM1NjDmUhdChijJ1U8NHt4xGta3fSswR2cQUL42c//A7lEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513465; a=rsa-sha256; cv=none; b=A8VBu6R5BTcD5DsHIDIwGTLSKqtU2p23Ts9zXuUvplojCuY/oMce+9aun/FMZh8TuyZytF +faFE/3CQpexpVPoprWFDBJBuxAXHEk3mMIMBEiZmBYAfj/s/KV3XxS7SLiQn70eLFi0uw SUio6ZLQRV2+yTmrfb9q85V0QI3OixxODCqdR4IjIsPiz4DcsIUgZlrhdYzAKlpXX3afpT FZMIIhAGM8JxUf+7PAR2lg9VoAZ9jF9sjlgPGmtTgWUAKWRnfUdoAz8XVh1Asm6CAlMDSg 2IjJuH3lu3bvHBKmXrg0ECynPgNY+Kw33O2fnmKn9uAOJyMGPSQw41AyBcfMJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyK0B1YzTMW; Mon, 21 Oct 2024 12:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOOSq049322; Mon, 21 Oct 2024 12:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOOHN049318; Mon, 21 Oct 2024 12:24:24 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:24 GMT Message-Id: <202410211224.49LCOOHN049318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 9707243a04ac - main - arm64: Remove a duplicated include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9707243a04ac5247071e490c1458e87bf22ef80e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9707243a04ac5247071e490c1458e87bf22ef80e commit 9707243a04ac5247071e490c1458e87bf22ef80e Author: Andrew Turner AuthorDate: 2024-10-18 09:21:59 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:16 +0000 arm64: Remove a duplicated include Sponsored by: Arm Ltd --- sys/arm64/arm64/sys_machdep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/arm64/arm64/sys_machdep.c b/sys/arm64/arm64/sys_machdep.c index 81b8ef73d9c0..efe2931e6b8a 100644 --- a/sys/arm64/arm64/sys_machdep.c +++ b/sys/arm64/arm64/sys_machdep.c @@ -28,7 +28,6 @@ */ #include -#include #include #include #include From nobody Mon Oct 21 12: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 4XXDyL2jfPz5YwYY; Mon, 21 Oct 2024 12:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyL1HZfz4Dkc; Mon, 21 Oct 2024 12:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j7tCLBqT+RWzIxBLjlTqY8BGj61E5l0K2dF4eEHjwu0=; b=Z+a7YwK0w4grsFRAz75poYx11Syb4KUzEU5KDtsYehN6jrLFhoLuRiK5gcgJl1653yt96n ZDBF3oR6v1coM48uk19RDc8Mgsx6B7BUnQpYkvYIJMdyqxTOplK+rLshCBec61G4ak7wVa HS7L2pWQRWImVUNSjwBGgbC/J2aV+3CCKdIOht8aQkRpqTnoRDSTI1Ou2NJYwoHtlFZGaV 5ZgPGi7Q2mXXiX62j/U/QCtOjML+9F+mHX1AILGPRypqozzyWYcz/wTdqQYgGmOtiFk7Zp yParJ0sF3TnScWuanoXwjjIM63Wi+nKrXVwgzBdUUYcqQW5jYcqsWUEUjkt3mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j7tCLBqT+RWzIxBLjlTqY8BGj61E5l0K2dF4eEHjwu0=; b=m5JkqwJ77cM6YWRwXRftFhBCsF6hR9AJrrtH4YT8GTQoecXA1o4qdsNQOoogga0fLClkft 4TrLxtG1dRWWcLX2vrNGhpszSJx0Sogb/80N2jPaESsHmBtl0JhqllqN5fCylxto7UpNbc l5tZD28fvMHoECExEEAHl4FhR13XXDSjRuaOPo+sESMvRkUexKZF4nBe4H7X2yxGCmYtS2 xgGTjkym7Rwui3e+Ez0VJU7lj+6DGyyG3H7JbXvhW4m21dfJRnr4RgVlxK9r1+xpqHFzNd HD0xqL8DOqv0e1pzsCzjJJkSQlMMVaGlOHTsR3q2+JaLkFp/RKHe7zmGcKaHkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513466; a=rsa-sha256; cv=none; b=iQix7daoF7/WMSguHjYQUDIzUxE3uY/+8+SeTTXQEkkyidnShhCe2ExOrEDw8UQi0lAS92 6VSFewN/5u+gK3anY4trYp7rtStRHnIUvQJdMQBNIQ911SkdwxaT9WyxdPjoJ/ZReRBoNE 6z54KgEUF4stXdJuyrjlu9yNuIqR+TY62c1qwKukRfpblxjwT1/ljN/dD2zYYSqjq7qoUZ Ww4s9clCC45KXKEAyNA2GSskKxBStF/YT9VHu5FoKFw1BbSX4rWhu+egG8VmWM/sVMgCbZ INgKMn7bgmmyNZyX91Yqf/Pd6+MUgQpgCwF5skk6MScNr6o8IpMDKLGPqq6mwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyL0v00zVsj; Mon, 21 Oct 2024 12:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOQSp049390; Mon, 21 Oct 2024 12:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOQqQ049387; Mon, 21 Oct 2024 12:24:26 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:26 GMT Message-Id: <202410211224.49LCOQqQ049387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3bd4724794a5 - main - arm64: write PID in CONTEXTIDR_EL1 on ctx switch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bd4724794a5e5838f09420a615227416d6b2903 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3bd4724794a5e5838f09420a615227416d6b2903 commit 3bd4724794a5e5838f09420a615227416d6b2903 Author: Zachary Leaf AuthorDate: 2024-07-31 08:23:24 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:16 +0000 arm64: write PID in CONTEXTIDR_EL1 on ctx switch Debug and trace features such as Statistical Profiling Extension (SPE) use the CONTEXTIDR_EL1 register to get the PID of the current process. Add a sysctl switch to toggle writing the current PID into this register in the thread switcher. To make use of the feature, the following sysctl switch must be set: sysctl machdep.pid_in_contextidr=1 Kernel code can also toggle the sysctl by writing directly to the global var behind the sysctl arm64_pid_in_contextidr: extern bool arm64_pid_in_contextidr; Sponsored by: Arm Ltd --- sys/arm64/arm64/genassym.c | 2 ++ sys/arm64/arm64/swtch.S | 21 +++++++++++++++++++++ sys/arm64/arm64/sys_machdep.c | 6 ++++++ 3 files changed, 29 insertions(+) diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index a4db825e976c..8cbafba45a7d 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -58,6 +58,8 @@ ASSYM(PCB_TPIDRRO, offsetof(struct pcb, pcb_tpidrro_el0)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); +ASSYM(P_PID, offsetof(struct proc, p_pid)); + ASSYM(SF_UC, offsetof(struct sigframe, sf_uc)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index c683a7e25314..7b6010a5f51f 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -55,6 +55,21 @@ 999: .endm +/* + * Lower 32 bits of CONTEXTIDR_EL1 are PID + * Upper 32 bits are reserved for future use e.g. TID + */ +.macro pid_in_context_idr + adrp x9, arm64_pid_in_contextidr + ldrb w10, [x9, :lo12:arm64_pid_in_contextidr] + cbz w10, 998f + ldr x9, [x1, #TD_PROC] + /* PID is always 0 or positive, do not sign extend */ + ldr w10, [x9, #P_PID] + msr contextidr_el1, x10 +998: +.endm + /* * void cpu_throw(struct thread *old, struct thread *new) */ @@ -66,7 +81,10 @@ ENTRY(cpu_throw) ldr x4, [x0, #TD_PCB] ldr w5, [x4, #PCB_FLAGS] clear_step_flag w5, x6 + 1: + /* debug/trace: set CONTEXTIDR_EL1 to current PID, if enabled */ + pid_in_context_idr #ifdef VFP /* Backup the new thread pointer around a call to C code */ @@ -147,6 +165,9 @@ ENTRY(cpu_switch) mov x20, x1 mov x21, x2 + /* debug/trace: set CONTEXTIDR_EL1 to current PID, if enabled */ + pid_in_context_idr + #ifdef VFP bl vfp_save_state_switch mov x0, x20 diff --git a/sys/arm64/arm64/sys_machdep.c b/sys/arm64/arm64/sys_machdep.c index efe2931e6b8a..33000b6c223b 100644 --- a/sys/arm64/arm64/sys_machdep.c +++ b/sys/arm64/arm64/sys_machdep.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -92,3 +93,8 @@ sysarch(struct thread *td, struct sysarch_args *uap) return (error); } + +bool arm64_pid_in_contextidr = false; +SYSCTL_BOOL(_machdep, OID_AUTO, pid_in_contextidr, CTLFLAG_RW, + &arm64_pid_in_contextidr, false, + "Save PID into CONTEXTIDR_EL1 register on context switch"); From nobody Mon Oct 21 12:24: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 4XXDyM6CSDz5YwpF; Mon, 21 Oct 2024 12:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyM3Gf8z4DwJ; Mon, 21 Oct 2024 12:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXgQvrVFuibvU1IWZ8Cpp7vw4mpApM0cOm2Jv4ffR9U=; b=CMiMQNdlvcIrAiIMEcFBsTW2L164YP6Ce+Ya5FAS4iQUioyOmuK7dki7KJLMJbxzUHoPuh D4maOFef3Trw3vyQLzjlsbeZ4vWepkUPk+xLU+4VlJ8aBRNUFMJtlXhHtltyF6vtD4DHJ0 w6R4KT3sUIu16l1YES6XNAFf8yj1Uwki6MmK8QvER7H7uDk+cmylqQpbWB/nAx2mQKs5Ga 4nJ9x/vmyPWUzZT47mgzmZIsc18bOwh2y4LWqagT0Eon3DWme6FFG42kNZiY+/vNxkwn+M odDcolu2UT3oWWC/PU2pEDlIaV0erXU0fTPKDP+p0gKsDvhLdVlyJVEjnRlYsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXgQvrVFuibvU1IWZ8Cpp7vw4mpApM0cOm2Jv4ffR9U=; b=ySJBrpeGamGb112VP/tJFK0qiaTMiQS+C2PUsCtMuo4NQk7dSblzB1Gms6qCujYXO/kUlJ v+wjku3kzmxp1BlQrv+DtO/kBLV7yLMJ182QgtyDG0zsidYk6IawbwDvjmnvlVo0DrUnzF g1ioP87wXcf1WwGu7OOwbfgW83cS2uQZXHgF0ONSm/BHqarMrhUg/SihAl1/Ida0mFLTgS 5WKGOIcgGdbWwF+a20JLO21KG27fweLgvtfmW/jnWZqvs8QKkwnA0i0gfFhuVb2A+R5lqs 9m7pn+uvf/dkm73I9E99q66V+DOk9zuI1dc1tqIBs8Les+AtXtNj6zEDw3b76w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513467; a=rsa-sha256; cv=none; b=oJX1DgkeoxPmumwc3Wiv1Kr9lN1KOvzmHpu6g9pT0QVpdz19nDoHjmCIkwNzMsspHSi60z tqtLmg97z7Mqm5HkjRKWwzC44g+mkh7u1vZvIbwo17s+NW92VWtOk0aEwRWF4Fj2C0h3Rr JU1o547CNPjQAtEUGokNZSTk9xgxiC6x0jr5S1gT/E/QLgW9UJEbJsyvMGq8Ic/h7v4nk2 fFmvOrn1Ne9mM8DOR/jUULoUdNTN4zRi4BV1mfXKS2M2sYsGP+Xq1CRSCRtN92pKPqBOby /E+SudZJ4Jk6SjamS1kSmrFSt7Xngl3VYaFQOfOC6gCNt0SLGRSZVxoJ7pQZuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyM2CgYzVPk; Mon, 21 Oct 2024 12:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCORGe049443; Mon, 21 Oct 2024 12:24:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCORuV049440; Mon, 21 Oct 2024 12:24:27 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:27 GMT Message-Id: <202410211224.49LCORuV049440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 386e2dc442f4 - main - .github: Use the two most recent LTS releases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 386e2dc442f46d2c4b43dc9e767eaa93facdbb42 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=386e2dc442f46d2c4b43dc9e767eaa93facdbb42 commit 386e2dc442f46d2c4b43dc9e767eaa93facdbb42 Author: Andrew Turner AuthorDate: 2024-08-29 16:45:43 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:16 +0000 .github: Use the two most recent LTS releases Ubuntu 24.04 is the most recent LTS release. Use it and the previous 22.04 LTS for cross build testing. Reported by: emaste, jhb Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/1399 --- .github/workflows/cross-bootstrap-tools.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index 1f4d41cce30c..c0be25d3b67c 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -18,17 +18,17 @@ jobs: fail-fast: false matrix: target_arch: [ amd64, aarch64 ] - os: [ ubuntu-20.04, ubuntu-22.04, macos-latest ] + os: [ ubuntu-22.04, ubuntu-24.04, macos-latest ] include: # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy. - - os: ubuntu-20.04 - compiler: clang-12 - cross-bindir: /usr/lib/llvm-12/bin - pkgs: bmake libarchive-dev clang-12 lld-12 - os: ubuntu-22.04 compiler: clang-14 cross-bindir: /usr/lib/llvm-14/bin pkgs: bmake libarchive-dev clang-14 lld-14 + - os: ubuntu-24.04 + compiler: clang-18 + cross-bindir: /usr/lib/llvm-18/bin + pkgs: bmake libarchive-dev clang-18 lld-18 - os: macos-latest compiler: clang-13 cross-bindir: /opt/homebrew/opt/llvm@13/bin From nobody Mon Oct 21 12:24: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 4XXDyN6vygz5YwwN; Mon, 21 Oct 2024 12:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXDyN3bgSz4DrT; Mon, 21 Oct 2024 12:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rs/q5rTUgIZKmPyGrfCQAYKGcFhsYnL1vJ1I0xxFj7A=; b=I/7Or5I5ESTMdixQv7KH4L3Nkm8OgjODEggQs7l7IgTsMR4EhTUtk8hKXJ5Rb344Q0iiuv CcX5ZFM/MOmL29HHoseDU9f/8c7QGCTBRZD8BGjBpL7nww+Y/cOARPudn3wHvhb6Jw7ZQO ufEhu6u7ktpZiCcNiCI9XXqeLHOXnArOpbowuwWC2lPrerg3IJnUipeILTGuitc3TK2r+E SUY7y5m8yaUffAkUzBJeT1HP5eareexNAeM/xd9lZkWRmFC5nmhOlJ0GvebkH0tSYR8KZ2 8Xy6LS5M4hA8AbbWchdp+VKa/HF3OfI3g7WZkQlEqFAkAs87qi7f+0fze1MAEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rs/q5rTUgIZKmPyGrfCQAYKGcFhsYnL1vJ1I0xxFj7A=; b=gMBy5isaQo8g2XqduCiwPBo3H3WUMwJbz1GI3y1WWR0UqMzS3qH4JsRkhnqVOzqkZeGLyi spnejJd5JDbeodsJ8vtdwqzz2TmqP8/Rj7UF/Tz/pxTJ7nCK5hWJvN3sqFXiu0EIgS8rFI sgm+ZSTh60Bk4aDcRxbL4Q0gGo8JtWk+KEef31SV8SuVI9aXJqgSKGzpd/uSU3mQ+xdrTc mcgX3QpkpBPdb1pgl9nfmZckEbZ2lgfXYfU+NuCewPVEf46ququFzkH3gvUKqvUt1XibXy wdrUJGUQ5ajfu9vT7xhB85wMEp29lgXE76vq9uBk6nRvXHxg+2gOcahEChKATw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513468; a=rsa-sha256; cv=none; b=vImoqXgCy8exbhQoAWJeihAsFWEG7NGeCasilLCCRrwx8eHW211/6/wTmqHg6YKuRMEEBC +jqCuZLGWDNPbche8qpY9cAU8v48EvaSlMhpChsB2NKPHH4aGdffEeKdI3tVE2Pkwx+tBc hC9xS42ODDivf1hEtprZ84ZQx6Kw3UJ4OyN/1WPuyCcSC211RP1YuE5GdZ3oWhNGo+LDPQ vQY6sbgmFCUgWOWcN0tgV0N3AqhLz+oAQHYTNz+w5+SLhbWHwvrY/4OvQpF7CGvyMN5iKX rrMfT1//3SMvb7qsviqclePeqi2Vj9JYpvzruvuxbJ8AK8ir2dYyc7jMGXr7gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXDyN3D9bzVr9; Mon, 21 Oct 2024 12:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCOS16049500; Mon, 21 Oct 2024 12:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOSl0049497; Mon, 21 Oct 2024 12:24:28 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:28 GMT Message-Id: <202410211224.49LCOSl0049497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: edc692b9052a - main - .github: Update the clang release used for macos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edc692b9052ab0594248104d002f32c657e36057 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=edc692b9052ab0594248104d002f32c657e36057 commit edc692b9052ab0594248104d002f32c657e36057 Author: Andrew Turner AuthorDate: 2024-08-29 16:44:46 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:16 +0000 .github: Update the clang release used for macos Reviewed by: emaste, jhb Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/1399 --- .github/workflows/cross-bootstrap-tools.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index c0be25d3b67c..540e05cbd6e2 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -30,9 +30,9 @@ jobs: cross-bindir: /usr/lib/llvm-18/bin pkgs: bmake libarchive-dev clang-18 lld-18 - os: macos-latest - compiler: clang-13 - cross-bindir: /opt/homebrew/opt/llvm@13/bin - pkgs: bmake libarchive llvm@13 + compiler: clang-18 + cross-bindir: /opt/homebrew/opt/llvm@18/bin + pkgs: bmake libarchive llvm@18 - target_arch: amd64 target: amd64 - target_arch: aarch64 From nobody Mon Oct 21 12:37: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 4XXFFF1kjfz5Yx86; Mon, 21 Oct 2024 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXFFF146Lz4KQt; Mon, 21 Oct 2024 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729514241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhGeYx32fNlU1QO1xpLsD3LC3T5eAdbQGBlcAV6klEQ=; b=v0yECi9BsGGBj7mStmJJHj5OpwYWcyXRvkNk95veumjpVnZ/GpZMZslWPho6zXTIpISrnJ 3k41OLalWw1mSX8a/sAk7stCJvsWb+PjS+8GUi0QorWlfM2X/UpkBNoZ9+qX0J6WYQsF2q 4DKfwhWBV58eaPd0eXKS7LyIfnof/niNzJPh7VDtWpffgExra59/Kz1kgrRCH+zpbJV+tS LzWE2HAQ0mLDEzaicY11sENgyE6DQQQmyTaNtg3XD93njZNZWnzo1oPUQI8kz41yBCF/+x E1Y7b8is9ZwU/ySFLbZzNqnsIbS4WSLuxS30jecmOAZe57Lmb0POE/YucLVAgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729514241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhGeYx32fNlU1QO1xpLsD3LC3T5eAdbQGBlcAV6klEQ=; b=L5I8BsJVy1Olt4LvswbLlbYa3CbLcwY1jjfc/mKfy1MI7e1yb6cCXBlfTkv6KOnl8DGhX3 n9wY8Oquy7/ioHAM/FMfzrGGIkEDewg87qMOfOpNZRUtHMGETg8nWyNJ+Pe9CAc7dPrk6V LWiWwqMdL19+gjmHtnGhAqWAfJRND42hfU1jNCid8YQqo62Y9VSjkS0Vh6TFmiFWL20vE9 ckYuwmXDyuLf9nAw+xQWOgHrLNWKZULKsAqMSwfPuTORJPTDUMQzKJE2eVbd7oOgybzxuP N++vvFlyemAm1Htss/cOpUFlpcrGtAyO5FAcazEjdUpzeIMj4ccFnQrZB6R5KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729514241; a=rsa-sha256; cv=none; b=Rmr0Sob1ZN3lNaENl6Kl4fLGAhLpJa+gXkgzBf1phzKzlLNk0zW313sWXCIVWHcDHl9X6B OK/APR1oD2XHDRo3Y0EBbg+IKxdeU2nJzBVIbYwGDXiJ+GdlHzard70ZhA8m9gEcIHapl1 Rs/YJoA+waRIJMvv16Pk9l2Pej2IA//B0SwuC5vTL9GBgbbsGM3qxNte3g1+hDYc66wWBD nrDPs0SL24whj2JC8AE3oystwbk7jEIIM+iXTcBFphqaGMpeoZ6A6mIqyIClEt6NJtjf62 ZFoxoUNCKyPUJqfWhWej8kVFsRUBd/9xbrgk5dcylXUMWkPTs4UGup/co7Oq4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXFFF0gWVzWCm; Mon, 21 Oct 2024 12:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCbKdU068605; Mon, 21 Oct 2024 12:37:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCbKOr068602; Mon, 21 Oct 2024 12:37:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:37:20 GMT Message-Id: <202410211237.49LCbKOr068602@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: 6c40282284d6 - main - libarchive: backport PR #2386 (fixes output of one 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6c40282284d6eab20256914648cdec39acb2c52a Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6c40282284d6eab20256914648cdec39acb2c52a commit 6c40282284d6eab20256914648cdec39acb2c52a Author: Martin Matuska AuthorDate: 2024-10-21 12:35:18 +0000 Commit: Martin Matuska CommitDate: 2024-10-21 12:37:09 +0000 libarchive: backport PR #2386 (fixes output of one test) MFC after: 6 days --- contrib/libarchive/tar/test/test_option_P.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libarchive/tar/test/test_option_P.c b/contrib/libarchive/tar/test/test_option_P.c index e63da3e0875c..953d9f58991c 100644 --- a/contrib/libarchive/tar/test/test_option_P.c +++ b/contrib/libarchive/tar/test/test_option_P.c @@ -55,7 +55,7 @@ DEFINE_TEST(test_extract_tar_absolute_paths) UNLINK(temp_absolute_file_name); // Extracting the archive without -P / --absolute-paths should strip leading drive letter or slash - r = systemf("%s -xf test.tar", testprog); + r = systemf("%s -xf test.tar 2>test.err", testprog); assertEqualInt(r, 0); assertFileNotExists(temp_absolute_file_name); From nobody Mon Oct 21 12:52: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 4XXFb14yT2z5Z0fv; Mon, 21 Oct 2024 12:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXFb14RgLz4NM5; Mon, 21 Oct 2024 12:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+oMUC4NQeH0nb7/3XVQ9uVCH4TYvoFL+umCCC2/42I=; b=ccePvzhEzFHguKBflBVq67PBj8fgbR4FDqWc72rYrr/UjBrw7PN+5aJMyTiXdFFJfG6d3d cLytEBd79CtzZFU3h7M4FHVboaV+HM32fcgMclK1QrHCAY+2/dVtzygcDMDyIqkh+eO0+o vT8KFdHzuUsJyy6leyvTM05i0m+oo64rQ4kgHDLS8ASR1GH4X2feI6E8hmS0wQIYrdaGJ0 RYS+8qtEmnj+cHojcfKAEMPjkrSUqloVqqr6ThMwXMzrbX5EzmYIopT+WdcY9RP3yyWYzT 1vhvPQ/EnebuqMKrNhMrLFN/gAPsBwRhKhyem8j2T++SENdmp01gJo0KcmEJ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+oMUC4NQeH0nb7/3XVQ9uVCH4TYvoFL+umCCC2/42I=; b=MSH+3kaGK53C9L2YtqUGlTqZ47UEDwLgG7FFNBXO+1GcTU0hQVXyWejo7YbXC+XFKHEBnd wWk1jqdnB1FNeWYZBGKAVvI7/v55xla2cPy1g8oFjoUH7FTtu/L0PnHjCOgrY+GUPgPcO7 0eyqCIAf+BHbEMoPnGEBfOw1mxETZVAuK7YlirYsi9B/IUGQiTVl/EE8GFcm2ldOMFwz5N vdA5DMH841ZYC5kLu5FCtW4iZZv7vog+4E3bUjA+JQyt55THGC7K/AXdRmtExRXLSsGb0n v6N6H/yboNgfWS+YxI/go24voPdlOXQd/VZHje2cktq9FTPJtLxMLAtbXMMrYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729515165; a=rsa-sha256; cv=none; b=A2RT66URH8XVQHsog2W65F5YKYA85Trqu8QgoYUsRS+u4kDQvK8G8P/mLY0PWa9jPp0pYa 8Ishb5pKrJD9cMuJfvEAFTu0YBdRvM9wYXGfs8RiJSTQJygdhdOIlOBugSGjVZIV4JDmK6 r6XLKJ0EMr1/ipGmsw/Uidp6FeEuqhub7QJeQI9KlwDlsrPjB9J5Ps5OHevpCMskcpkqKM 2tIFEN1k7ayYnDoH4sO6qPBzXKnr2GK2l8bevpJR3uvPnGqj4lS+9FMUfSlopSlm4LXckd gAOHxbpaBLSQre2kxqzQXefrF8ii1gF2Z0kvJplIqSroRJVK/fJ3Q1VLwMjcxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXFb1439LzXB9; Mon, 21 Oct 2024 12:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCqjac003560; Mon, 21 Oct 2024 12:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCqjpQ003557; Mon, 21 Oct 2024 12:52:45 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:45 GMT Message-Id: <202410211252.49LCqjpQ003557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f3586d26936c - stable/14 - netpfil tests: skip checksum verification in pft_ping.py List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: f3586d26936cbcc5bc13c2c74c9224532e896d13 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f3586d26936cbcc5bc13c2c74c9224532e896d13 commit f3586d26936cbcc5bc13c2c74c9224532e896d13 Author: Kristof Provost AuthorDate: 2024-10-14 12:57:49 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 12:51:36 +0000 netpfil tests: skip checksum verification in pft_ping.py From scapy 2.6.0 it now removes (sets to None) the IP checksum in its defrag code. We typically ask for IPv4 or IPv6 defragmentation, which causes check function failures. Just skip the checksum verificiation here, because we're going to notice incorrect checksums even if the tests don't directly verify it. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6b8096fa5f6f81e2959cbb2ca857c4e134273da2) --- tests/sys/netpfil/common/pft_ping.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index 1abf4f609832..216db4ea6bfd 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -149,12 +149,6 @@ def check_ipv4(expect_params, packet): if dst_address and ip.dst != dst_address: LOGGER.debug('Destination IPv4 address does not match!') return False - chksum = ip.chksum - ip.chksum = None - new_chksum = sp.IP(sp.raw(ip)).chksum - if chksum != new_chksum: - LOGGER.debug(f'Expected IP checksum {new_chksum} but found {chksum}') - return False if flags and ip.flags != flags: LOGGER.debug(f'Wrong IP flags value {ip.flags}, expected {flags}') return False From nobody Mon Oct 21 12:52: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 4XXFb23LzKz5Z0jg; Mon, 21 Oct 2024 12:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXFb22qdVz4N2k; Mon, 21 Oct 2024 12:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QP5niHvf6yFZXFw2B7RQK5W3BXC5iLY8H2czNBbgQ0o=; b=wSQZAizvw+tZ/L6dNihu9lKoJcncWy2R+L2WrBT1lZ14xuc2zc+cPlhE68QW1NwsTGv8ec c626NEV+Xgy/EXfg2id1BufTWjRXXoEhM67HErQCP4bTkdzuJVrS/NATlfu5G2czw0kDzo ZU0W2qpKLQlBVAuE64X2T3CkHnWXSDH9ZTOatUWYEKq7LSRnyGKbR5z3vkrUDadRpP5+ew QVeBcsCgqgZGtDmUA5YrMVu7TvcFkStv+m9OY6QMcHPhYd559S5/Z0qw0RJgM9A53C/ma1 HnXOrt9FsP32/qw+zaxzW8dkwJ51lyZ5ohap/3uYugqxP8fSaKnfqQnOhN8V6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QP5niHvf6yFZXFw2B7RQK5W3BXC5iLY8H2czNBbgQ0o=; b=Hd4fOuWqZn2302q0U98VEBYRoNTww76NhPPPh96g/iF8kdo6wQB/ZYSS+og7RGvLJVoog3 0yFfqN3tFfA0srIrY9WB5EVVaGcy8fhecfEtK0unrj00d1IU7+VsqeZ7oD6aDDjckrk3kH /DE+FzBYocqf1BMEirJAqIcQ1MF7Qjtd3pXro+nTcePRtXPkDgVbi8bCCKVkcFCwx+e2gf mKCpU278O491K2R0qanqwWP+E2u6C7Ghr7RjWZ5ehs5PotskZIYYuoi7yqe2jFCLT8fjF8 qchcOdCXBMicXSE3KoUS2ClK7oPHnzvrZMIvluiOzkqS0G8vJz5/qRSN1RXAPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729515166; a=rsa-sha256; cv=none; b=FY1YXyYBLchtXWX+0VU9YlJTn624K4AGKhYMMRvBDII6/EpL+2LTRs/bg/B2CS/LZBb6A0 uMJIghcBoZQcdBMUXlyHsRbijiKea945/KXj0w9rczwQpeRfdUpET3B3P7HzLaJG1QG3EV EBO3AEixBzFRXEAc7YwWN79XS9wv0t2BCUISgbfKPoLHzTYznEO3pkJTuz/4G+2Umw4R2b ZUSbEe5+PDGCAQRFgNCf89SlJ0fGuunY55Yq/O6YAg/mKYulm8pwm5XbTx+mkdLfBw8C3U ulIOktXTlVTLRL/SrzTyStOKdTojTHNlcEgeIKHdf5B/I1p7Y2HV8Xjl3E26TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXFb22R7MzX0b; Mon, 21 Oct 2024 12:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCqkvB003668; Mon, 21 Oct 2024 12:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCqkAU003665; Mon, 21 Oct 2024 12:52:46 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:46 GMT Message-Id: <202410211252.49LCqkAU003665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 48a202f5b219 - stable/13 - netpfil tests: skip checksum verification in pft_ping.py List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 48a202f5b2190f89c4a755c36155a054b721a19e Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=48a202f5b2190f89c4a755c36155a054b721a19e commit 48a202f5b2190f89c4a755c36155a054b721a19e Author: Kristof Provost AuthorDate: 2024-10-14 12:57:49 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 07:34:13 +0000 netpfil tests: skip checksum verification in pft_ping.py From scapy 2.6.0 it now removes (sets to None) the IP checksum in its defrag code. We typically ask for IPv4 or IPv6 defragmentation, which causes check function failures. Just skip the checksum verificiation here, because we're going to notice incorrect checksums even if the tests don't directly verify it. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6b8096fa5f6f81e2959cbb2ca857c4e134273da2) --- tests/sys/netpfil/common/pft_ping.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index 380b92a662c7..9f5aae08888e 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -137,12 +137,6 @@ def check_ipv4(expect_params, packet): if dst_address and ip.dst != dst_address: LOGGER.debug('Destination IPv4 address does not match!') return False - chksum = ip.chksum - ip.chksum = None - new_chksum = sp.IP(sp.raw(ip)).chksum - if chksum != new_chksum: - LOGGER.debug(f'Expected IP checksum {new_chksum} but found {chksum}') - return False if flags and ip.flags != flags: LOGGER.debug(f'Wrong IP flags value {ip.flags}, expected {flags}') return False From nobody Mon Oct 21 12:52: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 4XXFb25xZfz5Z0QF; Mon, 21 Oct 2024 12:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXFb25RMjz4NRm; Mon, 21 Oct 2024 12:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIdJ8NWKT1/MzzEUxrfj7F+AH/K7HbdovFdaKeSFvl4=; b=COs8PeQUnZBhWiYheNJZRkkXDpK5iAdmMzNrYJNNPa1b9xIY/15iKjju3l6bjq+85mcnDl 8ltIyrGgAKoIoXnPj6BgXFGntC/MZNUVJtBSggf0FohKkhls9Kq9/jO7krVsOjrEJuDVIk mBzTiA/tZbte6V7ApKMrLWQDfhJvUF8OZVw40QOCgse3Pp/VD97QEAb9OFd3pWK0aYCPR8 3TWXocR50seOk14noEU9IPAP6WDVloT9Arfins2vXU2dcQ6TtBolnrxFnU9TueSsZBqupW vEmBivFrKynK0QIWtDneByV9NTgFi9cWpGy/emJ/0qIn8NpLSH4fYa6DWOoxJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIdJ8NWKT1/MzzEUxrfj7F+AH/K7HbdovFdaKeSFvl4=; b=l3gI3HfsGzpuJvg2Jo4J8m/gIoLDffmJq5/HFVhBTcrrQpT5AcwhmFegaJpwkZztPYbvxQ moRMpJj+Sw86y6Qkt4JNZMmMbhKJGotvdNWsm5gK95nKe2WLyTjfR52F496dvH963ebOLk Johq8p6JMK8UYNIZLcUyr4Axi7tdocNxRM81Ox6TEF0FjsRKqvT5ZZoJfg4kegMAsG9IyG yYtuGuIgV7v0GfDjFHSpqD5w9DyYHG1JJUUxZrppS6xrgbd6exhf6LCP7OMDKgDPMWb5UM D+Lv6j3fOeCxT+s8dX0lThQ0mpFTrio9uwQyXiS8bD+WXGoNwZA19DGdtmcx7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729515166; a=rsa-sha256; cv=none; b=Wpd0Qny/mlQ/CYA4850x1KPWMebynUcCRCcJbI/LaBg3WAoSnhJqA1ifVw389HjZAVPQQi XHIASA7hivEYOqN9STk8eOeN7ZrxAdke9NbNrAg6+vPD96YZdzznKTcFBbzVWidnA/TM+1 6QdYhCXbA+V9QTsel0nq1RL5hW5XOEPdQCwQQWXHk9gt6vu+BWocdkKlw2VxSuahIDLcNJ nqsCWT8kf9t6cyfxjINJAB5yikci6to4h/xMwm0HBifQhMK/tXwO7Yk99iSYg1bY07/pr3 lKwNcJ60ZAmD57row+bIRAo5eghppAzDg7pAgArgwVZbAPkTCdXkJAMVcx3YQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXFb251yBzWxp; Mon, 21 Oct 2024 12:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCqkIK003710; Mon, 21 Oct 2024 12:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCqklg003707; Mon, 21 Oct 2024 12:52:46 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:46 GMT Message-Id: <202410211252.49LCqklg003707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: d261971e7d58 - stable/14 - ping tests: fix for scapy-2.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: d261971e7d58dcdd28bb18fd768ff028d90a6b9a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d261971e7d58dcdd28bb18fd768ff028d90a6b9a commit d261971e7d58dcdd28bb18fd768ff028d90a6b9a Author: Kristof Provost AuthorDate: 2024-10-16 07:57:06 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 12:51:36 +0000 ping tests: fix for scapy-2.6.0 Scapy 2.6.0 now appears to parse the IPOption during construction, and it then gets confused at a single-byte option. IP Options typically contain at least a 1 byte type and 1 byte length. Avoid this by just returning the raw bytes, rather than an IPOption object. MFC after: 1 week Reviewed by: Jose Luis Duran Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D47151 (cherry picked from commit 2926c2594249f64fecbbdcb0b0b9a3591931ab04) --- sbin/ping/tests/test_ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 3c66e6c54c4d..8ec0f3dc74dc 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -113,7 +113,7 @@ def generate_ip_options(opts): options = sc.IPOption_SSRR(length=3, routers=routers_zero) elif opts == "unk": ToolsHelper.set_sysctl("net.inet.ip.process_options", 0) - options = sc.IPOption(b"\x9f") + options = b"\x9f" elif opts == "unk-40": ToolsHelper.set_sysctl("net.inet.ip.process_options", 0) options = sc.IPOption(b"\x9f" * 40) From nobody Mon Oct 21 12:52: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 4XXFb35hcFz5Z127; Mon, 21 Oct 2024 12:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXFb33tsxz4NGM; Mon, 21 Oct 2024 12:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zzNP8GViXvc+8FmXURGCMiSaJ16aTtZ0zjuKNRBKkUY=; b=ikJmUjik93lk7zVhBLGKXozrzlNIFzr0e6sAZVis+nJrYLqM9vGpIaaJt6VEXAtu5Zcqbn GyVAg4/40H5akdqLCIMjD1y75f5pS2BYJsxV1FcNWGUzJ/79G3EzLqaH5fJ0u6kwdrbrjw NGFxEecapOW1c0gNwAM4++FzRkd+zPXlWJBSrBKKCUetPWYSHOyl3ks2s15vYfFyIldG1m vkz5CC6ZYvsjOMDKqzCGJTCW54skWxMu7qbIIvD8ZeytaH2dVggTmHWs/ELTvVWGkFrraj 0WMIojSaqG3qNnqNRT8AyJuy3wrlUdF06Ffoc52FwiUB3+HV2IC/GjSEGisTpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zzNP8GViXvc+8FmXURGCMiSaJ16aTtZ0zjuKNRBKkUY=; b=gk000BZwNwbNVykF+xjGZQ7/2lDgEO3SvpJP2mfcutfUnGUOIGN3ehWaDTYMMTSICb1wo6 gkFMTTHGjyJQ81XreBy7vQ123XmJmrZVt7Farn97TRx81MQrf/I13ugCPzAVlgY6yrfDZ0 mMUBh/3i7FfD5CSe3/KTCk3uIV0EX+zLRCczl6EHyH/krhDEZOdPac+5HlLmhHHx3FyTjq TZ1w/mVRI1Pxeh+LR74LxACQHc1PpCDWfisZBqvYK9zBBD6lHPzBms/TMSv+Zvirj0PEao fHmTEsVdRHaQ9QKCLm8kxn7peZ8S+mZBV75/QS1GskpmeZ8iuszEen8ugR8maA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729515167; a=rsa-sha256; cv=none; b=HMLQbDWVZgLcL+cROpIa/KKchmm3jLXW2iZNXUa7xuFcupmXDxVUlleUzcF0SrCVoSnJpn qBMLNBgfwkFPgx9OyM15jQEOkfxZPaXd0jkv1g6/It+UqRVcWnI2pTNslxW36ix3prZJ4s n/thboKV5CxpF7Y89zBHcrgWden9nyu7iysV7lAJtkyd4tiMuOyDv2AztF20BEupZJE/vz dZAjGHVCK32GMq+pdCnqxeaJ4WYDfcz1NuTYm58PrOFWzRQUsfD8pPOwZv40xo4J/kWTlf myjtLl010idyrWRE4dOYvekUe1okU8OjyC51dKC9mO/s4Yf1ZMD9PSXosZAEGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXFb33Rg5zWBB; Mon, 21 Oct 2024 12:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCqlGj003771; Mon, 21 Oct 2024 12:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCqlpI003768; Mon, 21 Oct 2024 12:52:47 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:47 GMT Message-Id: <202410211252.49LCqlpI003768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 667fd3bf5729 - stable/13 - pf tests: disable epsv for the ftp proxy 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 667fd3bf5729a3efbbeabe1d52599072f69ec38f Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=667fd3bf5729a3efbbeabe1d52599072f69ec38f commit 667fd3bf5729a3efbbeabe1d52599072f69ec38f Author: Kristof Provost AuthorDate: 2024-10-17 08:17:10 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 07:34:49 +0000 pf tests: disable epsv for the ftp proxy test The update to py-twisted 24.7.0 broke EPSV mode in twisted's ftp server. Work around this by disabling EPSV (and thus using PASV). PR: 282154 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 9cd6ab45a44607ea862c8bbb2ebaa8a7521178ff) --- tests/sys/netpfil/pf/proxy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/proxy.sh b/tests/sys/netpfil/pf/proxy.sh index b112001ef2b4..78ce25930c04 100644 --- a/tests/sys/netpfil/pf/proxy.sh +++ b/tests/sys/netpfil/pf/proxy.sh @@ -74,7 +74,7 @@ ftp_body() # Create a dummy file to download echo 'foo' > remote.txt - echo 'get remote.txt local.txt' | ftp -a 198.51.100.2 + echo -e 'epsv\nget remote.txt local.txt' | ftp -a 198.51.100.2 # Compare the downloaded file to the original if ! diff -q local.txt remote.txt; From nobody Mon Oct 21 12:52: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 4XXFb405rbz5Z128; Mon, 21 Oct 2024 12:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXFb36TyJz4NJk; Mon, 21 Oct 2024 12:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaBCCleb0JQJFttqcQ03rtofOWJnbdKZD6hoHAovVFs=; b=OXuwvtwMfYyspMh/IhyW68grfXguN/FZ76pK3pPZX3WyfKmvmhJRkaGehAnswvWANkVK4P BiVpGeK5IjIpuLuVI1qpQJ+uG7YGc63kGdyy2UQo/aSElXwxm9YJMgRnZ/vGyTJhybJecT xZBu+bvntQ0kENmLyw7drwG6ZJn8HPuiNueuKwKw1DqT0tkFOrw2THhAceRuklMWyTvWqf Iy81b0+/PcYUwOxEIw4OOH+y/r7uajCNJtcY9kCwz+UbJHwdhqpTub1hzJ/1mNtt+7TiMT jV9h98W1jTvsdVtyDXhhyTq1gKnQcJjOHt0QOzwl832wd09gFZuDfsl7gQBf+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaBCCleb0JQJFttqcQ03rtofOWJnbdKZD6hoHAovVFs=; b=pn5OGYTlWo8LwnQahA9OvKb9sgIwKn8tOtFagUR5kPfuW4dLdXbNKSyF3XSljnTWNtTuxi kX2PMQ5b74UtC/ADNJ1lF4ptCUvM53Dqs9rcDU3HncYWcjFu5n6gEIjh8+OWHmV2zjimcV lOhTKhSX4uIQERpKN8z2SPD4C2EwiiJ558+z++e5GT+LT0TtXDxEqEs89gOyJBk62EfXiB U+aYs/HB2wmTsTUbfzw2yuT+gImSoEKpL7dMtPR1NfQeI2tTCTAAihFf9kF1uPdqMZK+uv VpOlXf5aHMgoOoRTPe1vpx0flnVBgUuxtnyC9c0n4ZHR8mCyaHTurYIDRCFJCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729515167; a=rsa-sha256; cv=none; b=au/9y0j5n9C8ef1/Md8vCTiXXbS670r74AYrAmunXO8dUIE78STWM35wx12XpK3ZV/T1du dS/MaLr24ijqIJwxBAFcdWGN7+WSSMN2WWt6eWkqj9xnamyqQK3CcfSqCxyUsK3V1I6Yp6 cL4ZbXFkWICQ9cUHjKQjUekeaxfELvOyN5za5KCuzBGq7rohSKXolk7w+VY/fHtrs/S3uU yTrTwajISLrA7/0LlpIdL//okTAop8U5ZIjQSiKhARhri5RiNbgY3GItMA7/q7eVJxHkBJ 2ra0aSw8Ww61joxvr8EzdnUn2r0ICCmXStDRPcI3g3ucArsvyUAhtk/X2KkLdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXFb3648YzXDj; Mon, 21 Oct 2024 12:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LCqlND003825; Mon, 21 Oct 2024 12:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCqlij003822; Mon, 21 Oct 2024 12:52:47 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:47 GMT Message-Id: <202410211252.49LCqlij003822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: df88800a03fb - stable/14 - pf tests: disable epsv for the ftp proxy 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: df88800a03fbd5540d6862d1bbc2947c1abea2e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=df88800a03fbd5540d6862d1bbc2947c1abea2e0 commit df88800a03fbd5540d6862d1bbc2947c1abea2e0 Author: Kristof Provost AuthorDate: 2024-10-17 08:17:10 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 12:51:36 +0000 pf tests: disable epsv for the ftp proxy test The update to py-twisted 24.7.0 broke EPSV mode in twisted's ftp server. Work around this by disabling EPSV (and thus using PASV). PR: 282154 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 9cd6ab45a44607ea862c8bbb2ebaa8a7521178ff) --- tests/sys/netpfil/pf/proxy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/proxy.sh b/tests/sys/netpfil/pf/proxy.sh index b112001ef2b4..78ce25930c04 100644 --- a/tests/sys/netpfil/pf/proxy.sh +++ b/tests/sys/netpfil/pf/proxy.sh @@ -74,7 +74,7 @@ ftp_body() # Create a dummy file to download echo 'foo' > remote.txt - echo 'get remote.txt local.txt' | ftp -a 198.51.100.2 + echo -e 'epsv\nget remote.txt local.txt' | ftp -a 198.51.100.2 # Compare the downloaded file to the original if ! diff -q local.txt remote.txt; From nobody Mon Oct 21 13:33: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 4XXGTk1yJbz5ZHww; Mon, 21 Oct 2024 13:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXGTk1RtWz4S97; Mon, 21 Oct 2024 13:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729517594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZWFu6Wj9CplePIr8FYkwHKOEd1FZ1hfQI+K65pCzyLg=; b=J1Jy0NVotxsl+aLatcAzG6uA5bauGSbsNMPtupcVvS8Ot+fPKFEIMuzvw9U9TXvPPjy/fL vqg0P/WVzZnPtqG8vVRSCtP4jvd1HLZ3pQsW3NcKreN9rqRPSIAbJbux/fxSVNQKGkhKHz e5IkRBgvJrLNDY5/yPsZIFz+D5DhMDY6fe7n5IbYqFUKoB7Y9UWP6vgUql4yMQ6rz78pMk AgCqm0FUKxPdQTWg6KrVbHckwwPIuTyfsEWJGhMqFk15K3z9hx6egklpjKjp+GCGv2p0q1 5EmgtE0bd8+vxe94dNjIXl5YLlmlvwkGlUAS+nwV4FSpzgIOXZbDFnIlO3307g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729517594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZWFu6Wj9CplePIr8FYkwHKOEd1FZ1hfQI+K65pCzyLg=; b=SfDBLYPTmm+S4UbTTHPqsaRmht7t8VryZdVlQoDx5EWm2mdQb5odqURE5pDBR++qspF4fu i/v4WdInAvdKqc+9EZ53vltfNxln1JBmonjyjdTOAE4F9TttUt3kjEk11hB74HpXofHOM4 oe/NFivOYLzfTj+P0fXaYVnOxmMjcO3ZGcniNuTvBoIkEWXYDNza0i3JzEkZdUEB1eRcap hgBLFLNiiIpkOftJFBOv0y5nhzjQ/N0CKJNOWawpgL/5ElveLq1SIjguecedpYjd/5ur8f WJ0/zf4g4bjjbOLeHcNoFt5SsWUhPWm71nUeI5venwGqzGItSSasjXBcyEngWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729517594; a=rsa-sha256; cv=none; b=mKnIDJS0RYJKl8Hn3kFRItGjcqTIF1QmK3hJ6uGUNdJJ620ssaYpGInJ+GxAzq+Boq9B9k kKYbKEHTOEhYfXlMWRFsQbA/Hy+UdetiGA36hXHe8ByatYjaYgh4kMlJ6aPz2p7tEc34zs 0q3ejiSFpdGXBwqkO4t7JmqYek2G/siVBOy8JvGEOebn87teYk1dG4wXCakljSNBqryZMr UpxBOhX+11iyRmAtY8ITzsDoGpzqN/RR4rK73EyXAoJi7DI1XGf+FbAIY21nL/QXbOyski +muvln50uLYtVX1QFmxY8INPUSWd7VXr1x/R2z8I2/NmNuVgkYKCd60RJka1Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXGTk134bzXfn; Mon, 21 Oct 2024 13:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LDXExj078828; Mon, 21 Oct 2024 13:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LDXEKq078825; Mon, 21 Oct 2024 13:33:14 GMT (envelope-from git) Date: Mon, 21 Oct 2024 13:33:14 GMT Message-Id: <202410211333.49LDXEKq078825@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: 5fc343791566 - main - vm_object: Assert that managed pages are on pagequeues when freeing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5fc34379156678ccfd0b4fe0ca4397b420174236 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5fc34379156678ccfd0b4fe0ca4397b420174236 commit 5fc34379156678ccfd0b4fe0ca4397b420174236 Author: Mark Johnston AuthorDate: 2024-10-21 13:25:21 +0000 Commit: Mark Johnston CommitDate: 2024-10-21 13:25:53 +0000 vm_object: Assert that managed pages are on pagequeues when freeing Reviewed by: dougm, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46945 --- sys/vm/vm_object.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 83d6b709e277..5ce21a683541 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -895,6 +895,9 @@ vm_object_terminate_single_page(vm_page_t p, void *objectv) ("%s: page %p is inconsistent", __func__, p)); p->object = NULL; if (vm_page_drop(p, VPRC_OBJREF) == VPRC_OBJREF) { + KASSERT((object->flags & OBJ_UNMANAGED) != 0 || + vm_page_astate_load(p).queue != PQ_NONE, + ("%s: page %p does not belong to a queue", __func__, p)); VM_CNT_INC(v_pfree); vm_page_free(p); } From nobody Mon Oct 21 14:03: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 4XXH886L8zz5ZKHl; Mon, 21 Oct 2024 14:03:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXH885qKKz4WG2; Mon, 21 Oct 2024 14:03:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729519384; 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=aiSGXcX54+0JjgIHM66pk28jveXuU6QamXkxlxlaouU=; b=qToG6nyARRqcbg9+yjqsdPAVR7H/nZKXEdG0Pay/Za0Z+JnKgKibv/UtFpMwBZ1/OfeAW5 SaWYXr0udCyKZm9Dpv3mkELoV4ZzIFfbWRzCnx6u4dX0711IQrqUvsN/9sbucuDiHvfQJf 9iCZL5/kj4Lxu5hZ6+pqG1Wp7gSR1QVDU4v2/XoOJjM3cn2ceDzPqZBfoOiTFXjavTYkCZ y8hiW0I888Xy3Cv3m8OcBv+85J0bLXN7yLMwVLFq7A+Xz15dX3v/vghVMPYPIVnCYy2VBr 0xq/SPfiCQ4zm7ZA63Ei2R2Xua6uB7wW2OAxlzXnEA0oI0bIYt0RH0ozRsoHDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729519384; 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=aiSGXcX54+0JjgIHM66pk28jveXuU6QamXkxlxlaouU=; b=h6+h8HRv8mhkkkcRRbEr9crQoXrcDxnvJxDz58ngp5eS3PFsMwd+ItT0ea7yZSVygm5bHg vXAWCPqHr2r4msfwNCj4MNPl0aD7ZXQ6Cby15GTdfIcuKk0f59emB4M7cLE7hPkn/TQFax beFxUbNCYcOacjR0GuqX+eAP51EEzxYZ9nNeL3yQOOejPz0xjjioK1kXuqA2fnuPyOMhJY ZSdQImyWbDRnkVI8QexZJkoaxqdy15SWw7wewRKy0QfKdCaXN9Cn1YO3FFVsv3twJP7Jgg t8EackQYF1Ag91UJCP3aoSoYVwOqt93AZ/iItTS876TbjREZXcI55pFSH6tUYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729519384; a=rsa-sha256; cv=none; b=MGVMC7BsmVQBjulmNYMUq+lEEn+VclWKTkb3mx6uIYi9DdyFZz7Mu+zbPGZ8Pu5xpD4wGn 2JHFfnl03VXz59Covg2Db2AG51YO3/8fDP2R2PjLjc5G4QEFHh5GgjNfE+UibpkDFxsL38 QD89uIqaClHLqh6T6kFVMHJg6TtHwVZuB/rK+LNFt8oAADlrIq2crxX+2iPp7CcsbxSplG cWovtXh/0FbmNMuz5bQm/TqdE7vF44tJ+1WwNiHHGH7Emqr8kdB90fZwsDxhzktDcCRh31 hrPXl9XKaG4fweveILpJ4BH7D2lQQ02l9ZS6r2bSSYhCXxGgi4+d+8FdTCY2nQ== Received: from [IPV6:2601:5c0:4200:b830:f8e2:d9f1:55af:c410] (unknown [IPv6:2601:5c0:4200:b830:f8e2:d9f1:55af:c410]) (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 4XXH883wbWz10XF; Mon, 21 Oct 2024 14:03:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <1e519577-35cb-499e-8e41-57d93f78f8ee@FreeBSD.org> Date: Mon, 21 Oct 2024 10:03:03 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f4e35c044c89 - main - bus: Set the current VNET in device_attach() To: Konstantin Belousov Cc: Mark Johnston , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202410191304.49JD4JoM084001@gitrepo.freebsd.org> Content-Language: en-US From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/19/24 12:10, Konstantin Belousov wrote: > On Sat, Oct 19, 2024 at 11:36:32AM -0400, John Baldwin wrote: >> On 10/19/24 09:04, Mark Johnston wrote: >>> The branch main has been updated by markj: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=f4e35c044c8988b7452cefbdcc417f5fd723e021 >>> >>> commit f4e35c044c8988b7452cefbdcc417f5fd723e021 >>> Author: Mark Johnston >>> AuthorDate: 2024-10-19 13:03:56 +0000 >>> Commit: Mark Johnston >>> CommitDate: 2024-10-19 13:03:56 +0000 >>> >>> bus: Set the current VNET in device_attach() >>> Some drivers, in particular anything which creates an ifnet during >>> attach, need to have the current VNET set, as if_attach_internal() and >>> its callees access VNET-global variables. >>> device_probe_and_attach() handles this, but this is not the only way to >>> arrive in DEVICE_ATTACH. In particular, bus drivers may invoke >>> device_attach() directly, as does devctl2's DEV_ENABLE ioctl handler. >>> So, set the current VNET in device_attach() instead. >>> I believe it is always safe to use vnet0, as devctl2 ioctls are not >>> permitted within a jail. >>> PR: 282168 >>> Reviewed by: zlei, kevans, bz, imp, glebius >>> MFC after: 1 week >>> Differential Revision: https://reviews.freebsd.org/D47174 >> >> Hmm, there was some other review I thought that had a completely different change. >> That change removed all the vnet stuff from new-bus and instead handled it in >> if.c. Specifically, that if_attach would set a default vnet to vnet0 if there >> wasn't an active vnet at the time. See all the discussion in >> https://reviews.freebsd.org/D42678 which has a patch that I think is correct >> in the comments. >> > In fact, I think that bus level is better. At least, I know that detach > also might need something by vnet (e.g. mce(4) needs to clear the IPSEC > offload database on detach, although it still does not do). During detach your ifnet has if_vnet and it needs to use that (and only that, not vnet0). new-bus can't know about if_vnet so can't set curvnet correctly. -- John Baldwin From nobody Mon Oct 21 14:26: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 4XXHgY2Th3z5ZLWn; Mon, 21 Oct 2024 14:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXHgY1ss1z4XLZ; Mon, 21 Oct 2024 14:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729520809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjuLxzWgWqr7rKwZAtAGD+RiZpfuBSaPfCfMNsb8UQ0=; b=K4vi3MlXBtHuyZFmowxoi0CoTBzF4z4qGl1zBV66vLHeZAikq+WPYCWDBCKi6zOR2FLJmS DJxm6w8P4OOFyGB/0eWtefF1QohgsLQBh8mH7otJ01lsk54I/sDDcD9oWVJGVIHqYQ+LES EiWIWgrWlbZI1FQ24Q1JRVsbFVHL5SZhD+M1xSTCywcf7WWEPtRH1pqP2lHJFIQydfTR2K eInP9/esSTtxwIoNKO33VNSbeXXTUD3fD+dnx8q57xa20ozu2ZFTlknicyNAo6UJN5OvX4 NdYc839j3G29ItUvAvZAByB5B+hjRKa9o841hWIJlYpxVlYhl51AX+Ve2zFFrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729520809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjuLxzWgWqr7rKwZAtAGD+RiZpfuBSaPfCfMNsb8UQ0=; b=l+atofYmKgglhrxpwNJ8KWbEoA41IKiwp9AiEqwFb/QGTXqekqpq1wT17dqdAu9hJc2gpe aiqDK+rvJvQ5UmKJ7+SSzlJ0QHXBbUII3r7/YfqZ7sI3t5h5IhPAAny8aY2/HOqAOQdGzF 5P7lovI8o5I7X/q1Z9vjQVXrnshqgwubBcdNdNKgL0236leg6DW1hRuBN1o2UbXUrFrEtu YDsFvtX4+lLmzQ5DbTVEYAqfa5kgS/+A9MXPH/bJaKWskYTm81c0CInuNJupt6hsRZ4xt+ bx04qbnpxPWs4EGDdSIqUI0HzzIF5AdN9Pm3WWfM4pBudaDl4PUkT1xXCc5YRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729520809; a=rsa-sha256; cv=none; b=gHSpKXWcyT227U/W9yGjcGMtyW4DOORifoItw+H+5AMEoQN99J8SdXptQm9poze2bTIbN2 aLnVLkuGjrbG7Nc0ecs3tVLLimM9Q9Li9ctanUUWsJqkXr2nsSQuzCcZGlfG+t4hfTRgap TblPiqodfPxtAS9prh2Uo81ICFg2Qm2PjiFW2qhFYZpgIeyc1+tPtAXw/Qz4SFgSesSXKG JsqA82VsfTlGtPm8nwdwvWwrtIIAfE+qGAiYzgVztvJel20Bwy29A6TCuLQiuJ7hnw15Qp aqiBqxvML+mOkyMveCzYJ8K8uzSsPtaVJCHFMjsYfWNTGKYaOlP1m187s4/OZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXHgY1M1VzZM0; Mon, 21 Oct 2024 14:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LEQng9071840; Mon, 21 Oct 2024 14:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LEQnjR071837; Mon, 21 Oct 2024 14:26:49 GMT (envelope-from git) Date: Mon, 21 Oct 2024 14:26:49 GMT Message-Id: <202410211426.49LEQnjR071837@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: ce968b095e75 - main - cpufreq: Use a real device_probe routine List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ce968b095e75262ba3605491acf6850ce331481d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ce968b095e75262ba3605491acf6850ce331481d commit ce968b095e75262ba3605491acf6850ce331481d Author: John Baldwin AuthorDate: 2024-10-21 14:24:15 +0000 Commit: John Baldwin CommitDate: 2024-10-21 14:24:15 +0000 cpufreq: Use a real device_probe routine cpufreq doesn't have any child drivers, so calling bus_generic_probe was a nop. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47184 --- sys/kern/kern_cpu.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c index 23256f37a3f7..1b55ebf0738b 100644 --- a/sys/kern/kern_cpu.c +++ b/sys/kern/kern_cpu.c @@ -97,6 +97,7 @@ TAILQ_HEAD(cf_setting_lst, cf_setting_array); printf("cpufreq: " msg); \ } while (0) +static int cpufreq_probe(device_t dev); static int cpufreq_attach(device_t dev); static void cpufreq_startup_task(void *ctx, int pending); static int cpufreq_detach(device_t dev); @@ -116,7 +117,7 @@ static int cpufreq_levels_sysctl(SYSCTL_HANDLER_ARGS); static int cpufreq_settings_sysctl(SYSCTL_HANDLER_ARGS); static device_method_t cpufreq_methods[] = { - DEVMETHOD(device_probe, bus_generic_probe), + DEVMETHOD(device_probe, cpufreq_probe), DEVMETHOD(device_attach, cpufreq_attach), DEVMETHOD(device_detach, cpufreq_detach), @@ -141,6 +142,13 @@ SYSCTL_INT(_debug_cpufreq, OID_AUTO, lowest, CTLFLAG_RWTUN, &cf_lowest_freq, 1, SYSCTL_INT(_debug_cpufreq, OID_AUTO, verbose, CTLFLAG_RWTUN, &cf_verbose, 1, "Print verbose debugging messages"); +static int +cpufreq_probe(device_t dev) +{ + device_set_desc(dev, "CPU frequency control"); + return (BUS_PROBE_DEFAULT); +} + /* * This is called as the result of a hardware specific frequency control driver * calling cpufreq_register. It provides a general interface for system wide From nobody Mon Oct 21 14:26: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 4XXHgZ4TMNz5ZLWp; Mon, 21 Oct 2024 14:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXHgZ2lxcz4XlC; Mon, 21 Oct 2024 14:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729520810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m/hCSIJne5ht09ud648DlLE2qItNEw4Bemo2RDGqGH4=; b=J9RUCfmzQ4zLTrcrLNp/ab9rnpBfsH03A/Q04u/OAAf0jMuq1CKjDWiuOqvMr3JaQZKios qcIylrQ6Kl11OwQCVTPWSiRTh4uQN5CQ6NabiR/4X79AmGK9QMv0B/7VFIeX26YrlXmfXm e7RDDOtvKvwzGw0GSPF4Tq4InEc53AHN3UUfToLGeiPUASbAdXUaci7r5SC8f2E8HTcz8A Norq/T/c3oY3SvN0Voz3vgUJugUt/HsjLr8vq05FMXqXIuGXuNEYgn2wH8xeo/JR+wfdGu X0gfV1A5oI+EkHPi/8kZYg9ziifcXVmbmQnNqh1hpaIbaRuDzFwhkFiVnWJtpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729520810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m/hCSIJne5ht09ud648DlLE2qItNEw4Bemo2RDGqGH4=; b=CUj331K2JWkUmaNwoAhU1IQM10E//Af8H+7Ey6EDswcitmJVTg/keLW+C9fuawUkjq5t// W8Lg8cERqKIcnPjylOiE4eVfMWEn7zB/9FF9IwVKhS/2mzU2HhvxEgLSP0ey356nOTdDiz p5sm0xWjjcz+LcUSujYYTZ0TyIuITT93RNMUY4ITzgRijTNJcddB/hyuKoBi14o7NGUhUP W5C7nfEiAzwU9Yez+pG65biW9EhZArwKneQM/SbT0XJ0GX2vsPFgmjzscKTBdAQr3qtuvz aTaIO0ZBFKXc2y6tTeu+qoqu5KosserYdAaGdKhN2Sqim420KRgn5KuRGxgmiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729520810; a=rsa-sha256; cv=none; b=mS5a2ajSUaHeGYPrlE96zJHZS+RwKUdzB2UudD+qYJnWkcQGfev20C1+qB58W4nNYz8trf Y+jODIaHZsrNpsInxM6WMyeOob+BZT2tBtQ6L7CUqZNOCRwa5CNh6BkSMDoELtPhQhgWsc /RmtvJfJU1yYACLc56CvBJ+PSjfIGC6nxc9TZy5jzeH3nblq6eFE3Rs3pRi1zdLHF7ksLl VFCv360DcWzfLT1c5LgXnqzo+Tyjyzs0EeUZoQkvHZmZ2VVC4UBkKIqz7XGw32vvDPZfm9 eVO4YPHmPRt/IT8fGhub9pk1G8vsD95aaVMVmrMbpE2qxxcsSGAoIztXOFmvtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXHgZ2MPbzZM1; Mon, 21 Oct 2024 14:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LEQojK071898; Mon, 21 Oct 2024 14:26:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LEQoem071895; Mon, 21 Oct 2024 14:26:50 GMT (envelope-from git) Date: Mon, 21 Oct 2024 14:26:50 GMT Message-Id: <202410211426.49LEQoem071895@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: ab4f969f8d30 - main - legacy cpu: Add proper device_probe and device_attach routines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ab4f969f8d305665c478b25d4268501445fa5ba6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ab4f969f8d305665c478b25d4268501445fa5ba6 commit ab4f969f8d305665c478b25d4268501445fa5ba6 Author: John Baldwin AuthorDate: 2024-10-21 14:24:28 +0000 Commit: John Baldwin CommitDate: 2024-10-21 14:24:28 +0000 legacy cpu: Add proper device_probe and device_attach routines Set a device description in probe and handle both adding and attaching children in attach. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47185 --- sys/x86/x86/legacy.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/legacy.c b/sys/x86/x86/legacy.c index 6ece5e085dab..23439a4b549f 100644 --- a/sys/x86/x86/legacy.c +++ b/sys/x86/x86/legacy.c @@ -267,6 +267,8 @@ legacy_write_ivar(device_t dev, device_t child, int which, uintptr_t value) * cpufreq(4) hang off this. */ static void cpu_identify(driver_t *driver, device_t parent); +static device_probe_t cpu_probe; +static device_attach_t cpu_attach; static int cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); static device_t cpu_add_child(device_t bus, u_int order, const char *name, @@ -281,8 +283,8 @@ struct cpu_device { static device_method_t cpu_methods[] = { /* Device interface */ DEVMETHOD(device_identify, cpu_identify), - DEVMETHOD(device_probe, bus_generic_probe), - DEVMETHOD(device_attach, bus_generic_attach), + DEVMETHOD(device_probe, cpu_probe), + DEVMETHOD(device_attach, cpu_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), @@ -330,6 +332,21 @@ cpu_identify(driver_t *driver, device_t parent) } } +static int +cpu_probe(device_t dev) +{ + device_set_desc(dev, "legacy CPU"); + return (BUS_PROBE_DEFAULT); +} + +static int +cpu_attach(device_t dev) +{ + bus_generic_probe(dev); + bus_generic_attach(dev); + return (0); +} + static device_t cpu_add_child(device_t bus, u_int order, const char *name, int unit) { From nobody Mon Oct 21 14:26: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 4XXHgb4M0Rz5ZLHQ; Mon, 21 Oct 2024 14:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXHgb3bMdz4Xp9; Mon, 21 Oct 2024 14:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729520811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WNqAHntKagFbrmC+OsXooTu8O/AKUCeLdtQcUO+wvxo=; b=JPldClDdpJb0Pg73KXYSLQaiESlllZFkkppHhIJm6EN76daOwj95FIoD9WTM8nJzdcGFOg afO0H/3lXNpZ/ZZREl+yecu4BD587SF0zH512Bqgl1JezC0hzk+3Y0vBDyOD3qrxVMEwU/ 2zs/xHRe+LoaMGPO7IA8nouo1RXPSicP/EwD8xrTzvj95ZbL67KYxMRLR4ySndPNgw7Di1 2vQZt7dIWDAA50y2Q1KKztTFlbkXO8Xu2BxRbnA01m91hgwOV/b+1xIjSWigziRKwowaHI N0jnOQbu24DAlb3I8UqvhH4iNowPY7eKLLlCX+YFFMxITv1LLjPw94Bz20Taiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729520811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WNqAHntKagFbrmC+OsXooTu8O/AKUCeLdtQcUO+wvxo=; b=mZoJ1soiANbqA9+XiasyXVd+Vgs79iMe8cIw3JjMMXNuCUwScU7EzNBJ1Fw0VFQ+KIiWfj jbj6jVAvyRcYKjJr+qKcV1J9xB2vQilWFRPUtg0k93TC/tsVsT2oEkeWO1ZgPEuT9/mByh YaHOY8DMjUAV2SHYW/o+puknzBBPMQ+BKUtNZQi1v/cARK2qr8zKB+0Fl+xGA6TtD5BiNN 51Lm650t2m5VjGMsfo05at3grVKj9PopgZJ+KExj+wMR45lENa1ASo2bHExpirPU6uggSw ofmgg0QdRxlHpg0N3rIuAxlLo4zvnU/h1c9PzMfTIwjv/HYK6RW6/B9P+wFzwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729520811; a=rsa-sha256; cv=none; b=TqDe/oJCB0+8hvgoXui6AB/hpEUbd5evwdF2mE7PYKMAWHDTJMil+CoWdP8hDVI9cZj7cu 6AxSTEimFV/J9lLEVWV/JcfRB1U2yQva8yJ0/cICuIoilLpi2d8B/vJnwGegonDjFlLjPo /rbCAoU75x0OiCHMcYWPfcn8Q0rkmYT3EDHwLpYFNvlQX9DSse7GCh7UjWMSwOfOqMTbxQ cnn61IhcD0mLSPM9vevrcxaqSdNJCfQ77eE4+kIs+mbGzK2LKYX3o44l6aaEE1b7sh6sUg 6vq50RI4kbc0qVBt24+jZB4yqv7HCYU56Ly0rMGH2SaOkI/SUS10+71+2REOOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXHgb343XzZ9Y; Mon, 21 Oct 2024 14:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LEQpI7071948; Mon, 21 Oct 2024 14:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LEQppj071945; Mon, 21 Oct 2024 14:26:51 GMT (envelope-from git) Date: Mon, 21 Oct 2024 14:26:51 GMT Message-Id: <202410211426.49LEQppj071945@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: 5201decc8b43 - main - Use bus_delayed_attach_children instead of its inline 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5201decc8b431a8f4f53efb8db5fc452557de68b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5201decc8b431a8f4f53efb8db5fc452557de68b commit 5201decc8b431a8f4f53efb8db5fc452557de68b Author: John Baldwin AuthorDate: 2024-10-21 14:24:39 +0000 Commit: John Baldwin CommitDate: 2024-10-21 14:24:39 +0000 Use bus_delayed_attach_children instead of its inline implementation Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47186 --- sys/arm/xilinx/zy7_qspi.c | 2 +- sys/arm/xilinx/zy7_spi.c | 2 +- sys/dev/iicbus/controller/opencores/iicoc_fdt.c | 2 +- sys/riscv/sifive/sifive_spi.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c index 81ceb79e2bf6..c033fd29a7db 100644 --- a/sys/arm/xilinx/zy7_qspi.c +++ b/sys/arm/xilinx/zy7_qspi.c @@ -603,7 +603,7 @@ zy7_qspi_attach(device_t dev) zy7_qspi_add_sysctls(dev); /* Attach spibus driver as a child later when interrupts work. */ - config_intrhook_oneshot((ich_func_t)bus_generic_attach, dev); + bus_delayed_attach_children(dev); return (0); } diff --git a/sys/arm/xilinx/zy7_spi.c b/sys/arm/xilinx/zy7_spi.c index bb21ca6eec43..a24ce542a860 100644 --- a/sys/arm/xilinx/zy7_spi.c +++ b/sys/arm/xilinx/zy7_spi.c @@ -439,7 +439,7 @@ zy7_spi_attach(device_t dev) zy7_spi_add_sysctls(dev); /* Attach spibus driver as a child later when interrupts work. */ - config_intrhook_oneshot((ich_func_t)bus_generic_attach, dev); + bus_delayed_attach_children(dev); return (0); } diff --git a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c index 4220b0798398..2423d2b87272 100644 --- a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c +++ b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c @@ -127,7 +127,7 @@ iicoc_attach(device_t dev) } /* Probe and attach the iicbus when interrupts are available. */ - config_intrhook_oneshot((ich_func_t)bus_generic_attach, dev); + bus_delayed_attach_children(dev); return (0); diff --git a/sys/riscv/sifive/sifive_spi.c b/sys/riscv/sifive/sifive_spi.c index e5e1e60223e9..486cf4209c10 100644 --- a/sys/riscv/sifive/sifive_spi.c +++ b/sys/riscv/sifive/sifive_spi.c @@ -346,7 +346,7 @@ sfspi_attach(device_t dev) /* Probe and attach the spibus when interrupts are available. */ sc->parent = device_add_child(dev, "spibus", DEVICE_UNIT_ANY); - config_intrhook_oneshot((ich_func_t)bus_generic_attach, dev); + bus_delayed_attach_children(dev); return (0); From nobody Mon Oct 21 14:54: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 4XXJHQ7369z5ZNKt; Mon, 21 Oct 2024 14:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJHQ6GsPz4byh; Mon, 21 Oct 2024 14:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729522466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DcRIhFEK63TC/5u99G+XKiUO0KL2guIXGb/1fF0GnE=; b=KS7yFy4C6JBvQdGsC//x2mttkDBW1nf9OPLZuvnXnnf3Ekf/tbYrrRFEbyJnTlb3Yk8iiB +df3Fr1iDWrJdSO3vRrEsrGphB8MERmd7c5hekJA7kMbkwxM4g9Z4Mkt4rtVOoZElwyuRe +x7TXocT80QT1Ya3x/xcPUF69EqNJFAuI0cBbQ0Yr2q8fl9W5mSMIMWH0thcNpCpED25GR 9Yt02nohHSmP+AE4I7le79+yCKd1lPGBDiorQbpNJR0OF00I6yOQWAQ2GUTHFQ6WtMbLpb uOXkt0shODQP6wE53j4v+J6UhduBH6Wo2r3LYpwGDdQBImqjbQx2NcdV9ozf8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729522466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DcRIhFEK63TC/5u99G+XKiUO0KL2guIXGb/1fF0GnE=; b=KcOg9iSGHYK+XYL+AfnT7tYD+in3/Wo9lbiM/ZKfwpPlwGpnbd6N/DK3NyMfAqMUdgElfq iOTz3tEY8gNKYnZalJW2dnPMdYmP6ODCKE/BfdBKJws50Yelp32ZxPIAouzInIINX6htSV siEvG34Fw0GRJghMeH+q/k09Jg5lVwr8bYeBgg42kLEZDq9BGKPYFV+2p8CWC6KLCAJn6/ 0NKMaLUoEXUiFlk5J/oQdQglNlIJAXswBWOCcOtwfGr8ZU9LCYynBSGisKqHqlA1hUoCPo NIN2HcqE4CSfoEOlKNjKttoDhspga5uZ+vDltKZo1YJpBiCkJPr3v/6N5FgS0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729522466; a=rsa-sha256; cv=none; b=kyYA4kCCAi3YA1dsGgxMY1n1R9DZRilwEXKpOGMtwcTcQUEG3oEYOuXmhOWkjafwL4Fy+/ J6qK8JRpq9BHJs6lwScZUJd3wAx8jWCaxTg8WqS3l9wGVKkcdr1HTH/+jomT5PWcAwZTnA 51DK6y4glnud12ibuUaRelnTgLXSDcclGxx9monKwVme+lvxYC5E+RioFNdk1ta+YKyX9v RpFxrPA5NAKxYvgjxJyCo+oSPy/ufacsz3H+ZUcrbxAK7QABcpWengAcVn4QzVoUDW+U/i nSiJByM4/OZmUxZJ0z01+WemH6KaguXM8LJbV4MYwA1x5zVQmsBu+YpIzbo0xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJHQ5mYSzZ0q; Mon, 21 Oct 2024 14:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LEsQVS026065; Mon, 21 Oct 2024 14:54:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LEsQLd026061; Mon, 21 Oct 2024 14:54:26 GMT (envelope-from git) Date: Mon, 21 Oct 2024 14:54:26 GMT Message-Id: <202410211454.49LEsQLd026061@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: 0e3a21196101 - main - ctl_report_supported_opcodes: Handle invalid requested service action List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0e3a211961014e0991a54f583b2866ac19ed0e76 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e3a211961014e0991a54f583b2866ac19ed0e76 commit 0e3a211961014e0991a54f583b2866ac19ed0e76 Author: John Baldwin AuthorDate: 2024-10-21 14:53:48 +0000 Commit: John Baldwin CommitDate: 2024-10-21 14:53:48 +0000 ctl_report_supported_opcodes: Handle invalid requested service action Service actions are only valid up to 31 as they are encoded in the low 5 bits of byte 1 in CDBs. Fail requests with a requested service action of 32 or higher with an INVALID FIELD IN COMMAND specifying byte 4 as the illegal byte. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D46611 --- sys/cam/ctl/ctl.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index da147f0ec914..6533bf98011c 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -7461,16 +7461,20 @@ ctl_report_supported_opcodes(struct ctl_scsiio *ctsio) total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; case RSO_OPTIONS_OC_SA: - if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0 || - service_action >= 32) { + if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0) { goto invalid_options; } - total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; - break; + /* FALLTHROUGH */ case RSO_OPTIONS_OC_ASA: - if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) != 0 && - service_action >= 32) { - goto invalid_options; + if (service_action >= 32) { + ctl_set_invalid_field(/*ctsio*/ ctsio, + /*sks_valid*/ 1, + /*command*/ 1, + /*field*/ 4, + /*bit_valid*/ 0, + /*bit*/ 0); + ctl_done((union ctl_io *)ctsio); + return (CTL_RETVAL_COMPLETE); } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; From nobody Mon Oct 21 15:04: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 4XXJWb0fLkz5ZNvy; Mon, 21 Oct 2024 15:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWZ6f9Kz4f0m; Mon, 21 Oct 2024 15:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b70qfqZW9BN+aYH3DI/xiDY4V4tmdQ75a03wVB/4pcw=; b=WsKO3Hg9yp0siqVAomw69x4WEf8Ukg2pcO6gnyGyZepolMLjq3xCA9iA+83FeuuLrUkmpu KnH7g8wCqkMRbjzYzon8BO43tZKVwFdODbOM5WaUhLMm6pdEFSQ7HCtmvrZpnSkLenuhez z7/WlEz/6GVCoWKaa0yM2mnbxHve8iV38vZWuE5+IOyyF9qspLFlcXfZIDqS3JAAiCIiOT QRbP8gg/CHm8RUTKuzWgMpnDz7OU4oXa+W7iwG/Vd+SQX4MmTz/wJZTBPPogli8Bl/9D4F TGrKgfkI+V6SzbuXIcLbEevkvQE06Ex+2UzC/5Dvcv4yuVPbgPrmyAmL/ZI/kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b70qfqZW9BN+aYH3DI/xiDY4V4tmdQ75a03wVB/4pcw=; b=bOcmtVJE2ztC/4dVMbJXuEh7IpQOnbmehwAqypPgCCZqhO7TgXH9iGt0CX3UFyBMfQN/RO MEnEvEreqG+d/j/W8MWGepugW9gwTtvF0oB9jG3k+hxzT6Ph2C8PWPZdb183236bMpXxEX yoxU1vnw8S6DjbXmY8FEc3MFFaz6uapD0FzQYW6rNh7u7iO2B9KdZHxylQQfm4oxTbmLkv F4szi3ogg4Rfi22RztMN83rDazikyZjTSLUvYIBJ1AuY8Y4q+RM9nubwSkNfDNgonXJ2JG 6aDPoZZvb9jJCHUwXZfrRJwrzVnhEcQPrkVa85F3EEMA/oueSN21/XBFyqHpwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523098; a=rsa-sha256; cv=none; b=hcDF1oru7Id+xq/3CAWG/TNsMmnKx/RPHHpRPcrXCk4GPKF/m5yYB3t7iKdCTsGCNre2Ip I1mkcME52ryymTQNQoEZ7sQPW3QOWdtV+x5e0uCa6McHR7g/MW2fIoNy0xLwnEh+WzB4O3 b6FFKpzQq78J2aDL8T/wYsi68eC8ucO07cfSbKWGl4HYLbHteJ8TMVpIT1bgzLA+ug1k9F ny+mFsn7HxY7Cj6BBdE4SS56zmBj8L8IPFuE9ILiFK3xset9zPdPeARRZYcq0DZ/cKLhkV rd9fbnOtd7zOxAbZRoBKLvjos8fgw+S2ybw75WlhlNPJN1Sqkd/vsW2oxTuaPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWZ69h1zb1N; Mon, 21 Oct 2024 15:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF4wbI046412; Mon, 21 Oct 2024 15:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF4wII046407; Mon, 21 Oct 2024 15:04:58 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:04:58 GMT Message-Id: <202410211504.49LF4wII046407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 11b099f8030b - stable/14 - Add an Armv8 rndr random number provider List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 11b099f8030b4c31af7162b835e7b762b0aa4f08 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=11b099f8030b4c31af7162b835e7b762b0aa4f08 commit 11b099f8030b4c31af7162b835e7b762b0aa4f08 Author: Andrew Turner AuthorDate: 2023-11-15 17:42:02 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 Add an Armv8 rndr random number provider Armv8.5 adds an optional random number generator. This is implemented as two special registers one to read a random number, the other to re-seed the entropy pool before reading a random number. Both registers will set the condition flags to tell the caller they can't produce a random number in a reasonable amount of time. Without a signal to reseed the entropy pool use the latter register to provide random numbers to the kernel pool. If at a later time we had a way to tell the provider if it needs to reseed or not we could use the former. On an Amazon AWS Graviton3 VM this never failed, however this may not be the case on low end CPUs so retry reading the random number 10 times before returning an error. Reviewed by: imp, delphij (csprng) Sponsored by: The FreeBSD Foundation Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D35411 (cherry picked from commit 9eecef052155646fbc5f8f533b952b372572d06a) --- sys/arm64/conf/std.dev | 1 + sys/conf/files.arm64 | 2 + sys/dev/random/armv8rng.c | 135 +++++++++++++++++++++++++++++++++++++++ sys/dev/random/random_harvestq.c | 1 + sys/modules/Makefile | 2 + sys/modules/armv8_rng/Makefile | 11 ++++ sys/sys/random.h | 1 + 7 files changed, 153 insertions(+) diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev index d07ab6c22b7b..42c9fcf03b05 100644 --- a/sys/arm64/conf/std.dev +++ b/sys/arm64/conf/std.dev @@ -53,6 +53,7 @@ device vt_simplefb # Pseudo devices. device crypto # core crypto support +device armv8_rng # Armv8.5 rndr RNG device loop # Network loopback device ether # Ethernet support device vlan # 802.1Q VLAN support diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index fd59014ad461..0fefcca97c6c 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -374,6 +374,8 @@ dev/psci/psci.c standard dev/psci/smccc_arm64.S standard dev/psci/smccc.c standard +dev/random/armv8rng.c optional armv8_rng !random_loadable + dev/safexcel/safexcel.c optional safexcel fdt dev/sdhci/sdhci_xenon.c optional sdhci_xenon sdhci diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c new file mode 100644 index 000000000000..3cca42a5bbf3 --- /dev/null +++ b/sys/dev/random/armv8rng.c @@ -0,0 +1,135 @@ +/*- + * Copyright (c) 2022 The FreeBSD Foundation + * + * This software was 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 + * 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 + +static u_int random_rndr_read(void *, u_int); + +static bool has_rndr; +static struct random_source random_armv8_rndr = { + .rs_ident = "Armv8 rndr RNG", + .rs_source = RANDOM_PURE_ARMV8, + .rs_read = random_rndr_read, +}; + +static inline int +random_rndr_read_one(u_long *buf) +{ + u_long val; + int loop, ret; + + loop = 10; + do { + __asm __volatile( + ".arch_extension rng \n" + "mrs %0, rndrrs \n" /* Read the random number */ + "cset %w1, ne \n" /* 1 on success, 0 on failure */ + ".arch_extension norng \n" + : "=&r" (val), "=&r"(ret) :: "cc"); + } while (ret != 0 && --loop > 0); + + if (ret != 0) + *buf = val; + + return (ret); +} + +static u_int +random_rndr_read(void *buf, u_int c) +{ + u_long *b; + u_int count; + + b = buf; + for (count = 0; count < c; count += sizeof(*b)) { + if (!random_rndr_read_one(b)) + break; + + b++; + } + + return (count); +} + +static int +rndr_modevent(module_t mod, int type, void *unused) +{ + uint64_t reg; + int error = 0; + + switch (type) { + case MOD_LOAD: + has_rndr = false; + if (get_kernel_reg(ID_AA64ISAR0_EL1, ®) && + ID_AA64ISAR0_RNDR_VAL(reg) != ID_AA64ISAR0_RNDR_NONE) { + has_rndr = true; + random_source_register(&random_armv8_rndr); + printf("random: fast provider: \"%s\"\n", + random_armv8_rndr.rs_ident); + } + break; + + case MOD_UNLOAD: + if (has_rndr) + random_source_deregister(&random_armv8_rndr); + break; + + case MOD_SHUTDOWN: + break; + + default: + error = EOPNOTSUPP; + break; + + } + + return (error); +} + +static moduledata_t rndr_mod = { + "rndr", + rndr_modevent, + 0 +}; + +DECLARE_MODULE(rndr, rndr_mod, SI_SUB_RANDOM, SI_ORDER_FOURTH); +MODULE_VERSION(rndr, 1); +MODULE_DEPEND(rndr, random_harvestq, 1, 1, 1); diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index cb01f7b77195..50aa28dc9851 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -386,6 +386,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_PURE_TPM] = "PURE_TPM", [RANDOM_PURE_VMGENID] = "PURE_VMGENID", [RANDOM_PURE_QUALCOMM] = "PURE_QUALCOMM", + [RANDOM_PURE_ARMV8] = "PURE_ARMV8", /* "ENTROPYSOURCE" */ }; diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 45eec38565e2..c7015c61c705 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -41,6 +41,7 @@ SUBDIR= \ ${_arcmsr} \ ${_allwinner} \ ${_armv8crypto} \ + ${_armv8_rng} \ ${_asmc} \ ata \ ath \ @@ -688,6 +689,7 @@ _cxgb= cxgb .if ${MACHINE_CPUARCH} == "aarch64" _armv8crypto= armv8crypto +_armv8_rng= armv8_rng _dpaa2= dpaa2 _sff= sff _em= em diff --git a/sys/modules/armv8_rng/Makefile b/sys/modules/armv8_rng/Makefile new file mode 100644 index 000000000000..29d2907aed06 --- /dev/null +++ b/sys/modules/armv8_rng/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +.PATH: ${SRCTOP}/sys/dev/random + +KMOD= armv8_rng +SRCS= armv8rng.c +SRCS+= bus_if.h device_if.h + +CFLAGS+= -I${SRCTOP}/sys + +.include diff --git a/sys/sys/random.h b/sys/sys/random.h index 0e6ae02ac078..aa4457fc8c22 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -102,6 +102,7 @@ enum random_entropy_source { RANDOM_PURE_TPM, RANDOM_PURE_VMGENID, RANDOM_PURE_QUALCOMM, + RANDOM_PURE_ARMV8, ENTROPYSOURCE }; _Static_assert(ENTROPYSOURCE <= 32, From nobody Mon Oct 21 15:04: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 4XXJWc2GJqz5ZNr8; Mon, 21 Oct 2024 15:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWc0LRZz4dxg; Mon, 21 Oct 2024 15:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yobc1XS2/q2qmLbxS8VIAXuFgKcqR4Uz71Dvdc8kcDg=; b=aY4s+HMrR5cZJz5Ebv66wFxLMKU3GdsDNhqhyTiKZxKkJ4En1wPyEh3HCodb0BdfOY30x5 tzEM3ZzcZ6WDuHuZaYOr4GcNy5fwKnWY8uk+lOhMEWaP8iJgKft14OWtPD7kyxH0Dw/dfa Vw0Kg52PnrE82qrPM6iGfb7KpipH5/11XXFOtLa4MibCpBs8thNy3k5gICDxs0wNld9o5r yRxPtnIt9q7fIi7U9AXjGfofLwdVUB9mcCs6YAfDXwcYAtcSibr5KRiBOocDmSb2+9URya X8N/DHab2keULpH5tfdbTrmnjKsb0RA05ohJIPg5TsK/XuEc2wd0wYeUy/Ck7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yobc1XS2/q2qmLbxS8VIAXuFgKcqR4Uz71Dvdc8kcDg=; b=njipMMI42x+jUvUfMTWH1wu/wNBnYxGa2vS7SPIatJf4EynYiDEPaekeAE2BhFQ/+QqodO ZmwbK+qoyAUF/nYWO0tynUbWyB+MAOLxt15a7aqEAHYA2pvmE8Kgh4j6Dn66hP7LYjSPE0 ipHVyH1avc+1xUt/Xh8klpBMyE4pTfyI8pVQrRVRbOqC89AyhbOwllmOkak52RrkIWuBGn jayGRng8QDKZTQtvq9wVtSDxxiWVMPJuKCt5UF0T2NXcJr+fenpMXGFgt8e32htdFghYeM iJ5Qd7kunmSUku+52qwoRXIjLubxDnCHVq17U+XohY03ymfMIr2Lujfwjd5h3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523100; a=rsa-sha256; cv=none; b=bOKzY/JSivNiQBKUbktIBO8bwY6lXAXfLdRIzQZQe8T5c1HIq5tHd9dlIHFc/oa6H6DI5O /rpheOGKeTUCXSELgPZFc7g4Lv8LtHInSSIn8ZqPJ3ZlTmm14vkL30jgP+RnJ77QauE8ic kmjRoZUZzZ+eRUu+zww7BXOjhiYRh0AYy3zBVr+YBlF6xvy13qjZcIneNoreCbUucCw0ro DJROF/EEN4lq+dstIpDsd3paiZYUVPFmS8P1p8OMffHaBzjhaBEq96aN1K1PGiIjHyIHwz JCxMe2GaKHwscOjY2efh+yqPFecDoD5dBoVh06snUt+X87MqxDmjC57KmaSfFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWb718dzbDT; Mon, 21 Oct 2024 15:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF4xrw046464; Mon, 21 Oct 2024 15:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF4xHv046461; Mon, 21 Oct 2024 15:04:59 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:04:59 GMT Message-Id: <202410211504.49LF4xHv046461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 064adb4ba083 - stable/14 - armv8rng: Don't require toolchain to support FEAT_RNG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 064adb4ba083d00747e3fae6b111545e557ebb1e Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=064adb4ba083d00747e3fae6b111545e557ebb1e commit 064adb4ba083d00747e3fae6b111545e557ebb1e Author: Jessica Clarke AuthorDate: 2023-12-01 23:59:07 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 armv8rng: Don't require toolchain to support FEAT_RNG We have the mechanism in place to support encoding system registers explicitly, so use that rather than requiring LLVM 13+, which breaks our current set of GitHub CI builds. Fixes: 9eecef052155 ("Add an Armv8 rndr random number provider") (cherry picked from commit 9560ac4b638edf688566f576adc65d3654f2240c) --- sys/arm64/include/armreg.h | 9 +++++++++ sys/dev/random/armv8rng.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b96d2223eb0b..e6b5d313a3cf 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2105,6 +2105,15 @@ #define PMXEVTYPER_EL0_CRm 13 #define PMXEVTYPER_EL0_op2 1 +/* RNDRRS */ +#define RNDRRS MRS_REG(RNDRRS) +#define RNDRRS_REG MRS_REG_ALT_NAME(RNDRRS) +#define RNDRRS_op0 3 +#define RNDRRS_op1 3 +#define RNDRRS_CRn 2 +#define RNDRRS_CRm 4 +#define RNDRRS_op2 1 + /* SCTLR_EL1 - System Control Register */ #define SCTLR_RES1 0x30d00800 /* Reserved ARMv8.0, write 1 */ #define SCTLR_M (UL(0x1) << 0) diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 3cca42a5bbf3..61698bfff820 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -59,10 +59,10 @@ random_rndr_read_one(u_long *buf) loop = 10; do { __asm __volatile( - ".arch_extension rng \n" - "mrs %0, rndrrs \n" /* Read the random number */ - "cset %w1, ne \n" /* 1 on success, 0 on failure */ - ".arch_extension norng \n" + /* Read the random number */ + "mrs %0, " __XSTRING(RNDRRS_REG) "\n" + /* 1 on success, 0 on failure */ + "cset %w1, ne\n" : "=&r" (val), "=&r"(ret) :: "cc"); } while (ret != 0 && --loop > 0); From nobody Mon Oct 21 15:05: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 4XXJWd1qv5z5ZNSM; Mon, 21 Oct 2024 15:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWd0w6lz4fGS; Mon, 21 Oct 2024 15:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWEEhdB1PX9iVpYB5N2qhd4dfj7Q/HumZ+3Y0c7ey14=; b=m7fnDVxx2Bi9HlnqzQU6mDnNhFUhOdVd9JfP41EUKN3Q7HVRSLg2fKxUrt47+WgJvikM06 Dug6ic4YVOWeR/RD65OcWEMdj55jlVazz0NV60250+loB1fChliuKqRwYaft7Aw4KOn7mG oASbxh471hTyt9YErCLnUKugxAnG1GPWcqoGB5ZIgazOVgdI5zmby0mAzN6Vp007koZD4+ 1BqVenj3fDJaupPZWKsyopMe7zAJ27+/qyUxN4eK5lqZgcW/FjcmYbfmSOVkalPKKFIkeu rl8/bszhUUgmU5iCwnNQEHVWedMQOTyEmSf9Q6phiAwMa8yxSB0+pWyWoak/LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWEEhdB1PX9iVpYB5N2qhd4dfj7Q/HumZ+3Y0c7ey14=; b=NKPM7CsldwPNHcPx+6JiZyfHDrduKEDlGhX8SAUAs5XlAPpFKa5DaWolW5a9QE8lEw0do8 ET4g6FfvulpizeQNC+B4S3tJpcNgKpY91bMsNEDw4SyMPIKKAJILge9bWYj3Dssm5FvoJG 9SsBeOB1uwL/FMZqJnIAUJxPilL0rMZcZPrre+MDAL8BX4DFmrnxn08GT+M2Z/gUEaSBkq f4hyZbE2uygTAlV/9hoNjcgBhzdbLklf3UG2h5MgaNd/tm6WBNnh36Ce3OQD6oGkZPKZ6+ WDNTHOFVQbjtwMLqfMvL0/984tdT6Vgb04wP4tPHbDyh/x3wB9rZdH7g2596ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523101; a=rsa-sha256; cv=none; b=wgr1DGonqJFCDJLOrVuWIbxJ+GCY3v181y3xtH2tdJao7Fbx3KITSJH684OP7Y0xTJ3/4j aMUiO2YT57gLh5+gKSfibYWwtqu5x+7PdzfwY0CNM90AjwuyH5+HedYhamjewgn5R7EMSH hy5ys1DjRA6WTS9iHTrO5368hBtquOjhyVyJmfFB5ff/bhkh7QmnDsLJFiydurcNqoczmr xgzG3t51/Oha1H41AMAzRbAWu4zMxUHmqkVXq3D9PAGCmxMTk0AZE43766aLOfCtYOGKF3 vlIuP+Iq29dze1KAwUgacj0KzG4+wp7y4bCg5lEUYaIWdR+n8G1wO+zQzLDtFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWd0NRKzbL7; Mon, 21 Oct 2024 15:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5047046520; Mon, 21 Oct 2024 15:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF50Fd046517; Mon, 21 Oct 2024 15:05:00 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:00 GMT Message-Id: <202410211505.49LF50Fd046517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 2f0fe453bc70 - stable/14 - arm64: add CONTEXTIDR_EL1 reg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f0fe453bc7052123aa99f2cbc42981682834939 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2f0fe453bc7052123aa99f2cbc42981682834939 commit 2f0fe453bc7052123aa99f2cbc42981682834939 Author: Zachary Leaf AuthorDate: 2024-05-10 12:47:37 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: add CONTEXTIDR_EL1 reg CONTEXTIDR_EL1 is used in debug and trace features to identify the current process or context. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45173 (cherry picked from commit 4f8ba1c9dd00e0ae20fa161e166715746b6d1c04) --- sys/arm64/include/armreg.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index e6b5d313a3cf..194731c98902 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -218,6 +218,15 @@ #define CNTPCT_EL0_CRm 0 #define CNTPCT_EL0_op2 1 +/* CONTEXTIDR_EL1 - Context ID register */ +#define CONTEXTIDR_EL1 MRS_REG(CONTEXTIDR_EL1) +#define CONTEXTIDR_EL1_REG MRS_REG_ALT_NAME(CONTEXTIDR_EL1) +#define CONTEXTIDR_EL1_op0 3 +#define CONTEXTIDR_EL1_op1 0 +#define CONTEXTIDR_EL1_CRn 13 +#define CONTEXTIDR_EL1_CRm 0 +#define CONTEXTIDR_EL1_op2 1 + /* CPACR_EL1 */ #define CPACR_ZEN_MASK (0x3 << 16) #define CPACR_ZEN_TRAP_ALL1 (0x0 << 16) /* Traps from EL0 and EL1 */ From nobody Mon Oct 21 15:05: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 4XXJWf2g91z5ZNrC; Mon, 21 Oct 2024 15:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWf1fCHz4f65; Mon, 21 Oct 2024 15:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHNMMm+Put0JbiEV2vnPYE0srthOn6JhHH54tD+1I14=; b=BbYh+FPPjUBWzoNN2MiByjzDkq91VV/MOowC7fXc3G9PvBx5Q1UneWjNdObnTu+9yNOc7X BCIyCmyuc2OaiErcq2niWA14vayMprtfElo81RoqknQTKpzye8AOrypsP3m2C6cPAFsZDu ESqyhX3mT4dEtMhMl4MNSKMjR2IUIuWf6ao4rAHZH5+AOsEVv6mexvtuZTa0103CpBrC9i pbzO4QnYjy3H4L9MtORLehApAZPz7Z9HH9crbINAv0HKFFzoWPZ+ehgkO1z2OwNaG+PJRq RTJEu8tB7uEGUuchGAVXcbfAM2bR/4SvUhrphV7p2sDso3vMU6fq2YiK4z8Iiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HHNMMm+Put0JbiEV2vnPYE0srthOn6JhHH54tD+1I14=; b=NjgJjSs7n6xm7Pwj/FDzieMTMjgevA9ELRGP/kcy5Brxo62NDHmB2NlaQ3NHbX/LuOkvGZ Wgw0yv0jGYCucpw0CEUVgc2Lq/3p+S9c+MGzNO1OnjhX03tZVUplkz2BW96vbuRQ0dMJpy PbWwG09kWTi+mCjqFanGTRPo//OBthy7Iq3ismSrvKneexHzfMZij23g4+xVoH1FJ68l4q FFbbferJ2xVreB8SiBOPnausDJl5Pg8y9nQsQ/hSgNSwrO2I/s67AdIyjmxXvx/z4gUAJQ BM+d8cr7r42aJaSKGMabAd0ZihkyXiTOYBcyiao0PGp4TsC+WplHtaUZ72xJGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523102; a=rsa-sha256; cv=none; b=QKAQNL2GzQOVVlzcZAPxYs6oIfChgdkx+FJ6aP6pWVY5gd9y5MxpJwmRnlBuLrANRN4M9Z eSo+sUQOEmLZdbjnbFaei7Q8GmqpxWE7iZOgBvA5M+JJeeiWybw5c1jcqUmw6li4zSBslG ntcRhypve0qKQhcBxnnEZl7JJAeWbSsmDBoHPASnvtwzM42Pr2EH8csudk8b2OplWfc6Q6 VYlVDyM6Cz1Kas437m87QKM41z1Yi37Mwzut6zdFJNWiTwavOpnSfonpgKUaww+62G3Y97 DrkjwYIxaRkrR2DaZTtP41Omlv5twRhIOl83JHoWUGDgwMClHunWo0HrjHdikQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWf1FdSzb1P; Mon, 21 Oct 2024 15:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF52fU046571; Mon, 21 Oct 2024 15:05:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF52a4046568; Mon, 21 Oct 2024 15:05:02 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:02 GMT Message-Id: <202410211505.49LF52a4046568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 77ea17e63134 - stable/14 - arm64: Add EL1 and EL12 register alt names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 77ea17e63134172c12f45c7bb83ebc40d09df46f Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=77ea17e63134172c12f45c7bb83ebc40d09df46f commit 77ea17e63134172c12f45c7bb83ebc40d09df46f Author: Andrew Turner AuthorDate: 2024-07-23 09:17:52 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Add EL1 and EL12 register alt names When adding VHE support we may need to access these registers using the _EL12 or _EL1 name depending on if VHE is enabled or not. Add the registers we will likely need to access from VHE so these can be updated in the guest switcher code. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45525 (cherry picked from commit 47361851bc2e292bd7c723ba5f57792a7794f1b4) --- sys/arm64/include/armreg.h | 222 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 194731c98902..b2ab472dad0d 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -77,6 +77,54 @@ #define UL(x) UINT64_C(x) +/* AFSR0_EL1 - Auxiliary Fault Status Register 0 */ +#define AFSR0_EL1_REG MRS_REG_ALT_NAME(AFSR0_EL1) +#define AFSR0_EL1_op0 3 +#define AFSR0_EL1_op1 0 +#define AFSR0_EL1_CRn 5 +#define AFSR0_EL1_CRm 1 +#define AFSR0_EL1_op2 0 + +/* AFSR0_EL12 */ +#define AFSR0_EL12_REG MRS_REG_ALT_NAME(AFSR0_EL12) +#define AFSR0_EL12_op0 3 +#define AFSR0_EL12_op1 5 +#define AFSR0_EL12_CRn 5 +#define AFSR0_EL12_CRm 1 +#define AFSR0_EL12_op2 0 + +/* AFSR1_EL1 - Auxiliary Fault Status Register 1 */ +#define AFSR1_EL1_REG MRS_REG_ALT_NAME(AFSR1_EL1) +#define AFSR1_EL1_op0 3 +#define AFSR1_EL1_op1 0 +#define AFSR1_EL1_CRn 5 +#define AFSR1_EL1_CRm 1 +#define AFSR1_EL1_op2 1 + +/* AFSR1_EL12 */ +#define AFSR1_EL12_REG MRS_REG_ALT_NAME(AFSR1_EL12) +#define AFSR1_EL12_op0 3 +#define AFSR1_EL12_op1 5 +#define AFSR1_EL12_CRn 5 +#define AFSR1_EL12_CRm 1 +#define AFSR1_EL12_op2 1 + +/* AMAIR_EL1 - Auxiliary Memory Attribute Indirection Register */ +#define AMAIR_EL1_REG MRS_REG_ALT_NAME(AMAIR_EL1) +#define AMAIR_EL1_op0 3 +#define AMAIR_EL1_op1 0 +#define AMAIR_EL1_CRn 10 +#define AMAIR_EL1_CRm 3 +#define AMAIR_EL1_op2 0 + +/* AMAIR_EL12 */ +#define AMAIR_EL12_REG MRS_REG_ALT_NAME(AMAIR_EL12) +#define AMAIR_EL12_op0 3 +#define AMAIR_EL12_op1 5 +#define AMAIR_EL12_CRn 10 +#define AMAIR_EL12_CRm 3 +#define AMAIR_EL12_op2 0 + /* APDAKeyHi_EL1 */ #define APDAKeyHi_EL1_REG MRS_REG_ALT_NAME(APDAKeyHi_EL1) #define APDAKeyHi_EL1_op0 3 @@ -227,7 +275,21 @@ #define CONTEXTIDR_EL1_CRm 0 #define CONTEXTIDR_EL1_op2 1 +/* CONTEXTIDR_EL12 */ +#define CONTEXTIDR_EL12_REG MRS_REG_ALT_NAME(CONTEXTIDR_EL12) +#define CONTEXTIDR_EL12_op0 3 +#define CONTEXTIDR_EL12_op1 5 +#define CONTEXTIDR_EL12_CRn 13 +#define CONTEXTIDR_EL12_CRm 0 +#define CONTEXTIDR_EL12_op2 1 + /* CPACR_EL1 */ +#define CPACR_EL1_REG MRS_REG_ALT_NAME(CPACR_EL1) +#define CPACR_EL1_op0 3 +#define CPACR_EL1_op1 0 +#define CPACR_EL1_CRn 1 +#define CPACR_EL1_CRm 0 +#define CPACR_EL1_op2 2 #define CPACR_ZEN_MASK (0x3 << 16) #define CPACR_ZEN_TRAP_ALL1 (0x0 << 16) /* Traps from EL0 and EL1 */ #define CPACR_ZEN_TRAP_EL0 (0x1 << 16) /* Traps from EL0 */ @@ -240,6 +302,14 @@ #define CPACR_FPEN_TRAP_NONE (0x3 << 20) /* No traps */ #define CPACR_TTA (0x1 << 28) +/* CPACR_EL12 */ +#define CPACR_EL12_REG MRS_REG_ALT_NAME(CPACR_EL12) +#define CPACR_EL12_op0 3 +#define CPACR_EL12_op1 5 +#define CPACR_EL12_CRn 1 +#define CPACR_EL12_CRm 0 +#define CPACR_EL12_op2 2 + /* CSSELR_EL1 - Cache size selection register */ #define CSSELR_Level(i) (i << 1) #define CSSELR_InD 0x00000001 @@ -396,6 +466,22 @@ #define DBGPRCR_EL1_CRm 4 #define DBGPRCR_EL1_op2 4 +/* ELR_EL1 */ +#define ELR_EL1_REG MRS_REG_ALT_NAME(ELR_EL1) +#define ELR_EL1_op0 3 +#define ELR_EL1_op1 0 +#define ELR_EL1_CRn 4 +#define ELR_EL1_CRm 0 +#define ELR_EL1_op2 1 + +/* ELR_EL12 */ +#define ELR_EL12_REG MRS_REG_ALT_NAME(ELR_EL12) +#define ELR_EL12_op0 3 +#define ELR_EL12_op1 5 +#define ELR_EL12_CRn 4 +#define ELR_EL12_CRm 0 +#define ELR_EL12_op2 1 + /* ESR_ELx */ #define ESR_ELx_ISS_MASK 0x01ffffff #define ISS_FP_TFV_SHIFT 23 @@ -536,6 +622,38 @@ #define EXCP_BRKPT_32 0x38 /* 32bits breakpoint */ #define EXCP_BRK 0x3c /* Breakpoint */ +/* ESR_EL1 */ +#define ESR_EL1_REG MRS_REG_ALT_NAME(ESR_EL1) +#define ESR_EL1_op0 3 +#define ESR_EL1_op1 0 +#define ESR_EL1_CRn 5 +#define ESR_EL1_CRm 2 +#define ESR_EL1_op2 1 + +/* ESR_EL12 */ +#define ESR_EL12_REG MRS_REG_ALT_NAME(ESR_EL12) +#define ESR_EL12_op0 3 +#define ESR_EL12_op1 5 +#define ESR_EL12_CRn 5 +#define ESR_EL12_CRm 2 +#define ESR_EL12_op2 0 + +/* FAR_EL1 */ +#define FAR_EL1_REG MRS_REG_ALT_NAME(FAR_EL1) +#define FAR_EL1_op0 3 +#define FAR_EL1_op1 0 +#define FAR_EL1_CRn 6 +#define FAR_EL1_CRm 0 +#define FAR_EL1_op2 0 + +/* FAR_EL12 */ +#define FAR_EL12_REG MRS_REG_ALT_NAME(FAR_EL12) +#define FAR_EL12_op0 3 +#define FAR_EL12_op1 5 +#define FAR_EL12_CRn 6 +#define FAR_EL12_CRm 0 +#define FAR_EL12_op2 0 + /* ICC_CTLR_EL1 */ #define ICC_CTLR_EL1_EOIMODE (1U << 1) @@ -1505,6 +1623,12 @@ #define ID_ISAR5_VCMA_IMPL (UL(0x1) << ID_ISAR5_VCMA_SHIFT) /* MAIR_EL1 - Memory Attribute Indirection Register */ +#define MAIR_EL1_REG MRS_REG_ALT_NAME(MAIR_EL1) +#define MAIR_EL1_op0 3 +#define MAIR_EL1_op1 0 +#define MAIR_EL1_CRn 10 +#define MAIR_EL1_CRm 2 +#define MAIR_EL1_op2 0 #define MAIR_ATTR_MASK(idx) (UL(0xff) << ((n)* 8)) #define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) #define MAIR_DEVICE_nGnRnE UL(0x00) @@ -1513,6 +1637,14 @@ #define MAIR_NORMAL_WT UL(0xbb) #define MAIR_NORMAL_WB UL(0xff) +/* MAIR_EL12 */ +#define MAIR_EL12_REG MRS_REG_ALT_NAME(MAIR_EL12) +#define MAIR_EL12_op0 3 +#define MAIR_EL12_op1 5 +#define MAIR_EL12_CRn 10 +#define MAIR_EL12_CRm 2 +#define MAIR_EL12_op2 0 + /* MDCCINT_EL1 */ #define MDCCINT_EL1 MRS_REG(MDCCINT_EL1) #define MDCCINT_EL1_op0 2 @@ -2124,6 +2256,12 @@ #define RNDRRS_op2 1 /* SCTLR_EL1 - System Control Register */ +#define SCTLR_EL1_REG MRS_REG_ALT_NAME(SCTLR_EL1) +#define SCTLR_EL1_op0 3 +#define SCTLR_EL1_op1 0 +#define SCTLR_EL1_CRn 1 +#define SCTLR_EL1_CRm 0 +#define SCTLR_EL1_op2 0 #define SCTLR_RES1 0x30d00800 /* Reserved ARMv8.0, write 1 */ #define SCTLR_M (UL(0x1) << 0) #define SCTLR_A (UL(0x1) << 1) @@ -2174,7 +2312,21 @@ #define SCTLR_EnALS (UL(0x1) << 56) #define SCTLR_EPAN (UL(0x1) << 57) +/* SCTLR_EL12 */ +#define SCTLR_EL12_REG MRS_REG_ALT_NAME(SCTLR_EL12) +#define SCTLR_EL12_op0 3 +#define SCTLR_EL12_op1 5 +#define SCTLR_EL12_CRn 1 +#define SCTLR_EL12_CRm 0 +#define SCTLR_EL12_op2 0 + /* SPSR_EL1 */ +#define SPSR_EL1_REG MRS_REG_ALT_NAME(SPSR_EL1) +#define SPSR_EL1_op0 3 +#define SPSR_EL1_op1 0 +#define SPSR_EL1_CRn 4 +#define SPSR_EL1_CRm 0 +#define SPSR_EL1_op2 0 /* * When the exception is taken in AArch64: * M[3:2] is the exception level @@ -2220,6 +2372,14 @@ #define PSR_SETTABLE_32 PSR_FLAGS #define PSR_SETTABLE_64 (PSR_FLAGS | PSR_SS) +/* SPSR_EL12 */ +#define SPSR_EL12_REG MRS_REG_ALT_NAME(SPSR_EL12) +#define SPSR_EL12_op0 3 +#define SPSR_EL12_op1 5 +#define SPSR_EL12_CRn 4 +#define SPSR_EL12_CRm 0 +#define SPSR_EL12_op2 0 + /* REVIDR_EL1 - Revision ID Register */ #define REVIDR_EL1 MRS_REG(REVIDR_EL1) #define REVIDR_EL1_op0 3 @@ -2229,6 +2389,12 @@ #define REVIDR_EL1_op2 6 /* TCR_EL1 - Translation Control Register */ +#define TCR_EL1_REG MRS_REG_ALT_NAME(TCR_EL1) +#define TCR_EL1_op0 3 +#define TCR_EL1_op1 0 +#define TCR_EL1_CRn 2 +#define TCR_EL1_CRm 0 +#define TCR_EL1_op2 2 /* Bits 63:59 are reserved */ #define TCR_TCMA1_SHIFT 58 #define TCR_TCMA1 (UL(1) << TCR_TCMA1_SHIFT) @@ -2335,6 +2501,14 @@ #define TCR_SMP_ATTRS 0 #endif +/* TCR_EL12 */ +#define TCR_EL12_REG MRS_REG_ALT_NAME(TCR_EL12) +#define TCR_EL12_op0 3 +#define TCR_EL12_op1 5 +#define TCR_EL12_CRn 2 +#define TCR_EL12_CRm 0 +#define TCR_EL12_op2 2 + /* TTBR0_EL1 & TTBR1_EL1 - Translation Table Base Register 0 & 1 */ #define TTBR_ASID_SHIFT 48 #define TTBR_ASID_MASK (0xfffful << TTBR_ASID_SHIFT) @@ -2342,6 +2516,54 @@ #define TTBR_CnP_SHIFT 0 #define TTBR_CnP (1ul << TTBR_CnP_SHIFT) +/* TTBR0_EL1 */ +#define TTBR0_EL1_REG MRS_REG_ALT_NAME(TTBR0_EL1) +#define TTBR0_EL1_op0 3 +#define TTBR0_EL1_op1 0 +#define TTBR0_EL1_CRn 2 +#define TTBR0_EL1_CRm 0 +#define TTBR0_EL1_op2 0 + +/* TTBR0_EL12 */ +#define TTBR0_EL12_REG MRS_REG_ALT_NAME(TTBR0_EL12) +#define TTBR0_EL12_op0 3 +#define TTBR0_EL12_op1 5 +#define TTBR0_EL12_CRn 2 +#define TTBR0_EL12_CRm 0 +#define TTBR0_EL12_op2 0 + +/* TTBR1_EL1 */ +#define TTBR1_EL1_REG MRS_REG_ALT_NAME(TTBR1_EL1) +#define TTBR1_EL1_op0 3 +#define TTBR1_EL1_op1 0 +#define TTBR1_EL1_CRn 2 +#define TTBR1_EL1_CRm 0 +#define TTBR1_EL1_op2 1 + +/* TTBR1_EL12 */ +#define TTBR1_EL12_REG MRS_REG_ALT_NAME(TTBR1_EL12) +#define TTBR1_EL12_op0 3 +#define TTBR1_EL12_op1 5 +#define TTBR1_EL12_CRn 2 +#define TTBR1_EL12_CRm 0 +#define TTBR1_EL12_op2 1 + +/* VBAR_EL1 */ +#define VBAR_EL1_REG MRS_REG_ALT_NAME(VBAR_EL1) +#define VBAR_EL1_op0 3 +#define VBAR_EL1_op1 0 +#define VBAR_EL1_CRn 12 +#define VBAR_EL1_CRm 0 +#define VBAR_EL1_op2 0 + +/* VBAR_EL12 */ +#define VBAR_EL12_REG MRS_REG_ALT_NAME(VBAR_EL12) +#define VBAR_EL12_op0 3 +#define VBAR_EL12_op1 5 +#define VBAR_EL12_CRn 12 +#define VBAR_EL12_CRm 0 +#define VBAR_EL12_op2 0 + /* ZCR_EL1 - SVE Control Register */ #define ZCR_LEN_SHIFT 0 #define ZCR_LEN_MASK (0xf << ZCR_LEN_SHIFT) From nobody Mon Oct 21 15: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 4XXJWg4jr6z5ZNsH; Mon, 21 Oct 2024 15:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWg2WXHz4f3k; Mon, 21 Oct 2024 15: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=1729523103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eckMdLCq2eQy9ZWRyfpldws5QEQdqTgYsKC1XImnrwc=; b=KpTQux8weT2/sdGN5/65/WkhCxEuFhW+zZMu2lt6+UBRYa5nM9zpN6XfYOAG5lxrD0rMQP OA5x3r9AZjlbg50z5Q0DGciDMdHdF8XPhjsqm4bMWDttxZ/S+tYSX2NPXyU9xnbvbM5atr MXRDE3JzEBI6IcvKSPd258c6dfCgF8Pl47dTRYbSoddtaWIF8++POKCjfSMacz5pmq0dUF d86vTeNAYihLiq3EJV6sCXEHTXXyFxvosEXZxKuPlMZQYiPdQYF+fDN/zN4fdki0G1iKvD yN5tNioEgAe8+K8nFPQ4W+4VXEU9UZF2wBwErYt7NKDMn/7lZ1e67eMQ7bqqDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eckMdLCq2eQy9ZWRyfpldws5QEQdqTgYsKC1XImnrwc=; b=pajxk8Dli2hNiDFhB8kzAFGZr7dk4WEmdFqh+Q8KXRFugYUvIywoirpNRGAJPNEZBdWq1l VCX1JRWrKaRbZhkIHOSJceSPN/I0gmXhPZ1xAdwaIbFJzX2RL79ZNr2nKaim6t9Prot2qp XsQT+JHZBBQuWKB0KQ7RnwtZXpyjr39lwVqAK1fkzld1dnXYibEHV0e1W3aNh5gOc7P8kz Ho8U+dZSYNpA9HqrynDTxGjL3ZmhLA35tl/zscuUx8GOes1UurO62TEj1wVxR4Umzt1fZy Jc/pfjBexX3T6LmC/qibGDZ5zldEHYAiK4M8xSzPsD8bnX+fNGUi/4EBvfhMDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523103; a=rsa-sha256; cv=none; b=lN15rEczebHx111uUM1FE/UfPdGZsfl+VqUPHG645bClBthR1T6P7FKaBfVlcu7ik3qiZL KJOHFt3G412M3bo/vTzVYyx83zwumKQj/0zYeuYFavqPpzA9bVR7r1Akxhdp+XScystjj0 55e0N54ePthd1Jp+VEEuxWE5UsPt5+ajt1y8U48Cp0W+qLNZuSogcyEa5rST93siq1o4GA DDqwxLC8n4dEaZHzRSBlbLQSGZh7xEqS6FrLrUYnT1MbqWTghqygYcKMwPcDJmn9hFP8fx iO/ERaF89LvS/D/McRlT7lA4lVuVLEdV0zbOfVLCXhZFwZ3tLvGoQB91bhflLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWg20pjzb1Q; Mon, 21 Oct 2024 15:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF53Ah046618; Mon, 21 Oct 2024 15:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF53d7046615; Mon, 21 Oct 2024 15:05:03 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:03 GMT Message-Id: <202410211505.49LF53d7046615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: f87a9788a56d - stable/14 - arm64: Fix the ESR_EL1_op2 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f87a9788a56d97311946f9d703ca65f311141b2b Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f87a9788a56d97311946f9d703ca65f311141b2b commit f87a9788a56d97311946f9d703ca65f311141b2b Author: Andrew Turner AuthorDate: 2024-08-29 08:51:30 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Fix the ESR_EL1_op2 value This leads to an unallocated register. Fix the value to point to ESR_EL1. Sponsored by: Arm Ltd (cherry picked from commit 8b017284319c46d349abee5573d4656bb377b0fd) --- sys/arm64/include/armreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b2ab472dad0d..734fb55f07ba 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -628,7 +628,7 @@ #define ESR_EL1_op1 0 #define ESR_EL1_CRn 5 #define ESR_EL1_CRm 2 -#define ESR_EL1_op2 1 +#define ESR_EL1_op2 0 /* ESR_EL12 */ #define ESR_EL12_REG MRS_REG_ALT_NAME(ESR_EL12) From nobody Mon Oct 21 15: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 4XXJWj6L2pz5ZNfJ; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWj4cLkz4f6S; Mon, 21 Oct 2024 15: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=1729523105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyCmOe8jvYzYB26mPrnVU8suXvkttbkyxh8U3/xcnrM=; b=kQKkMfsYH5lyNdo+7ZSlNWp6AdGHIHnXJwuYInwrXi3zlOs25ddLKgo4OtMB8sfCOFJc9D dnTugrCt1OYR7f2QrFYkgqBOx1dGz8A1H1Xa8LDluecbsT9Oqi4W6h0QeWKiy7IywGKk1P 7L9Frntjq8LsOxxkD2yrIfqBlM9Bqr14AxXNBxvI5OgXoZHE1rmfsU77P3bBaAaru8YbG5 5tLbRm6zaMMYc2rKN6EtQh1JAZAgbqTeGQL2tPrk3hfk+8uOqzmrtFA11yKvCiY/oJkHZv csxDBpjQhl6enjPfxYC5lZ4AH2l47Lrb+7UGlSUm+xSBHFdhf7QEfU07xAHX4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyCmOe8jvYzYB26mPrnVU8suXvkttbkyxh8U3/xcnrM=; b=P/tEATl3ntMlVW+9xZ3z7vEBkK0wAO71G3jmgRFEh/M6nKtpdmpbaA/nRI6p1wrRbSeEqZ V/yMrYl1/X4h7x3VtIA/oa0B8Qo3shUQLI9D3ZBBif3vujVm/zjjU+lGHzSrTs9KYuIJOS yxu2/SbNsxNBixBV1KjfhEOpyNDq02ooLngtzhvRchiTQ01UrKCrn0T0asm6qjcvu44n0H S94oXYMNb/ykEj3KXvmh0uWxiPbIoreEJ0WOEDi/Q+STyQGFlicD1iqJzrlMTq3XAevtPm HDouN6WZAsrFQzyVGgnw5g5iFHFJdCadQ1qtQFDhqogsrAMcJR21+hlQtaTxjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523105; a=rsa-sha256; cv=none; b=tOf3WQQvZxjMhLzumritp5DxYo7I/vzOZJZjghbxDyeH/HASgS5h75/PVovuD/Ptc8xiiI TMfAUXtR4TGoPXnmxgls19EASkpijgz99cOeBq79EimnOyLmGJU2n6yJcikjCquq73V7Cf WdaX8ehHto2FQFcJL5+RhSU9dFOXdJ0XeD8cZG3kcjNrlQM3jUPHKp4ZTlXbLeDu8gppbH WYJIOEBvGCPDmcirTIBvUysmzTkztohwf6+xHTnDRvxpYZXfHTqWTZYze7p7CGiD4q+E7h QHPTq6IMlZfHim4PUVVnn8euXZUut6YoegzSv2RCDcnORrEigWKis1sArnakqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWj40GTzZn5; Mon, 21 Oct 2024 15:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF55Dn046710; Mon, 21 Oct 2024 15:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF55YA046707; Mon, 21 Oct 2024 15:05:05 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:05 GMT Message-Id: <202410211505.49LF55YA046707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 1ee244a9c5da - stable/14 - arm64: add additional MDCR_EL2 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ee244a9c5da0d965cdac14c92308bd8e73bf57e Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee244a9c5da0d965cdac14c92308bd8e73bf57e commit 1ee244a9c5da0d965cdac14c92308bd8e73bf57e Author: Zachary Leaf AuthorDate: 2024-07-03 07:26:34 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: add additional MDCR_EL2 fields Monitor Debug Configuration Register provides EL2 configuration options for self-hosted debug and the Performance Monitors Extension. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46191 (cherry picked from commit 610348a90467980de0498fab8dfdddf221d7a604) --- sys/arm64/include/hypervisor.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 011f86e83fdf..49689347d399 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -261,5 +261,35 @@ #define MDCR_EL2_TDOSA (0x1UL << MDCR_EL2_TDOSA_SHIFT) #define MDCR_EL2_TDRA_SHIFT 11 #define MDCR_EL2_TDRA (0x1UL << MDCR_EL2_TDRA_SHIFT) +#define MDCR_E2PB_SHIFT 12 +#define MDCR_E2PB_MASK (0x3UL << MDCR_E2PB_SHIFT) +#define MDCR_TPMS_SHIFT 14 +#define MDCR_TPMS (0x1UL << MDCR_TPMS_SHIFT) +#define MDCR_EnSPM_SHIFT 15 +#define MDCR_EnSPM (0x1UL << MDCR_EnSPM_SHIFT) +#define MDCR_HPMD_SHIFT 17 +#define MDCR_HPMD (0x1UL << MDCR_HPMD_SHIFT) +#define MDCR_TTRF_SHIFT 19 +#define MDCR_TTRF (0x1UL << MDCR_TTRF_SHIFT) +#define MDCR_HCCD_SHIFT 23 +#define MDCR_HCCD (0x1UL << MDCR_HCCD_SHIFT) +#define MDCR_E2TB_SHIFT 24 +#define MDCR_E2TB_MASK (0x3UL << MDCR_E2TB_SHIFT) +#define MDCR_HLP_SHIFT 26 +#define MDCR_HLP (0x1UL << MDCR_HLP_SHIFT) +#define MDCR_TDCC_SHIFT 27 +#define MDCR_TDCC (0x1UL << MDCR_TDCC_SHIFT) +#define MDCR_MTPME_SHIFT 28 +#define MDCR_MTPME (0x1UL << MDCR_MTPME_SHIFT) +#define MDCR_HPMFZO_SHIFT 29 +#define MDCR_HPMFZO (0x1UL << MDCR_HPMFZO_SHIFT) +#define MDCR_PMSSE_SHIFT 30 +#define MDCR_PMSSE_MASK (0x3UL << MDCR_PMSSE_SHIFT) +#define MDCR_HPMFZS_SHIFT 36 +#define MDCR_HPMFZS (0x1UL << MDCR_HPMFZS_SHIFT) +#define MDCR_PMEE_SHIFT 40 +#define MDCR_PMEE_MASK (0x3UL << MDCR_PMEE_SHIFT) +#define MDCR_EBWE_SHIFT 43 +#define MDCR_EBWE (0x1UL << MDCR_EBWE_SHIFT) #endif /* !_MACHINE_HYPERVISOR_H_ */ From nobody Mon Oct 21 15: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 4XXJWh6Zw5z5ZP1s; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWh3YgMz4f3t; Mon, 21 Oct 2024 15: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=1729523104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA6CBXtXxSXsPEdyzplsnW+lAdryoF6eBEsgLuc/ONs=; b=dp83JjXxuTlKl+lajQSweSrozTt8qhkxw715MPaPbVyy3alhRCrBC24zGXqoahZQV9+CqT 6ym4bULPzF7CGtvX6AGPP95pefda1MRoYk+f+Di2J3B7UwftkiMwT5PJK4Wy0i16wn+aOQ YIseekac2uKzhCWzvCkhl3fbWJzW4ljrMJVOBl5eNgN88HKLS27D1PVJH5mrkwkQ2Sx2uF oyFM7i9PvDqutTohgMwMLxRuplfrCGUPF4f93yz5ckWhaICVkhpbzCFZYce6cFEWEKHBsk zZqvuDE9PIhPi8rYuG/7B6tAnhm687UordTf8XWlQOEpUDD6b53rvmqDRIIyBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA6CBXtXxSXsPEdyzplsnW+lAdryoF6eBEsgLuc/ONs=; b=UdfnhiTWQLB1xGLpyY7QKiiL4AcOoALd/eXcMftIKMZExuJn+idb60k/bPbpSozq6/NyWs ZJSUawXv6YtnYw5ZmD6+yNuduycMYw0qc7aGF67JSNswTjKVflqqwiOQWJ4IilH9JlWr68 4qOsFF5u5Kw1RKotVvuWerQZv3Vi2qtBr2i+7qpN0JyiV5kQGLePCOlE1zS301XFg1Z5t8 Rtq9QTxEtHXseNP8ybSNdM3dp6XVAToV1lEWBjMsL2l+wIqeFK0A0wjNMG+QfURQ6mMUeP 0yjoHds5ecnDuNolowBS1I4LjfabyFrHKsFtYY2jZDlNuPa5blBCrMOr/TsUjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523104; a=rsa-sha256; cv=none; b=cT3/gxdRGp8dh2POIQc1FqVbFALc6aIWH6HWhIVt6GcaNBtvm6wpC+Q5hddp1+UHwlcqcg YU7LJrFI4FAj56nKddQHaZnA5pYvYMc1R1CS1N9o8xsd/vMMCbahP7MMSnVaer8fy70/p7 IamartROJRcQFRI1WrU49OswoeL74TF5DDfExHc/wp81SQnITLOG9Ysrx9ghkuEu1sZ/99 gBk4vi0MPFLUfE3jyheXeETVaqikjGK5KervwERAIBWplgzoZCS0p7RI5AYRtfb/tA5LR8 kAoL8zUTUXqKdmMrT6uNlhwkfBBODhwmZYIMRSp9FBcFAS3HqqIfTuNsHk97ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWh38q6zZn4; Mon, 21 Oct 2024 15:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF54RK046668; Mon, 21 Oct 2024 15:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF54ME046665; Mon, 21 Oct 2024 15:05:04 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:04 GMT Message-Id: <202410211505.49LF54ME046665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 6ac2d3cfb4ad - stable/14 - arm64: Add the tcr_el2 ds field List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ac2d3cfb4add8b1adaf549e8d6bc887f6afc176 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6ac2d3cfb4add8b1adaf549e8d6bc887f6afc176 commit 6ac2d3cfb4add8b1adaf549e8d6bc887f6afc176 Author: Andrew Turner AuthorDate: 2024-09-05 12:11:42 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Add the tcr_el2 ds field This will be used to support FEAT_LPA2 to allow more than 48 bits of physical address space. Reviewed by: alc, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46392 (cherry picked from commit 7be11454edd4eca6cbd299cb5b486294f912ffbd) --- sys/arm64/include/armreg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 734fb55f07ba..8bf4445e13b3 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2396,6 +2396,8 @@ #define TCR_EL1_CRm 0 #define TCR_EL1_op2 2 /* Bits 63:59 are reserved */ +#define TCR_DS_SHIFT 59 +#define TCR_DS (UL(1) << TCR_DS_SHIFT) #define TCR_TCMA1_SHIFT 58 #define TCR_TCMA1 (UL(1) << TCR_TCMA1_SHIFT) #define TCR_TCMA0_SHIFT 57 From nobody Mon Oct 21 15: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 4XXJWk6fDWz5ZNw6; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWk5NtVz4fDq; Mon, 21 Oct 2024 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MktgX0QqmvEtNr+RjbQi58ZBP4ZG/Bh+G4tFVSKiVcA=; b=SMt6tPza3n11KDsQYB8I2mOQ2AOY6Un6SdC/MfZ8osaziUhhSyy+lFxpfBvcORUHLp1kSE 3ZPFL3TJnD1miu6oNDDggLqqlMc4RyPQwYkyPvZLtwUktzsL2izuwtsc1NwY+wCMKYsQ+r vwHyHdwHoEHm3SN6gNg5O9CciKkyrhBdONWWF/ytHdVj5Vzk/xIPlQvZzhfGA5KtDZTQT7 ukEPdFg/Hab2xqfqVm5/01Wi6ZPz1C457oCVG9+UdT7yNFrHHTY/X5TIwtRN0bX8yykKwG 0jIqGt6iRm2KC/DP68xhDoYTeQFNfbkNe8EOpP2OzBNo1DRk7hn/zB2HArfASw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MktgX0QqmvEtNr+RjbQi58ZBP4ZG/Bh+G4tFVSKiVcA=; b=IRtAFlkGn1iaTkVgb21XGjtxkaNFUCuraIMCQqXqhA+lULycoKZet9y0wnQlx1GwxS3Dye YdBw5x9wj98x+jUxP8BK3An1L3jFWww0eKDbE/glsoIpwj1TKQAnAxh6zMZvoMU7ylLGk+ GhiO078GJvLgvfzwsLPQbfh3XGF0W4xmcysWYaVJVqVU2bO/gdrjhgBpybUZQGu8Axm3d4 lUCUZu1laQSaslgW9qpica59CXNE3Fp1MPEtGAvdbBaf5OYGotIl0QLG4Y1ShS24jiH/4W 11W0aLkIsKvvrfY7+X21Ywzg9WrLq7BfHrCBsVQfeX1Jjs/Ewg9+zBWb2Z7uqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523106; a=rsa-sha256; cv=none; b=eSSdG69MmOua2L3KYS/vP8sNH9hOGF9nE7MxVhZzQM+x1JDGMsysnKpf6RQLWZ4U3kg7NG zJwvRUdATF9GRh660iiOVAqvPYilZvTRpHslall5dAyQm7eXH2QK+teSrUbj0++IdSJ/Jf TreYfzGOfdiH1XLk2Jm48vXOkvtzSRvLp+qiLGHwOr5hoOUszwurH+gkN45NmbDYgWZzk6 wBxpnPYyCEha7gqFpaVuof2SgjvdGhnZuPoRgKovV5Os8BpQdI4vVtBGDWByjmp7ZCKQ+N YEJfnz02p9844pH24ysEZOtcZxzbgE/pHuLeSqR6gF5rxkghT1RjQudIvy73tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWk4xbQzZjk; Mon, 21 Oct 2024 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF56wu046759; Mon, 21 Oct 2024 15:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF56bk046756; Mon, 21 Oct 2024 15:05:06 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:06 GMT Message-Id: <202410211505.49LF56bk046756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 2db6ffac2497 - stable/14 - arm64: Adjust the indentation of CPTR_EL2 values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2db6ffac249731a6ffc10cbf4072d850d5d7e274 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2db6ffac249731a6ffc10cbf4072d850d5d7e274 commit 2db6ffac249731a6ffc10cbf4072d850d5d7e274 Author: Andrew Turner AuthorDate: 2024-09-11 09:38:08 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Adjust the indentation of CPTR_EL2 values Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46513 (cherry picked from commit 7a488d83b3af4d59946319b251a3a2060f18df40) --- sys/arm64/include/hypervisor.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 49689347d399..602436d2a725 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -49,14 +49,14 @@ /* CPTR_EL2 - Architecture feature trap register */ /* Valid if HCR_EL2.E2H == 0 */ -#define CPTR_RES0 0x7fefc800 -#define CPTR_RES1 0x000033ff -#define CPTR_TFP 0x00000400 +#define CPTR_RES0 0x7fefc800 +#define CPTR_RES1 0x000033ff +#define CPTR_TFP 0x00000400 /* Valid if HCR_EL2.E2H == 1 */ -#define CPTR_FPEN 0x00300000 +#define CPTR_FPEN 0x00300000 /* Unconditionally valid */ -#define CPTR_TTA 0x00100000 -#define CPTR_TCPAC 0x80000000 +#define CPTR_TTA 0x00100000 +#define CPTR_TCPAC 0x80000000 /* HCR_EL2 - Hypervisor Config Register */ #define HCR_VM (UL(0x1) << 0) From nobody Mon Oct 21 15:05: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 4XXJWm0qL5z5ZNbt; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWl63vbz4f91; Mon, 21 Oct 2024 15: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=1729523107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2T8dlAweCNDHoCWxRMl3Dmo2Uj/QzjqWnYhfyDteZgE=; b=SIHJOX922BpAPbqRFIG89Aufa1oFdS4OGiPUtnEeyd9z0lKAAx5fLq6UkXN54ArrvUy6fC fHZPlYOb4T5WbvlIGizXCbek0Ls48+qlMYjJYuCpG6gO1cDz+SlqZQfJ+LZYORlL3DxbPa P04KUhUg9XGg3GshMgdhPwA53nLzsb2QmQLak6GKdc/Krw4REq/EOU2MxbD7DIVfhc5Gix nuoRATNe7YZq0LFrzF0kTdsjXZ1VTp2ZaGXiEpK5rH9mSkwEU4w9Bot9fhiiUDQx6D2eV2 J+hY++e0SzhbrweD4G4pLpWtXSkRZH6J6HOGDdWsTX1KF0/+l+uGLImnVVqMBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2T8dlAweCNDHoCWxRMl3Dmo2Uj/QzjqWnYhfyDteZgE=; b=BWO9UpdvXJCKBkkmv0mdHw0EmJzTsBwF8rRRxQQW42cx2UvOGm7bEaoir8lJYjJLE/Rxbf KvnHkpn3dzBTYrZyErPbM99SuNz1bVwt/+PWT/k74evAMNxyRBtqroyqQLiA/HavKIN2uA K9ItcUjBQZKr6OCgaJuMYIMrA2ymnHoCKgWRXm5C6YrnbEUH7rNosuYJg3bYmD1wCFm72w twM5aNlK97sqy/tHsbi2dRLd/vIbuKgLIBSGG60B35++LdxiY5xVkXbJGxUKGSI5zi2OQ8 wRA7PMuniVvwxkyBjIuSc1X0OmOzVYPIVOuyGxo2c6ZgVhS8eQzt5EzDnu3WdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523107; a=rsa-sha256; cv=none; b=u0MEJci55fr5IfIUqRSqTLOhrGYn5x5vsVzieNM3gGPV3IsE5dYO1LTNpQ3WZ7zsZKHd+W eyWz06125cvjFkXCkGx5mMTxiC/poQFgdppz4pkMWHEa5SeIQHQLMm4bu1zvNja3y06P+g yaxcKecqWui6qurWF/hCrMy75H9PnMLZTv/Hbc8rn1e7XJ0NhCZoLouDS9vhpyCVpe+3tI O/g8YgZEp9pLG6ltMBVu5IInFZWmETVezZhy6Fe5v02P06OfrS2nqQu+EKc2OOnxMCG+a7 KeKJhECMrBT5JaoyVPbB0MUCdmDw4svyhSWzqSTN81on+3FSLmHkos+MzrLQkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWl5d02zbNl; Mon, 21 Oct 2024 15:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF57Fg046813; Mon, 21 Oct 2024 15:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF57Mn046810; Mon, 21 Oct 2024 15:05:07 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:07 GMT Message-Id: <202410211505.49LF57Mn046810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: e005eea2c977 - stable/14 - arm64: Split out a savectx version of vfp_save_state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e005eea2c977f8637071ee2b97501e21ce8f0de5 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e005eea2c977f8637071ee2b97501e21ce8f0de5 commit e005eea2c977f8637071ee2b97501e21ce8f0de5 Author: Andrew Turner AuthorDate: 2024-01-03 17:41:42 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Split out a savectx version of vfp_save_state Rather than try to detect when vfp_save_state is called by savectx use a separate function that sets up the pcb as needed. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43304 (cherry picked from commit 12257233e8fd94ab24e1a84ad87126af2a7be33b) --- sys/arm64/arm64/swtch.S | 4 +--- sys/arm64/arm64/vfp.c | 42 ++++++++++++++++++++++++++---------------- sys/arm64/include/vfp.h | 1 + 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 4c9851da3dc6..9c43de3a9eae 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -270,9 +270,7 @@ ENTRY(savectx) /* Store the VFP registers */ #ifdef VFP mov x28, lr - mov x1, x0 /* move pcb to the correct register */ - mov x0, xzr /* td = NULL */ - bl vfp_save_state + bl vfp_save_state_savectx mov lr, x28 #endif diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index be98af945b0a..f35cd960702b 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -170,25 +170,11 @@ vfp_restore(struct vfpstate *state) : : "r"(fpcr), "r"(fpsr), "r"(vfp_state)); } -void -vfp_save_state(struct thread *td, struct pcb *pcb) +static void +vfp_save_state_common(struct thread *td, struct pcb *pcb) { uint32_t cpacr; - KASSERT(pcb != NULL, ("NULL vfp pcb")); - KASSERT(td == NULL || td->td_pcb == pcb, ("Invalid vfp pcb")); - - /* - * savectx() will be called on panic with dumppcb as an argument, - * dumppcb doesn't have pcb_fpusaved set, so set it to save - * the VFP registers. - */ - if (pcb->pcb_fpusaved == NULL) - pcb->pcb_fpusaved = &pcb->pcb_fpustate; - - if (td == NULL) - td = curthread; - critical_enter(); /* * Only store the registers if the VFP is enabled, @@ -206,6 +192,30 @@ vfp_save_state(struct thread *td, struct pcb *pcb) critical_exit(); } +void +vfp_save_state(struct thread *td, struct pcb *pcb) +{ + KASSERT(td != NULL, ("NULL vfp thread")); + KASSERT(pcb != NULL, ("NULL vfp pcb")); + KASSERT(td->td_pcb == pcb, ("Invalid vfp pcb")); + + vfp_save_state_common(td, pcb); +} + +void +vfp_save_state_savectx(struct pcb *pcb) +{ + /* + * savectx() will be called on panic with dumppcb as an argument, + * dumppcb doesn't have pcb_fpusaved set, so set it to save + * the VFP registers. + */ + MPASS(pcb->pcb_fpusaved == NULL); + pcb->pcb_fpusaved = &pcb->pcb_fpustate; + + vfp_save_state_common(curthread, pcb); +} + /* * Update the VFP state for a forked process or new thread. The PCB will * have been copied from the old thread. diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h index 8c3d56918822..7f4c86e7737d 100644 --- a/sys/arm64/include/vfp.h +++ b/sys/arm64/include/vfp.h @@ -78,6 +78,7 @@ void vfp_new_thread(struct thread *, struct thread *, bool); void vfp_reset_state(struct thread *, struct pcb *); void vfp_restore_state(void); void vfp_save_state(struct thread *, struct pcb *); +void vfp_save_state_savectx(struct pcb *); struct fpu_kern_ctx; From nobody Mon Oct 21 15: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 4XXJWn1cgyz5ZNbv; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWn0Qbrz4fSc; Mon, 21 Oct 2024 15: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=1729523109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6FFuIiOSOQWlPpvh6gU3koZDiQC3nJCpSqKE9SV/2g=; b=JROOTpvDXOGqTJeAnXKzGFg6qzGYzCkILwwCEtPaCT9WafOrA0BwuvZSaNXX9DQg26v4X+ J7GnrRj9/DlRp8kC5fI6G2hENRHS6jAP4oKDprwtC9yKP0GhW4kmvssvsRTz2I0aXNwV6A JyYut9GU7nH42aZN+suL6OM/tIsBBYxaRme6BZBzj0XwAtA736gacnA7nvt7OfXTL1+3Xh 1BpFQrOEXX0OpleLIVkdR3T9uGIgCTB0YdYP7wecf5jQyOLk1T3Du430cvBMdeArAlxNVx BHYu+zvuGlHFNUZFPHcu0FZ7xBMbn4xBfeGR+0pvOpQY4Vfl64PKPF+FdCRQ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6FFuIiOSOQWlPpvh6gU3koZDiQC3nJCpSqKE9SV/2g=; b=xJizbtThzG3GBgy5rJ5mVSz7uqWnHT+5zVVRVm4g1DYI9WTmF1pvp79KvOGoq4yWSNvAou l0YU+kZwCFyUe85CEiBtyLwAiNq1Ltje0SYO4aoEaIftjyuCozjPuGLFuZw9Ki/UHZUgAZ 3v1eh3YxI72Fs0rTPMdrpqfc/LV45PmqflRfHaO9JcHNwGTq3hJ9cIcTKbpLd1Ols2vS1h +ZASL+iV/d2RZDrXLw0DlA152BClh3z4bertU9c9ONWx7pmeddr3TODeiCyT+8jccthEae 2d6adwg9YhkRVpKc7ElW68EQLCGMcxPzcSxBsDi2VR3RSgDO4iv9zF20XNsWeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523109; a=rsa-sha256; cv=none; b=Z9kKEdb/C1xgCHEVjS1GrwsISTV3p9i2q+fqMQ6WvDG3FvVMnv09qWhWOkeFAa0LxUy78V EpaNJ/drv6HfdoSaqme9TwgPKBb2GTJcmcB5Pu6uEqOs4jK4vOyBzjZ1Uwytmaw0Y+CGvd EycjdjV+AwMoZ2siCMHVkOTnX6X03b9jEg/IoS1iNA1MYOX60AlcxQ8P8uh0KgmFPXFJqs e8lQsRtwDrkuA2Y6n5Yoo8MMMY8K+XJoyvOQVXUg7B8jhJ9UZmVpWdnKXUxelBVKu6Idoi fpUWhDNFMxZk/hCirVbWB52v8LWZYymGidGb3jKsODbWh6589aFSnyiq/xlfNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWm739dzbQl; Mon, 21 Oct 2024 15:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF580J046868; Mon, 21 Oct 2024 15:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF58n8046865; Mon, 21 Oct 2024 15:05:08 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:08 GMT Message-Id: <202410211505.49LF58n8046865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 3f2ed1883896 - stable/14 - arm64: Create a version of vfp_save_state for cpu_switch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f2ed1883896651e51a98060f34808457d24f679 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3f2ed1883896651e51a98060f34808457d24f679 commit 3f2ed1883896651e51a98060f34808457d24f679 Author: Andrew Turner AuthorDate: 2024-06-12 13:09:14 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Create a version of vfp_save_state for cpu_switch This will be used when we add SVE support to reduce the registers needed to be saved on context switch. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43305 (cherry picked from commit a30149b2a9c6ac5280523eea9570e5b5e5f1fdf8) --- sys/arm64/arm64/swtch.S | 4 +--- sys/arm64/arm64/vfp.c | 8 ++++++++ sys/arm64/include/vfp.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 9c43de3a9eae..882bfd7cf05a 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -146,9 +146,7 @@ ENTRY(cpu_switch) mov x21, x2 #ifdef VFP - /* Load the pcb address */ - mov x1, x4 - bl vfp_save_state + bl vfp_save_state_switch mov x0, x20 #else mov x0, x1 diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index f35cd960702b..c65108a83399 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -216,6 +216,14 @@ vfp_save_state_savectx(struct pcb *pcb) vfp_save_state_common(curthread, pcb); } +void +vfp_save_state_switch(struct thread *td) +{ + KASSERT(td != NULL, ("NULL vfp thread")); + + vfp_save_state_common(td, td->td_pcb); +} + /* * Update the VFP state for a forked process or new thread. The PCB will * have been copied from the old thread. diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h index 7f4c86e7737d..47d068d6050c 100644 --- a/sys/arm64/include/vfp.h +++ b/sys/arm64/include/vfp.h @@ -79,6 +79,7 @@ void vfp_reset_state(struct thread *, struct pcb *); void vfp_restore_state(void); void vfp_save_state(struct thread *, struct pcb *); void vfp_save_state_savectx(struct pcb *); +void vfp_save_state_switch(struct thread *); struct fpu_kern_ctx; From nobody Mon Oct 21 15: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 4XXJWp483vz5ZNyj; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWp18Wsz4fHb; Mon, 21 Oct 2024 15: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=1729523110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPrW0h4KeTICzsxQotfC/hzY9cuuyj6lYMHTT/maIu0=; b=ahm7+2SbcKRbWnps+ot1xMAPl8aQtfORpThzMMjwkhd+Wb2flVkhcQfE6tgZ4ymQ/r6Ngd 8Wqw07/HMBqIAVqziiA3iJl/6K92BsGOxlMfy6mJ0dfqms1X2pLuADj+dFFQ1NcoT2d/TV mXEe5J9GgCBqTXHZbevIkkyom+UVN22i8Rzr7Hdm4nM42xMBO6HmuPz+7miV2jmq3tZ9cz jF4QE2LgijgmbQW5WO38PCUaIhKyVF77ikP+UghlnRk3FM/Nnmn0PlORwfhUnWLYSQ2Arc xsvlGJHi1U0iwdv81Q3MSzxZ09s3mMMuXfE0uOelg0JGNBFdMnwi7MvboirzbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPrW0h4KeTICzsxQotfC/hzY9cuuyj6lYMHTT/maIu0=; b=ceFrHOu8jp+9i7Q0yguEsQl99CM3Pj0CNKJOUlzmKhP1TKbPKEnzmcdkQR9wDzsPnsf2xO vNRICnlbzJPATkzrE/GaOxq68CCVRqIrJajHqIyirXf82sql+OxOJltkET79yDdXn+lfI1 XRJFA8syQMhKhP5P4utH5r3R/5w1V4Bj54gYIRiFFs5iroBavnhkMwAC1O8/rUlKDuy3ud jFOqRjL0oy9LlfqOE3k74ZcSIFJzH9kZjJNO/knnMChoJPBTto0m8R6pKqy1LFmxBfhFgh gWXNIFQf0r24FoknJlJmwTftRcuHCFSJjdRNfSLX5qWtsfwe8tZhzfwWvvUy6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523110; a=rsa-sha256; cv=none; b=JcbmUxlALEjFxyhDOmJHItMFc60q+SVFvp4+BN9CCuHb3lbXRIbndlb7TJj4ZltBIRHYsD pBNVoNirSIzY0WO20nT0h9wUBy13GWke/kFUGc3eA2vuypHjWs3Ps9lIPErIIezedCP7Jc DwNpglK5/ZYIG60pmW54L5aWs7VbWOI7+O7wOEBWS2lCaEzo/r2oNuNTiDlEv3ax2AFuhx RNWibQkDJDokf0YxQlXog99mGe4qKFgRe+kKq8YvSL5ALgOpfmBX3Sv0cZMTd1yssBS5Vi hwwwoq+xTAx5g4SudUk1l2WB4daf6TtZJlKf6l49AK2L0urFZPqLmfgPagtuTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWp0gQLzb1R; Mon, 21 Oct 2024 15:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5A7i046933; Mon, 21 Oct 2024 15:05:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5ADH046930; Mon, 21 Oct 2024 15:05:10 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:10 GMT Message-Id: <202410211505.49LF5ADH046930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 2c5961fff4e5 - stable/14 - arm64: Initial SVE support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c5961fff4e5f31079d69e57105132ef9685ca53 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5961fff4e5f31079d69e57105132ef9685ca53 commit 2c5961fff4e5f31079d69e57105132ef9685ca53 Author: Andrew Turner AuthorDate: 2024-09-27 13:36:35 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Initial SVE support Add initial kernel support for SVE. This detects if SVE is present on all CPUs, and if so allows for the use of SVE in the future. As the SVE registers are a superset of the VFP registers we don't need to restore the VFP registers when SVE is enabled. Ths interface to enable SVE is provided, but not used until SVE is supported in signals and with ptrace. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43306 (cherry picked from commit 332c426328dbb30a6b2e69d9b1e8298d77d85bd1) --- sys/arm64/arm64/exec_machdep.c | 2 + sys/arm64/arm64/trap.c | 3 +- sys/arm64/arm64/vfp.c | 606 +++++++++++++++++++++++++++++++++++++++-- sys/arm64/include/armreg.h | 7 + sys/arm64/include/pcb.h | 8 +- sys/arm64/include/vfp.h | 6 + 6 files changed, 610 insertions(+), 22 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index bc4ee178db23..31191ec21602 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -607,6 +607,8 @@ sys_sigreturn(struct thread *td, struct sigreturn_args *uap) if (copyin(uap->sigcntxp, &uc, sizeof(uc))) return (EFAULT); + /* Stop an interrupt from causing the sve state to be dropped */ + td->td_sa.code = -1; error = set_mcontext(td, &uc.uc_mcontext); if (error != 0) return (error); diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 69c5cd73ade8..78582f5ac563 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -730,7 +730,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame) break; } - KASSERT((td->td_pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, + KASSERT( + (td->td_pcb->pcb_fpflags & ~(PCB_FP_USERMASK|PCB_FP_SVEVALID)) == 0, ("Kernel VFP flags set while entering userspace")); KASSERT( td->td_pcb->pcb_fpusaved == &td->td_pcb->pcb_fpustate, diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index c65108a83399..d57927991c03 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -30,11 +30,13 @@ #ifdef VFP #include #include +#include #include #include #include #include #include +#include #include @@ -60,6 +62,63 @@ struct fpu_kern_ctx { static uma_zone_t fpu_save_area_zone; static struct vfpstate *fpu_initialstate; +static u_int sve_max_vector_len; + +static size_t +_sve_buf_size(u_int sve_len) +{ + size_t len; + + /* 32 vector registers */ + len = (size_t)sve_len * 32; + /* + * 16 predicate registers and the fault fault register, each 1/8th + * the size of a vector register. + */ + len += ((size_t)sve_len * 17) / 8; + /* + * FPSR and FPCR + */ + len += sizeof(uint64_t) * 2; + + return (len); +} + +size_t +sve_max_buf_size(void) +{ + MPASS(sve_max_vector_len > 0); + return (_sve_buf_size(sve_max_vector_len)); +} + +size_t +sve_buf_size(struct thread *td) +{ + struct pcb *pcb; + + pcb = td->td_pcb; + MPASS(pcb->pcb_svesaved != NULL); + MPASS(pcb->pcb_sve_len > 0); + + return (_sve_buf_size(pcb->pcb_sve_len)); +} + +static void * +sve_alloc(void) +{ + void *buf; + + buf = malloc(sve_max_buf_size(), M_FPUKERN_CTX, M_WAITOK | M_ZERO); + + return (buf); +} + +static void +sve_free(void *buf) +{ + free(buf, M_FPUKERN_CTX); +} + void vfp_enable(void) { @@ -71,13 +130,30 @@ vfp_enable(void) isb(); } +static void +sve_enable(void) +{ + uint32_t cpacr; + + cpacr = READ_SPECIALREG(cpacr_el1); + /* Enable FP */ + cpacr = (cpacr & ~CPACR_FPEN_MASK) | CPACR_FPEN_TRAP_NONE; + /* Enable SVE */ + cpacr = (cpacr & ~CPACR_ZEN_MASK) | CPACR_ZEN_TRAP_NONE; + WRITE_SPECIALREG(cpacr_el1, cpacr); + isb(); +} + void vfp_disable(void) { uint32_t cpacr; cpacr = READ_SPECIALREG(cpacr_el1); + /* Disable FP */ cpacr = (cpacr & ~CPACR_FPEN_MASK) | CPACR_FPEN_TRAP_ALL1; + /* Disable SVE */ + cpacr = (cpacr & ~CPACR_ZEN_MASK) | CPACR_ZEN_TRAP_ALL1; WRITE_SPECIALREG(cpacr_el1, cpacr); isb(); } @@ -171,9 +247,266 @@ vfp_restore(struct vfpstate *state) } static void -vfp_save_state_common(struct thread *td, struct pcb *pcb) +sve_store(void *state, u_int sve_len) +{ + vm_offset_t f_start, p_start, z_start; + uint64_t fpcr, fpsr; + + /* + * Calculate the start of each register groups. There are three + * groups depending on size, with the First Fault Register (FFR) + * stored with the predicate registers as we use one of them to + * temporarily hold it. + * + * +-------------------------+-------------------+ + * | Contents | Register size | + * z_start -> +-------------------------+-------------------+ + * | | | + * | 32 Z regs | sve_len | + * | | | + * p_start -> +-------------------------+-------------------+ + * | | | + * | 16 Predicate registers | 1/8 size of Z reg | + * | 1 First Fault register | | + * | | | + * f_start -> +-------------------------+-------------------+ + * | | | + * | FPSR/FPCR | 32 bit | + * | | | + * +-------------------------+-------------------+ + */ + z_start = (vm_offset_t)state; + p_start = z_start + sve_len * 32; + f_start = p_start + (sve_len / 8) * 17; + + __asm __volatile( + ".arch_extension sve \n" + "str z0, [%0, #0, MUL VL] \n" + "str z1, [%0, #1, MUL VL] \n" + "str z2, [%0, #2, MUL VL] \n" + "str z3, [%0, #3, MUL VL] \n" + "str z4, [%0, #4, MUL VL] \n" + "str z5, [%0, #5, MUL VL] \n" + "str z6, [%0, #6, MUL VL] \n" + "str z7, [%0, #7, MUL VL] \n" + "str z8, [%0, #8, MUL VL] \n" + "str z9, [%0, #9, MUL VL] \n" + "str z10, [%0, #10, MUL VL] \n" + "str z11, [%0, #11, MUL VL] \n" + "str z12, [%0, #12, MUL VL] \n" + "str z13, [%0, #13, MUL VL] \n" + "str z14, [%0, #14, MUL VL] \n" + "str z15, [%0, #15, MUL VL] \n" + "str z16, [%0, #16, MUL VL] \n" + "str z17, [%0, #17, MUL VL] \n" + "str z18, [%0, #18, MUL VL] \n" + "str z19, [%0, #19, MUL VL] \n" + "str z20, [%0, #20, MUL VL] \n" + "str z21, [%0, #21, MUL VL] \n" + "str z22, [%0, #22, MUL VL] \n" + "str z23, [%0, #23, MUL VL] \n" + "str z24, [%0, #24, MUL VL] \n" + "str z25, [%0, #25, MUL VL] \n" + "str z26, [%0, #26, MUL VL] \n" + "str z27, [%0, #27, MUL VL] \n" + "str z28, [%0, #28, MUL VL] \n" + "str z29, [%0, #29, MUL VL] \n" + "str z30, [%0, #30, MUL VL] \n" + "str z31, [%0, #31, MUL VL] \n" + /* Store the predicate registers */ + "str p0, [%1, #0, MUL VL] \n" + "str p1, [%1, #1, MUL VL] \n" + "str p2, [%1, #2, MUL VL] \n" + "str p3, [%1, #3, MUL VL] \n" + "str p4, [%1, #4, MUL VL] \n" + "str p5, [%1, #5, MUL VL] \n" + "str p6, [%1, #6, MUL VL] \n" + "str p7, [%1, #7, MUL VL] \n" + "str p8, [%1, #8, MUL VL] \n" + "str p9, [%1, #9, MUL VL] \n" + "str p10, [%1, #10, MUL VL] \n" + "str p11, [%1, #11, MUL VL] \n" + "str p12, [%1, #12, MUL VL] \n" + "str p13, [%1, #13, MUL VL] \n" + "str p14, [%1, #14, MUL VL] \n" + "str p15, [%1, #15, MUL VL] \n" + ".arch_extension nosve \n" + : : "r"(z_start), "r"(p_start)); + + /* Save the FFR if needed */ + /* TODO: Skip if in SME streaming mode (when supported) */ + __asm __volatile( + ".arch_extension sve \n" + "rdffr p0.b \n" + "str p0, [%0, #16, MUL VL] \n" + /* + * Load the old p0 value to ensure it is consistent if we enable + * without calling sve_restore, e.g. switch to a kernel thread and + * back. + */ + "ldr p0, [%0, #0, MUL VL] \n" + ".arch_extension nosve \n" + : : "r"(p_start)); + + __asm __volatile( + ".arch_extension fp \n" + "mrs %0, fpsr \n" + "mrs %1, fpcr \n" + "stp %w0, %w1, [%2] \n" + ".arch_extension nofp \n" + : "=&r"(fpsr), "=&r"(fpcr) : "r"(f_start)); +} + +static void +sve_restore(void *state, u_int sve_len) +{ + vm_offset_t f_start, p_start, z_start; + uint64_t fpcr, fpsr; + + /* See sve_store for the layout of the state buffer */ + z_start = (vm_offset_t)state; + p_start = z_start + sve_len * 32; + f_start = p_start + (sve_len / 8) * 17; + + __asm __volatile( + ".arch_extension sve \n" + "ldr p0, [%0, #16, MUL VL] \n" + "wrffr p0.b \n" + ".arch_extension nosve \n" + : : "r"(p_start)); + + __asm __volatile( + ".arch_extension sve \n" + "ldr z0, [%0, #0, MUL VL] \n" + "ldr z1, [%0, #1, MUL VL] \n" + "ldr z2, [%0, #2, MUL VL] \n" + "ldr z3, [%0, #3, MUL VL] \n" + "ldr z4, [%0, #4, MUL VL] \n" + "ldr z5, [%0, #5, MUL VL] \n" + "ldr z6, [%0, #6, MUL VL] \n" + "ldr z7, [%0, #7, MUL VL] \n" + "ldr z8, [%0, #8, MUL VL] \n" + "ldr z9, [%0, #9, MUL VL] \n" + "ldr z10, [%0, #10, MUL VL] \n" + "ldr z11, [%0, #11, MUL VL] \n" + "ldr z12, [%0, #12, MUL VL] \n" + "ldr z13, [%0, #13, MUL VL] \n" + "ldr z14, [%0, #14, MUL VL] \n" + "ldr z15, [%0, #15, MUL VL] \n" + "ldr z16, [%0, #16, MUL VL] \n" + "ldr z17, [%0, #17, MUL VL] \n" + "ldr z18, [%0, #18, MUL VL] \n" + "ldr z19, [%0, #19, MUL VL] \n" + "ldr z20, [%0, #20, MUL VL] \n" + "ldr z21, [%0, #21, MUL VL] \n" + "ldr z22, [%0, #22, MUL VL] \n" + "ldr z23, [%0, #23, MUL VL] \n" + "ldr z24, [%0, #24, MUL VL] \n" + "ldr z25, [%0, #25, MUL VL] \n" + "ldr z26, [%0, #26, MUL VL] \n" + "ldr z27, [%0, #27, MUL VL] \n" + "ldr z28, [%0, #28, MUL VL] \n" + "ldr z29, [%0, #29, MUL VL] \n" + "ldr z30, [%0, #30, MUL VL] \n" + "ldr z31, [%0, #31, MUL VL] \n" + /* Store the predicate registers */ + "ldr p0, [%1, #0, MUL VL] \n" + "ldr p1, [%1, #1, MUL VL] \n" + "ldr p2, [%1, #2, MUL VL] \n" + "ldr p3, [%1, #3, MUL VL] \n" + "ldr p4, [%1, #4, MUL VL] \n" + "ldr p5, [%1, #5, MUL VL] \n" + "ldr p6, [%1, #6, MUL VL] \n" + "ldr p7, [%1, #7, MUL VL] \n" + "ldr p8, [%1, #8, MUL VL] \n" + "ldr p9, [%1, #9, MUL VL] \n" + "ldr p10, [%1, #10, MUL VL] \n" + "ldr p11, [%1, #11, MUL VL] \n" + "ldr p12, [%1, #12, MUL VL] \n" + "ldr p13, [%1, #13, MUL VL] \n" + "ldr p14, [%1, #14, MUL VL] \n" + "ldr p15, [%1, #15, MUL VL] \n" + ".arch_extension nosve \n" + : : "r"(z_start), "r"(p_start)); + + __asm __volatile( + ".arch_extension fp \n" + "ldp %w0, %w1, [%2] \n" + "msr fpsr, %0 \n" + "msr fpcr, %1 \n" + ".arch_extension nofp \n" + : "=&r"(fpsr), "=&r"(fpcr) : "r"(f_start)); +} + +/* + * Sync the VFP registers to the SVE register state, e.g. in signal return + * when userspace may have changed the vfp register values and expect them + * to be used when the signal handler returns. + */ +void +vfp_to_sve_sync(struct thread *td) +{ + struct pcb *pcb; + uint32_t *fpxr; + + pcb = td->td_pcb; + if (pcb->pcb_svesaved == NULL) + return; + + MPASS(pcb->pcb_fpusaved != NULL); + + /* Copy the VFP registers to the SVE region */ + for (int i = 0; i < nitems(pcb->pcb_fpusaved->vfp_regs); i++) { + __uint128_t *sve_reg; + + sve_reg = (__uint128_t *)((uintptr_t)pcb->pcb_svesaved + + i * pcb->pcb_sve_len); + *sve_reg = pcb->pcb_fpusaved->vfp_regs[i]; + } + + fpxr = (uint32_t *)((uintptr_t)pcb->pcb_svesaved + + (32 * pcb->pcb_sve_len) + (17 * pcb->pcb_sve_len / 8)); + fpxr[0] = pcb->pcb_fpusaved->vfp_fpsr; + fpxr[1] = pcb->pcb_fpusaved->vfp_fpcr; +} + +/* + * Sync the SVE registers to the VFP register state. + */ +void +sve_to_vfp_sync(struct thread *td) +{ + struct pcb *pcb; + uint32_t *fpxr; + + pcb = td->td_pcb; + if (pcb->pcb_svesaved == NULL) + return; + + MPASS(pcb->pcb_fpusaved == &pcb->pcb_fpustate); + + /* Copy the SVE registers to the VFP saved state */ + for (int i = 0; i < nitems(pcb->pcb_fpusaved->vfp_regs); i++) { + __uint128_t *sve_reg; + + sve_reg = (__uint128_t *)((uintptr_t)pcb->pcb_svesaved + + i * pcb->pcb_sve_len); + pcb->pcb_fpusaved->vfp_regs[i] = *sve_reg; + } + + fpxr = (uint32_t *)((uintptr_t)pcb->pcb_svesaved + + (32 * pcb->pcb_sve_len) + (17 * pcb->pcb_sve_len / 8)); + pcb->pcb_fpusaved->vfp_fpsr = fpxr[0]; + pcb->pcb_fpusaved->vfp_fpcr = fpxr[1]; +} + +static void +vfp_save_state_common(struct thread *td, struct pcb *pcb, bool full_save) { uint32_t cpacr; + bool save_sve; + + save_sve = false; critical_enter(); /* @@ -181,14 +514,49 @@ vfp_save_state_common(struct thread *td, struct pcb *pcb) * i.e. return if we are trapping on FP access. */ cpacr = READ_SPECIALREG(cpacr_el1); - if ((cpacr & CPACR_FPEN_MASK) == CPACR_FPEN_TRAP_NONE) { - KASSERT(PCPU_GET(fpcurthread) == td, - ("Storing an invalid VFP state")); + if ((cpacr & CPACR_FPEN_MASK) != CPACR_FPEN_TRAP_NONE) + goto done; + KASSERT(PCPU_GET(fpcurthread) == td, + ("Storing an invalid VFP state")); + + /* + * Also save the SVE state. As SVE depends on the VFP being + * enabled we can rely on only needing to check this when + * the VFP unit has been enabled. + */ + if ((cpacr & CPACR_ZEN_MASK) == CPACR_ZEN_TRAP_NONE) { + /* If SVE is enabled it should be valid */ + MPASS((pcb->pcb_fpflags & PCB_FP_SVEVALID) != 0); + + /* + * If we are switching while in a system call skip saving + * SVE registers. The ABI allows us to drop them over any + * system calls, however doing so is expensive in SVE + * heavy userspace code. This would require us to disable + * SVE for all system calls and trap the next use of them. + * As an optimisation only disable SVE on context switch. + */ + if (td->td_frame == NULL || + (ESR_ELx_EXCEPTION(td->td_frame->tf_esr) != EXCP_SVC64 && + td->td_sa.code != (u_int)-1)) + save_sve = true; + } + + if (save_sve) { + KASSERT(pcb->pcb_svesaved != NULL, + ("Storing to a NULL SVE state")); + sve_store(pcb->pcb_svesaved, pcb->pcb_sve_len); + if (full_save) + sve_to_vfp_sync(td); + } else { + pcb->pcb_fpflags &= ~PCB_FP_SVEVALID; vfp_store(pcb->pcb_fpusaved); - dsb(ish); - vfp_disable(); } + dsb(ish); + vfp_disable(); + +done: critical_exit(); } @@ -199,7 +567,7 @@ vfp_save_state(struct thread *td, struct pcb *pcb) KASSERT(pcb != NULL, ("NULL vfp pcb")); KASSERT(td->td_pcb == pcb, ("Invalid vfp pcb")); - vfp_save_state_common(td, pcb); + vfp_save_state_common(td, pcb, true); } void @@ -213,7 +581,7 @@ vfp_save_state_savectx(struct pcb *pcb) MPASS(pcb->pcb_fpusaved == NULL); pcb->pcb_fpusaved = &pcb->pcb_fpustate; - vfp_save_state_common(curthread, pcb); + vfp_save_state_common(curthread, pcb, true); } void @@ -221,7 +589,7 @@ vfp_save_state_switch(struct thread *td) { KASSERT(td != NULL, ("NULL vfp thread")); - vfp_save_state_common(td, td->td_pcb); + vfp_save_state_common(td, td->td_pcb, false); } /* @@ -231,21 +599,40 @@ vfp_save_state_switch(struct thread *td) void vfp_new_thread(struct thread *newtd, struct thread *oldtd, bool fork) { - struct pcb *newpcb; + struct pcb *newpcb, *oldpcb; newpcb = newtd->td_pcb; + oldpcb = oldtd->td_pcb; /* Kernel threads start with clean VFP */ if ((oldtd->td_pflags & TDP_KTHREAD) != 0) { newpcb->pcb_fpflags &= - ~(PCB_FP_STARTED | PCB_FP_KERN | PCB_FP_NOSAVE); + ~(PCB_FP_STARTED | PCB_FP_SVEVALID | PCB_FP_KERN | + PCB_FP_NOSAVE); } else { MPASS((newpcb->pcb_fpflags & (PCB_FP_KERN|PCB_FP_NOSAVE)) == 0); + + /* + * The only SVE register state to be guaranteed to be saved + * a system call is the lower bits of the Z registers as + * these are aliased with the existing FP registers. Because + * we can only create a new thread or fork through a system + * call it is safe to drop the SVE state in the new thread. + */ + newpcb->pcb_fpflags &= ~PCB_FP_SVEVALID; if (!fork) { newpcb->pcb_fpflags &= ~PCB_FP_STARTED; } } + newpcb->pcb_svesaved = NULL; + if (oldpcb->pcb_svesaved == NULL) + newpcb->pcb_sve_len = sve_max_vector_len; + else + KASSERT(newpcb->pcb_sve_len == oldpcb->pcb_sve_len, + ("%s: pcb sve vector length differs: %x != %x", __func__, + newpcb->pcb_sve_len, oldpcb->pcb_sve_len)); + newpcb->pcb_fpusaved = &newpcb->pcb_fpustate; newpcb->pcb_vfpcpu = UINT_MAX; } @@ -272,23 +659,48 @@ vfp_reset_state(struct thread *td, struct pcb *pcb) ("pcb_fpusaved should point to pcb_fpustate.")); pcb->pcb_fpustate.vfp_fpcr = VFPCR_INIT; pcb->pcb_fpustate.vfp_fpsr = 0; + /* XXX: Memory leak when using SVE between fork & exec? */ + pcb->pcb_svesaved = NULL; pcb->pcb_vfpcpu = UINT_MAX; pcb->pcb_fpflags = 0; } -void -vfp_restore_state(void) +static void +vfp_restore_state_common(struct thread *td, int flags) { struct pcb *curpcb; u_int cpu; + bool restore_sve; + + KASSERT(td == curthread, ("%s: Called with non-current thread", + __func__)); critical_enter(); cpu = PCPU_GET(cpuid); - curpcb = curthread->td_pcb; - curpcb->pcb_fpflags |= PCB_FP_STARTED; + curpcb = td->td_pcb; - vfp_enable(); + /* + * If SVE has been used and the base VFP state is in use then + * restore the SVE registers. A non-base VFP state should only + * be used by the kernel and SVE should onlu be used by userspace. + */ + restore_sve = false; + if ((curpcb->pcb_fpflags & PCB_FP_SVEVALID) != 0 && + curpcb->pcb_fpusaved == &curpcb->pcb_fpustate) { + MPASS(curpcb->pcb_svesaved != NULL); + /* SVE shouldn't be enabled in the kernel */ + MPASS((flags & PCB_FP_KERN) == 0); + restore_sve = true; + } + + if (restore_sve) { + MPASS((curpcb->pcb_fpflags & PCB_FP_SVEVALID) != 0); + sve_enable(); + } else { + curpcb->pcb_fpflags |= PCB_FP_STARTED; + vfp_enable(); + } /* * If the previous thread on this cpu to use the VFP was not the @@ -296,14 +708,104 @@ vfp_restore_state(void) * cpu we need to restore the old state. */ if (PCPU_GET(fpcurthread) != curthread || cpu != curpcb->pcb_vfpcpu) { - vfp_restore(curthread->td_pcb->pcb_fpusaved); - PCPU_SET(fpcurthread, curthread); + /* + * The VFP registers are the lower 128 bits of the SVE + * registers. Use the SVE store state if it was previously + * enabled. + */ + if (restore_sve) { + MPASS(td->td_pcb->pcb_svesaved != NULL); + sve_restore(td->td_pcb->pcb_svesaved, + td->td_pcb->pcb_sve_len); + } else { + vfp_restore(td->td_pcb->pcb_fpusaved); + } + PCPU_SET(fpcurthread, td); curpcb->pcb_vfpcpu = cpu; } critical_exit(); } +void +vfp_restore_state(void) +{ + struct thread *td; + + td = curthread; + vfp_restore_state_common(td, td->td_pcb->pcb_fpflags); +} + +bool +sve_restore_state(struct thread *td) +{ + struct pcb *curpcb; + void *svesaved; + uint64_t cpacr; + + KASSERT(td == curthread, ("%s: Called with non-current thread", + __func__)); + + curpcb = td->td_pcb; + + /* The SVE state should alias the base VFP state */ + MPASS(curpcb->pcb_fpusaved == &curpcb->pcb_fpustate); + + /* SVE not enabled, tell the caller to raise a fault */ + if (curpcb->pcb_sve_len == 0) { + /* + * The init pcb is created before we read the vector length. + * Set it to the default length. + */ + if (sve_max_vector_len == 0) + return (false); + + MPASS(curpcb->pcb_svesaved == NULL); + curpcb->pcb_sve_len = sve_max_vector_len; + } + + if (curpcb->pcb_svesaved == NULL) { + /* SVE should be disabled so will be invalid */ + MPASS((curpcb->pcb_fpflags & PCB_FP_SVEVALID) == 0); + + /* + * Allocate the SVE buffer of this thread. + * Enable interrupts so the allocation can sleep + */ + svesaved = sve_alloc(); + + critical_enter(); + + /* Restore the VFP state if needed */ + cpacr = READ_SPECIALREG(cpacr_el1); + if ((cpacr & CPACR_FPEN_MASK) != CPACR_FPEN_TRAP_NONE) { + vfp_restore_state_common(td, curpcb->pcb_fpflags); + } + + /* + * Set the flags after enabling the VFP as the SVE saved + * state will be invalid. + */ + curpcb->pcb_svesaved = svesaved; + curpcb->pcb_fpflags |= PCB_FP_SVEVALID; + sve_enable(); + + critical_exit(); + } else { + vfp_restore_state_common(td, curpcb->pcb_fpflags); + + /* Enable SVE if it wasn't previously enabled */ + if ((curpcb->pcb_fpflags & PCB_FP_SVEVALID) == 0) { + critical_enter(); + sve_enable(); + curpcb->pcb_fpflags |= PCB_FP_SVEVALID; + critical_exit(); + } + } + + return (true); +} + void vfp_init_secondary(void) { @@ -348,6 +850,74 @@ vfp_init(const void *dummy __unused) SYSINIT(vfp, SI_SUB_CPU, SI_ORDER_ANY, vfp_init, NULL); +static void +sve_thread_dtor(void *arg __unused, struct thread *td) +{ + sve_free(td->td_pcb->pcb_svesaved); +} + +static void +sve_pcpu_read(void *arg) +{ + u_int *len; + uint64_t vl; + + len = arg; + + /* Enable SVE to read zcr_el1 and VFP for rdvl */ + sve_enable(); + + /* Set the longest vector length */ + WRITE_SPECIALREG(ZCR_EL1_REG, ZCR_LEN_MASK); + isb(); + + /* Read the real vector length */ + __asm __volatile( + ".arch_extension sve \n" + "rdvl %0, #1 \n" + ".arch_extension nosve \n" + : "=&r"(vl)); + + vfp_disable(); + + len[PCPU_GET(cpuid)] = vl; +} + +static void +sve_init(const void *dummy __unused) +{ + u_int *len_list; + uint64_t reg; + int i; + + if (!get_kernel_reg(ID_AA64PFR0_EL1, ®)) + return; + + if (ID_AA64PFR0_SVE_VAL(reg) == ID_AA64PFR0_SVE_NONE) + return; + + len_list = malloc(sizeof(*len_list) * (mp_maxid + 1), M_TEMP, + M_WAITOK | M_ZERO); + smp_rendezvous(NULL, sve_pcpu_read, NULL, len_list); + + sve_max_vector_len = ZCR_LEN_BYTES(ZCR_LEN_MASK); + CPU_FOREACH(i) { + if (bootverbose) + printf("CPU%d SVE vector length: %u\n", i, len_list[i]); + sve_max_vector_len = MIN(sve_max_vector_len, len_list[i]); + } + free(len_list, M_TEMP); + + if (bootverbose) + printf("SVE with %u byte vectors\n", sve_max_vector_len); + + if (sve_max_vector_len > 0) { + EVENTHANDLER_REGISTER(thread_dtor, sve_thread_dtor, NULL, + EVENTHANDLER_PRI_ANY); + } +} +SYSINIT(sve, SI_SUB_SMP, SI_ORDER_ANY, sve_init, NULL); + struct fpu_kern_ctx * fpu_kern_alloc_ctx(u_int flags) { diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 8bf4445e13b3..2b92c036ef1c 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2567,6 +2567,13 @@ #define VBAR_EL12_op2 0 /* ZCR_EL1 - SVE Control Register */ +#define ZCR_EL1 MRS_REG(ZCR_EL1) +#define ZCR_EL1_REG MRS_REG_ALT_NAME(ZCR_EL1_REG) +#define ZCR_EL1_REG_op0 3 +#define ZCR_EL1_REG_op1 0 +#define ZCR_EL1_REG_CRn 1 +#define ZCR_EL1_REG_CRm 2 +#define ZCR_EL1_REG_op2 0 #define ZCR_LEN_SHIFT 0 #define ZCR_LEN_MASK (0xf << ZCR_LEN_SHIFT) #define ZCR_LEN_BYTES(x) ((((x) & ZCR_LEN_MASK) + 1) * 16) diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index d7392d5f2032..273b53cdc6cf 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -59,17 +59,19 @@ struct pcb { u_int pcb_flags; #define PCB_SINGLE_STEP_SHIFT 0 #define PCB_SINGLE_STEP (1 << PCB_SINGLE_STEP_SHIFT) - uint32_t pcb_pad1; + u_int pcb_sve_len; /* The SVE vector length */ struct vfpstate *pcb_fpusaved; int pcb_fpflags; #define PCB_FP_STARTED 0x00000001 +#define PCB_FP_SVEVALID 0x00000002 #define PCB_FP_KERN 0x40000000 #define PCB_FP_NOSAVE 0x80000000 /* The bits passed to userspace in get_fpcontext */ -#define PCB_FP_USERMASK (PCB_FP_STARTED) +#define PCB_FP_USERMASK (PCB_FP_STARTED | PCB_FP_SVEVALID) u_int pcb_vfpcpu; /* Last cpu this thread ran VFP code */ - uint64_t pcb_reserved[5]; + void *pcb_svesaved; + uint64_t pcb_reserved[4]; /* * The userspace VFP state. The pcb_fpusaved pointer will point to diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h index 47d068d6050c..fc93908add0b 100644 --- a/sys/arm64/include/vfp.h +++ b/sys/arm64/include/vfp.h @@ -80,6 +80,12 @@ void vfp_restore_state(void); void vfp_save_state(struct thread *, struct pcb *); void vfp_save_state_savectx(struct pcb *); void vfp_save_state_switch(struct thread *); +void vfp_to_sve_sync(struct thread *); +void sve_to_vfp_sync(struct thread *); + +size_t sve_max_buf_size(void); +size_t sve_buf_size(struct thread *); +bool sve_restore_state(struct thread *); struct fpu_kern_ctx; From nobody Mon Oct 21 15: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 4XXJWr0NyGz5ZNrb; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWq1kh7z4fHs; Mon, 21 Oct 2024 15: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=1729523111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vToR4MQ4/Gd6lpBO19j8jhbNOm5gd+wMlf5O2WhnzQ=; b=PyW9iW1heZrzdJXg7dJ8r9NGIAy8j+SpHHfFiSYhRfdr4+oDyDbwRMHVP1RT2GastSJhEa mOm+BT2Bod7yIat8SywDFvqU7cE2aSh7AJeWn5PGoMVYFuSu6iLW8TchExkTPbiUgXY4VC FPjSQ1CyT26blLkIy3X+nlkUwvxlfDebOHe9yRtO4rdu/5UvJzmMjkMqfGXsFpKCpU2YgX H8v5QoH0hRoiNMrDlLDyxmxmvWaMUaDmo2f4+p4Akkv4CpCoxsEoARAbnZsvSeNiDkiDOw N5VSB4F79Az7EnrbyO6fGURAueXXGwAqU2F3OCIf+kRr3EC4blqgbckdVwoWEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vToR4MQ4/Gd6lpBO19j8jhbNOm5gd+wMlf5O2WhnzQ=; b=Jk7p4dkASpcR6ry7iPpKBG8j7g65e526oL1N5PWqEnwpOUOxWQiEuhALKPLgBGrsjRL5yG 7uR5HrlurpsFC/y2eUMEU7PAc7zRfH+TBdMZaaD6ypktxfHiofCsTOX3O7LLsQBV61ACwh HbP59w/K4rUcWlOvk4r7D8ixAKP7gYmJwSufLtP/kYIy8y4eWIJfMQpWf1gxiR8ZruYa4O X6Z5+UmUU1p/BHuF+qaXBlKzrZBCODo8X/JEsKQJqS1s1X47YLO6WTUf8tXm7+/85V81Mj FvJ6uR6AsZJp+dLWlPu8aRcjH1eX9+oVT6oDv94+jsD6vOa4pfpmcOm70ojpSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523111; a=rsa-sha256; cv=none; b=fsVYD7bsX8zKY0K7LtXRtUlK25BzNaPhoLfnpV7TDKugV7mFA4QwKHmX7q0vm5zepCuUMB 84fe7nnCGCI8vKcrH80O0yC5F+fwOwvTGn4A6xtRgqaghFC7nMouTM3q9onWX3HPoEio+r Prr/Gr3zJofEhsXg0FDAt+WuRlbLib0RejDEC1qLVYSLdbNxfuk4dxo5kOs7oGGmUeaEXz TLNMpL3897iwq9CDrIA8HcNo+KIWQOPhWqZ5Irq3frUa/3M3dZ150ZgcJEg2i7Fh5DrjZJ fj2MbCraVHcG/+N/ricoBw/Zi0IRE0gBuGm/K/njdlwq2MJTZTOjv0oD7lzUVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWq1LzkzZfy; Mon, 21 Oct 2024 15:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5B5S046989; Mon, 21 Oct 2024 15:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5Bok046986; Mon, 21 Oct 2024 15:05:11 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:11 GMT Message-Id: <202410211505.49LF5Bok046986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 7588c7024ed9 - stable/14 - arm64: Add the SVE registers to the signal frame List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7588c7024ed9b3d9845529edd56e46b675430a02 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7588c7024ed9b3d9845529edd56e46b675430a02 commit 7588c7024ed9b3d9845529edd56e46b675430a02 Author: Andrew Turner AuthorDate: 2024-09-27 13:37:03 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Add the SVE registers to the signal frame Use the new extended register support in the arm64 signal frame to handle the SVE registers. As these registers alias the VFP registers we use the floating point register values to restore the lower bits of the SVE registers. This is to support software that doesn't understand SVE to continue working. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43307 (cherry picked from commit e45132e978030f0aa964d975a9fbad5614f260bd) --- sys/arm64/arm64/exec_machdep.c | 88 +++++++++++++++++++++++++++++++++++++++++- sys/arm64/include/ucontext.h | 8 ++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index 31191ec21602..67760850c56a 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -464,9 +464,10 @@ set_mcontext(struct thread *td, mcontext_t *mcp) #define PSR_13_MASK 0xfffffffful struct arm64_reg_context ctx; struct trapframe *tf = td->td_frame; + struct pcb *pcb; uint64_t spsr; vm_offset_t addr; - int error; + int error, seen_types; bool done; spsr = mcp->mc_gpregs.gp_spsr; @@ -512,7 +513,11 @@ set_mcontext(struct thread *td, mcontext_t *mcp) /* Read any register contexts we find */ if (mcp->mc_ptr != 0) { addr = mcp->mc_ptr; + pcb = td->td_pcb; + +#define CTX_TYPE_FLAG_SVE (1 << 0) + seen_types = 0; done = false; do { if (!__is_aligned(addr, @@ -524,6 +529,38 @@ set_mcontext(struct thread *td, mcontext_t *mcp) return (error); switch (ctx.ctx_id) { +#ifdef VFP + case ARM64_CTX_SVE: { + struct sve_context sve_ctx; + size_t buf_size; + + if ((seen_types & CTX_TYPE_FLAG_SVE) != 0) + return (EINVAL); + seen_types |= CTX_TYPE_FLAG_SVE; + + if (pcb->pcb_svesaved == NULL) + return (EINVAL); + + /* XXX: Check pcb_svesaved is valid */ + + buf_size = sve_buf_size(td); + /* Check the size is valid */ + if (ctx.ctx_size != + (sizeof(sve_ctx) + buf_size)) + return (EINVAL); + + memset(pcb->pcb_svesaved, 0, + sve_max_buf_size()); + + /* Copy the SVE registers from userspace */ + if (copyin((void *)(addr + sizeof(sve_ctx)), + pcb->pcb_svesaved, buf_size) != 0) + return (EINVAL); + + pcb->pcb_fpflags |= PCB_FP_SVEVALID; + break; + } +#endif case ARM64_CTX_END: done = true; break; @@ -533,6 +570,8 @@ set_mcontext(struct thread *td, mcontext_t *mcp) addr += ctx.ctx_size; } while (!done); + +#undef CTX_TYPE_FLAG_SVE } return (0); @@ -593,7 +632,7 @@ set_fpcontext(struct thread *td, mcontext_t *mcp) sizeof(mcp->mc_fpregs.fp_q)); curpcb->pcb_fpustate.vfp_fpcr = mcp->mc_fpregs.fp_cr; curpcb->pcb_fpustate.vfp_fpsr = mcp->mc_fpregs.fp_sr; - curpcb->pcb_fpflags = mcp->mc_fpregs.fp_flags & PCB_FP_USERMASK; + curpcb->pcb_fpflags = mcp->mc_fpregs.fp_flags & PCB_FP_STARTED; } #endif } @@ -613,6 +652,13 @@ sys_sigreturn(struct thread *td, struct sigreturn_args *uap) if (error != 0) return (error); + /* + * Sync the VFP and SVE registers. To be backwards compatible we + * use the VFP registers to restore the lower bits of the SVE + * register it aliases. + */ + vfp_to_sve_sync(td); + /* Restore signal mask. */ kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0); @@ -638,9 +684,47 @@ sendsig_ctx_end(struct thread *td, vm_offset_t *addrp) return (true); } +static bool +sendsig_ctx_sve(struct thread *td, vm_offset_t *addrp) +{ + struct sve_context ctx; + struct pcb *pcb; + size_t buf_size; + vm_offset_t ctx_addr; + + pcb = td->td_pcb; + /* Do nothing if sve hasn't started */ + if (pcb->pcb_svesaved == NULL) + return (true); + + MPASS(pcb->pcb_svesaved != NULL); + + buf_size = sve_buf_size(td); + + /* Address for the full context */ + *addrp -= sizeof(ctx) + buf_size; + ctx_addr = *addrp; + + memset(&ctx, 0, sizeof(ctx)); + ctx.sve_ctx.ctx_id = ARM64_CTX_SVE; + ctx.sve_ctx.ctx_size = sizeof(ctx) + buf_size; + ctx.sve_vector_len = pcb->pcb_sve_len; + ctx.sve_flags = 0; + + /* Copy out the header and data */ + if (copyout(&ctx, (void *)ctx_addr, sizeof(ctx)) != 0) + return (false); + if (copyout(pcb->pcb_svesaved, (void *)(ctx_addr + sizeof(ctx)), + buf_size) != 0) + return (false); + + return (true); +} + typedef bool(*ctx_func)(struct thread *, vm_offset_t *); static const ctx_func ctx_funcs[] = { sendsig_ctx_end, /* Must be first to end the linked list */ + sendsig_ctx_sve, NULL, }; diff --git a/sys/arm64/include/ucontext.h b/sys/arm64/include/ucontext.h index dedbd061ec6b..a4f0ee243b3a 100644 --- a/sys/arm64/include/ucontext.h +++ b/sys/arm64/include/ucontext.h @@ -62,6 +62,14 @@ struct arm64_reg_context { }; #define ARM64_CTX_END 0xa5a5a5a5 +#define ARM64_CTX_SVE 0x00657673 + +struct sve_context { + struct arm64_reg_context sve_ctx; + __uint16_t sve_vector_len; + __uint16_t sve_flags; + __uint16_t sve_reserved[2]; +}; struct __mcontext { struct gpregs mc_gpregs; From nobody Mon Oct 21 15: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 4XXJWr6ly0z5ZP24; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWr3Tm4z4fNH; Mon, 21 Oct 2024 15: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=1729523112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ct16RH/8KacMemrXOgO07yiHrmg6vkbzgpc3TfBwQzU=; b=iEzDJYvcDFDY/jpsa6pUfmU1fB92IrrF5xYm6LjIMhu68xT4Z8jL7kcc37FfhttFw2EPZB VxVpKAEwQT2uPnyaSfrjSnDzyNJ7sYxGe/xzCidZe0a5OoK6rCTGf09dkQMYIiwXFLrGb2 THWBgeERTO3Z2mWgikZnfGLR3Ac7syLbr54zoa3yf60XLxMzphs90pihMwuzy5epwO0IfC pOrsMUAXaysLAJpp9wtBJm9M3EDtcyrz5GBTa+9rtxS3wPgp+QrvaO0IDaLv7ckCLVD6GF 8AuU5oMht6g9K56tV+Cq1jesrCll/1JRn8Xp5v9cYu6wVhXXm5KlaU875wLBSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ct16RH/8KacMemrXOgO07yiHrmg6vkbzgpc3TfBwQzU=; b=jnvoJyy7VPng3YHJF8hTU9o6qQWs6HfaSD5fCxvaUkgr3CvHCvkzqGjFBKP65Rj+F8DQDP qZNEQYLw7U2q887UzGnWANVPD9HyQJbZrB8YgRUTPagzyUUhmFQstnjrb5uPQcy5xShKmi PoIdi6p1BPj/QcNkvqvqQUiRj5HcZDwxMYGyYQSddqsbkIUBHYioF8w89wWHVK52oYMjH9 ftJWBu7Od6u9X/9BfWS7NANGl9cV4YVcBdpwRLodNNw94lfUOC/XxLVYdp7+Ye59rJG1mT FdqZEVtl3B5u0GlIWG7/ZdnzuUXf2n/rnAxTYicZpNOGiAEtfrDUJWlNx53sQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523112; a=rsa-sha256; cv=none; b=Id6G4hj8+55Z7oW3W0BNKxtBsxj/zss0k0DLsyIpRujC5grf1I8L9WsbBQDbYBifK1lLqI 2cOoz06heb+eWEGayobZWVHYQgEgZGv7+83T8ldA5DNyIKBB3drEFIcJnvbacy8njAnif0 lcDZicCjy+Tg8bOvTOINZD9uhvpG4rglpxZHih3itoIpbiWl0vwTeZHbRZEew3E3V6ZfI2 Jv2xgHjnUaNp0vIU+i01pgCSpUHSy8Fic/gDVZYQqmCOvNm2An7a/0G3YZiYS5UsKZZuyd MBD3wN2oIpMRuDRmzkKzAfrabB8+3Io1kuE3fAlacXTY7rpHRsopDCg6tmbEkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWr2RPVzZg0; Mon, 21 Oct 2024 15:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5Cnc047035; Mon, 21 Oct 2024 15:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5CQY047032; Mon, 21 Oct 2024 15:05:12 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:12 GMT Message-Id: <202410211505.49LF5CQY047032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: aa594ddcc854 - stable/14 - arm64: Add an SVE sysarch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aa594ddcc85459ed342694816df26434e96ba88a Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aa594ddcc85459ed342694816df26434e96ba88a commit aa594ddcc85459ed342694816df26434e96ba88a Author: Andrew Turner AuthorDate: 2024-09-27 13:37:10 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Add an SVE sysarch To allow for user space to read the SVE vector length add a sysarch handler to return the value to userspace. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43308 (cherry picked from commit 87a58d931db7b40d8d225a7edb82b78937078b7f) --- sys/arm64/arm64/sys_machdep.c | 22 +++++++++++++++++++++- sys/arm64/include/sysarch.h | 3 +++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/sys_machdep.c b/sys/arm64/arm64/sys_machdep.c index c50b745cfba0..aba864b9526e 100644 --- a/sys/arm64/arm64/sys_machdep.c +++ b/sys/arm64/arm64/sys_machdep.c @@ -29,14 +29,34 @@ #include #include +#include #include #include +#include #include +#include + int sysarch(struct thread *td, struct sysarch_args *uap) { + struct pcb *pcb; + unsigned long sve_len; + int error; + + switch (uap->op) { + case ARM64_GET_SVE_VL: + pcb = td->td_pcb; + sve_len = pcb->pcb_sve_len; + error = EINVAL; + if (sve_len != 0) + error = copyout(&sve_len, uap->parms, sizeof(sve_len)); + break; + default: + error = EINVAL; + break; + } - return (ENOTSUP); + return (error); } diff --git a/sys/arm64/include/sysarch.h b/sys/arm64/include/sysarch.h index 2bd45d384743..f72d3427602e 100644 --- a/sys/arm64/include/sysarch.h +++ b/sys/arm64/include/sysarch.h @@ -39,6 +39,9 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ +#define ARM64_GET_SVE_VL 0x200 +/* Reserved ARM64_SET_SVE_VL 0x201 */ + #ifndef _KERNEL __BEGIN_DECLS From nobody Mon Oct 21 15: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 4XXJWt0XjYz5ZNSZ; Mon, 21 Oct 2024 15:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWs3hpdz4fRB; Mon, 21 Oct 2024 15: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=1729523113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcOhJTVwBpnQW2X1GCOsei0+1EnSKFhajxBtyN1ZqsU=; b=FY8hMwQp1kNdgCFhBxuSd7d4Ebb4ILIahiYMtVpl6mY7E6U+uqWrC53mquADoairRlHgpW g5p6ye8Xj2kpIx6+aEhz4dIWdBdedM6jgNqjxXupt1EsP+MYdlEm9MqW8w8ph2OYjklDlA mHy8P5Y0Ci4yKn6uxIsBdcL/AVTSKGiX/WdfDk1IVpAnX/VINB/BocPDHXby0TGCAqKJiH pcoddQ1MzuxF8pLG4H6zJDu1QZw/hYYe8MStOOEGIuVoSrG/78DxkkshBxOaptr8xspCGm ZXeiy0KmnWS0SE4PF4aaRcypN1uwN+fdN5bZfQXmL0yf64/cSVF2l34a3hh6KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcOhJTVwBpnQW2X1GCOsei0+1EnSKFhajxBtyN1ZqsU=; b=vG1Mc+REzBmWXP7O1OQL72bTRZ50H2VIRMEuK7GjYNtby6HS+OyI/KTwjCint8ZB5lBa2F tybfPB1IMMhpcgLH9q0ehzJ9g8OydJj8RIxAeSk7yN+2RuVNDNBXJBf5tUrzWLzUnifVH1 pD5R1jAOGjaa3D+q74qdFY+DQi5FIC+O5QZpPJe0xXNRZiq6wxs5v+i8mTzGQU0zqg9snO 62uGaADgM/OdekZXq8ygSdRe+tjfrtGZWPvysC70q468+UI/VZe3BUyNWE7Lu/ww0kWuR4 nHpI6X6dbZPcd0OBR+2xcJqvhThwcFNGVmHUOpOn62i+5bT6nAmhKtOwQimR2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523113; a=rsa-sha256; cv=none; b=Jp+AR4NYtmsc8WoLwncsA2IOESykgKvGW+4m9Zwdf/MCNlqh+hIKCYaJdqijM0UII6KGaN /raM6UyyiErORaA1NogRgjZ/kgVKcMNT63D22UyMMe656a1eLR+n6xGGoG9ev0jqe3htwj 64HJcnWo1w2NBLjaapivY+HEr5DoW2IEnkXhMaiAvJsIVJE93mxhfbTJ/ej2pG3kIlygrY DWTqpgTQS8cWq3UQH5OjACdua8QrmEmkX+11G+ReN8mMY/Uvm4Gz+JJ+KCtLS3euL8YrgI 9f0d5c7hPI/z/t0jPwfLQt1PQy/oe1wzyPO3gOEs6rfpFsLR048hlGjSmImYuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWs3K0jzbDV; Mon, 21 Oct 2024 15:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5DrL047090; Mon, 21 Oct 2024 15:05:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5DPS047087; Mon, 21 Oct 2024 15:05:13 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:13 GMT Message-Id: <202410211505.49LF5DPS047087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: f7caa6fb7489 - stable/14 - arm64: Support SVE in ptrace and core dumps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7caa6fb7489b7e9721f064e39050614ae0fc875 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f7caa6fb7489b7e9721f064e39050614ae0fc875 commit f7caa6fb7489b7e9721f064e39050614ae0fc875 Author: Andrew Turner AuthorDate: 2024-09-27 13:37:17 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 arm64: Support SVE in ptrace and core dumps Add the NT_ARM_SVE note type and use it to access the SVE registers from ptrace. This allows userspace to modify the full SVE register values. Try to follow the Linux semantics to allow debuggers to use this with minimal changes. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43309 (cherry picked from commit aab60068943d733b0b4573e5481c543ab3d45a00) --- sys/arm64/arm64/vfp.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/arm64/include/reg.h | 13 +++++ sys/sys/elf_common.h | 1 + 3 files changed, 155 insertions(+) diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index d57927991c03..a3aa77ed6180 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -30,12 +30,14 @@ #ifdef VFP #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -918,6 +920,145 @@ sve_init(const void *dummy __unused) } SYSINIT(sve, SI_SUB_SMP, SI_ORDER_ANY, sve_init, NULL); +static bool +get_arm64_sve(struct regset *rs, struct thread *td, void *buf, + size_t *sizep) +{ + struct svereg_header *header; + struct pcb *pcb; + size_t buf_size; + uint16_t sve_flags; + + pcb = td->td_pcb; + + /* If there is no SVE support in HW then we don't support NT_ARM_SVE */ + if (pcb->pcb_sve_len == 0) + return (false); + + sve_flags = 0; + if ((pcb->pcb_fpflags & PCB_FP_SVEVALID) == 0) { + /* If SVE hasn't been used yet provide the VFP registers */ + buf_size = sizeof(struct fpreg); + sve_flags |= SVEREG_FLAG_FP; + } else { + /* We have SVE registers */ + buf_size = sve_buf_size(td); + sve_flags |= SVEREG_FLAG_SVE; + KASSERT(pcb->pcb_svesaved != NULL, ("%s: no saved sve", + __func__)); + } + + if (buf != NULL) { + KASSERT(*sizep == sizeof(struct svereg_header) + buf_size, + ("%s: invalid size", __func__)); + + if (td == curthread && (pcb->pcb_fpflags & PCB_FP_STARTED) != 0) + vfp_save_state(td, pcb); + + header = buf; + memset(header, 0, sizeof(*header)); + + header->sve_size = sizeof(struct svereg_header) + buf_size; + header->sve_maxsize = sizeof(struct svereg_header) + + sve_max_buf_size(); + header->sve_vec_len = pcb->pcb_sve_len; + header->sve_max_vec_len = sve_max_vector_len; + header->sve_flags = sve_flags; + + if ((sve_flags & SVEREG_FLAG_REGS_MASK) == SVEREG_FLAG_FP) { + struct fpreg *fpregs; + + fpregs = (void *)(&header[1]); + memcpy(fpregs->fp_q, pcb->pcb_fpustate.vfp_regs, + sizeof(fpregs->fp_q)); + fpregs->fp_cr = pcb->pcb_fpustate.vfp_fpcr; + fpregs->fp_sr = pcb->pcb_fpustate.vfp_fpsr; + } else { + memcpy((void *)(&header[1]), pcb->pcb_svesaved, + buf_size); + } + } + *sizep = sizeof(struct svereg_header) + buf_size; + + return (true); +} + +static bool +set_arm64_sve(struct regset *rs, struct thread *td, void *buf, size_t size) +{ + struct svereg_header *header; + struct pcb *pcb; + size_t buf_size; + uint16_t sve_flags; + + pcb = td->td_pcb; + + /* If there is no SVE support in HW then we don't support NT_ARM_SVE */ + if (pcb->pcb_sve_len == 0) + return (false); + + sve_flags = 0; + if ((pcb->pcb_fpflags & PCB_FP_SVEVALID) == 0) { + /* + * If the SVE state is invalid it provide the FP registers. + * This may be beause it hasn't been used, or it has but + * was switched out in a system call. + */ + buf_size = sizeof(struct fpreg); + sve_flags |= SVEREG_FLAG_FP; + } else { + /* We have SVE registers */ + MPASS(pcb->pcb_svesaved != NULL); + buf_size = sve_buf_size(td); + sve_flags |= SVEREG_FLAG_SVE; + KASSERT(pcb->pcb_svesaved != NULL, ("%s: no saved sve", + __func__)); + } + + if (size != sizeof(struct svereg_header) + buf_size) + return (false); + + header = buf; + /* Sanity checks on the header */ + if (header->sve_size != sizeof(struct svereg_header) + buf_size) + return (false); + + if (header->sve_maxsize != sizeof(struct svereg_header) + + sve_max_buf_size()) + return (false); + + if (header->sve_vec_len != pcb->pcb_sve_len) + return (false); + + if (header->sve_max_vec_len != sve_max_vector_len) + return (false); + + if (header->sve_flags != sve_flags) + return (false); + + if ((sve_flags & SVEREG_FLAG_REGS_MASK) == SVEREG_FLAG_FP) { + struct fpreg *fpregs; + + fpregs = (void *)(&header[1]); + memcpy(pcb->pcb_fpustate.vfp_regs, fpregs->fp_q, + sizeof(fpregs->fp_q)); + pcb->pcb_fpustate.vfp_fpcr = fpregs->fp_cr; + pcb->pcb_fpustate.vfp_fpsr = fpregs->fp_sr; + } else { + /* Restore the SVE registers */ + memcpy(pcb->pcb_svesaved, (void *)(&header[1]), buf_size); + } + + return (true); +} + +static struct regset regset_arm64_sve = { + .note = NT_ARM_SVE, + .get = get_arm64_sve, + .set = set_arm64_sve, +}; +ELF_REGSET(regset_arm64_sve); + struct fpu_kern_ctx * fpu_kern_alloc_ctx(u_int flags) { diff --git a/sys/arm64/include/reg.h b/sys/arm64/include/reg.h index c699752197a8..4226385480e8 100644 --- a/sys/arm64/include/reg.h +++ b/sys/arm64/include/reg.h @@ -63,6 +63,19 @@ struct fpreg32 { int dummy; }; +#define SVEREG_FLAG_REGS_MASK 0x0001 +#define SVEREG_FLAG_FP 0x0000 +#define SVEREG_FLAG_SVE 0x0001 + +struct svereg_header { + __uint32_t sve_size; + __uint32_t sve_maxsize; + __uint16_t sve_vec_len; + __uint16_t sve_max_vec_len; + __uint16_t sve_flags; + __uint16_t sve_reserved; +}; + struct dbreg { __uint8_t db_debug_ver; __uint8_t db_nbkpts; diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index b9e82cb8fa35..0c7d7e2b2fc3 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -826,6 +826,7 @@ typedef struct { #define NT_X86_XSTATE 0x202 /* x86 XSAVE extended state. */ #define NT_ARM_VFP 0x400 /* ARM VFP registers */ #define NT_ARM_TLS 0x401 /* ARM TLS register */ +#define NT_ARM_SVE 0x405 /* ARM SVE registers */ #define NT_ARM_ADDR_MASK 0x406 /* arm64 address mask (e.g. for TBI) */ /* GNU note types. */ From nobody Mon Oct 21 15:05: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 4XXJWt6bTZz5ZNSb; Mon, 21 Oct 2024 15:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWt4fZQz4fRM; Mon, 21 Oct 2024 15:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cQ5tXdfhKKUlLBq2QRYtTv04p6TpBjEGzSHMJ924YI=; b=K7sqxmjzxA9ib2q8BHwFPjXwPcH03ynCy3lxW+ekoDAiHde5FN3zqI2Z04n/kStAhCzV5y JO85oV6hmpF/341Dn6CPQi3hCkHOF14yGzOtQdpJ2dpPUCBrD1EcxvRs7aALXMTOuKH+hR 9Jtj2HbCGGa//LTa7+/C2hbXwb9+Z4QQd4jRZO+Qj5vlLVUXB/iMPLiirQiW/7Gmvsd3RB F6n62QYCqQgGLeywFwfsrdwR8I4WqrkRyF3FfW3KPtVgAv28mQyXXyw1eqc6gujRPkvLvK Q2PmWnrEplnhL4c7hMGK8U8VEP6huMfeN6sGFrko12a/TOvnIICDqL9/zFUjTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cQ5tXdfhKKUlLBq2QRYtTv04p6TpBjEGzSHMJ924YI=; b=HfBu2BWhQhTFMF9iQgyVxgFB+6PwA0k+lJeqr5gW+9ub5dDA+FohVhT1QHNoCAz98VI9w1 5twKlj/8wJCVVCY+k8Y5z/uStIMBLb/1kU+7+PsAnIE+8LERC2XnG0xQVmhJ0817KABg5L n2ybdGJVNRSHjSQAqunJnyW1+Dc2MSbAfYe8nAOm2AmabYTnvk5xW2BiUQkgFQzfPVBZhW anryL/yxCHAgMB6fZfajtJe2maw/7hmyphwxXqBm6Rqq9jzSvoqBJrzG6UWy8n5jnMH+Qe +226XdFftWDkDO0Zzy4dc6VGQw5TpjW7IbR6rmtqAzN8kOHkXYRQboZ3MkyD7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523114; a=rsa-sha256; cv=none; b=TychaT+V+r2uWYu78HPWln7gYGegxEhKhkR+M1AwZPPRzbjeG+bZI79s42OQ0TYp3dqZpN YBUl/sfgaVVnCpljs8QQVXoPqHZbGXBkGmswpvfUT3u7non4K4ZjzxzpQ1uEwZkFMliCo6 Fgljfapfi0W6lA1X+ZyXyMGl9eca1R0oQANe9mDPshdukfQToSqxIr5haqxFbtm4g15nwc YqYVRKZt4h3WgEywrdZNSVQjV+mDi84EDei1AfVzN/tcoEqwpvJBsIOfo0t/0DEIfwzsum aG4e3fXVm0iN0I4KAC0KqaGMGAjOzoE1DiXqtmWSVaR6NZAJwuGtP7+zzNqLXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWt4GXLzbL8; Mon, 21 Oct 2024 15:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5Ex8047144; Mon, 21 Oct 2024 15:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5EhO047141; Mon, 21 Oct 2024 15:05:14 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:14 GMT Message-Id: <202410211505.49LF5EhO047141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: a16f10ab0aa7 - stable/14 - arm64: Don't trap SVE to EL2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a16f10ab0aa76d88cc45cc01fae44b94d1873bbc Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a16f10ab0aa76d88cc45cc01fae44b94d1873bbc commit a16f10ab0aa76d88cc45cc01fae44b94d1873bbc Author: Andrew Turner AuthorDate: 2024-09-27 13:41:08 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 arm64: Don't trap SVE to EL2 As with floating point instructions don't trap SVE instructions to the hypervisor. This lets us handle then in the kernel. Reviewed by: imp (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43303 (cherry picked from commit fe5ed2496e44aec018a6215175bba225b20d81fd) --- sys/arm64/include/hypervisor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 602436d2a725..324b28673b14 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -50,7 +50,7 @@ /* CPTR_EL2 - Architecture feature trap register */ /* Valid if HCR_EL2.E2H == 0 */ #define CPTR_RES0 0x7fefc800 -#define CPTR_RES1 0x000033ff +#define CPTR_RES1 0x000032ff #define CPTR_TFP 0x00000400 /* Valid if HCR_EL2.E2H == 1 */ #define CPTR_FPEN 0x00300000 From nobody Mon Oct 21 15:05: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 4XXJWw1H4Vz5ZNrj; Mon, 21 Oct 2024 15:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWv6Sy7z4fTk; Mon, 21 Oct 2024 15:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gYtwz7AD8FLK4icVLieLkRJ/qxPWOM9V9c21OSoXk+0=; b=HQ5/7Bd/7hjlhBszJHnHdQ7MA2ROEcfFqJf5ZYpKdVBI7jMc6TX1wPYDSX9xx9/CEO8bLZ ZBrhXq+1t4RPTeLc4ffIgSsJvPJer1oe+QHoZmSJcAulDMkvr5h7WsmumeJVHxDZCWFHf5 q3xePrVwFkNCFbnHprh7OU9eZU/+TTNhIzEfKAG2gE9tMJ4dWSSj9+V2oIviRMqcHtzWf1 cPoqc4LiXtCIvJjEdyEuGF4bj5fryBbXaCklmhJuRK2jP3KLJ+kkBErAPq6J/Flvby521q t3MpLJGLDctyMpayvWPWeaACQ/W6GF2oBFnw2rFphyu5ZraIiFDfAg1ougJefg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gYtwz7AD8FLK4icVLieLkRJ/qxPWOM9V9c21OSoXk+0=; b=i7D+bWYkIE02FK7E5QUzTyjBJYxofhxgF3ZU9OuJdw4pFkxOSpnS91pGsfJ+IOoRfIpHd3 FzQA2+qfpa59pTKzNCiGNniUvy5h0dPZkiBajaO5PJ2wDw8csM2gy/iTw5KvvDKrcOjr0T uyW9g3dFmg4tHW8vAHarPUPofRZGiRaZDQqNB3wWsm+8DI2AHmaZPxVLss2jWwHQoNex4Z aEwPIcjukG6eiPsuF42PuBYJe9r9bcyhfl5+nZBQj7NmorRY3gyQLXYh0Bdc4iEx5PZIzo hN7wMsn3k84GJ9G20KNGEHRYqGGRb16IhGmYkp2h0Xf8rD73aSkPOUw0QTMnhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523115; a=rsa-sha256; cv=none; b=i8B3NIs3yPEhRViGJ6AM/gBbnU8nAlzu3Jl9eJ5oDjtrLr6RlIV8aL4NSbdjrhU/2+S3bl DiqC1b/h+wh/dgubQrGLM+cmaKVKzIjC7UYXMiHl3dzc1HlOJVj2aC+idLsgP6Kfs+6NgW h0TU7bVhURkQYuJLv70RvSOcmCQ8YS1WgVDxaHMEauLUQJT81Y/ZeWpqgmelbJLEch9wPP N6V4K1W6NASCZqnDdmes55RDs8VNTep6WL9Q5V4opZoxJ4TuD8i+QrVkXF+uksmAKNmJmG n2aHl3kUudlCbF2pELswIF7WgP961LnsBjIGP/1D8RQz7iP6Lz5UNrBkhcVT+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 4XXJWv5Cgpzb4w; Mon, 21 Oct 2024 15:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5FCj047204; Mon, 21 Oct 2024 15:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5Ffo047201; Mon, 21 Oct 2024 15:05:15 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:15 GMT Message-Id: <202410211505.49LF5Ffo047201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 1f9635e2c213 - stable/14 - arm64: Enable SVE in userspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f9635e2c213368cfed3737970f3814fbb55a922 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1f9635e2c213368cfed3737970f3814fbb55a922 commit 1f9635e2c213368cfed3737970f3814fbb55a922 Author: Andrew Turner AuthorDate: 2024-09-27 14:06:03 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 arm64: Enable SVE in userspace Report when SVE is present and allow it to be used by calling sve_restore_state on an SVE exception from userspace. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43310 (cherry picked from commit 205c1007be6d57b2eb8620f79384cb2299dde40e) --- sys/arm64/arm64/identcpu.c | 82 ++++++++++++++++++++++++++++++++++++++-------- sys/arm64/arm64/trap.c | 6 ++-- sys/arm64/include/armreg.h | 1 + 3 files changed, 74 insertions(+), 15 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 84ad2d0eb282..22978af219dc 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1384,13 +1384,10 @@ static const struct mrs_field_value id_aa64pfr0_sve[] = { MRS_FIELD_VALUE_END, }; -#if 0 -/* Enable when we add SVE support */ static const struct mrs_field_hwcap id_aa64pfr0_sve_caps[] = { MRS_HWCAP(1, HWCAP_SVE, ID_AA64PFR0_SVE_IMPL), MRS_HWCAP_END }; -#endif static const struct mrs_field_value id_aa64pfr0_ras[] = { MRS_FIELD_VALUE(ID_AA64PFR0_RAS_NONE, ""), @@ -1464,7 +1461,8 @@ static const struct mrs_field id_aa64pfr0_fields[] = { MRS_FIELD(ID_AA64PFR0, AMU, false, MRS_EXACT, id_aa64pfr0_amu), MRS_FIELD(ID_AA64PFR0, MPAM, false, MRS_EXACT, id_aa64pfr0_mpam), MRS_FIELD(ID_AA64PFR0, SEL2, false, MRS_EXACT, id_aa64pfr0_sel2), - MRS_FIELD(ID_AA64PFR0, SVE, false, MRS_EXACT, id_aa64pfr0_sve), + MRS_FIELD_HWCAP_SPLIT(ID_AA64PFR0, SVE, false, MRS_LOWER, MRS_EXACT, + id_aa64pfr0_sve, id_aa64pfr0_sve_caps), MRS_FIELD(ID_AA64PFR0, RAS, false, MRS_EXACT, id_aa64pfr0_ras), MRS_FIELD(ID_AA64PFR0, GIC, false, MRS_EXACT, id_aa64pfr0_gic), MRS_FIELD_HWCAP(ID_AA64PFR0, AdvSIMD, true, MRS_LOWER, @@ -1581,59 +1579,117 @@ static const struct mrs_field_value id_aa64zfr0_f64mm[] = { MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_f64mm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEF64MM, ID_AA64ZFR0_F64MM_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_f32mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, F32MM, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_f32mm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEF32MM, ID_AA64ZFR0_F32MM_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_i8mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, I8MM, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_i8mm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEI8MM, ID_AA64ZFR0_I8MM_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_sm4[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, SM4, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_sm4_caps[] = { + MRS_HWCAP(2, HWCAP2_SVESM4, ID_AA64ZFR0_SM4_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_sha3[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, SHA3, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_sha3_caps[] = { + MRS_HWCAP(2, HWCAP2_SVESHA3, ID_AA64ZFR0_SHA3_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_bf16[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, BF16, NONE, BASE), MRS_FIELD_VALUE(ID_AA64ZFR0_BF16_EBF, "BF16+EBF"), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_bf16_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEBF16, ID_AA64ZFR0_BF16_BASE), + MRS_HWCAP(2, HWCAP2_SVE_EBF16, ID_AA64ZFR0_BF16_EBF), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_bitperm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, BitPerm, NONE, IMPL), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_bitperm_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEBITPERM, ID_AA64ZFR0_BitPerm_IMPL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_aes[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, AES, NONE, BASE), MRS_FIELD_VALUE(ID_AA64ZFR0_AES_PMULL, "AES+PMULL"), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_aes_caps[] = { + MRS_HWCAP(2, HWCAP2_SVEAES, ID_AA64ZFR0_AES_BASE), + MRS_HWCAP(2, HWCAP2_SVEPMULL, ID_AA64ZFR0_AES_PMULL), + MRS_HWCAP_END, +}; + static const struct mrs_field_value id_aa64zfr0_svever[] = { MRS_FIELD_VALUE(ID_AA64ZFR0_SVEver_SVE1, "SVE1"), MRS_FIELD_VALUE(ID_AA64ZFR0_SVEver_SVE2, "SVE2"), + MRS_FIELD_VALUE(ID_AA64ZFR0_SVEver_SVE2P1, "SVE2P1"), MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64zfr0_svever_caps[] = { + MRS_HWCAP(2, HWCAP2_SVE2, ID_AA64ZFR0_SVEver_SVE2), + MRS_HWCAP(2, HWCAP2_SVE2P1, ID_AA64ZFR0_SVEver_SVE2P1), + MRS_HWCAP_END, +}; + static const struct mrs_field id_aa64zfr0_fields[] = { - MRS_FIELD(ID_AA64ZFR0, F64MM, false, MRS_EXACT, id_aa64zfr0_f64mm), - MRS_FIELD(ID_AA64ZFR0, F32MM, false, MRS_EXACT, id_aa64zfr0_f32mm), - MRS_FIELD(ID_AA64ZFR0, I8MM, false, MRS_EXACT, id_aa64zfr0_i8mm), - MRS_FIELD(ID_AA64ZFR0, SM4, false, MRS_EXACT, id_aa64zfr0_sm4), - MRS_FIELD(ID_AA64ZFR0, SHA3, false, MRS_EXACT, id_aa64zfr0_sha3), - MRS_FIELD(ID_AA64ZFR0, BF16, false, MRS_EXACT, id_aa64zfr0_bf16), - MRS_FIELD(ID_AA64ZFR0, BitPerm, false, MRS_EXACT, id_aa64zfr0_bitperm), - MRS_FIELD(ID_AA64ZFR0, AES, false, MRS_EXACT, id_aa64zfr0_aes), - MRS_FIELD(ID_AA64ZFR0, SVEver, false, MRS_EXACT, id_aa64zfr0_svever), + MRS_FIELD_HWCAP(ID_AA64ZFR0, F64MM, false, MRS_LOWER, + id_aa64zfr0_f64mm, id_aa64zfr0_f64mm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, F32MM, false, MRS_LOWER, + id_aa64zfr0_f32mm, id_aa64zfr0_f32mm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, I8MM, false, MRS_LOWER, id_aa64zfr0_i8mm, + id_aa64zfr0_i8mm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SM4, false, MRS_LOWER, id_aa64zfr0_sm4, + id_aa64zfr0_sm4_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SHA3, false, MRS_LOWER, id_aa64zfr0_sha3, + id_aa64zfr0_sha3_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, BF16, false, MRS_LOWER, id_aa64zfr0_bf16, + id_aa64zfr0_bf16_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, BitPerm, false, MRS_LOWER, + id_aa64zfr0_bitperm, id_aa64zfr0_bitperm_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, AES, false, MRS_LOWER, id_aa64zfr0_aes, + id_aa64zfr0_aes_caps), + MRS_FIELD_HWCAP(ID_AA64ZFR0, SVEver, false, MRS_LOWER, + id_aa64zfr0_svever, id_aa64zfr0_svever_caps), MRS_FIELD_END, }; diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 78582f5ac563..64a27b138a9a 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -635,8 +635,10 @@ do_el0_sync(struct thread *td, struct trapframe *frame) #endif break; case EXCP_SVE: - call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_elr, - exception); + /* Returns true if this thread can use SVE */ + if (!sve_restore_state(td)) + call_trapsignal(td, SIGILL, ILL_ILLTRP, + (void *)frame->tf_elr, exception); userret(td, frame); break; case EXCP_SVC32: diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 2b92c036ef1c..6a3db5adc930 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1535,6 +1535,7 @@ #define ID_AA64ZFR0_SVEver_VAL(x) ((x) & ID_AA64ZFR0_SVEver_MASK #define ID_AA64ZFR0_SVEver_SVE1 (UL(0x0) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_SVEver_SVE2 (UL(0x1) << ID_AA64ZFR0_SVEver_SHIFT) +#define ID_AA64ZFR0_SVEver_SVE2P1 (UL(0x2) << ID_AA64ZFR0_SVEver_SHIFT) #define ID_AA64ZFR0_AES_SHIFT 4 #define ID_AA64ZFR0_AES_MASK (UL(0xf) << ID_AA64ZFR0_AES_SHIFT) #define ID_AA64ZFR0_AES_VAL(x) ((x) & ID_AA64ZFR0_AES_MASK From nobody Mon Oct 21 15:05: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 4XXJWx380Tz5ZNfc; Mon, 21 Oct 2024 15:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWx00D4z4ffY; Mon, 21 Oct 2024 15:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7v4adu34jN91WUjLXhTcUE2CCBhNrsvwldfCmW5DI7A=; b=dxOvx0BAXwFSdwXMYuhSGFZS8tgjyjLRsvRj0JZQYq9fxU/fmiNJPRgk4TJTvR2ckG8sA3 6uKNAwEesTy2pXU4NeljW3o1tKUjTE6F1AemUPEg1nhSRYgViQv3DVRba336N14euVfwM+ L9wvQvMJp1Bx0onsWwnYWJjQcP/yz/BXsaYb8oDqNyXXCT7jdArOKkdtZy1C0EqeJbzjgn 0r87dtNIcL7282EOImNLVrAz+KvNnzNKtRL73YcPQOSoRwkx0alD/XPPV3NvxjOH3dkmif dbHvPS7WoZe9CEyBdvO7qoPyugaIXPNQ6CzNeb/DkFdOS5oWOcPV7SZgC1/SCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7v4adu34jN91WUjLXhTcUE2CCBhNrsvwldfCmW5DI7A=; b=OrgrOIlh3etMZCRnq5Hlvw7GfW9f8sRQlT6C1ZLLZ+eY9uRvGoPv/UGk8Y4kvFyGG4j0nt j33SlRzncPU/F8L4o9RKfptTxyXlK9MgYA7YYRgj+TIHLtKT5Vlw7qct53T3glSXhnwbgE 4KnK8W2T/U2Zqw9TJuBgJvhJg3gtcskg7gydhS/qCKOpKQnXrfIOxuDlgaAc4bkaUeD/9/ h0sHNmar/Muqkf4RStINcCnsXV/oQLL26qTFNwVz4VShc2uyv4b8PYSjebUNj9yJZm1Mc1 GTix7NmmRkin3pUhOsa2LCMhgAvfE8VomjsHSgM7JDHG5YHZXGbMR+JMk7j2Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523117; a=rsa-sha256; cv=none; b=uiMwNWhGD4FHVjSTNTxgDjr4d35zwLrKmu15GncmL1/2nSZpQ7ppnQqK5QhJLmtJJgdbFp JT/izfFzM9fDxI8i37dew6CAMGPSmtMHOy7VzLOJ4s7YdzcmbRa7QSs4ixUwDjir+xraT8 NfPIPq5oaOIw080vZIqvlrQ1Elg0urGZeXvjDd9YMcXKrn8Nqt1gem8j2FLgjwqdQ88nvT vNxHuMPbQz2rYctbzeDzzICvz9affnt9W6y3sxQh3R+ZDO7On1EWTcHzVdMfHqwPcLRhwj GunDhWjxQaHaRKVQNggneloSnL+6Rz8xh7MhdAz8fcfFQtsbLmqj1Q3xyXhZ8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWw5wz6zbQm; Mon, 21 Oct 2024 15:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5GKd047246; Mon, 21 Oct 2024 15:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5Ggf047243; Mon, 21 Oct 2024 15:05:16 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:16 GMT Message-Id: <202410211505.49LF5Ggf047243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: c0de8718a5c1 - stable/14 - arm64: Support HWCAP2_AFP and HWCAP2_RPRES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c0de8718a5c1523c01bf30745a4be80784587fc1 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c0de8718a5c1523c01bf30745a4be80784587fc1 commit c0de8718a5c1523c01bf30745a4be80784587fc1 Author: Andrew Turner AuthorDate: 2024-10-04 13:08:36 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 arm64: Support HWCAP2_AFP and HWCAP2_RPRES These add alternative behaviour to some floating-point instructions so don't need any kernel support and can just be exposed to userspace. Sponsored by: Arm Ltd (cherry picked from commit 48979e8def00b69a07880e7827af7e32d5e377ff) --- sys/arm64/arm64/identcpu.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 22978af219dc..d0b4f74c8a15 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -943,6 +943,11 @@ static const struct mrs_field_value id_aa64isar2_rpres[] = { MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64isar2_rpres_caps[] = { + MRS_HWCAP(2, HWCAP2_RPRES, ID_AA64ISAR2_RPRES_IMPL), + MRS_HWCAP_END +}; + static const struct mrs_field_value id_aa64isar2_wfxt[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ISAR2, WFxT, NONE, IMPL), MRS_FIELD_VALUE_END, @@ -957,7 +962,8 @@ static const struct mrs_field id_aa64isar2_fields[] = { id_aa64isar2_apa3, id_aa64isar2_apa3_caps), MRS_FIELD_HWCAP(ID_AA64ISAR2, GPA3, false, MRS_EXACT, id_aa64isar2_gpa3, id_aa64isar2_gpa3_caps), - MRS_FIELD(ID_AA64ISAR2, RPRES, false, MRS_EXACT, id_aa64isar2_rpres), + MRS_FIELD_HWCAP(ID_AA64ISAR2, RPRES, false, MRS_LOWER, + id_aa64isar2_rpres, id_aa64isar2_rpres_caps), MRS_FIELD(ID_AA64ISAR2, WFxT, false, MRS_EXACT, id_aa64isar2_wfxt), MRS_FIELD_END, }; @@ -1100,6 +1106,11 @@ static const struct mrs_field_value id_aa64mmfr1_afp[] = { MRS_FIELD_VALUE_END, }; +static const struct mrs_field_hwcap id_aa64mmfr1_afp_caps[] = { + MRS_HWCAP(2, HWCAP2_AFP, ID_AA64MMFR1_AFP_IMPL), + MRS_HWCAP_END +}; + static const struct mrs_field_value id_aa64mmfr1_hcx[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR1, HCX, NONE, IMPL), MRS_FIELD_VALUE_END, @@ -1166,7 +1177,8 @@ static const struct mrs_field id_aa64mmfr1_fields[] = { MRS_FIELD(ID_AA64MMFR1, CMOVW, false, MRS_EXACT, id_aa64mmfr1_cmovw), MRS_FIELD(ID_AA64MMFR1, TIDCP1, false, MRS_EXACT, id_aa64mmfr1_tidcp1), MRS_FIELD(ID_AA64MMFR1, nTLBPA, false, MRS_EXACT, id_aa64mmfr1_ntlbpa), - MRS_FIELD(ID_AA64MMFR1, AFP, false, MRS_EXACT, id_aa64mmfr1_afp), + MRS_FIELD_HWCAP(ID_AA64MMFR1, AFP, false, MRS_LOWER, id_aa64mmfr1_afp, + id_aa64mmfr1_afp_caps), MRS_FIELD(ID_AA64MMFR1, HCX, false, MRS_EXACT, id_aa64mmfr1_hcx), MRS_FIELD(ID_AA64MMFR1, ETS, false, MRS_EXACT, id_aa64mmfr1_ets), MRS_FIELD(ID_AA64MMFR1, TWED, false, MRS_EXACT, id_aa64mmfr1_twed), From nobody Mon Oct 21 15: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 4XXJWz6vXcz5ZNyt; Mon, 21 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWz1l3Dz4fYC; Mon, 21 Oct 2024 15: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=1729523119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ncKcSXQhqaFpLAei4KplDIKbfCb0rNgq7t+fNwINdYk=; b=gi6T8YNFffrtt8fkrTiirmuNXGwTmddm1iSxgsc5etbbKBQBhDmcyN16K3g3jfmqmkeD9y foPdMYAfE6bm8ixHjl3PtOuQEHNHsUZCZuKJzxCVBDSGem8KMepPGax1IGKX5jIoDLLzql b58eL3A5lZZTkn8vD/h1PYy1lVlhwNoQW7NTQmSlCYOStC485SOy2KluCh11U9UcXjYTEy +mIrfATevCvnkRl/4WbiWQxsQnEPdm6impeuEgKGvZtnhZHb/tJibEIr9w7BznTfgzGClP VMd8VawfhYPFc/1yzzMoFlZdTmcHg+rJ/Rx4BHOdWfcgByULWc6wFPd3AXIkQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ncKcSXQhqaFpLAei4KplDIKbfCb0rNgq7t+fNwINdYk=; b=IwnLWeZ/mhLjcSv6yXUoJq5KDJI9fanARFuYNlMV6ZFAMEWZD3VmC9q3GPj9tX1v1GX/R7 1+FALvLKZniYgcJtijbYUEuZjQ6znf7LWVAT2IujnkZz1CBVyr6aSnue1iGBL/bx6bgrKN GwXK99MfssXTkUTmk7BIwYrb7PAxh9tEDbUUpwy7s26xW2ohSMHt3nFvQjKqaFKdDHJiCD rF9PpuiN0p/rbbAy26pmiogyexiW0Ob1KtpqOSLNdyalgUxiorKVBsollbaQNtIY2UErc+ lya/HPP0610CNqXMnMbh2MrxpampUCIdE6NEwMB0vWPFOcgHFliYAcTPnOFC5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523119; a=rsa-sha256; cv=none; b=eIYEIUUWV6kqaPhPNZtOFx7SaNu9YaHEqYJp94PBS+NQRKSNpwpWdnf7/v6yJeg39N2skt gNAG1Jvfa/GBquI4W8mJuvXW0Dn9d2RYmOirrOwuanrXVaN78yWyWcAUOIv4fpqq97Dugd gehea+TOnHUdenfnNvSCWifJWel08HTMb9nrNqBg3dwBtLGDJVCn6uO/POW3Qoew8Ed9ql +FXEeJ1Btan0NXp1mf7su/6Eg/gbBlokdIcyB+LuhxQ3BX/9AC086jI12k74eIkzolkiTK X6R8ynH53OCqbLESWYYKbLIMIvlNxNd56NBYWmPWWuaDE8SIGz5x7Gqsb8LRgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWz1Mb5zbQn; Mon, 21 Oct 2024 15:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5J7A047342; Mon, 21 Oct 2024 15:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5Jkd047339; Mon, 21 Oct 2024 15:05:19 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:19 GMT Message-Id: <202410211505.49LF5Jkd047339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 78b308e5a4a1 - stable/14 - sys: Use the new arm_smccc_invoke macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78b308e5a4a15f1dbf52c289b1f1ad4f4b980184 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=78b308e5a4a15f1dbf52c289b1f1ad4f4b980184 commit 78b308e5a4a15f1dbf52c289b1f1ad4f4b980184 Author: Andrew Turner AuthorDate: 2024-10-14 14:33:51 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 sys: Use the new arm_smccc_invoke macros Simplify the calls into the SMCCC firmware with the new arm_smccc_invoke* macros. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46987 (cherry picked from commit b9cd72b06d795a8c7b39df1f520e866ad7f11aa8) --- sys/arm/qualcomm/qcom_scm_legacy.c | 4 ++-- sys/arm64/nvidia/tegra210/tegra210_pmc.c | 4 ++-- sys/dev/firmware/xilinx/zynqmp_firmware.c | 2 +- sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c | 7 +++---- sys/dev/pci/pci_host_generic_den0115.c | 14 ++++++-------- sys/dev/psci/smccc.c | 6 +++--- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/sys/arm/qualcomm/qcom_scm_legacy.c b/sys/arm/qualcomm/qcom_scm_legacy.c index 24c62c8181c3..e1c375c922af 100644 --- a/sys/arm/qualcomm/qcom_scm_legacy.c +++ b/sys/arm/qualcomm/qcom_scm_legacy.c @@ -74,8 +74,8 @@ qcom_scm_legacy_mp_set_cold_boot_address(vm_offset_t mp_entry_func) | QCOM_SCM_FLAG_COLDBOOT_CPU3; uint32_t scm_arg2 = pmap_kextract((vm_offset_t)mp_entry_func); - ret = arm_smccc_smc(scm_arg0, (uint32_t) &context_id, scm_arg1, - scm_arg2, 0, 0, 0, 0, &res); + ret = arm_smccc_invoke_smc(scm_arg0, (uint32_t) &context_id, scm_arg1, + scm_arg2, &res); if (ret == 0 && res.a0 == 0) return (0); diff --git a/sys/arm64/nvidia/tegra210/tegra210_pmc.c b/sys/arm64/nvidia/tegra210/tegra210_pmc.c index 5ae5c0e8092c..85c01d7ce7d6 100644 --- a/sys/arm64/nvidia/tegra210/tegra210_pmc.c +++ b/sys/arm64/nvidia/tegra210/tegra210_pmc.c @@ -191,7 +191,7 @@ WR4(struct tegra210_pmc_softc *sc, bus_size_t r, uint32_t v) struct arm_smccc_res res; if (sc->secure_access) { - arm_smccc_smc(PMC_SMC, PMC_SMC_WRITE, r, v, 0, 0, 0, 0, &res); + arm_smccc_invoke_smc(PMC_SMC, PMC_SMC_WRITE, r, v, &res); if (res.a0 != 0) device_printf(sc->dev," PMC SMC write failed: %lu\n", res.a0); @@ -206,7 +206,7 @@ RD4(struct tegra210_pmc_softc *sc, bus_size_t r) struct arm_smccc_res res; if (sc->secure_access) { - arm_smccc_smc(PMC_SMC, PMC_SMC_READ, r, 0, 0, 0, 0, 0, &res); + arm_smccc_invoke_smc(PMC_SMC, PMC_SMC_READ, r, &res); if (res.a0 != 0) device_printf(sc->dev," PMC SMC write failed: %lu\n", res.a0); diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware.c b/sys/dev/firmware/xilinx/zynqmp_firmware.c index 8ee6c9a21377..a6b55a3528a1 100644 --- a/sys/dev/firmware/xilinx/zynqmp_firmware.c +++ b/sys/dev/firmware/xilinx/zynqmp_firmware.c @@ -105,7 +105,7 @@ zynqmp_call_smc(uint32_t id, uint32_t a0, uint32_t a1, uint32_t a2, uint32_t a3, args[0] = id | PM_SIP_SVC; args[1] = ((uint64_t)a1 << 32) | a0; args[2] = ((uint64_t)a3 << 32) | a2; - arm_smccc_smc(args[0], args[1], args[2], 0, 0, 0, 0, 0, &res); + arm_smccc_invoke_smc(args[0], args[1], args[2], &res); if (payload != NULL) { payload[0] = res.a0 & 0xFFFFFFFF; payload[1] = res.a0 >> 32; diff --git a/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c b/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c index dbb6aac2de31..e808cc081535 100644 --- a/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c +++ b/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c @@ -50,10 +50,10 @@ void arm_hv_set_vreg(u32 msr, u64 value) { - arm_smccc_hvc(HV_FUNC_ID, + arm_smccc_invoke_hvc(HV_FUNC_ID, HVCALL_SET_VP_REGISTERS | HV_HYPERCALL_FAST_BIT | HV_HYPERCALL_REP_COMP_1, - HV_PARTITION_ID_SELF, HV_VP_INDEX_SELF, msr, 0, value, 0, NULL); + HV_PARTITION_ID_SELF, HV_VP_INDEX_SELF, msr, 0, value, NULL); } void @@ -95,8 +95,7 @@ hypercall_md(volatile void *hc_addr, uint64_t in_val, uint64_t in_paddr, { struct arm_smccc_res res; - arm_smccc_hvc(HV_FUNC_ID, in_val, in_paddr, out_paddr, 0, 0, 0, 0, - &res); + arm_smccc_invoke_hvc(HV_FUNC_ID, in_val, in_paddr, out_paddr, &res); return (res.a0); } diff --git a/sys/dev/pci/pci_host_generic_den0115.c b/sys/dev/pci/pci_host_generic_den0115.c index cfef34824965..a14fe84039fe 100644 --- a/sys/dev/pci/pci_host_generic_den0115.c +++ b/sys/dev/pci/pci_host_generic_den0115.c @@ -124,8 +124,7 @@ pci_host_acpi_smccc_has_feature(uint32_t pci_func_id) { struct arm_smccc_res result; - if (psci_callfn(SMCCC_PCI_FEATURES, pci_func_id, 0, 0, 0, 0, 0, 0, - &result) < 0) { + if (arm_smccc_invoke(SMCCC_PCI_FEATURES, pci_func_id, &result) < 0) { return (false); } @@ -137,7 +136,7 @@ pci_host_acpi_smccc_pci_version(uint32_t *versionp) { struct arm_smccc_res result; - if (psci_callfn(SMCCC_PCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &result) < 0) { + if (arm_smccc_invoke(SMCCC_PCI_VERSION, &result) < 0) { return (false); } @@ -185,8 +184,8 @@ pci_host_acpi_smccc_attach(device_t dev) return (error); if (pci_host_acpi_smccc_has_feature(SMCCC_PCI_GET_SEG_INFO) && - psci_callfn(SMCCC_PCI_GET_SEG_INFO, sc->base.ecam, 0, 0, 0, 0, 0, - 0, &result) == SMCCC_RET_SUCCESS) { + arm_smccc_invoke(SMCCC_PCI_GET_SEG_INFO, sc->base.ecam, + &result) == SMCCC_RET_SUCCESS) { start = SMCCC_PCI_SEG_START(result.a1); end = SMCCC_PCI_SEG_END(result.a1); @@ -215,8 +214,7 @@ pci_host_acpi_smccc_read_config(device_t dev, u_int bus, u_int slot, return (~0U); addr = (sc->base.ecam << 16) | (bus << 8) | (slot << 3) | (func << 0); - if (psci_callfn(SMCCC_PCI_READ, addr, reg, bytes, 0, 0, 0, 0, - &result) < 0) { + if (arm_smccc_invoke(SMCCC_PCI_READ, addr, reg, bytes, &result) < 0) { return (~0U); } @@ -240,7 +238,7 @@ pci_host_acpi_smccc_write_config(device_t dev, u_int bus, u_int slot, return; addr = (sc->base.ecam << 16) | (bus << 8) | (slot << 3) | (func << 0); - psci_callfn(SMCCC_PCI_WRITE, addr, reg, bytes, val, 0, 0, 0, &result); + arm_smccc_invoke(SMCCC_PCI_WRITE, addr, reg, bytes, val, &result); } static device_method_t generic_pcie_acpi_smccc_methods[] = { diff --git a/sys/dev/psci/smccc.c b/sys/dev/psci/smccc.c index 5c5e140abab1..e8a367bed7d6 100644 --- a/sys/dev/psci/smccc.c +++ b/sys/dev/psci/smccc.c @@ -79,7 +79,7 @@ smccc_arch_features(uint32_t smccc_func_id) if (smccc_version == SMCCC_VERSION_1_0) return (PSCI_RETVAL_NOT_SUPPORTED); - return (psci_call(SMCCC_ARCH_FEATURES, smccc_func_id, 0, 0)); + return (arm_smccc_invoke(SMCCC_ARCH_FEATURES, smccc_func_id, NULL)); } /* @@ -92,7 +92,7 @@ smccc_arch_workaround_1(void) KASSERT(smccc_version != SMCCC_VERSION_1_0, ("SMCCC arch workaround 1 called with an invalid SMCCC interface")); - return (psci_call(SMCCC_ARCH_WORKAROUND_1, 0, 0, 0)); + return (arm_smccc_invoke(SMCCC_ARCH_WORKAROUND_1, NULL)); } int @@ -101,5 +101,5 @@ smccc_arch_workaround_2(int enable) KASSERT(smccc_version != SMCCC_VERSION_1_0, ("SMCCC arch workaround 2 called with an invalid SMCCC interface")); - return (psci_call(SMCCC_ARCH_WORKAROUND_2, enable, 0, 0)); + return (arm_smccc_invoke(SMCCC_ARCH_WORKAROUND_2, enable, NULL)); } From nobody Mon Oct 21 15:05: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 4XXJWy4vmqz5ZNfh; Mon, 21 Oct 2024 15:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWy1Fr8z4fcL; Mon, 21 Oct 2024 15:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZljbcU5JPXKtlyUK5/WUjXqEBVOUgboiulGC2Z3Rvog=; b=ZQ5uklZsJsArJueaDZR4GrJOSJ0XfEgmtNk8VGnz5YQqSXzO0I2UIcerx3WnGbY0mz6abm cmZVw5r3AzvVRl8G1G7CB63nnoUwscYa6i0c1VEBcny4ofpqVKestrJOdURXNxBLYlJX8z T4iG3GnjzAWc+VtUmDHJ47peLscmjajIXxhaB7onSQQjjZhGjEY2tYE1rWq+5DOUnoY0BR y+n8oGFlx75AmI52h5Hl/htOfdFve5PFPmzE6ACwd8MhlYcQD3ZPevDp92N5ofBAGmverC N6yJ1/9RHOj2ZGzrOZdiAbuLJ0RyHZoHV8893bdDa8GerxXT7kM7wsH/PpbUdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZljbcU5JPXKtlyUK5/WUjXqEBVOUgboiulGC2Z3Rvog=; b=jKTwhrSL8KsbXhdGekeN1JpLCaRZkiHo2kmDu4FjDjhFOGZAvwo6v5hxDsPUvsBQlYo9Vk c2zYcQulSuI4VULqzjUcln1GrMcoWM2HPoa7Fz6W3UIXbz8TORKbThNRtrBOFjdrU+5kB2 iiBnsfMmAvqKOYgDzFAiq5GWQOmS+2TpcvRmKZIr62ufWI71UOLwTVBJVEYqz8cOIVO7b7 cAF3r5XgJKe+aYC6XB9TqzOT7h8kBt0T/7iGvtOzMqCWuQfC/IvAq5U4ObDhovaoGTQRA1 qs3xSqOTvgtqsWiOmGypQrtvpkvZ2Gg7zb+cxG9SXcfwHqD0g8CHY20L4r+X/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523118; a=rsa-sha256; cv=none; b=KKAvi7qgbMgPZP66AX9rgMnVbvkYvVnZnQAI8HynchJ2+GW2b/LH5KTTHLgjhlbvO/JvwY qXyDMacXjHupc13ojBObuuTXllFC+tMNzwAJfCjSEVgitNqTZ2poOzU0+QEM2IwNeDdUwp e8jyPOnGKsczEBuRkOgl+tg1U2Ea88YPdDoInYeE8Y9KaeB03viDy1tZ52bAS2UgvI/SLG Xy9/5YEVnDoBRxNaLlNYmeBj+PRaW9y1DfERMi8h6rkhvYcpN+u0Ul/BowBmUd7XUhTVB/ k34zROej0ElJD13ZaekOvDxZQ4gmlxgsM+HDVxw0wd0t0Zv9+i57qX5J/1v46Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJWy0GPPzbDW; Mon, 21 Oct 2024 15:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5HSY047294; Mon, 21 Oct 2024 15:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5HQq047291; Mon, 21 Oct 2024 15:05:17 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:17 GMT Message-Id: <202410211505.49LF5HQq047291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: ee7cb98d4cd0 - stable/14 - dev/psci: Create macros to simplify calling SMCCC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ee7cb98d4cd0b53c3a7a1bd2cda476c1726232fc Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ee7cb98d4cd0b53c3a7a1bd2cda476c1726232fc commit ee7cb98d4cd0b53c3a7a1bd2cda476c1726232fc Author: Andrew Turner AuthorDate: 2024-10-14 14:33:44 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 dev/psci: Create macros to simplify calling SMCCC When calling into SMCCC functions we often only need a few arguments. As the current function needs all 8 possible arguments to be set the unused values will be zero. Create a macro to pass in the used values, followed by enough zeros, then the result pointer. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46986 (cherry picked from commit e4c3536138f4a314dc26331b0a1488faae09aaf4) --- sys/dev/psci/smccc.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sys/dev/psci/smccc.h b/sys/dev/psci/smccc.h index 96527f037d78..dd10fb8018ae 100644 --- a/sys/dev/psci/smccc.h +++ b/sys/dev/psci/smccc.h @@ -91,6 +91,38 @@ int arm_smccc_smc(register_t, register_t, register_t, register_t, register_t, int arm_smccc_hvc(register_t, register_t, register_t, register_t, register_t, register_t, register_t, register_t, struct arm_smccc_res *res); +#define arm_smccc_invoke_1(func, a0, res) \ + func(a0, 0, 0, 0, 0, 0, 0, 0, res) +#define arm_smccc_invoke_2(func, a0, a1, res) \ + func(a0, a1, 0, 0, 0, 0, 0, 0, res) +#define arm_smccc_invoke_3(func, a0, a1, a2, res) \ + func(a0, a1, a2, 0, 0, 0, 0, 0, res) +#define arm_smccc_invoke_4(func, a0, a1, a2, a3, res) \ + func(a0, a1, a2, a3, 0, 0, 0, 0, res) +#define arm_smccc_invoke_5(func, a0, a1, a2, a3, a4, res) \ + func(a0, a1, a2, a3, a4, 0, 0, 0, res) +#define arm_smccc_invoke_6(func, a0, a1, a2, a3, a4, a5, res) \ + func(a0, a1, a2, a3, a4, a5, 0, 0, res) +#define arm_smccc_invoke_7(func, a0, a1, a2, a3, a4, a5, a6, res) \ + func(a0, a1, a2, a3, a4, a5, a6, 0, res) +#define arm_smccc_invoke_8(func, a0, a1, a2, a3, a4, a5, a6, a7, res) \ + func(a0, a1, a2, a3, a4, a5, a6, a7, res) + +#define _arm_smccc_invoke_macro(_1, _2, _3, _4, _5, _6, _7, _8, NAME, ...) \ + NAME +#define _arm_smccc_invoke(func, a0, ...) \ + _arm_smccc_invoke_macro(__VA_ARGS__, arm_smccc_invoke_8, \ + arm_smccc_invoke_7, arm_smccc_invoke_6, arm_smccc_invoke_5, \ + arm_smccc_invoke_4, arm_smccc_invoke_3, arm_smccc_invoke_2, \ + arm_smccc_invoke_1)(func, a0, __VA_ARGS__) + +#define arm_smccc_invoke_hvc(a0, ...) \ + _arm_smccc_invoke(arm_smccc_hvc, a0, __VA_ARGS__) +#define arm_smccc_invoke_smc(a0, ...) \ + _arm_smccc_invoke(arm_smccc_smc, a0, __VA_ARGS__) +#define arm_smccc_invoke(a0, ...) \ + _arm_smccc_invoke(psci_callfn, a0, __VA_ARGS__) + struct arm_smccc_1_2_regs { register_t a0; register_t a1; From nobody Mon Oct 21 15:05: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 4XXJX04TtWz5ZNc2; Mon, 21 Oct 2024 15:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJX02qNlz4fVn; Mon, 21 Oct 2024 15:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m2W4YmdXlgZMbUe4bLV1N7CvEjavrZvppzwhG9WB7rU=; b=lwOj4tnxcg8kSuMprbTCBsi4VSB8R8hoWcMU27STZ7lnnpyEWUhtEbL8uIyZeL2GeGLy37 LlIqCLCwP+uxgga/jyB4Nr8EsSc86DzGwGoXTuGzvkWjUOOAvouh1s7HHN9fEd2DEnDXjD HjpoyY3eWYKKp+E38WsEx33K69GyT1Z5M/bk6XlUlTjFp/55Rd00r20DhWlU3onMczdJMK /7J/RroxM+R3Bwr8NG64S+3pWX59W6mjFbED1ISQe3q+Duc433zsOmyrHQRWpXM0beGiQ1 5ieLxZ8EFpuFwzoza+b1gNKgxwcPmV73Ck3KgmNjYXNyX/XRvvxaq7IacIeqLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m2W4YmdXlgZMbUe4bLV1N7CvEjavrZvppzwhG9WB7rU=; b=gJq5nPkrIAYzXgaXpw1d4qFNvFeRhZNPcHYSwQk3Zkg7hKIPX83HTBbY8aQQnZLIfRy+9z Gy4DVT2EGU0A6ryZGYpvOuWtZc9ZKD25ss/s+uKLInzagrYOjXRmFsbopONhXo7WryeGA8 fmsIqIX/Drd4i7INb5ybYQ1kgAiAQtXdvdR5ufgwfa2bi6xNU8JJj8Akkg1NhPMJu6JGm4 DYR78geVNt9SDLQ5TDNnpQH1IdAHpyIQ6SUqSsF2abbK06vHF5X3cFTeXFSDR/wy5cW142 F/qvRs+3DGwpPmOk29n8YdLIbNVsAUi71e3Of4QNkpUGmjhKFT2Vi72qgbsDXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523120; a=rsa-sha256; cv=none; b=D1/0TqoASsW6t7R1BTsM5XR8uOqustKfP6blZtsoPvTtC6WsfRa4NoANJJvjaWfdGTWcvY VSrZ7fGNc48hv0N3V3HF609RdowKui7G6evBp2hAEWUT0/IbKjf/TGPGanpP9RiLNfr2qD MxmTpnzovZ18EMj1wviZPxiXa+FcdwKFK2UbZaPAZ1PRH6SaDK9GpGyWyhyaDeHwghLBgT 4lwohSiaj19lQ2s7YOmSnVKOt91+IVXDVDfxYpx22pOqc/Ldng9WG1ilhmrQrl9v0KPh6m J6wOKBZNHiSpqrKIxHx9kX5ION+nnwuh+aUZUM/+58cgRX3k6DuaRXhJ2ngwkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJX02L6Rzb1S; Mon, 21 Oct 2024 15:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF5KoG047403; Mon, 21 Oct 2024 15:05:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF5KFV047400; Mon, 21 Oct 2024 15:05:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:20 GMT Message-Id: <202410211505.49LF5KFV047400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: ce5a07a9d2c5 - stable/14 - arm64: Stop trashing x28 in savectx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce5a07a9d2c58b65bbce5609834af63c5ff7e85d Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ce5a07a9d2c58b65bbce5609834af63c5ff7e85d commit ce5a07a9d2c58b65bbce5609834af63c5ff7e85d Author: Andrew Turner AuthorDate: 2024-10-15 08:30:17 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:27 +0000 arm64: Stop trashing x28 in savectx While here make it return void, we don't set any useful return value and nothing checks for it. Sponsored by: Arm Ltd (cherry picked from commit a7c5c88cb29ff512467a6599f1b4d8e2b8817480) --- sys/arm64/arm64/swtch.S | 10 ++++------ sys/arm64/include/pcb.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 882bfd7cf05a..85752dd6fc86 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -265,13 +265,11 @@ ENTRY(savectx) mrs x6, tpidr_el0 stp x5, x6, [x0, #PCB_SP] - /* Store the VFP registers */ #ifdef VFP - mov x28, lr - bl vfp_save_state_savectx - mov lr, x28 -#endif - + /* Store the VFP registers */ + b vfp_save_state_savectx +#else ret +#endif END(savectx) diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index 273b53cdc6cf..c0feb1149cf5 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -85,7 +85,7 @@ struct pcb { #ifdef _KERNEL void makectx(struct trapframe *tf, struct pcb *pcb); -int savectx(struct pcb *pcb) __returns_twice; +void savectx(struct pcb *pcb) __returns_twice; #endif #endif /* !LOCORE */ From nobody Mon Oct 21 15:11: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 4XXJfm0LvHz5ZP8H; Mon, 21 Oct 2024 15:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJfl5nzSz4lPP; Mon, 21 Oct 2024 15:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQAVuTg4pUjvNYIaHDGh0TfiLiHB7+UPSSQgAiVyqPk=; b=cRJUYCXI9aqzgugoRyVGyHGhBgOkKsROSPdf8xJNc0uFwAWUhatbmaXXy37fn4qnOM7Fy3 JRaj2v3VnDl5hc/xhCmLfj5wdMvUqYwEJqX5LZj453zejZjmlYaY6C7Tl/uvsEr6p+t5wL YLiPtk/yjrxQGmgVuUESMza9M6SLkeo1dOOyPheEvObCg33cOWRQLK+WbnZ40UBXWHVOGu UMGnZ9Lwl1KXAotpMkiWbsSXRjcZa/jRI4DfxcuQrvD0gkyCFEIdR0AApyBkeWL9KZLZHL rc7K+8zOpJbfqixHukz3J5DGubsheMZ4gQC6ShRx9I2h4J2c2TkWzGcYYCkQYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQAVuTg4pUjvNYIaHDGh0TfiLiHB7+UPSSQgAiVyqPk=; b=B9pBbYYhhdUBjbMhO+WFhzREvkbchlhsVv/IPEy9+cCnBXfhxICaE2FnsRo10HEgK4KI0F 7NDOwiQ4M9MnxnCxSsX5nJFFHQuJMSUoWUvH21V5gUm3Peua/bdrazQIffJq1xA0DdvI4x TQqA9hFUCP7SyfZiUcI5i4EEH2XPiCLr1JN7vjWJgr4aWWzlDgx1IwAr6KhPXbjQ3sfySc hCbO9zE66ABTSAfmpxDucErFncaDlODUvzUeOPuOiPNtV65vwyH3METnBY0p6/++FDporp FPaAb46cM/8i8fGQV4OVbDxRJ/HhwGO+NNJcrOSRm1zuMsdBqZSvCFQhDv1lJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523471; a=rsa-sha256; cv=none; b=A2FjZ3lzMwqEU+/KS56AujtyHFCooSejDLoH6WP0W3ju6yviQwDJeNPiG7fdArJG2jxgur hfaqKTP52dz7nibVCv7BplC4eXpnDuugHUSbqT4OvkvkCWbtBI8bZwAZA+e5fGSbsSxkNl 5k9ogK1Surng0s8t3p2Scz6MGsJjWkW59Emk324kWF69x/4lfnT+e1oiT6Tw/iit9AhMXT KLl6D72n1JR6Huq/dOD9/pDkUdZhU8J/M6EzRWIiS4WtRKJYazGnNBN0ug6BaqbkEGFwWN BuyQHglD0++NOJNOSjJSuAMo9F+W6d8oqPQo0YwePGSUc3qcam9RyzIA7lJ4ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJfl55w3zb1p; Mon, 21 Oct 2024 15:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFBBZB060458; Mon, 21 Oct 2024 15:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFBBo7060455; Mon, 21 Oct 2024 15:11:11 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:11:11 GMT Message-Id: <202410211511.49LFBBo7060455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4c1441bba1d1 - stable/14 - igc: Add sysctl for DMA Coalesce List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c1441bba1d1bcc5a8237c97f136bf7e3cc77058 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4c1441bba1d1bcc5a8237c97f136bf7e3cc77058 commit 4c1441bba1d1bcc5a8237c97f136bf7e3cc77058 Author: Kevin Bowling AuthorDate: 2024-10-14 12:55:18 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:09:35 +0000 igc: Add sysctl for DMA Coalesce This feature can increase efficiency at the expense of latency It does not work well with the default interrupt delay, but expose the otherwise unconnected code in the driver in case people want to experiment. See https://www.intel.com/content/dam/support/us/en/documents/network/adapter/pro100/sb/466827_intel_r__dma_coalescing_white_paper_v003.pdf Sponsored by: BBOX.io (cherry picked from commit 68b1f5dc59368ce5175e3300bf95476ea5a560bc) --- sys/dev/igc/if_igc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index d964fbe4cf91..da897d636cfe 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -141,6 +141,7 @@ static int igc_msix_link(void *); static void igc_handle_link(void *context); static int igc_set_flowcntl(SYSCTL_HANDLER_ARGS); +static int igc_sysctl_dmac(SYSCTL_HANDLER_ARGS); static int igc_sysctl_eee(SYSCTL_HANDLER_ARGS); static int igc_get_regs(SYSCTL_HANDLER_ARGS); @@ -490,6 +491,12 @@ igc_if_attach_pre(if_ctx_t ctx) CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, adapter, 0, igc_get_rs, "I", "Dump RS indexes"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "dmac", + CTLTYPE_INT | CTLFLAG_RW, adapter, 0, + igc_sysctl_dmac, "I", "DMA Coalesce"); + /* Determine hardware and mac info */ igc_identify_hardware(ctx); @@ -3030,6 +3037,55 @@ igc_set_flowcntl(SYSCTL_HANDLER_ARGS) return (error); } +/* + * Manage DMA Coalesce: + * Control values: + * 0/1 - off/on + * Legal timer values are: + * 250,500,1000-10000 in thousands + */ +static int +igc_sysctl_dmac(SYSCTL_HANDLER_ARGS) +{ + struct igc_adapter *sc = (struct igc_adapter *) arg1; + int error; + + error = sysctl_handle_int(oidp, &sc->dmac, 0, req); + + if ((error) || (req->newptr == NULL)) + return (error); + + switch (sc->dmac) { + case 0: + /* Disabling */ + break; + case 1: /* Just enable and use default */ + sc->dmac = 1000; + break; + case 250: + case 500: + case 1000: + case 2000: + case 3000: + case 4000: + case 5000: + case 6000: + case 7000: + case 8000: + case 9000: + case 10000: + /* Legal values - allow */ + break; + default: + /* Do nothing, illegal value */ + sc->dmac = 0; + return (EINVAL); + } + /* Reinit the interface */ + igc_if_init(sc->ctx); + return (error); +} + /* * Manage Energy Efficient Ethernet: * Control values: From nobody Mon Oct 21 15:11: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 4XXJfn0zRnz5ZP14; Mon, 21 Oct 2024 15:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJfm6Vfdz4ldB; Mon, 21 Oct 2024 15:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ApNoJXJwNBhc86ls5yK9tUd1aoCxSwxlF3Ald+qI7U=; b=W4WllvbFXklDuOAhgcrS3Hp7apdR2Efh9Mnb1t22ncpyaqpQ6M7aPELgV7PGLs+SDh5u6f zYZYwpyRRXPvk1LCULKutRb2/sBLEeLlvLRZu0AkbzpksHbXKr4rVWn9rOQ7TaEnTNaAoD cYYd7xGXmd87oseDQS9ovwHmgdvrJnttr4hDOotXdGF+1l0BYIu+Qp1U89laokfroTLOvG xkQCgD9V8NuiwRAd2t7jap1EAlM9q6sJ/6pxiCCkU2pdJY/urKVMgJd9ajKunyhZ5u3xis RIzJIwf24zieQxfU4lCLFkMb8YNWZjlfqN5TH9Y9FP2v1s6lpdu8XJtIp7Q6Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ApNoJXJwNBhc86ls5yK9tUd1aoCxSwxlF3Ald+qI7U=; b=MogdLnS7QHt4dthQIEQw48FfvzzP0YoPgv+KXwiIZyYYCOV4sXXojW8VlccF3iy8hio4ye LeNgLtbl3Z7+z7IdsYuJEpxsatfCM3vgJmbJkgSsjFyq3N4atc+/j9eQIQfJbG6C3gREtR iISEHAC4EF6JsSa/U7DOPfroZWTcShgXbaQEieNYySyli5/S6ot0hkBWvIoVWdsqdW+dXJ TLZeyDzQ0U1CduTeXHVlqmR1WD6tzZdIDtmzqwLgsxtOuaTO6f7IXv6TVxZUHHVojqzLr9 SDZqMvjj/bWwDU54X6/t+FL5eBGM9TdPfgaMP47wBqh3E5Z5U33cs4qOmAiI6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523472; a=rsa-sha256; cv=none; b=OaXu5Na/f+AyN70CZPoIq/D2zh1FGlpPRzcX7gBIi1NVwXOMwbKCtU4656muKzlYkIu12m GzxEgFfOe7zAe74VuQJ4P+Q5QkI3I87Cj0tro9QgCRb4xLHsvum8jVNQtuLyTYa0oGcA83 BeK1phbtu12h4grqA4DUwOyWbV7YzlxBUKBfeQBY+HfRUK6/+yog/hbeiOoKzZy1+VMgAb tBQj0QPVJHgD4rlUGtxxf9bELxqXExzIUyQFRc9l8lciTb2ws5Cx8EOv7xXFO5EVyOJg24 BjjJ7pT/ACwnb9Jg6eLnJl3mmPWQvmOcjaarW2lHqq8nLaZAvOzd57Q5u4Kr4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJfm669vzbR2; Mon, 21 Oct 2024 15:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFBCZa060513; Mon, 21 Oct 2024 15:11:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFBCkw060510; Mon, 21 Oct 2024 15:11:12 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:11:12 GMT Message-Id: <202410211511.49LFBCkw060510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 1dae98bc4bfd - stable/14 - igc: Add sysctls for some missing MAC stats List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1dae98bc4bfdcdfa389e9b41098421316a26c87e Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1dae98bc4bfdcdfa389e9b41098421316a26c87e commit 1dae98bc4bfdcdfa389e9b41098421316a26c87e Author: Kevin Bowling AuthorDate: 2024-10-14 13:07:41 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:09:51 +0000 igc: Add sysctls for some missing MAC stats Sponsored by: BBOX.io (cherry picked from commit 09526a771afc411e641a3d04c905824fe8afc627) --- sys/dev/igc/if_igc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index da897d636cfe..b927b9e3b260 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2491,6 +2491,10 @@ igc_update_stats_counters(struct igc_adapter *adapter) adapter->stats.roc += IGC_READ_REG(&adapter->hw, IGC_ROC); adapter->stats.rjc += IGC_READ_REG(&adapter->hw, IGC_RJC); + adapter->stats.mgprc += IGC_READ_REG(&adapter->hw, IGC_MGTPRC); + adapter->stats.mgpdc += IGC_READ_REG(&adapter->hw, IGC_MGTPDC); + adapter->stats.mgptc += IGC_READ_REG(&adapter->hw, IGC_MGTPTC); + adapter->stats.tor += IGC_READ_REG(&adapter->hw, IGC_TORH); adapter->stats.tot += IGC_READ_REG(&adapter->hw, IGC_TOTH); @@ -2731,6 +2735,9 @@ igc_add_hw_stats(struct igc_adapter *adapter) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "missed_packets", CTLFLAG_RD, &adapter->stats.mpc, "Missed Packets"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_length_errors", + CTLFLAG_RD, &adapter->stats.rlec, + "Receive Length Errors"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_no_buff", CTLFLAG_RD, &adapter->stats.rnbc, "Receive No Buffers"); @@ -2767,6 +2774,18 @@ igc_add_hw_stats(struct igc_adapter *adapter) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "xoff_txd", CTLFLAG_RD, &adapter->stats.xofftxc, "XOFF Transmitted"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "unsupported_fc_recvd", + CTLFLAG_RD, &adapter->stats.fcruc, + "Unsupported Flow Control Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_recvd", + CTLFLAG_RD, &adapter->stats.mgprc, + "Management Packets Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_drop", + CTLFLAG_RD, &adapter->stats.mgpdc, + "Management Packets Dropped"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_txd", + CTLFLAG_RD, &adapter->stats.mgptc, + "Management Packets Transmitted"); /* Packet Reception Stats */ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_recvd", From nobody Mon Oct 21 15:11: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 4XXJfp14n7z5ZPBW; Mon, 21 Oct 2024 15:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJfp09gvz4lXS; Mon, 21 Oct 2024 15:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89XTAjcuGwvqYjHtAxCX7DRMyuHJzccYcnGclijUz/k=; b=gnWLJEu0Jm2J7f4UJzpzzoanwCrazWi6LQWKwel+bBd7uGWrkexOZlsgi8IxXh4Tfl/pCt 3YvNJyQggYGe1AhdviNsUuhkHrYfDH7vUj9M+3kc524ytzvgJ8B90/PvkApKdgDSx3a6We n2dGoE586IFFoYZPvvNQLTiRrg/K00oYrPesfyhdaSDPjH0oIGIftCQJ5x03PFR8fDYQtj pF2cAjuMX4ADpyougTPFHeKCeeqtipup6oZgQpKdbgwwnQKOmAeAUyvbzgkWHV3cEkFKls nUmHw6mHdSOBg9FM7AddzZaMXX5fnTtMDVKL4SQizOsRZcFGI8uhhX/muFUzYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89XTAjcuGwvqYjHtAxCX7DRMyuHJzccYcnGclijUz/k=; b=N1C0wiIK2aeBW5aLzN50FjMnS0REUDSNGq9NFjro871e2KwEFWKLcm10BvBy0eFZ7fKzuo yOyT5vif1N/9HQ03Pll6rCaHExTm6DrPtWNksq/v4BOCn36V9FWMzCc5H0EIaw2xSwcPK8 MJE4JhCq1qqTNS9qGooMcDa+PjPBKIz811n51mnjpEYhwBMrvaLs2e3yiLp6KtReqSP2Jc 6/fwlKDJ8NxGfs/V6YvKNwMOLY5GsFWVUs56ztMiornhWrEpjmv8G8UpeIeBwcxeaFFfnt ZQc3Q/zM3PHSAKGk/JlmHiXOd+w6xeKBVSot6NJbIo4cl/pvV/OcTZo+DZQu8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523474; a=rsa-sha256; cv=none; b=q1aYfyE5SEqqAmdyzfz2e5i3HDVyLPOiBxH2wpO7PVXhk1kV+pHf4qIDYUvZBUwrt+GquD lzm80QGdm3UYPuTQE3SGIs+h85K3fBYR5y/5jgteSW63qD5C/3fTv1C3ieTDKwYUzh4kGD Gw+IqrIZWXlU1jwfffg3/RgBe/gTcZFZnx0rwwQZ/l/o/Ta0T3zTVTK2r6zfXTveseTB6V GEY8j0KAN2DfBDHTHkkdRgATXiA0mOqtFUHM7EN5CNQye8cbvMktg2H/HLHlgiveS18Z5J gAAJg6qyUggx1J8IYOcj0uOKIj5Uxcimm8aYZkfcdrkoVtsmEfgp4x/HRHu12g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJfn6ffZzbP1; Mon, 21 Oct 2024 15:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFBDo5060569; Mon, 21 Oct 2024 15:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFBD2E060566; Mon, 21 Oct 2024 15:11:13 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:11:13 GMT Message-Id: <202410211511.49LFBD2E060566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e624987fe435 - stable/14 - igc: Rename 'struct adapter' to 'struct igc_softc' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e624987fe43585124ac2b231a2208cc10c3b1c54 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e624987fe43585124ac2b231a2208cc10c3b1c54 commit e624987fe43585124ac2b231a2208cc10c3b1c54 Author: Kevin Bowling AuthorDate: 2024-10-14 13:29:55 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:10:09 +0000 igc: Rename 'struct adapter' to 'struct igc_softc' Rename the 'struct adapter' to 'struct igc_softc' to avoid type ambiguity in things like kgdb and make sharing code with e1000 and ixgbe easier. Sponsored by: BBOX.io (cherry picked from commit 542f5d56317e94676cf19cb9d66207bf9a6b6758) --- sys/dev/igc/if_igc.c | 970 ++++++++++++++++++++++++------------------------- sys/dev/igc/if_igc.h | 28 +- sys/dev/igc/igc_txrx.c | 36 +- 3 files changed, 517 insertions(+), 517 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index b927b9e3b260..a55d8b6cbc9c 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -111,25 +111,25 @@ static int igc_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txqid); static void igc_if_multi_set(if_ctx_t ctx); static void igc_if_update_admin_status(if_ctx_t ctx); static void igc_if_debug(if_ctx_t ctx); -static void igc_update_stats_counters(struct igc_adapter *); -static void igc_add_hw_stats(struct igc_adapter *adapter); +static void igc_update_stats_counters(struct igc_softc *); +static void igc_add_hw_stats(struct igc_softc *sc); static int igc_if_set_promisc(if_ctx_t ctx, int flags); static void igc_setup_vlan_hw_support(if_ctx_t ctx); -static void igc_fw_version(struct igc_adapter *); +static void igc_fw_version(struct igc_softc *); static void igc_sbuf_fw_version(struct igc_fw_version *, struct sbuf *); -static void igc_print_fw_version(struct igc_adapter *); +static void igc_print_fw_version(struct igc_softc *); static int igc_sysctl_print_fw_version(SYSCTL_HANDLER_ARGS); static int igc_sysctl_nvm_info(SYSCTL_HANDLER_ARGS); -static void igc_print_nvm_info(struct igc_adapter *); +static void igc_print_nvm_info(struct igc_softc *); static int igc_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int igc_get_rs(SYSCTL_HANDLER_ARGS); -static void igc_print_debug_info(struct igc_adapter *); +static void igc_print_debug_info(struct igc_softc *); static int igc_is_valid_ether_addr(u8 *); -static void igc_neweitr(struct igc_adapter *, struct igc_rx_queue *, +static void igc_neweitr(struct igc_softc *, struct igc_rx_queue *, struct tx_ring *, struct rx_ring *); /* Management and WOL Support */ -static void igc_get_hw_control(struct igc_adapter *); -static void igc_release_hw_control(struct igc_adapter *); +static void igc_get_hw_control(struct igc_softc *); +static void igc_release_hw_control(struct igc_softc *); static void igc_get_wakeup(if_ctx_t ctx); static void igc_enable_wakeup(if_ctx_t ctx); @@ -146,7 +146,7 @@ static int igc_sysctl_eee(SYSCTL_HANDLER_ARGS); static int igc_get_regs(SYSCTL_HANDLER_ARGS); -static void igc_configure_queues(struct igc_adapter *adapter); +static void igc_configure_queues(struct igc_softc *sc); /********************************************************************* @@ -165,7 +165,7 @@ static device_method_t igc_methods[] = { }; static driver_t igc_driver = { - "igc", igc_methods, sizeof(struct igc_adapter), + "igc", igc_methods, sizeof(struct igc_softc), }; DRIVER_MODULE(igc, pci, igc_driver, 0, 0); @@ -208,7 +208,7 @@ static device_method_t igc_if_methods[] = { }; static driver_t igc_if_driver = { - "igc_if", igc_if_methods, sizeof(struct igc_adapter) + "igc_if", igc_if_methods, sizeof(struct igc_softc) }; /********************************************************************* @@ -295,8 +295,8 @@ static struct if_shared_ctx igc_sctx_init = { static int igc_get_regs(SYSCTL_HANDLER_ARGS) { - struct igc_adapter *adapter = (struct igc_adapter *)arg1; - struct igc_hw *hw = &adapter->hw; + struct igc_softc *sc = (struct igc_softc *)arg1; + struct igc_hw *hw = &sc->hw; struct sbuf *sb; u32 *regs_buff; int rc; @@ -372,7 +372,7 @@ static int igc_get_regs(SYSCTL_HANDLER_ARGS) #ifdef DUMP_DESCS { - if_softc_ctx_t scctx = adapter->shared; + if_softc_ctx_t scctx = sc->shared; struct rx_ring *rxr = &rx_que->rxr; struct tx_ring *txr = &tx_que->txr; int ntxd = scctx->isc_ntxd[0]; @@ -434,7 +434,7 @@ igc_set_num_queues(if_ctx_t ctx) static int igc_if_attach_pre(if_ctx_t ctx) { - struct igc_adapter *adapter; + struct igc_softc *sc; if_softc_ctx_t scctx; device_t dev; struct igc_hw *hw; @@ -442,59 +442,59 @@ igc_if_attach_pre(if_ctx_t ctx) INIT_DEBUGOUT("igc_if_attach_pre: begin"); dev = iflib_get_dev(ctx); - adapter = iflib_get_softc(ctx); + sc = iflib_get_softc(ctx); - adapter->ctx = adapter->osdep.ctx = ctx; - adapter->dev = adapter->osdep.dev = dev; - scctx = adapter->shared = iflib_get_softc_ctx(ctx); - adapter->media = iflib_get_media(ctx); - hw = &adapter->hw; + sc->ctx = sc->osdep.ctx = ctx; + sc->dev = sc->osdep.dev = dev; + scctx = sc->shared = iflib_get_softc_ctx(ctx); + sc->media = iflib_get_media(ctx); + hw = &sc->hw; /* SYSCTL stuff */ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "nvm", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_sysctl_nvm_info, "I", "NVM Information"); + sc, 0, igc_sysctl_nvm_info, "I", "NVM Information"); - adapter->enable_aim = igc_enable_aim; + sc->enable_aim = igc_enable_aim; SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "enable_aim", CTLFLAG_RW, - &adapter->enable_aim, 0, + &sc->enable_aim, 0, "Interrupt Moderation (1=normal, 2=lowlatency)"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fw_version", CTLTYPE_STRING | CTLFLAG_RD, - adapter, 0, igc_sysctl_print_fw_version, "A", + sc, 0, igc_sysctl_print_fw_version, "A", "Prints FW/NVM Versions"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_sysctl_debug_info, "I", "Debug Information"); + sc, 0, igc_sysctl_debug_info, "I", "Debug Information"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fc", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_set_flowcntl, "I", "Flow Control"); + sc, 0, igc_set_flowcntl, "I", "Flow Control"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "reg_dump", - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, adapter, 0, + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, sc, 0, igc_get_regs, "A", "Dump Registers"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rs_dump", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, adapter, 0, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, igc_get_rs, "I", "Dump RS indexes"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "dmac", - CTLTYPE_INT | CTLFLAG_RW, adapter, 0, + CTLTYPE_INT | CTLFLAG_RW, sc, 0, igc_sysctl_dmac, "I", "DMA Coalesce"); /* Determine hardware and mac info */ @@ -559,13 +559,13 @@ igc_if_attach_pre(if_ctx_t ctx) * Set the frame limits assuming * standard ethernet sized frames. */ - scctx->isc_max_frame_size = adapter->hw.mac.max_frame_size = + scctx->isc_max_frame_size = sc->hw.mac.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHERNET_FCS_SIZE; /* Allocate multicast array memory. */ - adapter->mta = malloc(sizeof(u8) * ETHER_ADDR_LEN * + sc->mta = malloc(sizeof(u8) * ETHER_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES, M_DEVBUF, M_NOWAIT); - if (adapter->mta == NULL) { + if (sc->mta == NULL) { device_printf(dev, "Can not allocate multicast setup array\n"); error = ENOMEM; goto err_late; @@ -577,12 +577,12 @@ igc_if_attach_pre(if_ctx_t ctx) " due to SOL/IDER session.\n"); /* Sysctl for setting Energy Efficient Ethernet */ - adapter->hw.dev_spec._i225.eee_disable = igc_eee_setting; + sc->hw.dev_spec._i225.eee_disable = igc_eee_setting; SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "eee_control", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_sysctl_eee, "I", + sc, 0, igc_sysctl_eee, "I", "Disable Energy Efficient Ethernet"); /* @@ -622,9 +622,9 @@ igc_if_attach_pre(if_ctx_t ctx) } /* Save the EEPROM/NVM versions */ - igc_fw_version(adapter); + igc_fw_version(sc); - igc_print_fw_version(adapter); + igc_print_fw_version(sc); /* * Get Wake-on-Lan and Management info for later use @@ -633,7 +633,7 @@ igc_if_attach_pre(if_ctx_t ctx) /* Enable only WOL MAGIC by default */ scctx->isc_capenable &= ~IFCAP_WOL; - if (adapter->wol != 0) + if (sc->wol != 0) scctx->isc_capenable |= IFCAP_WOL_MAGIC; iflib_set_mac(ctx, hw->mac.addr); @@ -641,10 +641,10 @@ igc_if_attach_pre(if_ctx_t ctx) return (0); err_late: - igc_release_hw_control(adapter); + igc_release_hw_control(sc); err_pci: igc_free_pci_resources(ctx); - free(adapter->mta, M_DEVBUF); + free(sc->mta, M_DEVBUF); return (error); } @@ -652,8 +652,8 @@ err_pci: static int igc_if_attach_post(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_hw *hw = &adapter->hw; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_hw *hw = &sc->hw; int error = 0; /* Setup OS specific network interface */ @@ -665,23 +665,23 @@ igc_if_attach_post(if_ctx_t ctx) igc_reset(ctx); /* Initialize statistics */ - igc_update_stats_counters(adapter); + igc_update_stats_counters(sc); hw->mac.get_link_status = true; igc_if_update_admin_status(ctx); - igc_add_hw_stats(adapter); + igc_add_hw_stats(sc); /* the driver can now take control from firmware */ - igc_get_hw_control(adapter); + igc_get_hw_control(sc); INIT_DEBUGOUT("igc_if_attach_post: end"); return (error); err_late: - igc_release_hw_control(adapter); + igc_release_hw_control(sc); igc_free_pci_resources(ctx); igc_if_queues_free(ctx); - free(adapter->mta, M_DEVBUF); + free(sc->mta, M_DEVBUF); return (error); } @@ -698,13 +698,13 @@ err_late: static int igc_if_detach(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); INIT_DEBUGOUT("igc_if_detach: begin"); - igc_phy_hw_reset(&adapter->hw); + igc_phy_hw_reset(&sc->hw); - igc_release_hw_control(adapter); + igc_release_hw_control(sc); igc_free_pci_resources(ctx); return (0); @@ -728,9 +728,9 @@ igc_if_shutdown(if_ctx_t ctx) static int igc_if_suspend(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); - igc_release_hw_control(adapter); + igc_release_hw_control(sc); igc_enable_wakeup(ctx); return (0); } @@ -747,7 +747,7 @@ static int igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu) { int max_frame_size; - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); if_softc_ctx_t scctx = iflib_get_softc_ctx(ctx); IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFMTU (Set Interface MTU)"); @@ -759,7 +759,7 @@ igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu) return (EINVAL); } - scctx->isc_max_frame_size = adapter->hw.mac.max_frame_size = + scctx->isc_max_frame_size = sc->hw.mac.max_frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; return (0); } @@ -776,8 +776,8 @@ igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu) static void igc_if_init(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - if_softc_ctx_t scctx = adapter->shared; + struct igc_softc *sc = iflib_get_softc(ctx); + if_softc_ctx_t scctx = sc->shared; if_t ifp = iflib_get_ifp(ctx); struct igc_tx_queue *tx_que; int i; @@ -785,17 +785,17 @@ igc_if_init(if_ctx_t ctx) INIT_DEBUGOUT("igc_if_init: begin"); /* Get the latest mac address, User can use a LAA */ - bcopy(if_getlladdr(ifp), adapter->hw.mac.addr, + bcopy(if_getlladdr(ifp), sc->hw.mac.addr, ETHER_ADDR_LEN); /* Put the address into the Receive Address Array */ - igc_rar_set(&adapter->hw, adapter->hw.mac.addr, 0); + igc_rar_set(&sc->hw, sc->hw.mac.addr, 0); /* Initialize the hardware */ igc_reset(ctx); igc_if_update_admin_status(ctx); - for (i = 0, tx_que = adapter->tx_queues; i < adapter->tx_num_queues; i++, tx_que++) { + for (i = 0, tx_que = sc->tx_queues; i < sc->tx_num_queues; i++, tx_que++) { struct tx_ring *txr = &tx_que->txr; txr->tx_rs_cidx = txr->tx_rs_pidx; @@ -809,7 +809,7 @@ igc_if_init(if_ctx_t ctx) } /* Setup VLAN support, basic and offload if available */ - IGC_WRITE_REG(&adapter->hw, IGC_VET, ETHERTYPE_VLAN); + IGC_WRITE_REG(&sc->hw, IGC_VET, ETHERTYPE_VLAN); /* Prepare transmit descriptors and buffers */ igc_initialize_transmit_unit(ctx); @@ -817,7 +817,7 @@ igc_if_init(if_ctx_t ctx) /* Setup Multicast table */ igc_if_multi_set(ctx); - adapter->rx_mbuf_sz = iflib_get_rx_mbuf_sz(ctx); + sc->rx_mbuf_sz = iflib_get_rx_mbuf_sz(ctx); igc_initialize_receive_unit(ctx); /* Set up VLAN support */ @@ -825,20 +825,20 @@ igc_if_init(if_ctx_t ctx) /* Don't lose promiscuous settings */ igc_if_set_promisc(ctx, if_getflags(ifp)); - igc_clear_hw_cntrs_base_generic(&adapter->hw); + igc_clear_hw_cntrs_base_generic(&sc->hw); - if (adapter->intr_type == IFLIB_INTR_MSIX) /* Set up queue routing */ - igc_configure_queues(adapter); + if (sc->intr_type == IFLIB_INTR_MSIX) /* Set up queue routing */ + igc_configure_queues(sc); /* this clears any pending interrupts */ - IGC_READ_REG(&adapter->hw, IGC_ICR); - IGC_WRITE_REG(&adapter->hw, IGC_ICS, IGC_ICS_LSC); + IGC_READ_REG(&sc->hw, IGC_ICR); + IGC_WRITE_REG(&sc->hw, IGC_ICS, IGC_ICS_LSC); /* the driver can now take control from firmware */ - igc_get_hw_control(adapter); + igc_get_hw_control(sc); /* Set Energy Efficient Ethernet */ - igc_set_eee_i225(&adapter->hw, true, true, true); + igc_set_eee_i225(&sc->hw, true, true, true); } enum eitr_latency_target { @@ -853,7 +853,7 @@ enum eitr_latency_target { * *********************************************************************/ static void -igc_neweitr(struct igc_adapter *sc, struct igc_rx_queue *que, +igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, struct tx_ring *txr, struct rx_ring *rxr) { struct igc_hw *hw = &sc->hw; @@ -985,12 +985,12 @@ igc_set_next_eitr: int igc_intr(void *arg) { - struct igc_adapter *adapter = arg; - struct igc_hw *hw = &adapter->hw; - struct igc_rx_queue *que = &adapter->rx_queues[0]; - struct tx_ring *txr = &adapter->tx_queues[0].txr; + struct igc_softc *sc = arg; + struct igc_hw *hw = &sc->hw; + struct igc_rx_queue *que = &sc->rx_queues[0]; + struct tx_ring *txr = &sc->tx_queues[0].txr; struct rx_ring *rxr = &que->rxr; - if_ctx_t ctx = adapter->ctx; + if_ctx_t ctx = sc->ctx; u32 reg_icr; reg_icr = IGC_READ_REG(hw, IGC_ICR); @@ -1019,9 +1019,9 @@ igc_intr(void *arg) igc_handle_link(ctx); if (reg_icr & IGC_ICR_RXO) - adapter->rx_overruns++; + sc->rx_overruns++; - igc_neweitr(adapter, que, txr, rxr); + igc_neweitr(sc, que, txr, rxr); /* Reset state */ txr->tx_bytes = 0; @@ -1035,20 +1035,20 @@ igc_intr(void *arg) static int igc_if_rx_queue_intr_enable(if_ctx_t ctx, uint16_t rxqid) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_rx_queue *rxq = &adapter->rx_queues[rxqid]; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_rx_queue *rxq = &sc->rx_queues[rxqid]; - IGC_WRITE_REG(&adapter->hw, IGC_EIMS, rxq->eims); + IGC_WRITE_REG(&sc->hw, IGC_EIMS, rxq->eims); return (0); } static int igc_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txqid) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_tx_queue *txq = &adapter->tx_queues[txqid]; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_tx_queue *txq = &sc->tx_queues[txqid]; - IGC_WRITE_REG(&adapter->hw, IGC_EIMS, txq->eims); + IGC_WRITE_REG(&sc->hw, IGC_EIMS, txq->eims); return (0); } @@ -1061,7 +1061,7 @@ static int igc_msix_que(void *arg) { struct igc_rx_queue *que = arg; - struct igc_adapter *sc = que->adapter; + struct igc_softc *sc = que->sc; struct tx_ring *txr = &sc->tx_queues[que->msix].txr; struct rx_ring *rxr = &que->rxr; @@ -1086,22 +1086,22 @@ igc_msix_que(void *arg) static int igc_msix_link(void *arg) { - struct igc_adapter *adapter = arg; + struct igc_softc *sc = arg; u32 reg_icr; - ++adapter->link_irq; - MPASS(adapter->hw.back != NULL); - reg_icr = IGC_READ_REG(&adapter->hw, IGC_ICR); + ++sc->link_irq; + MPASS(sc->hw.back != NULL); + reg_icr = IGC_READ_REG(&sc->hw, IGC_ICR); if (reg_icr & IGC_ICR_RXO) - adapter->rx_overruns++; + sc->rx_overruns++; if (reg_icr & (IGC_ICR_RXSEQ | IGC_ICR_LSC)) { - igc_handle_link(adapter->ctx); + igc_handle_link(sc->ctx); } - IGC_WRITE_REG(&adapter->hw, IGC_IMS, IGC_IMS_LSC); - IGC_WRITE_REG(&adapter->hw, IGC_EIMS, adapter->link_mask); + IGC_WRITE_REG(&sc->hw, IGC_IMS, IGC_IMS_LSC); + IGC_WRITE_REG(&sc->hw, IGC_EIMS, sc->link_mask); return (FILTER_HANDLED); } @@ -1110,9 +1110,9 @@ static void igc_handle_link(void *context) { if_ctx_t ctx = context; - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); - adapter->hw.mac.get_link_status = true; + sc->hw.mac.get_link_status = true; iflib_admin_intr_deferred(ctx); } @@ -1127,7 +1127,7 @@ igc_handle_link(void *context) static void igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); INIT_DEBUGOUT("igc_if_media_status: begin"); @@ -1136,13 +1136,13 @@ igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) ifmr->ifm_status = IFM_AVALID; ifmr->ifm_active = IFM_ETHER; - if (!adapter->link_active) { + if (!sc->link_active) { return; } ifmr->ifm_status |= IFM_ACTIVE; - switch (adapter->link_speed) { + switch (sc->link_speed) { case 10: ifmr->ifm_active |= IFM_10_T; break; @@ -1157,7 +1157,7 @@ igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) break; } - if (adapter->link_duplex == FULL_DUPLEX) + if (sc->link_duplex == FULL_DUPLEX) ifmr->ifm_active |= IFM_FDX; else ifmr->ifm_active |= IFM_HDX; @@ -1174,7 +1174,7 @@ igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) static int igc_if_media_change(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); struct ifmedia *ifm = iflib_get_media(ctx); INIT_DEBUGOUT("igc_if_media_change: begin"); @@ -1182,32 +1182,32 @@ igc_if_media_change(if_ctx_t ctx) if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) return (EINVAL); - adapter->hw.mac.autoneg = DO_AUTO_NEG; + sc->hw.mac.autoneg = DO_AUTO_NEG; switch (IFM_SUBTYPE(ifm->ifm_media)) { case IFM_AUTO: - adapter->hw.phy.autoneg_advertised = AUTONEG_ADV_DEFAULT; + sc->hw.phy.autoneg_advertised = AUTONEG_ADV_DEFAULT; break; case IFM_2500_T: - adapter->hw.phy.autoneg_advertised = ADVERTISE_2500_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_2500_FULL; break; case IFM_1000_T: - adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) - adapter->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; else - adapter->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; + sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; break; case IFM_10_T: if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) - adapter->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; else - adapter->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; + sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; break; default: - device_printf(adapter->dev, "Unsupported media type\n"); + device_printf(sc->dev, "Unsupported media type\n"); } igc_if_init(ctx); @@ -1218,12 +1218,12 @@ igc_if_media_change(if_ctx_t ctx) static int igc_if_set_promisc(if_ctx_t ctx, int flags) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); if_t ifp = iflib_get_ifp(ctx); u32 reg_rctl; int mcnt = 0; - reg_rctl = IGC_READ_REG(&adapter->hw, IGC_RCTL); + reg_rctl = IGC_READ_REG(&sc->hw, IGC_RCTL); reg_rctl &= ~(IGC_RCTL_SBP | IGC_RCTL_UPE); if (flags & IFF_ALLMULTI) mcnt = MAX_NUM_MULTICAST_ADDRESSES; @@ -1233,18 +1233,18 @@ igc_if_set_promisc(if_ctx_t ctx, int flags) /* Don't disable if in MAX groups */ if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) reg_rctl &= (~IGC_RCTL_MPE); - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); if (flags & IFF_PROMISC) { reg_rctl |= (IGC_RCTL_UPE | IGC_RCTL_MPE); /* Turn this on if you want to see bad packets */ if (igc_debug_sbp) reg_rctl |= IGC_RCTL_SBP; - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); } else if (flags & IFF_ALLMULTI) { reg_rctl |= IGC_RCTL_MPE; reg_rctl &= ~IGC_RCTL_UPE; - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); } return (0); } @@ -1272,7 +1272,7 @@ igc_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int idx) static void igc_if_multi_set(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); if_t ifp = iflib_get_ifp(ctx); u8 *mta; /* Multicast array memory */ u32 reg_rctl = 0; @@ -1280,12 +1280,12 @@ igc_if_multi_set(if_ctx_t ctx) IOCTL_DEBUGOUT("igc_set_multi: begin"); - mta = adapter->mta; + mta = sc->mta; bzero(mta, sizeof(u8) * ETHER_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES); mcnt = if_foreach_llmaddr(ifp, igc_copy_maddr, mta); - reg_rctl = IGC_READ_REG(&adapter->hw, IGC_RCTL); + reg_rctl = IGC_READ_REG(&sc->hw, IGC_RCTL); if (if_getflags(ifp) & IFF_PROMISC) { reg_rctl |= (IGC_RCTL_UPE | IGC_RCTL_MPE); @@ -1300,9 +1300,9 @@ igc_if_multi_set(if_ctx_t ctx) reg_rctl &= ~(IGC_RCTL_UPE | IGC_RCTL_MPE); if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) - igc_update_mc_addr_list(&adapter->hw, mta, mcnt); + igc_update_mc_addr_list(&sc->hw, mta, mcnt); - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); } /********************************************************************* @@ -1326,8 +1326,8 @@ igc_if_timer(if_ctx_t ctx, uint16_t qid) static void igc_if_update_admin_status(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_hw *hw = &adapter->hw; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_hw *hw = &sc->hw; device_t dev = iflib_get_dev(ctx); u32 link_check, thstat, ctrl; @@ -1351,36 +1351,36 @@ igc_if_update_admin_status(if_ctx_t ctx) } /* Now check for a transition */ - if (link_check && (adapter->link_active == 0)) { - igc_get_speed_and_duplex(hw, &adapter->link_speed, - &adapter->link_duplex); + if (link_check && (sc->link_active == 0)) { + igc_get_speed_and_duplex(hw, &sc->link_speed, + &sc->link_duplex); if (bootverbose) device_printf(dev, "Link is up %d Mbps %s\n", - adapter->link_speed, - ((adapter->link_duplex == FULL_DUPLEX) ? + sc->link_speed, + ((sc->link_duplex == FULL_DUPLEX) ? "Full Duplex" : "Half Duplex")); - adapter->link_active = 1; + sc->link_active = 1; iflib_link_state_change(ctx, LINK_STATE_UP, - IF_Mbps(adapter->link_speed)); - } else if (!link_check && (adapter->link_active == 1)) { - adapter->link_speed = 0; - adapter->link_duplex = 0; - adapter->link_active = 0; + IF_Mbps(sc->link_speed)); + } else if (!link_check && (sc->link_active == 1)) { + sc->link_speed = 0; + sc->link_duplex = 0; + sc->link_active = 0; iflib_link_state_change(ctx, LINK_STATE_DOWN, 0); } - igc_update_stats_counters(adapter); + igc_update_stats_counters(sc); } static void igc_if_watchdog_reset(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); /* * Just count the event; iflib(4) will already trigger a * sufficient reset of the controller. */ - adapter->watchdog_events++; + sc->watchdog_events++; } /********************************************************************* @@ -1392,12 +1392,12 @@ igc_if_watchdog_reset(if_ctx_t ctx) static void igc_if_stop(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); INIT_DEBUGOUT("igc_if_stop: begin"); - igc_reset_hw(&adapter->hw); - IGC_WRITE_REG(&adapter->hw, IGC_WUC, 0); + igc_reset_hw(&sc->hw); + IGC_WRITE_REG(&sc->hw, IGC_WUC, 0); } /********************************************************************* @@ -1409,22 +1409,22 @@ static void igc_identify_hardware(if_ctx_t ctx) { device_t dev = iflib_get_dev(ctx); - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); /* Make sure our PCI config space has the necessary stuff set */ - adapter->hw.bus.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2); + sc->hw.bus.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2); /* Save off the information about this board */ - adapter->hw.vendor_id = pci_get_vendor(dev); - adapter->hw.device_id = pci_get_device(dev); - adapter->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1); - adapter->hw.subsystem_vendor_id = + sc->hw.vendor_id = pci_get_vendor(dev); + sc->hw.device_id = pci_get_device(dev); + sc->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1); + sc->hw.subsystem_vendor_id = pci_read_config(dev, PCIR_SUBVEND_0, 2); - adapter->hw.subsystem_device_id = + sc->hw.subsystem_device_id = pci_read_config(dev, PCIR_SUBDEV_0, 2); /* Do Shared Code Init and Setup */ - if (igc_set_mac_type(&adapter->hw)) { + if (igc_set_mac_type(&sc->hw)) { device_printf(dev, "Setup init failure\n"); return; } @@ -1433,23 +1433,23 @@ igc_identify_hardware(if_ctx_t ctx) static int igc_allocate_pci_resources(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); device_t dev = iflib_get_dev(ctx); int rid; rid = PCIR_BAR(0); - adapter->memory = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + sc->memory = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (adapter->memory == NULL) { + if (sc->memory == NULL) { device_printf(dev, "Unable to allocate bus resource: memory\n"); return (ENXIO); } - adapter->osdep.mem_bus_space_tag = rman_get_bustag(adapter->memory); - adapter->osdep.mem_bus_space_handle = - rman_get_bushandle(adapter->memory); - adapter->hw.hw_addr = (u8 *)&adapter->osdep.mem_bus_space_handle; + sc->osdep.mem_bus_space_tag = rman_get_bustag(sc->memory); + sc->osdep.mem_bus_space_handle = + rman_get_bushandle(sc->memory); + sc->hw.hw_addr = (u8 *)&sc->osdep.mem_bus_space_handle; - adapter->hw.back = &adapter->osdep; + sc->hw.back = &sc->osdep; return (0); } @@ -1462,20 +1462,20 @@ igc_allocate_pci_resources(if_ctx_t ctx) static int igc_if_msix_intr_assign(if_ctx_t ctx, int msix) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_rx_queue *rx_que = adapter->rx_queues; - struct igc_tx_queue *tx_que = adapter->tx_queues; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_rx_queue *rx_que = sc->rx_queues; + struct igc_tx_queue *tx_que = sc->tx_queues; int error, rid, i, vector = 0, rx_vectors; char buf[16]; /* First set up ring resources */ - for (i = 0; i < adapter->rx_num_queues; i++, rx_que++, vector++) { + for (i = 0; i < sc->rx_num_queues; i++, rx_que++, vector++) { rid = vector + 1; snprintf(buf, sizeof(buf), "rxq%d", i); error = iflib_irq_alloc_generic(ctx, &rx_que->que_irq, rid, IFLIB_INTR_RXTX, igc_msix_que, rx_que, rx_que->me, buf); if (error) { device_printf(iflib_get_dev(ctx), "Failed to allocate que int %d err: %d", i, error); - adapter->rx_num_queues = i + 1; + sc->rx_num_queues = i + 1; goto fail; } @@ -1492,14 +1492,14 @@ igc_if_msix_intr_assign(if_ctx_t ctx, int msix) rx_vectors = vector; vector = 0; - for (i = 0; i < adapter->tx_num_queues; i++, tx_que++, vector++) { + for (i = 0; i < sc->tx_num_queues; i++, tx_que++, vector++) { snprintf(buf, sizeof(buf), "txq%d", i); - tx_que = &adapter->tx_queues[i]; + tx_que = &sc->tx_queues[i]; iflib_softirq_alloc_generic(ctx, - &adapter->rx_queues[i % adapter->rx_num_queues].que_irq, + &sc->rx_queues[i % sc->rx_num_queues].que_irq, IFLIB_INTR_TX, tx_que, tx_que->me, buf); - tx_que->msix = (vector % adapter->rx_num_queues); + tx_que->msix = (vector % sc->rx_num_queues); /* * Set the bit to enable interrupt @@ -1512,26 +1512,26 @@ igc_if_msix_intr_assign(if_ctx_t ctx, int msix) /* Link interrupt */ rid = rx_vectors + 1; - error = iflib_irq_alloc_generic(ctx, &adapter->irq, rid, IFLIB_INTR_ADMIN, igc_msix_link, adapter, 0, "aq"); + error = iflib_irq_alloc_generic(ctx, &sc->irq, rid, IFLIB_INTR_ADMIN, igc_msix_link, sc, 0, "aq"); if (error) { device_printf(iflib_get_dev(ctx), "Failed to register admin handler"); goto fail; } - adapter->linkvec = rx_vectors; + sc->linkvec = rx_vectors; return (0); fail: - iflib_irq_free(ctx, &adapter->irq); - rx_que = adapter->rx_queues; - for (int i = 0; i < adapter->rx_num_queues; i++, rx_que++) + iflib_irq_free(ctx, &sc->irq); + rx_que = sc->rx_queues; + for (int i = 0; i < sc->rx_num_queues; i++, rx_que++) iflib_irq_free(ctx, &rx_que->que_irq); return (error); } static void -igc_configure_queues(struct igc_adapter *adapter) +igc_configure_queues(struct igc_softc *sc) { - struct igc_hw *hw = &adapter->hw; + struct igc_hw *hw = &sc->hw; struct igc_rx_queue *rx_que; struct igc_tx_queue *tx_que; u32 ivar = 0, newitr = 0; @@ -1543,10 +1543,10 @@ igc_configure_queues(struct igc_adapter *adapter) /* Turn on MSI-X */ /* RX entries */ - for (int i = 0; i < adapter->rx_num_queues; i++) { + for (int i = 0; i < sc->rx_num_queues; i++) { u32 index = i >> 1; ivar = IGC_READ_REG_ARRAY(hw, IGC_IVAR0, index); - rx_que = &adapter->rx_queues[i]; + rx_que = &sc->rx_queues[i]; if (i & 1) { ivar &= 0xFF00FFFF; ivar |= (rx_que->msix | IGC_IVAR_VALID) << 16; @@ -1557,10 +1557,10 @@ igc_configure_queues(struct igc_adapter *adapter) IGC_WRITE_REG_ARRAY(hw, IGC_IVAR0, index, ivar); } /* TX entries */ - for (int i = 0; i < adapter->tx_num_queues; i++) { + for (int i = 0; i < sc->tx_num_queues; i++) { u32 index = i >> 1; ivar = IGC_READ_REG_ARRAY(hw, IGC_IVAR0, index); - tx_que = &adapter->tx_queues[i]; + tx_que = &sc->tx_queues[i]; if (i & 1) { ivar &= 0x00FFFFFF; ivar |= (tx_que->msix | IGC_IVAR_VALID) << 24; @@ -1569,12 +1569,12 @@ igc_configure_queues(struct igc_adapter *adapter) ivar |= (tx_que->msix | IGC_IVAR_VALID) << 8; } IGC_WRITE_REG_ARRAY(hw, IGC_IVAR0, index, ivar); - adapter->que_mask |= tx_que->eims; + sc->que_mask |= tx_que->eims; } /* And for the link interrupt */ - ivar = (adapter->linkvec | IGC_IVAR_VALID) << 8; - adapter->link_mask = 1 << adapter->linkvec; + ivar = (sc->linkvec | IGC_IVAR_VALID) << 8; + sc->link_mask = 1 << sc->linkvec; IGC_WRITE_REG(hw, IGC_IVAR_MISC, ivar); /* Set the starting interrupt rate */ @@ -1583,8 +1583,8 @@ igc_configure_queues(struct igc_adapter *adapter) newitr |= IGC_EITR_CNT_IGNR; - for (int i = 0; i < adapter->rx_num_queues; i++) { - rx_que = &adapter->rx_queues[i]; + for (int i = 0; i < sc->rx_num_queues; i++) { + rx_que = &sc->rx_queues[i]; IGC_WRITE_REG(hw, IGC_EITR(rx_que->msix), newitr); } @@ -1594,34 +1594,34 @@ igc_configure_queues(struct igc_adapter *adapter) static void igc_free_pci_resources(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_rx_queue *que = adapter->rx_queues; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_rx_queue *que = sc->rx_queues; device_t dev = iflib_get_dev(ctx); /* Release all MSI-X queue resources */ *** 1508 LINES SKIPPED *** From nobody Mon Oct 21 15:11: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 4XXJfq3cngz5ZPXx; Mon, 21 Oct 2024 15:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJfq23mfz4lPn; Mon, 21 Oct 2024 15:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/sRLMpiFbxPpr3vwVlTulWng7QNJtuZaxCQNn6g2gR0=; b=dYZ9taUBrxaMfkNyEv4f41Z1aY/fIyLx76Vm/ZaywlREWbirgzLcntQsFDnOK8s1uRhvuo OkobVwCSKJbje/1feHutsSdZmbOClFso0VttjNkrDdMCuIN8fQRkzElrdFkxlywhcDB0ov Vhf3ldy75ofwKAhdAWZXSHmJQRa+xms/Kel4hmt0LVPtZV8gTssrMzyrYtybmO5gzl0bGa Wrsj0fboWEM6EGGK8VDo73VDoZ6e6ikEex5dOeoFX5AvJDxSz5XLcqNh2/CwEBvgS6DCKP UdmYnqb4NPWEjKnrFezv4uyUtUIQ238i7avP0bjGSzXZjRAnha8C2Kt470gw2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/sRLMpiFbxPpr3vwVlTulWng7QNJtuZaxCQNn6g2gR0=; b=OkhHwykylYwjcWAelnK3zUFRegUVS3kPFx7EDI7wOaFrBO7RhpT6h6r2u246QUFM+Swa0i lCQ8kvfK3Mryy5H7qWFouVbIqSa74ggJj86Ckb3sCjnnQsGl4k8VO/gW13BJYXU5rQmFcV RRjLnmIEHwZL/SPyWCNdaBEbo8Jlgxxhj1ENsWgTHKqD/cLAwowMTIJtSO00OhUGB1ykBk Hf3tISpQkzdlPz30n5hWodrzAWQVnsfHpmS4fBvelC45R6az3of7XRlBRpo5904ooXcoWa z4HN026dre3EuBuDqASgqMjC2nOxxdSvh/77/i5XEnFYv/9eBZaP3r3BIWeUJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523475; a=rsa-sha256; cv=none; b=NOgopXruNMzhd7yKdOBS7Eddhdl9zv+5G6DSQ2nP0QJ8smrEfqEJ7FeoIbMnHAMAx2F0iy +etNwhz8LCLQLpGjH12fOA5jcuuQ+3EHIReSOHQ5R6C7w+TMoATa5CRsF8vnE2JOililB7 sie2c2GQIBZdYOOV6fOjnxCE0fYazjtaOIbd9ehADAKmmOpwrCGwylW6mA6fppeLdLBbpL 1WP6isH+Bsm1trPa2Zq7FGSZWyrccdw23+Y6mxkOAzbbpq4WOVW1ssIh7p1SMW8PzXLo3z jT6bXi50Kk6sQQUI3CkeNEQZ5YkZdztFD6Ouz1GANRFcpPmCpLUw9Hvg3YgJTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJfq0Yf3zbTP; Mon, 21 Oct 2024 15:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFBEW4060610; Mon, 21 Oct 2024 15:11:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFBEWb060607; Mon, 21 Oct 2024 15:11:14 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:11:14 GMT Message-Id: <202410211511.49LFBEWb060607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: cd310c0135f2 - stable/14 - igc: Function prototype cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd310c0135f2a5a9cf5e6447ea9e93835f72248d Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cd310c0135f2a5a9cf5e6447ea9e93835f72248d commit cd310c0135f2a5a9cf5e6447ea9e93835f72248d Author: Kevin Bowling AuthorDate: 2024-10-14 13:49:19 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:10:28 +0000 igc: Function prototype cleanup Drop variable names of function prototypes since the file is mixed in listing them or not and they fall out of sync. Sponsored by: BBOX.io (cherry picked from commit 1b0e41ddffbf0ac84c88019df84dfd50ce9f7788) --- sys/dev/igc/if_igc.c | 86 ++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index a55d8b6cbc9c..dd89b27e134c 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -72,49 +72,49 @@ static const pci_vendor_info_t igc_vendor_info_array[] = /********************************************************************* * Function prototypes *********************************************************************/ -static void *igc_register(device_t dev); -static int igc_if_attach_pre(if_ctx_t ctx); -static int igc_if_attach_post(if_ctx_t ctx); -static int igc_if_detach(if_ctx_t ctx); -static int igc_if_shutdown(if_ctx_t ctx); -static int igc_if_suspend(if_ctx_t ctx); -static int igc_if_resume(if_ctx_t ctx); - -static int igc_if_tx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, uint64_t *paddrs, int ntxqs, int ntxqsets); -static int igc_if_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, uint64_t *paddrs, int nrxqs, int nrxqsets); -static void igc_if_queues_free(if_ctx_t ctx); +static void *igc_register(device_t); +static int igc_if_attach_pre(if_ctx_t); +static int igc_if_attach_post(if_ctx_t); +static int igc_if_detach(if_ctx_t); +static int igc_if_shutdown(if_ctx_t); +static int igc_if_suspend(if_ctx_t); +static int igc_if_resume(if_ctx_t); + +static int igc_if_tx_queues_alloc(if_ctx_t, caddr_t *, uint64_t *, int, int); +static int igc_if_rx_queues_alloc(if_ctx_t, caddr_t *, uint64_t *, int, int); +static void igc_if_queues_free(if_ctx_t); static uint64_t igc_if_get_counter(if_ctx_t, ift_counter); -static void igc_if_init(if_ctx_t ctx); -static void igc_if_stop(if_ctx_t ctx); +static void igc_if_init(if_ctx_t); +static void igc_if_stop(if_ctx_t); static void igc_if_media_status(if_ctx_t, struct ifmediareq *); -static int igc_if_media_change(if_ctx_t ctx); -static int igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu); -static void igc_if_timer(if_ctx_t ctx, uint16_t qid); -static void igc_if_watchdog_reset(if_ctx_t ctx); -static bool igc_if_needs_restart(if_ctx_t ctx, enum iflib_restart_event event); - -static void igc_identify_hardware(if_ctx_t ctx); -static int igc_allocate_pci_resources(if_ctx_t ctx); -static void igc_free_pci_resources(if_ctx_t ctx); -static void igc_reset(if_ctx_t ctx); -static int igc_setup_interface(if_ctx_t ctx); -static int igc_setup_msix(if_ctx_t ctx); - -static void igc_initialize_transmit_unit(if_ctx_t ctx); -static void igc_initialize_receive_unit(if_ctx_t ctx); - -static void igc_if_intr_enable(if_ctx_t ctx); -static void igc_if_intr_disable(if_ctx_t ctx); -static int igc_if_rx_queue_intr_enable(if_ctx_t ctx, uint16_t rxqid); -static int igc_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txqid); -static void igc_if_multi_set(if_ctx_t ctx); -static void igc_if_update_admin_status(if_ctx_t ctx); -static void igc_if_debug(if_ctx_t ctx); +static int igc_if_media_change(if_ctx_t); +static int igc_if_mtu_set(if_ctx_t, uint32_t); +static void igc_if_timer(if_ctx_t, uint16_t); +static void igc_if_watchdog_reset(if_ctx_t); +static bool igc_if_needs_restart(if_ctx_t, enum iflib_restart_event); + +static void igc_identify_hardware(if_ctx_t); +static int igc_allocate_pci_resources(if_ctx_t); +static void igc_free_pci_resources(if_ctx_t); +static void igc_reset(if_ctx_t); +static int igc_setup_interface(if_ctx_t); +static int igc_setup_msix(if_ctx_t); + +static void igc_initialize_transmit_unit(if_ctx_t); +static void igc_initialize_receive_unit(if_ctx_t); + +static void igc_if_intr_enable(if_ctx_t); +static void igc_if_intr_disable(if_ctx_t); +static int igc_if_rx_queue_intr_enable(if_ctx_t, uint16_t); +static int igc_if_tx_queue_intr_enable(if_ctx_t, uint16_t); +static void igc_if_multi_set(if_ctx_t); +static void igc_if_update_admin_status(if_ctx_t); +static void igc_if_debug(if_ctx_t); static void igc_update_stats_counters(struct igc_softc *); -static void igc_add_hw_stats(struct igc_softc *sc); -static int igc_if_set_promisc(if_ctx_t ctx, int flags); -static void igc_setup_vlan_hw_support(if_ctx_t ctx); +static void igc_add_hw_stats(struct igc_softc *); +static int igc_if_set_promisc(if_ctx_t, int); +static void igc_setup_vlan_hw_support(if_ctx_t); static void igc_fw_version(struct igc_softc *); static void igc_sbuf_fw_version(struct igc_fw_version *, struct sbuf *); static void igc_print_fw_version(struct igc_softc *); @@ -130,10 +130,10 @@ static void igc_neweitr(struct igc_softc *, struct igc_rx_queue *, /* Management and WOL Support */ static void igc_get_hw_control(struct igc_softc *); static void igc_release_hw_control(struct igc_softc *); -static void igc_get_wakeup(if_ctx_t ctx); -static void igc_enable_wakeup(if_ctx_t ctx); +static void igc_get_wakeup(if_ctx_t); +static void igc_enable_wakeup(if_ctx_t); -int igc_intr(void *arg); +int igc_intr(void *); /* MSI-X handlers */ static int igc_if_msix_intr_assign(if_ctx_t, int); @@ -146,7 +146,7 @@ static int igc_sysctl_eee(SYSCTL_HANDLER_ARGS); static int igc_get_regs(SYSCTL_HANDLER_ARGS); -static void igc_configure_queues(struct igc_softc *sc); +static void igc_configure_queues(struct igc_softc *); /********************************************************************* From nobody Mon Oct 21 15:11: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 4XXJfr4GD2z5ZP16; Mon, 21 Oct 2024 15:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJfr1wcjz4lXr; Mon, 21 Oct 2024 15:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hA9WIZRTMdDl6M5DsD0A//m45cbmIXo6bGO5p7sMvp0=; b=etI+jS91eHIzxLgT68DPB1oe8g9ENe72sbZeWWny6a4uyq6oKQVfwbl9dADN/vV/mx/HYf sptF0TT5d6KX9bB1x4uwWqzNiRmjRqm8huK+Exbmm0j5JubwotRO+gAi7l9s+BTbzis/Y7 iYf5g9XWncqOEGzJ96qF0tSiO4XyJg0pTpwzWo6akG+B0ok3vHR3nrFlrj6/OyrxhziKsX T62AR+odqxvOHiAEFmq/YNghdzgYSu+voalgFo3ToWCgp5WuOxMPMhh6Pb+O6OYnIRc0Um ncRbFL8IO3JSTlPaeBQAuSR/DXAtTf+zgd8eh4Dtrk6FBG3icDsdGv1SpZUB5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hA9WIZRTMdDl6M5DsD0A//m45cbmIXo6bGO5p7sMvp0=; b=If43gLPMXRr5pXMYxMttoXOO8AX3R/VUEOqzzKT2cknqTMJZPCSv5ewspBdndZBBAXC58Y ca6NyX3++1AwgsptJiYEJJq9VI6n8avZX9Y8KnPOjy9ZZ1OMV0TXm4Vfh1O/8AudbG0Jgz RlIz/Rh8pKsbAjtL4uUw4NQkW0OfBC2bKx7o22xq7rCDs8fAOuzhkhlHZMRM1UTQFqbat7 6LXYO7x3/W5tkomUSrnC6BruDcDBlZzROOO7Jx/kqnAHGQtYdz3N/psHWPgQ3WDRbSeSIM 7C3OeaPQpUkanNZdcZX+oMNs+ZEPouGZLkp3cPFJhGzKPevJ5cEGZ5lihWtHtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523476; a=rsa-sha256; cv=none; b=q+loCHyR+O6g6guefB+P5tfwUtC078UcbRV1NmCF0ESdVWqXJHrX+rF+L24EjX6PYcuts6 ddLjB2YRFurFPBTtW2QysQnMCqR1uWoL0NVvpfponCeNOnpmwBR6FYCv1VUyLNQyPjWDQB wvBTIsYnf0kMBEHxRv3X5Cx4TbmLSajsnstDdk/0aw49D9IM8XNkmgyArXC1lJHtfRnESh AyrRwk8C4cjmpxQRJsetsY5euVvq4oJdjebwPjOhherf/sDXmRMyZRIEtGS6KbtBNrxe+8 9T0TcNF6ymMwJtiMY7npTcsZkNkVjgBQ2zEkjjS2OmvhIOd/9VhLs4OqZOdfRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJfr1WJ3zbLL; Mon, 21 Oct 2024 15:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFBGNT060662; Mon, 21 Oct 2024 15:11:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFBG4b060659; Mon, 21 Oct 2024 15:11:16 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:11:16 GMT Message-Id: <202410211511.49LFBG4b060659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 10ad90dfd101 - stable/14 - e1000: txrx function prototype cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10ad90dfd101a4bc6c3045530853c46c5716e63c Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=10ad90dfd101a4bc6c3045530853c46c5716e63c commit 10ad90dfd101a4bc6c3045530853c46c5716e63c Author: Kevin Bowling AuthorDate: 2024-10-14 16:07:29 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:10:43 +0000 e1000: txrx function prototype cleanup Drop variable names of function prototypes since the file is mixed in listing them or not and they fall out of sync. Sponsored by: BBOX.io (cherry picked from commit 9dc452b983f042aa9d2a2562517d44c1928ff42a) --- sys/dev/e1000/em_txrx.c | 39 ++++++++++++++++++--------------------- sys/dev/e1000/igb_txrx.c | 30 ++++++++++++++---------------- 2 files changed, 32 insertions(+), 37 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 6e8fff07cd82..65ffcdfd67f6 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -43,29 +43,26 @@ /********************************************************************* * Local Function prototypes *********************************************************************/ -static int em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, - uint32_t *txd_upper, uint32_t *txd_lower); -static int em_transmit_checksum_setup(struct e1000_softc *sc, - if_pkt_info_t pi, uint32_t *txd_upper, uint32_t *txd_lower); -static int em_isc_txd_encap(void *arg, if_pkt_info_t pi); -static void em_isc_txd_flush(void *arg, uint16_t txqid, qidx_t pidx); -static int em_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear); -static void em_isc_rxd_refill(void *arg, if_rxd_update_t iru); -static void em_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, - qidx_t pidx); -static int em_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); -static int em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); - -static void lem_isc_rxd_refill(void *arg, if_rxd_update_t iru); - -static int lem_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); -static int lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); +static int em_tso_setup(struct e1000_softc *, if_pkt_info_t, uint32_t *, + uint32_t *); +static int em_transmit_checksum_setup(struct e1000_softc *, if_pkt_info_t, + uint32_t *, uint32_t *); +static int em_isc_txd_encap(void *, if_pkt_info_t); +static void em_isc_txd_flush(void *, uint16_t, qidx_t); +static int em_isc_txd_credits_update(void *, uint16_t, bool); +static void em_isc_rxd_refill(void *, if_rxd_update_t); +static void em_isc_rxd_flush(void *, uint16_t, uint8_t, qidx_t); +static int em_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); +static int em_isc_rxd_pkt_get(void *, if_rxd_info_t); + +static void lem_isc_rxd_refill(void *, if_rxd_update_t); + +static int lem_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); +static int lem_isc_rxd_pkt_get(void *, if_rxd_info_t); static void em_receive_checksum(uint16_t, uint8_t, if_rxd_info_t); -static int em_determine_rsstype(uint32_t pkt_info); -extern int em_intr(void *arg); +static int em_determine_rsstype(uint32_t); +extern int em_intr(void *); struct if_txrx em_txrx = { .ift_txd_encap = em_isc_txd_encap, diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index 82cbb37ce4cd..8b663d7e6d3e 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -42,29 +42,27 @@ /********************************************************************* * Local Function prototypes *********************************************************************/ -static int igb_isc_txd_encap(void *arg, if_pkt_info_t pi); -static void igb_isc_txd_flush(void *arg, uint16_t txqid, qidx_t pidx); -static int igb_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear); +static int igb_isc_txd_encap(void *, if_pkt_info_t); +static void igb_isc_txd_flush(void *, uint16_t, qidx_t); +static int igb_isc_txd_credits_update(void *, uint16_t, bool); -static void igb_isc_rxd_refill(void *arg, if_rxd_update_t iru); +static void igb_isc_rxd_refill(void *, if_rxd_update_t); -static void igb_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, - qidx_t pidx); -static int igb_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); +static void igb_isc_rxd_flush(void *, uint16_t, uint8_t, qidx_t); +static int igb_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); static int igb_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); -static int igb_tx_ctx_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); -static int igb_tso_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); +static int igb_tx_ctx_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); +static int igb_tso_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); -static void igb_rx_checksum(uint32_t staterr, if_rxd_info_t ri, uint32_t ptype); -static int igb_determine_rsstype(uint16_t pkt_info); +static void igb_rx_checksum(uint32_t, if_rxd_info_t, uint32_t); +static int igb_determine_rsstype(uint16_t); -extern void igb_if_enable_intr(if_ctx_t ctx); -extern int em_intr(void *arg); +extern void igb_if_enable_intr(if_ctx_t); +extern int em_intr(void *); struct if_txrx igb_txrx = { .ift_txd_encap = igb_isc_txd_encap, From nobody Mon Oct 21 15:11: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 4XXJfv5FDzz5ZPGK; Mon, 21 Oct 2024 15:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJft0y8Mz4ldk; Mon, 21 Oct 2024 15:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UrGdtDfmzXQC+82zjR0bJI2qN5Pl3/OrxeAPS72OhU8=; b=UFKfzYTLk5N59+irDWJPLzxc1hzkuR3hHc6F5lNPqSDHg9Or4zBKxW6OZB0dSDM4ZGlndJ O41ysS2FGEmmHo48PNuU3KV+CMeDqk6slaLlyEruSXt0x0seLh37R6BzH1v9Fmxun6GegA YPzW5epftLU4DoeXuL52+loj8a4gJk+JZOAYLTXhwDbiBGGFKJacN6tErSnKdHJXewEqAn zBQeHxzWTiBBvGKyvToMPkE6cgruWnuGnbwRt1CbRChb8XjsuoJqS5EsiVbGv2y2OVZh4j KvumsqOV3GSr5Oa6VbKgLsP9SgiCw5D69KKsPYpaVcx9ROS7PDvpGJ8myKWzRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UrGdtDfmzXQC+82zjR0bJI2qN5Pl3/OrxeAPS72OhU8=; b=DJWHOrNgG8zmjy5pW0K3dhNoYC++jFm/mmt1e4kDfSX48U8vStrQz2vIfgEIeFDPX7ERRF 5VDHtwW6wtMGWFedB5UTVwFYPDgJol5IP0xcwNaTg1LvKDTBzxBjIhZCnH301WQowBu3b6 TzOtfaKnYuHX2EqpkmrhwqUUikcyBuGWNWrw1BOtv3rirGbWwCN9vIZSECGW0E4hJ109yg Lz4TB5j0NidW1Xjarw+GQNOaZnuCLYBT9TDfbNgEv1BfyOd3EhmtCWOc9uMBMQKr/RHHrC ygpx6owbNgl3kGLAtbWwGYq7nqt/Hmd8JaeLrENm4IYZgOTmQesYQjo/S3CHYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523478; a=rsa-sha256; cv=none; b=ZGHa0hnorvxFr/2vyK7J49VNm4QzY2sE+lIERm+owBQdTH1MNAnZtxzyZvoIVGFWwKJNIE /H/xNunIwDk03dIzysHebyl8A9I71V0VzV085DkJITdJ4Qrmnh/B/jUDPnDr54sZm86FTA ID+0Z7AY9VHcgQQilA8W6j3lnTo5TlYOBCkqMqNaS9b0I+sMcst1yMIs1GyTUAaehPfkJU 9pqAzGWkJy9BIncZaf/Rw0g1jpHnAfi4fMnH/psjkVNczLtsdxpZHC5GqqlCsy7gZ4gHMH 8fH/PgCkyyfWFMJozphNLph8w/gDn5amTptjFoD5XW/CPxXtdlygEqKPLNqEyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJfs2V0YzbP2; Mon, 21 Oct 2024 15:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFBHtB060710; Mon, 21 Oct 2024 15:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFBHPo060707; Mon, 21 Oct 2024 15:11:17 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:11:17 GMT Message-Id: <202410211511.49LFBHPo060707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4608b5f80d29 - stable/14 - igc: txrx function prototype cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4608b5f80d29ecc414e490e75c44433b2c00f557 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4608b5f80d29ecc414e490e75c44433b2c00f557 commit 4608b5f80d29ecc414e490e75c44433b2c00f557 Author: Kevin Bowling AuthorDate: 2024-10-14 16:10:10 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:10:57 +0000 igc: txrx function prototype cleanup Drop variable names of function prototypes since the file is mixed in listing them or not and they fall out of sync. Sponsored by: BBOX.io (cherry picked from commit 7763b194d8de6fe8034f754064449a7510ca16b9) --- sys/dev/igc/igc_txrx.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c index a95b34702e24..59f4725388ee 100644 --- a/sys/dev/igc/igc_txrx.c +++ b/sys/dev/igc/igc_txrx.c @@ -44,29 +44,27 @@ /********************************************************************* * Local Function prototypes *********************************************************************/ -static int igc_isc_txd_encap(void *arg, if_pkt_info_t pi); -static void igc_isc_txd_flush(void *arg, uint16_t txqid, qidx_t pidx); -static int igc_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear); +static int igc_isc_txd_encap(void *, if_pkt_info_t); +static void igc_isc_txd_flush(void *, uint16_t, qidx_t); +static int igc_isc_txd_credits_update(void *, uint16_t, bool); -static void igc_isc_rxd_refill(void *arg, if_rxd_update_t iru); +static void igc_isc_rxd_refill(void *, if_rxd_update_t); -static void igc_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, - qidx_t pidx); -static int igc_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); +static void igc_isc_rxd_flush(void *, uint16_t, uint8_t, qidx_t); +static int igc_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); -static int igc_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); +static int igc_isc_rxd_pkt_get(void *, if_rxd_info_t); -static int igc_tx_ctx_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); -static int igc_tso_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); +static int igc_tx_ctx_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); +static int igc_tso_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); -static void igc_rx_checksum(uint32_t staterr, if_rxd_info_t ri, uint32_t ptype); -static int igc_determine_rsstype(uint16_t pkt_info); +static void igc_rx_checksum(uint32_t, if_rxd_info_t, uint32_t); +static int igc_determine_rsstype(uint16_t); -extern void igc_if_enable_intr(if_ctx_t ctx); -extern int igc_intr(void *arg); +extern void igc_if_enable_intr(if_ctx_t); +extern int igc_intr(void *); struct if_txrx igc_txrx = { .ift_txd_encap = igc_isc_txd_encap, From nobody Mon Oct 21 15:24: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 4XXJyX0sr2z5ZQF7; Mon, 21 Oct 2024 15:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJyX0Jhnz4pQt; Mon, 21 Oct 2024 15:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K0tTN8Y2rQKDQGhMZnZ8hkW7QTcihM72O3e3z0D+4zg=; b=SbtwfxHTa31Xls2UQcwNCi3X0khc+TA4AQ7Y+PP9fuV4XHD2zIWkVyjDkfLVpPobeqQVxw mrq8zjUF416SeRpFsPLo/CM3wyNAUUIerE8JIpr9BxRj2RQn7snM9POMnstva0YVM4J1xY 0z77gBLfvsjjCWnLR8lakK3H+7vBt+eKgt/3gaeAk2tGQCO/T8+GmaQ41px6JeD92D9j0g SGgz3Md4iKetUgieiDcpb/ccfrvMxDSgDVADYe4Dn8vZkZjldC2bOrPtHyyoEIvZ64m+hE e4NRXVu7JemOoZzrXMljL0X+WX58oKuzuZUu0Jsw1mhBaEvYwi/up4wcc1RNRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K0tTN8Y2rQKDQGhMZnZ8hkW7QTcihM72O3e3z0D+4zg=; b=sbhnfxghct0U3mHCZcC4/417yolwljThNCTVvimWxl2eJQhLJNW6HjQhCxv8TD2pBSheUk sL2NRU9TwzZfbwdra+rPmccgp33MaujGZu4Z/bRfCA7P+cYWs7sjbshIt8H83aBapli9tX hMXaciCbzQtGel9rgOahviPU/UwobgvVA49vgeyD2DkTm5KYIYwP/yNV7ajwdYcGg6bz+n gXOI3LPp2JIiGJ4L5YDY4BrcuR9YVASlWhqAZqFoH1URoYdY5x1nM0wsrTA+XDHgsMythn k2vz3Fee7k8eI/6+ENH6XwU3OAKFJVTSYMT48TAoWWdM8CcfhhjyvBwqjKB71A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729524292; a=rsa-sha256; cv=none; b=cjPgxnHikz2+xaAn27BwUIvxD/+D+IPyYQzXBQZi+yVb5aPWUTNjYzLwISTdoOYNhqo/uJ CPmsarESVCusfM0+hUAeKcqF28VCKi8z1k0UcyxuiNd72lOs9+UirVX8fip/YUE399i5Yq YhUKZagHjorqnDPZW0D5aKlFKBbnguVXg9wabcubeCZDVIxVc9AsTcYzvIy71pJ/FK/YyJ rAz7JPicSfeSdKQAXfym2vvrqK5nxKrSSKZU+c0Iv+QVcKfxzuEJzF954tdOPv1Jl1mRt1 SHbwV+9JL3bKWtSZhkfCxMiHQQc9jlz7mAkDVtQpIbKasDBv0semyxziERM+nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJyW71pPzbYK; Mon, 21 Oct 2024 15:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFOpCV083922; Mon, 21 Oct 2024 15:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFOp3k083919; Mon, 21 Oct 2024 15:24:51 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:24:51 GMT Message-Id: <202410211524.49LFOp3k083919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: dd8392810169 - stable/13 - igc: Add sysctl for DMA Coalesce List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd8392810169827e53586c1864c5d6b3be259605 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=dd8392810169827e53586c1864c5d6b3be259605 commit dd8392810169827e53586c1864c5d6b3be259605 Author: Kevin Bowling AuthorDate: 2024-10-14 12:55:18 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:11:52 +0000 igc: Add sysctl for DMA Coalesce This feature can increase efficiency at the expense of latency It does not work well with the default interrupt delay, but expose the otherwise unconnected code in the driver in case people want to experiment. See https://www.intel.com/content/dam/support/us/en/documents/network/adapter/pro100/sb/466827_intel_r__dma_coalescing_white_paper_v003.pdf Sponsored by: BBOX.io (cherry picked from commit 68b1f5dc59368ce5175e3300bf95476ea5a560bc) --- sys/dev/igc/if_igc.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 7d95c2909b7a..d73b3a9aa510 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -141,6 +141,7 @@ static int igc_msix_link(void *); static void igc_handle_link(void *context); static int igc_set_flowcntl(SYSCTL_HANDLER_ARGS); +static int igc_sysctl_dmac(SYSCTL_HANDLER_ARGS); static int igc_sysctl_eee(SYSCTL_HANDLER_ARGS); static int igc_get_regs(SYSCTL_HANDLER_ARGS); @@ -491,6 +492,12 @@ igc_if_attach_pre(if_ctx_t ctx) CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, adapter, 0, igc_get_rs, "I", "Dump RS indexes"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "dmac", + CTLTYPE_INT | CTLFLAG_RW, adapter, 0, + igc_sysctl_dmac, "I", "DMA Coalesce"); + /* Determine hardware and mac info */ igc_identify_hardware(ctx); @@ -3031,6 +3038,55 @@ igc_set_flowcntl(SYSCTL_HANDLER_ARGS) return (error); } +/* + * Manage DMA Coalesce: + * Control values: + * 0/1 - off/on + * Legal timer values are: + * 250,500,1000-10000 in thousands + */ +static int +igc_sysctl_dmac(SYSCTL_HANDLER_ARGS) +{ + struct igc_adapter *sc = (struct igc_adapter *) arg1; + int error; + + error = sysctl_handle_int(oidp, &sc->dmac, 0, req); + + if ((error) || (req->newptr == NULL)) + return (error); + + switch (sc->dmac) { + case 0: + /* Disabling */ + break; + case 1: /* Just enable and use default */ + sc->dmac = 1000; + break; + case 250: + case 500: + case 1000: + case 2000: + case 3000: + case 4000: + case 5000: + case 6000: + case 7000: + case 8000: + case 9000: + case 10000: + /* Legal values - allow */ + break; + default: + /* Do nothing, illegal value */ + sc->dmac = 0; + return (EINVAL); + } + /* Reinit the interface */ + igc_if_init(sc->ctx); + return (error); +} + /* * Manage Energy Efficient Ethernet: * Control values: From nobody Mon Oct 21 15:24: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 4XXJyY23hFz5ZQ66; Mon, 21 Oct 2024 15:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJyY0rVGz4pSw; Mon, 21 Oct 2024 15:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bnmTLeSixU9QyWQbPkpSioJXrBJsP9uB8fU9WSw8mtE=; b=aJB9GSKqvg6qqFSdXQ/2j28wsYlxxBU01Go4RemBjrKuq8BjeASYJULxuczXh06xjyyxrX Hu4Elccw+vHjkzlTPFJtkIP5wjLNZelkpc0fA1zoykIYLZmBAkrNHLtXFhvfLyTwDBh/RR QoitACuW4M9AN6jt35ikHCU6n7vBn9r8wg8Vl0NBhMTMGhxK+5uNJdcnHD3Tol+3fLBSfA WL8evgfsg8flyWjElylZG9fbvT5Pknun37vATBfZDJK65ao6krbciOwq+zigcjKKEgUS8V Lzlk2nzJjX1o47K+gIjfAJA7F+vraHGq2zJqzAPhbQMDUWbVK8bTsz16d15JpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bnmTLeSixU9QyWQbPkpSioJXrBJsP9uB8fU9WSw8mtE=; b=eY1V0L7txvB9Mrrk9b1iL/b+mEpx2vwEoZaa9Y9g5Rtoqvx3BQ5K3PAmgSrjz+t0YnL6NL Jp73iHBspcadJZaU8Fp4Y/LFPaOT5/9jdU3InW0RPCBrbHerg0toE3m/7EBuIwC1HKOHtR B1qJJ06OhekEnV9QGP+yyKqRJE1PQraxcN6Csvd62T6YXry90yXLxAub8o8KVc02zXy3Ur vVjrHS/fgQ5ebygzl/7oRSihPPWmZ5UYRL5X4NTzkDl2XUwfNjVydecyTgj7sbtOOY18Y7 Z3H5smwdRUPaGJRkr8KQrOQmYRwzImBGD6CIo1HnYFNWk6MpoukVafWQlew4uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729524293; a=rsa-sha256; cv=none; b=DhqBkZiVRBEKOCtLeyqb1lrJvElYqIMOUYo/zlzqRV85MXXXN7ibhZLUwuJDrh8w24ATb6 ChLImHDbkhnSyfTMmscg0Wh0JbkMqaeEhFikVpYO+nSBFNuSPtXRIKf9e18hxUsRBLW15f PrWxym+Jo5/a0toDBjWRRV/lEmIWRCJWkaYdSDTSPDmYVuGXFrd4qNch3g7AaCSjEkYU2b UsbfuCvhegPtx66tbVgycFILsWoIfjQp1s08doR+F2d4oGdpMHVI7KI/YUypAoCdVH/QkK RvqbwI9SYTOki+0zBW/WTPl6C2v3CiV1jzJJzgc5LBo1PaSx3kahnD7dIkr4qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJyY0S3jzbSS; Mon, 21 Oct 2024 15:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFOqOZ083988; Mon, 21 Oct 2024 15:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFOqwU083985; Mon, 21 Oct 2024 15:24:52 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:24:52 GMT Message-Id: <202410211524.49LFOqwU083985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 05e687d5916a - stable/13 - igc: Add sysctls for some missing MAC stats List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05e687d5916a83c1ba73edd0858e1939a21e1df7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=05e687d5916a83c1ba73edd0858e1939a21e1df7 commit 05e687d5916a83c1ba73edd0858e1939a21e1df7 Author: Kevin Bowling AuthorDate: 2024-10-14 13:07:41 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:12:09 +0000 igc: Add sysctls for some missing MAC stats Sponsored by: BBOX.io (cherry picked from commit 09526a771afc411e641a3d04c905824fe8afc627) --- sys/dev/igc/if_igc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index d73b3a9aa510..50f26e1d6541 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2492,6 +2492,10 @@ igc_update_stats_counters(struct igc_adapter *adapter) adapter->stats.roc += IGC_READ_REG(&adapter->hw, IGC_ROC); adapter->stats.rjc += IGC_READ_REG(&adapter->hw, IGC_RJC); + adapter->stats.mgprc += IGC_READ_REG(&adapter->hw, IGC_MGTPRC); + adapter->stats.mgpdc += IGC_READ_REG(&adapter->hw, IGC_MGTPDC); + adapter->stats.mgptc += IGC_READ_REG(&adapter->hw, IGC_MGTPTC); + adapter->stats.tor += IGC_READ_REG(&adapter->hw, IGC_TORH); adapter->stats.tot += IGC_READ_REG(&adapter->hw, IGC_TOTH); @@ -2732,6 +2736,9 @@ igc_add_hw_stats(struct igc_adapter *adapter) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "missed_packets", CTLFLAG_RD, &adapter->stats.mpc, "Missed Packets"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_length_errors", + CTLFLAG_RD, &adapter->stats.rlec, + "Receive Length Errors"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_no_buff", CTLFLAG_RD, &adapter->stats.rnbc, "Receive No Buffers"); @@ -2768,6 +2775,18 @@ igc_add_hw_stats(struct igc_adapter *adapter) SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "xoff_txd", CTLFLAG_RD, &adapter->stats.xofftxc, "XOFF Transmitted"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "unsupported_fc_recvd", + CTLFLAG_RD, &adapter->stats.fcruc, + "Unsupported Flow Control Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_recvd", + CTLFLAG_RD, &adapter->stats.mgprc, + "Management Packets Received"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_drop", + CTLFLAG_RD, &adapter->stats.mgpdc, + "Management Packets Dropped"); + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "mgmt_pkts_txd", + CTLFLAG_RD, &adapter->stats.mgptc, + "Management Packets Transmitted"); /* Packet Reception Stats */ SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "total_pkts_recvd", From nobody Mon Oct 21 15:24: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 4XXJyZ4nCRz5ZQ69; Mon, 21 Oct 2024 15:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJyZ1sHkz4pWf; Mon, 21 Oct 2024 15:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpHCo2fukT4wpDKN2qsxZ2QujnteB4P9Df/8ZTqhpbM=; b=vKOI1qqaTdyTgtW95jBO2aUV30knxLQgZtBVcEu/YRoTc15kzDcDo2MiSGnhWX78Aqb6JB R1t8J/Gwq714T4MmJ3VTSTEb/pq73V2pfKMU5PZpxX6By7bl0bh/eNN/PYM7nuNfssaWfT Km+mloAA3eYvgxMtblxNAE2f7V0hmCBoSJiVjadhbbKw5I8nJY5PrSDGtTOVUTXrsfRprR fiFCa8BlBCxwXCzTb0DBMwOBEm/WFYUtnDxbTGyEIsFwqPhOcyr19Zd0yyB3H7nJO6L29M gv8agNwoyCBt497mSk6m2B4tDcY7YKPy6tdy6oAuQE4lnJM5pkI7AfGRqbbanA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpHCo2fukT4wpDKN2qsxZ2QujnteB4P9Df/8ZTqhpbM=; b=qlxObe1dBljBQJgykw9mgAnqzSd++uTDSCYlcN9c63rA+0+/v9p3Z7olPfvBKABBk2cNum NiY1q/HCmj7ajA6xSp/hfle8ifBing9kKztx2FICRVn9DtQrEqLIeppk/G5khh7thIXyvE E725Wbm/IUxRqoHk8ewl3AB1werKRVcLFflhFYCBjMl4Ef5j6ZqdO4H60QSvMdhhSNRnds pqZlLcE4O0zdNUqk10y+U0EltXg43upKtKxlgVtnDwamH/meK8cBrfG559OlGrQQ30WSJu mKCNs714qJseOphbk0oz5bD5SmPqMptH8+F3QYeN+hEhy/+y/HG3pWPu8ThHBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729524294; a=rsa-sha256; cv=none; b=SDm4FqsyEmhJbmlCLxDhNfU6WUnwiIv6vt5oXXJ2buh4+RD5Fdu4ovYozSq141p9cPsxEK 9SYQVHbcnqI70p3hhTuw0jknmNWAqEEVDSypUCcpufUCDhF2+XMGyiq024Zo36IPuFTxQA CN9AfO06v9Glum/jlNHIzVM9IxfNe0+mmLDJnwb3x0UcUbnsVBKiCdxEw4apJVrZVOhxXr GAI016qdONOeDoTKo9NK/3nJpw2blU0m2pgevhOS/VTmUQlnOahm9utaND1k1iPNW9nUHH J7ciatqowe0JkaRJB1gVpshetJ+ra1i9OKWuCzMTQiLvfu1Z95jMg78h0qqs4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJyZ1N90zbST; Mon, 21 Oct 2024 15:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFOsE2084036; Mon, 21 Oct 2024 15:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFOsjB084033; Mon, 21 Oct 2024 15:24:54 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:24:54 GMT Message-Id: <202410211524.49LFOsjB084033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 494fb534f20e - stable/13 - igc: Rename 'struct adapter' to 'struct igc_softc' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 494fb534f20ebddf9135c550035fa4e86db26e32 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=494fb534f20ebddf9135c550035fa4e86db26e32 commit 494fb534f20ebddf9135c550035fa4e86db26e32 Author: Kevin Bowling AuthorDate: 2024-10-14 13:29:55 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:21:35 +0000 igc: Rename 'struct adapter' to 'struct igc_softc' Rename the 'struct adapter' to 'struct igc_softc' to avoid type ambiguity in things like kgdb and make sharing code with e1000 and ixgbe easier. MFC after: 1 week Sponsored by: BBOX.io (cherry picked from commit 542f5d56317e94676cf19cb9d66207bf9a6b6758) --- sys/dev/igc/if_igc.c | 970 ++++++++++++++++++++++++------------------------- sys/dev/igc/if_igc.h | 28 +- sys/dev/igc/igc_txrx.c | 36 +- 3 files changed, 517 insertions(+), 517 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 50f26e1d6541..8d72eb9d2447 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -111,25 +111,25 @@ static int igc_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txqid); static void igc_if_multi_set(if_ctx_t ctx); static void igc_if_update_admin_status(if_ctx_t ctx); static void igc_if_debug(if_ctx_t ctx); -static void igc_update_stats_counters(struct igc_adapter *); -static void igc_add_hw_stats(struct igc_adapter *adapter); +static void igc_update_stats_counters(struct igc_softc *); +static void igc_add_hw_stats(struct igc_softc *sc); static int igc_if_set_promisc(if_ctx_t ctx, int flags); static void igc_setup_vlan_hw_support(if_ctx_t ctx); -static void igc_fw_version(struct igc_adapter *); +static void igc_fw_version(struct igc_softc *); static void igc_sbuf_fw_version(struct igc_fw_version *, struct sbuf *); -static void igc_print_fw_version(struct igc_adapter *); +static void igc_print_fw_version(struct igc_softc *); static int igc_sysctl_print_fw_version(SYSCTL_HANDLER_ARGS); static int igc_sysctl_nvm_info(SYSCTL_HANDLER_ARGS); -static void igc_print_nvm_info(struct igc_adapter *); +static void igc_print_nvm_info(struct igc_softc *); static int igc_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int igc_get_rs(SYSCTL_HANDLER_ARGS); -static void igc_print_debug_info(struct igc_adapter *); +static void igc_print_debug_info(struct igc_softc *); static int igc_is_valid_ether_addr(u8 *); -static void igc_neweitr(struct igc_adapter *, struct igc_rx_queue *, +static void igc_neweitr(struct igc_softc *, struct igc_rx_queue *, struct tx_ring *, struct rx_ring *); /* Management and WOL Support */ -static void igc_get_hw_control(struct igc_adapter *); -static void igc_release_hw_control(struct igc_adapter *); +static void igc_get_hw_control(struct igc_softc *); +static void igc_release_hw_control(struct igc_softc *); static void igc_get_wakeup(if_ctx_t ctx); static void igc_enable_wakeup(if_ctx_t ctx); @@ -146,7 +146,7 @@ static int igc_sysctl_eee(SYSCTL_HANDLER_ARGS); static int igc_get_regs(SYSCTL_HANDLER_ARGS); -static void igc_configure_queues(struct igc_adapter *adapter); +static void igc_configure_queues(struct igc_softc *sc); /********************************************************************* @@ -165,7 +165,7 @@ static device_method_t igc_methods[] = { }; static driver_t igc_driver = { - "igc", igc_methods, sizeof(struct igc_adapter), + "igc", igc_methods, sizeof(struct igc_softc), }; static devclass_t igc_devclass; @@ -209,7 +209,7 @@ static device_method_t igc_if_methods[] = { }; static driver_t igc_if_driver = { - "igc_if", igc_if_methods, sizeof(struct igc_adapter) + "igc_if", igc_if_methods, sizeof(struct igc_softc) }; /********************************************************************* @@ -296,8 +296,8 @@ static struct if_shared_ctx igc_sctx_init = { static int igc_get_regs(SYSCTL_HANDLER_ARGS) { - struct igc_adapter *adapter = (struct igc_adapter *)arg1; - struct igc_hw *hw = &adapter->hw; + struct igc_softc *sc = (struct igc_softc *)arg1; + struct igc_hw *hw = &sc->hw; struct sbuf *sb; u32 *regs_buff; int rc; @@ -373,7 +373,7 @@ static int igc_get_regs(SYSCTL_HANDLER_ARGS) #ifdef DUMP_DESCS { - if_softc_ctx_t scctx = adapter->shared; + if_softc_ctx_t scctx = sc->shared; struct rx_ring *rxr = &rx_que->rxr; struct tx_ring *txr = &tx_que->txr; int ntxd = scctx->isc_ntxd[0]; @@ -435,7 +435,7 @@ igc_set_num_queues(if_ctx_t ctx) static int igc_if_attach_pre(if_ctx_t ctx) { - struct igc_adapter *adapter; + struct igc_softc *sc; if_softc_ctx_t scctx; device_t dev; struct igc_hw *hw; @@ -443,59 +443,59 @@ igc_if_attach_pre(if_ctx_t ctx) INIT_DEBUGOUT("igc_if_attach_pre: begin"); dev = iflib_get_dev(ctx); - adapter = iflib_get_softc(ctx); + sc = iflib_get_softc(ctx); - adapter->ctx = adapter->osdep.ctx = ctx; - adapter->dev = adapter->osdep.dev = dev; - scctx = adapter->shared = iflib_get_softc_ctx(ctx); - adapter->media = iflib_get_media(ctx); - hw = &adapter->hw; + sc->ctx = sc->osdep.ctx = ctx; + sc->dev = sc->osdep.dev = dev; + scctx = sc->shared = iflib_get_softc_ctx(ctx); + sc->media = iflib_get_media(ctx); + hw = &sc->hw; /* SYSCTL stuff */ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "nvm", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_sysctl_nvm_info, "I", "NVM Information"); + sc, 0, igc_sysctl_nvm_info, "I", "NVM Information"); - adapter->enable_aim = igc_enable_aim; + sc->enable_aim = igc_enable_aim; SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "enable_aim", CTLFLAG_RW, - &adapter->enable_aim, 0, + &sc->enable_aim, 0, "Interrupt Moderation (1=normal, 2=lowlatency)"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fw_version", CTLTYPE_STRING | CTLFLAG_RD, - adapter, 0, igc_sysctl_print_fw_version, "A", + sc, 0, igc_sysctl_print_fw_version, "A", "Prints FW/NVM Versions"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "debug", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_sysctl_debug_info, "I", "Debug Information"); + sc, 0, igc_sysctl_debug_info, "I", "Debug Information"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fc", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_set_flowcntl, "I", "Flow Control"); + sc, 0, igc_set_flowcntl, "I", "Flow Control"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "reg_dump", - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, adapter, 0, + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, sc, 0, igc_get_regs, "A", "Dump Registers"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rs_dump", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, adapter, 0, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, igc_get_rs, "I", "Dump RS indexes"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "dmac", - CTLTYPE_INT | CTLFLAG_RW, adapter, 0, + CTLTYPE_INT | CTLFLAG_RW, sc, 0, igc_sysctl_dmac, "I", "DMA Coalesce"); /* Determine hardware and mac info */ @@ -560,13 +560,13 @@ igc_if_attach_pre(if_ctx_t ctx) * Set the frame limits assuming * standard ethernet sized frames. */ - scctx->isc_max_frame_size = adapter->hw.mac.max_frame_size = + scctx->isc_max_frame_size = sc->hw.mac.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHERNET_FCS_SIZE; /* Allocate multicast array memory. */ - adapter->mta = malloc(sizeof(u8) * ETHER_ADDR_LEN * + sc->mta = malloc(sizeof(u8) * ETHER_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES, M_DEVBUF, M_NOWAIT); - if (adapter->mta == NULL) { + if (sc->mta == NULL) { device_printf(dev, "Can not allocate multicast setup array\n"); error = ENOMEM; goto err_late; @@ -578,12 +578,12 @@ igc_if_attach_pre(if_ctx_t ctx) " due to SOL/IDER session.\n"); /* Sysctl for setting Energy Efficient Ethernet */ - adapter->hw.dev_spec._i225.eee_disable = igc_eee_setting; + sc->hw.dev_spec._i225.eee_disable = igc_eee_setting; SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "eee_control", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - adapter, 0, igc_sysctl_eee, "I", + sc, 0, igc_sysctl_eee, "I", "Disable Energy Efficient Ethernet"); /* @@ -623,9 +623,9 @@ igc_if_attach_pre(if_ctx_t ctx) } /* Save the EEPROM/NVM versions */ - igc_fw_version(adapter); + igc_fw_version(sc); - igc_print_fw_version(adapter); + igc_print_fw_version(sc); /* * Get Wake-on-Lan and Management info for later use @@ -634,7 +634,7 @@ igc_if_attach_pre(if_ctx_t ctx) /* Enable only WOL MAGIC by default */ scctx->isc_capenable &= ~IFCAP_WOL; - if (adapter->wol != 0) + if (sc->wol != 0) scctx->isc_capenable |= IFCAP_WOL_MAGIC; iflib_set_mac(ctx, hw->mac.addr); @@ -642,10 +642,10 @@ igc_if_attach_pre(if_ctx_t ctx) return (0); err_late: - igc_release_hw_control(adapter); + igc_release_hw_control(sc); err_pci: igc_free_pci_resources(ctx); - free(adapter->mta, M_DEVBUF); + free(sc->mta, M_DEVBUF); return (error); } @@ -653,8 +653,8 @@ err_pci: static int igc_if_attach_post(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_hw *hw = &adapter->hw; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_hw *hw = &sc->hw; int error = 0; /* Setup OS specific network interface */ @@ -666,23 +666,23 @@ igc_if_attach_post(if_ctx_t ctx) igc_reset(ctx); /* Initialize statistics */ - igc_update_stats_counters(adapter); + igc_update_stats_counters(sc); hw->mac.get_link_status = true; igc_if_update_admin_status(ctx); - igc_add_hw_stats(adapter); + igc_add_hw_stats(sc); /* the driver can now take control from firmware */ - igc_get_hw_control(adapter); + igc_get_hw_control(sc); INIT_DEBUGOUT("igc_if_attach_post: end"); return (error); err_late: - igc_release_hw_control(adapter); + igc_release_hw_control(sc); igc_free_pci_resources(ctx); igc_if_queues_free(ctx); - free(adapter->mta, M_DEVBUF); + free(sc->mta, M_DEVBUF); return (error); } @@ -699,13 +699,13 @@ err_late: static int igc_if_detach(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); INIT_DEBUGOUT("igc_if_detach: begin"); - igc_phy_hw_reset(&adapter->hw); + igc_phy_hw_reset(&sc->hw); - igc_release_hw_control(adapter); + igc_release_hw_control(sc); igc_free_pci_resources(ctx); return (0); @@ -729,9 +729,9 @@ igc_if_shutdown(if_ctx_t ctx) static int igc_if_suspend(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); - igc_release_hw_control(adapter); + igc_release_hw_control(sc); igc_enable_wakeup(ctx); return (0); } @@ -748,7 +748,7 @@ static int igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu) { int max_frame_size; - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); if_softc_ctx_t scctx = iflib_get_softc_ctx(ctx); IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFMTU (Set Interface MTU)"); @@ -760,7 +760,7 @@ igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu) return (EINVAL); } - scctx->isc_max_frame_size = adapter->hw.mac.max_frame_size = + scctx->isc_max_frame_size = sc->hw.mac.max_frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; return (0); } @@ -777,8 +777,8 @@ igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu) static void igc_if_init(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - if_softc_ctx_t scctx = adapter->shared; + struct igc_softc *sc = iflib_get_softc(ctx); + if_softc_ctx_t scctx = sc->shared; struct ifnet *ifp = iflib_get_ifp(ctx); struct igc_tx_queue *tx_que; int i; @@ -786,17 +786,17 @@ igc_if_init(if_ctx_t ctx) INIT_DEBUGOUT("igc_if_init: begin"); /* Get the latest mac address, User can use a LAA */ - bcopy(if_getlladdr(ifp), adapter->hw.mac.addr, + bcopy(if_getlladdr(ifp), sc->hw.mac.addr, ETHER_ADDR_LEN); /* Put the address into the Receive Address Array */ - igc_rar_set(&adapter->hw, adapter->hw.mac.addr, 0); + igc_rar_set(&sc->hw, sc->hw.mac.addr, 0); /* Initialize the hardware */ igc_reset(ctx); igc_if_update_admin_status(ctx); - for (i = 0, tx_que = adapter->tx_queues; i < adapter->tx_num_queues; i++, tx_que++) { + for (i = 0, tx_que = sc->tx_queues; i < sc->tx_num_queues; i++, tx_que++) { struct tx_ring *txr = &tx_que->txr; txr->tx_rs_cidx = txr->tx_rs_pidx; @@ -810,7 +810,7 @@ igc_if_init(if_ctx_t ctx) } /* Setup VLAN support, basic and offload if available */ - IGC_WRITE_REG(&adapter->hw, IGC_VET, ETHERTYPE_VLAN); + IGC_WRITE_REG(&sc->hw, IGC_VET, ETHERTYPE_VLAN); /* Prepare transmit descriptors and buffers */ igc_initialize_transmit_unit(ctx); @@ -818,7 +818,7 @@ igc_if_init(if_ctx_t ctx) /* Setup Multicast table */ igc_if_multi_set(ctx); - adapter->rx_mbuf_sz = iflib_get_rx_mbuf_sz(ctx); + sc->rx_mbuf_sz = iflib_get_rx_mbuf_sz(ctx); igc_initialize_receive_unit(ctx); /* Set up VLAN support */ @@ -826,20 +826,20 @@ igc_if_init(if_ctx_t ctx) /* Don't lose promiscuous settings */ igc_if_set_promisc(ctx, if_getflags(ifp)); - igc_clear_hw_cntrs_base_generic(&adapter->hw); + igc_clear_hw_cntrs_base_generic(&sc->hw); - if (adapter->intr_type == IFLIB_INTR_MSIX) /* Set up queue routing */ - igc_configure_queues(adapter); + if (sc->intr_type == IFLIB_INTR_MSIX) /* Set up queue routing */ + igc_configure_queues(sc); /* this clears any pending interrupts */ - IGC_READ_REG(&adapter->hw, IGC_ICR); - IGC_WRITE_REG(&adapter->hw, IGC_ICS, IGC_ICS_LSC); + IGC_READ_REG(&sc->hw, IGC_ICR); + IGC_WRITE_REG(&sc->hw, IGC_ICS, IGC_ICS_LSC); /* the driver can now take control from firmware */ - igc_get_hw_control(adapter); + igc_get_hw_control(sc); /* Set Energy Efficient Ethernet */ - igc_set_eee_i225(&adapter->hw, true, true, true); + igc_set_eee_i225(&sc->hw, true, true, true); } enum eitr_latency_target { @@ -854,7 +854,7 @@ enum eitr_latency_target { * *********************************************************************/ static void -igc_neweitr(struct igc_adapter *sc, struct igc_rx_queue *que, +igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, struct tx_ring *txr, struct rx_ring *rxr) { struct igc_hw *hw = &sc->hw; @@ -986,12 +986,12 @@ igc_set_next_eitr: int igc_intr(void *arg) { - struct igc_adapter *adapter = arg; - struct igc_hw *hw = &adapter->hw; - struct igc_rx_queue *que = &adapter->rx_queues[0]; - struct tx_ring *txr = &adapter->tx_queues[0].txr; + struct igc_softc *sc = arg; + struct igc_hw *hw = &sc->hw; + struct igc_rx_queue *que = &sc->rx_queues[0]; + struct tx_ring *txr = &sc->tx_queues[0].txr; struct rx_ring *rxr = &que->rxr; - if_ctx_t ctx = adapter->ctx; + if_ctx_t ctx = sc->ctx; u32 reg_icr; reg_icr = IGC_READ_REG(hw, IGC_ICR); @@ -1020,9 +1020,9 @@ igc_intr(void *arg) igc_handle_link(ctx); if (reg_icr & IGC_ICR_RXO) - adapter->rx_overruns++; + sc->rx_overruns++; - igc_neweitr(adapter, que, txr, rxr); + igc_neweitr(sc, que, txr, rxr); /* Reset state */ txr->tx_bytes = 0; @@ -1036,20 +1036,20 @@ igc_intr(void *arg) static int igc_if_rx_queue_intr_enable(if_ctx_t ctx, uint16_t rxqid) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_rx_queue *rxq = &adapter->rx_queues[rxqid]; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_rx_queue *rxq = &sc->rx_queues[rxqid]; - IGC_WRITE_REG(&adapter->hw, IGC_EIMS, rxq->eims); + IGC_WRITE_REG(&sc->hw, IGC_EIMS, rxq->eims); return (0); } static int igc_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txqid) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_tx_queue *txq = &adapter->tx_queues[txqid]; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_tx_queue *txq = &sc->tx_queues[txqid]; - IGC_WRITE_REG(&adapter->hw, IGC_EIMS, txq->eims); + IGC_WRITE_REG(&sc->hw, IGC_EIMS, txq->eims); return (0); } @@ -1062,7 +1062,7 @@ static int igc_msix_que(void *arg) { struct igc_rx_queue *que = arg; - struct igc_adapter *sc = que->adapter; + struct igc_softc *sc = que->sc; struct tx_ring *txr = &sc->tx_queues[que->msix].txr; struct rx_ring *rxr = &que->rxr; @@ -1087,22 +1087,22 @@ igc_msix_que(void *arg) static int igc_msix_link(void *arg) { - struct igc_adapter *adapter = arg; + struct igc_softc *sc = arg; u32 reg_icr; - ++adapter->link_irq; - MPASS(adapter->hw.back != NULL); - reg_icr = IGC_READ_REG(&adapter->hw, IGC_ICR); + ++sc->link_irq; + MPASS(sc->hw.back != NULL); + reg_icr = IGC_READ_REG(&sc->hw, IGC_ICR); if (reg_icr & IGC_ICR_RXO) - adapter->rx_overruns++; + sc->rx_overruns++; if (reg_icr & (IGC_ICR_RXSEQ | IGC_ICR_LSC)) { - igc_handle_link(adapter->ctx); + igc_handle_link(sc->ctx); } - IGC_WRITE_REG(&adapter->hw, IGC_IMS, IGC_IMS_LSC); - IGC_WRITE_REG(&adapter->hw, IGC_EIMS, adapter->link_mask); + IGC_WRITE_REG(&sc->hw, IGC_IMS, IGC_IMS_LSC); + IGC_WRITE_REG(&sc->hw, IGC_EIMS, sc->link_mask); return (FILTER_HANDLED); } @@ -1111,9 +1111,9 @@ static void igc_handle_link(void *context) { if_ctx_t ctx = context; - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); - adapter->hw.mac.get_link_status = true; + sc->hw.mac.get_link_status = true; iflib_admin_intr_deferred(ctx); } @@ -1128,7 +1128,7 @@ igc_handle_link(void *context) static void igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); INIT_DEBUGOUT("igc_if_media_status: begin"); @@ -1137,13 +1137,13 @@ igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) ifmr->ifm_status = IFM_AVALID; ifmr->ifm_active = IFM_ETHER; - if (!adapter->link_active) { + if (!sc->link_active) { return; } ifmr->ifm_status |= IFM_ACTIVE; - switch (adapter->link_speed) { + switch (sc->link_speed) { case 10: ifmr->ifm_active |= IFM_10_T; break; @@ -1158,7 +1158,7 @@ igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) break; } - if (adapter->link_duplex == FULL_DUPLEX) + if (sc->link_duplex == FULL_DUPLEX) ifmr->ifm_active |= IFM_FDX; else ifmr->ifm_active |= IFM_HDX; @@ -1175,7 +1175,7 @@ igc_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) static int igc_if_media_change(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); struct ifmedia *ifm = iflib_get_media(ctx); INIT_DEBUGOUT("igc_if_media_change: begin"); @@ -1183,32 +1183,32 @@ igc_if_media_change(if_ctx_t ctx) if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) return (EINVAL); - adapter->hw.mac.autoneg = DO_AUTO_NEG; + sc->hw.mac.autoneg = DO_AUTO_NEG; switch (IFM_SUBTYPE(ifm->ifm_media)) { case IFM_AUTO: - adapter->hw.phy.autoneg_advertised = AUTONEG_ADV_DEFAULT; + sc->hw.phy.autoneg_advertised = AUTONEG_ADV_DEFAULT; break; case IFM_2500_T: - adapter->hw.phy.autoneg_advertised = ADVERTISE_2500_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_2500_FULL; break; case IFM_1000_T: - adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) - adapter->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; else - adapter->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; + sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; break; case IFM_10_T: if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) - adapter->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; + sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; else - adapter->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; + sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; break; default: - device_printf(adapter->dev, "Unsupported media type\n"); + device_printf(sc->dev, "Unsupported media type\n"); } igc_if_init(ctx); @@ -1219,12 +1219,12 @@ igc_if_media_change(if_ctx_t ctx) static int igc_if_set_promisc(if_ctx_t ctx, int flags) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); struct ifnet *ifp = iflib_get_ifp(ctx); u32 reg_rctl; int mcnt = 0; - reg_rctl = IGC_READ_REG(&adapter->hw, IGC_RCTL); + reg_rctl = IGC_READ_REG(&sc->hw, IGC_RCTL); reg_rctl &= ~(IGC_RCTL_SBP | IGC_RCTL_UPE); if (flags & IFF_ALLMULTI) mcnt = MAX_NUM_MULTICAST_ADDRESSES; @@ -1234,18 +1234,18 @@ igc_if_set_promisc(if_ctx_t ctx, int flags) /* Don't disable if in MAX groups */ if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) reg_rctl &= (~IGC_RCTL_MPE); - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); if (flags & IFF_PROMISC) { reg_rctl |= (IGC_RCTL_UPE | IGC_RCTL_MPE); /* Turn this on if you want to see bad packets */ if (igc_debug_sbp) reg_rctl |= IGC_RCTL_SBP; - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); } else if (flags & IFF_ALLMULTI) { reg_rctl |= IGC_RCTL_MPE; reg_rctl &= ~IGC_RCTL_UPE; - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); } return (0); } @@ -1273,7 +1273,7 @@ igc_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int idx) static void igc_if_multi_set(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); struct ifnet *ifp = iflib_get_ifp(ctx); u8 *mta; /* Multicast array memory */ u32 reg_rctl = 0; @@ -1281,12 +1281,12 @@ igc_if_multi_set(if_ctx_t ctx) IOCTL_DEBUGOUT("igc_set_multi: begin"); - mta = adapter->mta; + mta = sc->mta; bzero(mta, sizeof(u8) * ETHER_ADDR_LEN * MAX_NUM_MULTICAST_ADDRESSES); mcnt = if_foreach_llmaddr(ifp, igc_copy_maddr, mta); - reg_rctl = IGC_READ_REG(&adapter->hw, IGC_RCTL); + reg_rctl = IGC_READ_REG(&sc->hw, IGC_RCTL); if (if_getflags(ifp) & IFF_PROMISC) { reg_rctl |= (IGC_RCTL_UPE | IGC_RCTL_MPE); @@ -1301,9 +1301,9 @@ igc_if_multi_set(if_ctx_t ctx) reg_rctl &= ~(IGC_RCTL_UPE | IGC_RCTL_MPE); if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) - igc_update_mc_addr_list(&adapter->hw, mta, mcnt); + igc_update_mc_addr_list(&sc->hw, mta, mcnt); - IGC_WRITE_REG(&adapter->hw, IGC_RCTL, reg_rctl); + IGC_WRITE_REG(&sc->hw, IGC_RCTL, reg_rctl); } /********************************************************************* @@ -1327,8 +1327,8 @@ igc_if_timer(if_ctx_t ctx, uint16_t qid) static void igc_if_update_admin_status(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_hw *hw = &adapter->hw; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_hw *hw = &sc->hw; device_t dev = iflib_get_dev(ctx); u32 link_check, thstat, ctrl; @@ -1352,36 +1352,36 @@ igc_if_update_admin_status(if_ctx_t ctx) } /* Now check for a transition */ - if (link_check && (adapter->link_active == 0)) { - igc_get_speed_and_duplex(hw, &adapter->link_speed, - &adapter->link_duplex); + if (link_check && (sc->link_active == 0)) { + igc_get_speed_and_duplex(hw, &sc->link_speed, + &sc->link_duplex); if (bootverbose) device_printf(dev, "Link is up %d Mbps %s\n", - adapter->link_speed, - ((adapter->link_duplex == FULL_DUPLEX) ? + sc->link_speed, + ((sc->link_duplex == FULL_DUPLEX) ? "Full Duplex" : "Half Duplex")); - adapter->link_active = 1; + sc->link_active = 1; iflib_link_state_change(ctx, LINK_STATE_UP, - IF_Mbps(adapter->link_speed)); - } else if (!link_check && (adapter->link_active == 1)) { - adapter->link_speed = 0; - adapter->link_duplex = 0; - adapter->link_active = 0; + IF_Mbps(sc->link_speed)); + } else if (!link_check && (sc->link_active == 1)) { + sc->link_speed = 0; + sc->link_duplex = 0; + sc->link_active = 0; iflib_link_state_change(ctx, LINK_STATE_DOWN, 0); } - igc_update_stats_counters(adapter); + igc_update_stats_counters(sc); } static void igc_if_watchdog_reset(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); /* * Just count the event; iflib(4) will already trigger a * sufficient reset of the controller. */ - adapter->watchdog_events++; + sc->watchdog_events++; } /********************************************************************* @@ -1393,12 +1393,12 @@ igc_if_watchdog_reset(if_ctx_t ctx) static void igc_if_stop(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); INIT_DEBUGOUT("igc_if_stop: begin"); - igc_reset_hw(&adapter->hw); - IGC_WRITE_REG(&adapter->hw, IGC_WUC, 0); + igc_reset_hw(&sc->hw); + IGC_WRITE_REG(&sc->hw, IGC_WUC, 0); } /********************************************************************* @@ -1410,22 +1410,22 @@ static void igc_identify_hardware(if_ctx_t ctx) { device_t dev = iflib_get_dev(ctx); - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); /* Make sure our PCI config space has the necessary stuff set */ - adapter->hw.bus.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2); + sc->hw.bus.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2); /* Save off the information about this board */ - adapter->hw.vendor_id = pci_get_vendor(dev); - adapter->hw.device_id = pci_get_device(dev); - adapter->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1); - adapter->hw.subsystem_vendor_id = + sc->hw.vendor_id = pci_get_vendor(dev); + sc->hw.device_id = pci_get_device(dev); + sc->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1); + sc->hw.subsystem_vendor_id = pci_read_config(dev, PCIR_SUBVEND_0, 2); - adapter->hw.subsystem_device_id = + sc->hw.subsystem_device_id = pci_read_config(dev, PCIR_SUBDEV_0, 2); /* Do Shared Code Init and Setup */ - if (igc_set_mac_type(&adapter->hw)) { + if (igc_set_mac_type(&sc->hw)) { device_printf(dev, "Setup init failure\n"); return; } @@ -1434,23 +1434,23 @@ igc_identify_hardware(if_ctx_t ctx) static int igc_allocate_pci_resources(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); + struct igc_softc *sc = iflib_get_softc(ctx); device_t dev = iflib_get_dev(ctx); int rid; rid = PCIR_BAR(0); - adapter->memory = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + sc->memory = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (adapter->memory == NULL) { + if (sc->memory == NULL) { device_printf(dev, "Unable to allocate bus resource: memory\n"); return (ENXIO); } - adapter->osdep.mem_bus_space_tag = rman_get_bustag(adapter->memory); - adapter->osdep.mem_bus_space_handle = - rman_get_bushandle(adapter->memory); - adapter->hw.hw_addr = (u8 *)&adapter->osdep.mem_bus_space_handle; + sc->osdep.mem_bus_space_tag = rman_get_bustag(sc->memory); + sc->osdep.mem_bus_space_handle = + rman_get_bushandle(sc->memory); + sc->hw.hw_addr = (u8 *)&sc->osdep.mem_bus_space_handle; - adapter->hw.back = &adapter->osdep; + sc->hw.back = &sc->osdep; return (0); } @@ -1463,20 +1463,20 @@ igc_allocate_pci_resources(if_ctx_t ctx) static int igc_if_msix_intr_assign(if_ctx_t ctx, int msix) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_rx_queue *rx_que = adapter->rx_queues; - struct igc_tx_queue *tx_que = adapter->tx_queues; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_rx_queue *rx_que = sc->rx_queues; + struct igc_tx_queue *tx_que = sc->tx_queues; int error, rid, i, vector = 0, rx_vectors; char buf[16]; /* First set up ring resources */ - for (i = 0; i < adapter->rx_num_queues; i++, rx_que++, vector++) { + for (i = 0; i < sc->rx_num_queues; i++, rx_que++, vector++) { rid = vector + 1; snprintf(buf, sizeof(buf), "rxq%d", i); error = iflib_irq_alloc_generic(ctx, &rx_que->que_irq, rid, IFLIB_INTR_RXTX, igc_msix_que, rx_que, rx_que->me, buf); if (error) { device_printf(iflib_get_dev(ctx), "Failed to allocate que int %d err: %d", i, error); - adapter->rx_num_queues = i + 1; + sc->rx_num_queues = i + 1; goto fail; } @@ -1493,14 +1493,14 @@ igc_if_msix_intr_assign(if_ctx_t ctx, int msix) rx_vectors = vector; vector = 0; - for (i = 0; i < adapter->tx_num_queues; i++, tx_que++, vector++) { + for (i = 0; i < sc->tx_num_queues; i++, tx_que++, vector++) { snprintf(buf, sizeof(buf), "txq%d", i); - tx_que = &adapter->tx_queues[i]; + tx_que = &sc->tx_queues[i]; iflib_softirq_alloc_generic(ctx, - &adapter->rx_queues[i % adapter->rx_num_queues].que_irq, + &sc->rx_queues[i % sc->rx_num_queues].que_irq, IFLIB_INTR_TX, tx_que, tx_que->me, buf); - tx_que->msix = (vector % adapter->rx_num_queues); + tx_que->msix = (vector % sc->rx_num_queues); /* * Set the bit to enable interrupt @@ -1513,26 +1513,26 @@ igc_if_msix_intr_assign(if_ctx_t ctx, int msix) /* Link interrupt */ rid = rx_vectors + 1; - error = iflib_irq_alloc_generic(ctx, &adapter->irq, rid, IFLIB_INTR_ADMIN, igc_msix_link, adapter, 0, "aq"); + error = iflib_irq_alloc_generic(ctx, &sc->irq, rid, IFLIB_INTR_ADMIN, igc_msix_link, sc, 0, "aq"); if (error) { device_printf(iflib_get_dev(ctx), "Failed to register admin handler"); goto fail; } - adapter->linkvec = rx_vectors; + sc->linkvec = rx_vectors; return (0); fail: - iflib_irq_free(ctx, &adapter->irq); - rx_que = adapter->rx_queues; - for (int i = 0; i < adapter->rx_num_queues; i++, rx_que++) + iflib_irq_free(ctx, &sc->irq); + rx_que = sc->rx_queues; + for (int i = 0; i < sc->rx_num_queues; i++, rx_que++) iflib_irq_free(ctx, &rx_que->que_irq); return (error); } static void -igc_configure_queues(struct igc_adapter *adapter) +igc_configure_queues(struct igc_softc *sc) { - struct igc_hw *hw = &adapter->hw; + struct igc_hw *hw = &sc->hw; struct igc_rx_queue *rx_que; struct igc_tx_queue *tx_que; u32 ivar = 0, newitr = 0; @@ -1544,10 +1544,10 @@ igc_configure_queues(struct igc_adapter *adapter) /* Turn on MSI-X */ /* RX entries */ - for (int i = 0; i < adapter->rx_num_queues; i++) { + for (int i = 0; i < sc->rx_num_queues; i++) { u32 index = i >> 1; ivar = IGC_READ_REG_ARRAY(hw, IGC_IVAR0, index); - rx_que = &adapter->rx_queues[i]; + rx_que = &sc->rx_queues[i]; if (i & 1) { ivar &= 0xFF00FFFF; ivar |= (rx_que->msix | IGC_IVAR_VALID) << 16; @@ -1558,10 +1558,10 @@ igc_configure_queues(struct igc_adapter *adapter) IGC_WRITE_REG_ARRAY(hw, IGC_IVAR0, index, ivar); } /* TX entries */ - for (int i = 0; i < adapter->tx_num_queues; i++) { + for (int i = 0; i < sc->tx_num_queues; i++) { u32 index = i >> 1; ivar = IGC_READ_REG_ARRAY(hw, IGC_IVAR0, index); - tx_que = &adapter->tx_queues[i]; + tx_que = &sc->tx_queues[i]; if (i & 1) { ivar &= 0x00FFFFFF; ivar |= (tx_que->msix | IGC_IVAR_VALID) << 24; @@ -1570,12 +1570,12 @@ igc_configure_queues(struct igc_adapter *adapter) ivar |= (tx_que->msix | IGC_IVAR_VALID) << 8; } IGC_WRITE_REG_ARRAY(hw, IGC_IVAR0, index, ivar); - adapter->que_mask |= tx_que->eims; + sc->que_mask |= tx_que->eims; } /* And for the link interrupt */ - ivar = (adapter->linkvec | IGC_IVAR_VALID) << 8; - adapter->link_mask = 1 << adapter->linkvec; + ivar = (sc->linkvec | IGC_IVAR_VALID) << 8; + sc->link_mask = 1 << sc->linkvec; IGC_WRITE_REG(hw, IGC_IVAR_MISC, ivar); /* Set the starting interrupt rate */ @@ -1584,8 +1584,8 @@ igc_configure_queues(struct igc_adapter *adapter) newitr |= IGC_EITR_CNT_IGNR; - for (int i = 0; i < adapter->rx_num_queues; i++) { - rx_que = &adapter->rx_queues[i]; + for (int i = 0; i < sc->rx_num_queues; i++) { + rx_que = &sc->rx_queues[i]; IGC_WRITE_REG(hw, IGC_EITR(rx_que->msix), newitr); } @@ -1595,34 +1595,34 @@ igc_configure_queues(struct igc_adapter *adapter) static void igc_free_pci_resources(if_ctx_t ctx) { - struct igc_adapter *adapter = iflib_get_softc(ctx); - struct igc_rx_queue *que = adapter->rx_queues; + struct igc_softc *sc = iflib_get_softc(ctx); + struct igc_rx_queue *que = sc->rx_queues; device_t dev = iflib_get_dev(ctx); *** 1509 LINES SKIPPED *** From nobody Mon Oct 21 15:24: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 4XXJyb5hKXz5ZPlQ; Mon, 21 Oct 2024 15:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJyb2tv5z4plk; Mon, 21 Oct 2024 15:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=csrA3Lae3161DlkyIrOTpGPFd0LCLeE8l4r/OdIhWFs=; b=OprfajmJf7g/JLNP8Tc2Je6ZL9jYXZoi86dQkDMqoQYx5294KCFpLCOenrU3N+BdbAvYR5 Ng2SfYpdmJBwSHs10+L7m4ZNamt/bRZZzlKLRYUA55k+WxEUnD9M6rOxdSuBJqNqrGtsx8 Z4i0EnzOdX94wbIanu2+qEnvamB7h0kQ28vXBolJkYZmJGgHvHm3TDuLZgB96A0tYdOlgr 0xEJ3mrCF6eTwRNDSL/zIjjQOIP/I+CcLzG9h2TbhytAyUXfu9R5lKFA+qJzZWyG2QHPUn sWzpWRZqtw1IuA4zEXoF5httF58ITP/m6GQrjtRhXNuLCiIq9goO6Uuw03T5qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=csrA3Lae3161DlkyIrOTpGPFd0LCLeE8l4r/OdIhWFs=; b=owprTwxEqSKsDQULnhMf8AEvY9+6hY4qpxmIzoDqFsWZ41o3ZNDfjzI/BBKuixDcGBPs/E 0vx177IJchLKfi2V8ELM4QVmrQTcOOgw1nbguXUssNZzBjEZsRNvdaLTxNDXvAqdl3NvnI NJAEMSmW8hSwNP0kNvYpdLYpnUON7QZBtnrZ8itsfK/f1aAq6zsbY6jxyqT5lI4LWBFnUT HLpQZjOp4F4kk/ud5nC3QfbBDVqTZAhR/+h1juaVG6z5ZtsA7bxmDI+X4CfYrPaYFr+ktI bnxgj2SblEcfabkEgrffda/+TTyUweFEmmMRftCk/dWw1SEIiFoik5WwAH5QqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729524295; a=rsa-sha256; cv=none; b=oHYeBPxThoo+vTCvBGV8ihLZO1Gvx+IS9ut8wDpEHBdchJyNTIGIV/DiDkYOsXoz5In+s6 4diVHiaNpbsDKoSyIRJCPiaA6IsD/5f6BrShZ7P9SQ1+ZqyjyeGmZ3Lc2IPns0k2yMWOVo vtnuPx0xJ8HZO2aJOsP12Q/Ps4y35a8cLOnRkpwXmI/1zwUyBdkZdeDic/XYMPRbdV3pfx vbFrfDBNWnoNTAA2ngqxUQ+7RdtUgh19opwwe2Fqcmz3WefTDOttTOGqLUCKwQ43LIlZAi jJVbTkS8tsT/VK+6+s+LWTJ3pGMq54aRJTpHo3ErmjvD7DDb0wwyWEvIMtT5gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJyb20f1zbVQ; Mon, 21 Oct 2024 15:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFOt6T084082; Mon, 21 Oct 2024 15:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFOtXx084079; Mon, 21 Oct 2024 15:24:55 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:24:55 GMT Message-Id: <202410211524.49LFOtXx084079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: f04e3505ae91 - stable/13 - igc: Function prototype cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f04e3505ae915a71a0be4e8bf670a3e8b294c97d Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f04e3505ae915a71a0be4e8bf670a3e8b294c97d commit f04e3505ae915a71a0be4e8bf670a3e8b294c97d Author: Kevin Bowling AuthorDate: 2024-10-14 13:49:19 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:21:41 +0000 igc: Function prototype cleanup Drop variable names of function prototypes since the file is mixed in listing them or not and they fall out of sync. Sponsored by: BBOX.io (cherry picked from commit 1b0e41ddffbf0ac84c88019df84dfd50ce9f7788) --- sys/dev/igc/if_igc.c | 86 ++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 8d72eb9d2447..1daec6e09694 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -72,49 +72,49 @@ static const pci_vendor_info_t igc_vendor_info_array[] = /********************************************************************* * Function prototypes *********************************************************************/ -static void *igc_register(device_t dev); -static int igc_if_attach_pre(if_ctx_t ctx); -static int igc_if_attach_post(if_ctx_t ctx); -static int igc_if_detach(if_ctx_t ctx); -static int igc_if_shutdown(if_ctx_t ctx); -static int igc_if_suspend(if_ctx_t ctx); -static int igc_if_resume(if_ctx_t ctx); - -static int igc_if_tx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, uint64_t *paddrs, int ntxqs, int ntxqsets); -static int igc_if_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, uint64_t *paddrs, int nrxqs, int nrxqsets); -static void igc_if_queues_free(if_ctx_t ctx); +static void *igc_register(device_t); +static int igc_if_attach_pre(if_ctx_t); +static int igc_if_attach_post(if_ctx_t); +static int igc_if_detach(if_ctx_t); +static int igc_if_shutdown(if_ctx_t); +static int igc_if_suspend(if_ctx_t); +static int igc_if_resume(if_ctx_t); + +static int igc_if_tx_queues_alloc(if_ctx_t, caddr_t *, uint64_t *, int, int); +static int igc_if_rx_queues_alloc(if_ctx_t, caddr_t *, uint64_t *, int, int); +static void igc_if_queues_free(if_ctx_t); static uint64_t igc_if_get_counter(if_ctx_t, ift_counter); -static void igc_if_init(if_ctx_t ctx); -static void igc_if_stop(if_ctx_t ctx); +static void igc_if_init(if_ctx_t); +static void igc_if_stop(if_ctx_t); static void igc_if_media_status(if_ctx_t, struct ifmediareq *); -static int igc_if_media_change(if_ctx_t ctx); -static int igc_if_mtu_set(if_ctx_t ctx, uint32_t mtu); -static void igc_if_timer(if_ctx_t ctx, uint16_t qid); -static void igc_if_watchdog_reset(if_ctx_t ctx); -static bool igc_if_needs_restart(if_ctx_t ctx, enum iflib_restart_event event); - -static void igc_identify_hardware(if_ctx_t ctx); -static int igc_allocate_pci_resources(if_ctx_t ctx); -static void igc_free_pci_resources(if_ctx_t ctx); -static void igc_reset(if_ctx_t ctx); -static int igc_setup_interface(if_ctx_t ctx); -static int igc_setup_msix(if_ctx_t ctx); - -static void igc_initialize_transmit_unit(if_ctx_t ctx); -static void igc_initialize_receive_unit(if_ctx_t ctx); - -static void igc_if_intr_enable(if_ctx_t ctx); -static void igc_if_intr_disable(if_ctx_t ctx); -static int igc_if_rx_queue_intr_enable(if_ctx_t ctx, uint16_t rxqid); -static int igc_if_tx_queue_intr_enable(if_ctx_t ctx, uint16_t txqid); -static void igc_if_multi_set(if_ctx_t ctx); -static void igc_if_update_admin_status(if_ctx_t ctx); -static void igc_if_debug(if_ctx_t ctx); +static int igc_if_media_change(if_ctx_t); +static int igc_if_mtu_set(if_ctx_t, uint32_t); +static void igc_if_timer(if_ctx_t, uint16_t); +static void igc_if_watchdog_reset(if_ctx_t); +static bool igc_if_needs_restart(if_ctx_t, enum iflib_restart_event); + +static void igc_identify_hardware(if_ctx_t); +static int igc_allocate_pci_resources(if_ctx_t); +static void igc_free_pci_resources(if_ctx_t); +static void igc_reset(if_ctx_t); +static int igc_setup_interface(if_ctx_t); +static int igc_setup_msix(if_ctx_t); + +static void igc_initialize_transmit_unit(if_ctx_t); +static void igc_initialize_receive_unit(if_ctx_t); + +static void igc_if_intr_enable(if_ctx_t); +static void igc_if_intr_disable(if_ctx_t); +static int igc_if_rx_queue_intr_enable(if_ctx_t, uint16_t); +static int igc_if_tx_queue_intr_enable(if_ctx_t, uint16_t); +static void igc_if_multi_set(if_ctx_t); +static void igc_if_update_admin_status(if_ctx_t); +static void igc_if_debug(if_ctx_t); static void igc_update_stats_counters(struct igc_softc *); -static void igc_add_hw_stats(struct igc_softc *sc); -static int igc_if_set_promisc(if_ctx_t ctx, int flags); -static void igc_setup_vlan_hw_support(if_ctx_t ctx); +static void igc_add_hw_stats(struct igc_softc *); +static int igc_if_set_promisc(if_ctx_t, int); +static void igc_setup_vlan_hw_support(if_ctx_t); static void igc_fw_version(struct igc_softc *); static void igc_sbuf_fw_version(struct igc_fw_version *, struct sbuf *); static void igc_print_fw_version(struct igc_softc *); @@ -130,10 +130,10 @@ static void igc_neweitr(struct igc_softc *, struct igc_rx_queue *, /* Management and WOL Support */ static void igc_get_hw_control(struct igc_softc *); static void igc_release_hw_control(struct igc_softc *); -static void igc_get_wakeup(if_ctx_t ctx); -static void igc_enable_wakeup(if_ctx_t ctx); +static void igc_get_wakeup(if_ctx_t); +static void igc_enable_wakeup(if_ctx_t); -int igc_intr(void *arg); +int igc_intr(void *); /* MSI-X handlers */ static int igc_if_msix_intr_assign(if_ctx_t, int); @@ -146,7 +146,7 @@ static int igc_sysctl_eee(SYSCTL_HANDLER_ARGS); static int igc_get_regs(SYSCTL_HANDLER_ARGS); -static void igc_configure_queues(struct igc_softc *sc); +static void igc_configure_queues(struct igc_softc *); /********************************************************************* From nobody Mon Oct 21 15:24: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 4XXJyd2SDfz5ZPqH; Mon, 21 Oct 2024 15:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJyc3GSGz4pns; Mon, 21 Oct 2024 15:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6FSf7IOMCEeSyrwoPFXWNSN+D8MZe31maW6Zl9/Zh8=; b=ur0JRFbr66A5wz0PK1tfkTpEeq08btOwx4HZzl2pPf6psnpRCs1gC9RwPFo3dqbTD6CXfY fnxvHF155zE7nwSM6OkV4/lWtmFMUmZ4a9IUdNq5EHzPECQJsZo6qcijVV9z4n2ukAuJI2 tfBYINN643hSZjJHYapsP20qa0tdH6jUPehJDE8k+TJ9KjNxyMcVeQ707YtP491ZMrA8mB C28LpJscg/sWpkZhJMLODo+TsfQq7nNP3Wo6B+woLMCwuICt3ZFTLDXisGbbtI5JfjSKTv F21x1XDNWmNvIYx7ZGTWyxMAIfasHX70bp1Ix7l5djY5E+qkAcVdU9vM0/gfZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6FSf7IOMCEeSyrwoPFXWNSN+D8MZe31maW6Zl9/Zh8=; b=JxK3qh2lOU4B9O39CXAkLg4kaJrWXneGlvVBJMqP1GUE/DQJDSc8chcu4HAO5SINd/ZtmF msvhFrJ1G0klUdA0SsJ6iqnuZIwVwGub5S5HUuptOi6v22kdwyGxi/JT32UrbPShbxerxO DWQ0wG1ZsWwEJOTNtvT/oGgtMRc2MDTMLDyESgozENN9KKMhfJpinuUB6RCWK36pEnu763 vvAJP966DrPE025pmZ3pQ+0ygsIzr3Sl6O9939TmG4x6/S1c8GDtMyW4U8KlHATVLHg6nw xtgKJFN9R56CcMMDflojvHP9kGuN2J2bQV6vCOskJ5mV9nZbm/h0HorsG+nTBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729524296; a=rsa-sha256; cv=none; b=YgevInTIoIGjfoW+a+sclJCGfTfjwbNc1NGnw8iijsuY7wf61HRphLkl3bg+MjzC79P6cN Khe7gH0bXllcp8p8yKdYZd5ZEpc95KZJvFau59NsP6Y+hr5GVl9D8ZrmC7quIeiWW9Cd8p 09NAyzfmctgLYDRycvhibV3v49DHqRjoqdRxxbaxeRBPfxnQtaYrLT5RiN20cB/Bm66iQa 2iTT3DXqHQ3Cnm7n3BiqJzqA9ouCQgNaAa123v7Yj6EdQC/5SzSoRQx4Wp2IPVGNqj4ho2 66zLUcnfTQxsIoMmsk+WUX1PjrGFt49kPenuoJj2P88k1QL1T9I21o/AYAJU9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJyc2Z48zbSV; Mon, 21 Oct 2024 15:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFOuSg084127; Mon, 21 Oct 2024 15:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFOu8L084124; Mon, 21 Oct 2024 15:24:56 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:24:56 GMT Message-Id: <202410211524.49LFOu8L084124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2b45f8eb33d1 - stable/13 - e1000: txrx function prototype cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b45f8eb33d14584015fb31878f504ca4a6e28a8 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2b45f8eb33d14584015fb31878f504ca4a6e28a8 commit 2b45f8eb33d14584015fb31878f504ca4a6e28a8 Author: Kevin Bowling AuthorDate: 2024-10-14 16:07:29 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:21:54 +0000 e1000: txrx function prototype cleanup Drop variable names of function prototypes since the file is mixed in listing them or not and they fall out of sync. Sponsored by: BBOX.io (cherry picked from commit 9dc452b983f042aa9d2a2562517d44c1928ff42a) --- sys/dev/e1000/em_txrx.c | 39 ++++++++++++++++++--------------------- sys/dev/e1000/igb_txrx.c | 30 ++++++++++++++---------------- 2 files changed, 32 insertions(+), 37 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 6e8fff07cd82..65ffcdfd67f6 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -43,29 +43,26 @@ /********************************************************************* * Local Function prototypes *********************************************************************/ -static int em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, - uint32_t *txd_upper, uint32_t *txd_lower); -static int em_transmit_checksum_setup(struct e1000_softc *sc, - if_pkt_info_t pi, uint32_t *txd_upper, uint32_t *txd_lower); -static int em_isc_txd_encap(void *arg, if_pkt_info_t pi); -static void em_isc_txd_flush(void *arg, uint16_t txqid, qidx_t pidx); -static int em_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear); -static void em_isc_rxd_refill(void *arg, if_rxd_update_t iru); -static void em_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, - qidx_t pidx); -static int em_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); -static int em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); - -static void lem_isc_rxd_refill(void *arg, if_rxd_update_t iru); - -static int lem_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); -static int lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); +static int em_tso_setup(struct e1000_softc *, if_pkt_info_t, uint32_t *, + uint32_t *); +static int em_transmit_checksum_setup(struct e1000_softc *, if_pkt_info_t, + uint32_t *, uint32_t *); +static int em_isc_txd_encap(void *, if_pkt_info_t); +static void em_isc_txd_flush(void *, uint16_t, qidx_t); +static int em_isc_txd_credits_update(void *, uint16_t, bool); +static void em_isc_rxd_refill(void *, if_rxd_update_t); +static void em_isc_rxd_flush(void *, uint16_t, uint8_t, qidx_t); +static int em_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); +static int em_isc_rxd_pkt_get(void *, if_rxd_info_t); + +static void lem_isc_rxd_refill(void *, if_rxd_update_t); + +static int lem_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); +static int lem_isc_rxd_pkt_get(void *, if_rxd_info_t); static void em_receive_checksum(uint16_t, uint8_t, if_rxd_info_t); -static int em_determine_rsstype(uint32_t pkt_info); -extern int em_intr(void *arg); +static int em_determine_rsstype(uint32_t); +extern int em_intr(void *); struct if_txrx em_txrx = { .ift_txd_encap = em_isc_txd_encap, diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index 82cbb37ce4cd..8b663d7e6d3e 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -42,29 +42,27 @@ /********************************************************************* * Local Function prototypes *********************************************************************/ -static int igb_isc_txd_encap(void *arg, if_pkt_info_t pi); -static void igb_isc_txd_flush(void *arg, uint16_t txqid, qidx_t pidx); -static int igb_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear); +static int igb_isc_txd_encap(void *, if_pkt_info_t); +static void igb_isc_txd_flush(void *, uint16_t, qidx_t); +static int igb_isc_txd_credits_update(void *, uint16_t, bool); -static void igb_isc_rxd_refill(void *arg, if_rxd_update_t iru); +static void igb_isc_rxd_refill(void *, if_rxd_update_t); -static void igb_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, - qidx_t pidx); -static int igb_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); +static void igb_isc_rxd_flush(void *, uint16_t, uint8_t, qidx_t); +static int igb_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); static int igb_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); -static int igb_tx_ctx_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); -static int igb_tso_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); +static int igb_tx_ctx_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); +static int igb_tso_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); -static void igb_rx_checksum(uint32_t staterr, if_rxd_info_t ri, uint32_t ptype); -static int igb_determine_rsstype(uint16_t pkt_info); +static void igb_rx_checksum(uint32_t, if_rxd_info_t, uint32_t); +static int igb_determine_rsstype(uint16_t); -extern void igb_if_enable_intr(if_ctx_t ctx); -extern int em_intr(void *arg); +extern void igb_if_enable_intr(if_ctx_t); +extern int em_intr(void *); struct if_txrx igb_txrx = { .ift_txd_encap = igb_isc_txd_encap, From nobody Mon Oct 21 15:24: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 4XXJyh3Ypfz5ZPqM; Mon, 21 Oct 2024 15:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJyd4YfBz4q2H; Mon, 21 Oct 2024 15:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tqDw2Hz/gZrdsZL8fu6c0bHHVNYeVXvd9sy4cFuFGM=; b=G+taSZ14sJysm7oKk1HBadGSXmh2Nms0Y9QknsSxMw60j/fcYsvL6FLX2khsyUdnqo0aXW YHEshgjngTViGlOCOWLZ/17FFu8JsoBthHnWniGFRXSxCUhTcOMaU1kAwonG0cv9MhdV5z iI0xkQt1vhfeM9W7UFQjcJawxqOc1ZKpehUVcED3JIVkxySvIWaWfKPEsmMGbTKIQregJ4 aoBJJSC8EUSKfYTP4BYZJlO214a1zAhR8ArjAWa5d0fMRm4johJDAVWfIDTrgF8IO83fs0 XFXVsEtCTLDAvLMSNzWk0TJ5xx1W0VZ7MJFGvzq8j0EcGF5/qmN2YfIxAaCoEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729524297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tqDw2Hz/gZrdsZL8fu6c0bHHVNYeVXvd9sy4cFuFGM=; b=gE+dNTryhbanTdQm/3nU4rto950BrxHwGNdfPgIH5gJIfpuLTJVOzRp7vCzAgL2x6dGCG1 GD8vCtuueKgXGYxtP0zIu97qiTE055rsgXJuAFVnyi6ReU7kOwJXrNDEFX5jWImzc9C18M RqiWVtqXFH60zI2lH47nYIsGObWw/qiqVPiZwmEftc1YuW7GgB8pcJcJdTffMBl4L3lfnb GsnxKhGFh/sW4jq7Y3MoqDk1tI/KufpjrtO3Btyys6oXGypux2PJsvrIdMsysC7oWc4Vb4 rEtmxDBY/9AN3XxXf3/qUSme8lVOWYT3LaP7RhZzR/R42Dbe2MtsshyEcNCt9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729524297; a=rsa-sha256; cv=none; b=rZ8OxXpWh5KTG1psfL2XsPejVxUjkjZXdZbg8EmUgTRMOjvOA6zxuBgS60WlYPxZW+lSMX Pjv16LaOFuTJqK61ecoKfFmaVw3eCHK0ma2aJhwaDfTBYj0OtkZeoySH2I4lsbZQpLPG/U QVCxfJ6TAS8xtbDltNzbUFEIW70KmCgNxCbIbmK1ptS4bpL4Ifge0w0/3GeDLnd86gpk3E sOzOxwx1N1NQQfEW8Lqr7M4A6/UcOSJhWNRwx/lEaKgoXYm4rwZWls5g/sC+wtcSVWdocb cshOJKusUEOod6F3uvxKaUl/iEK51GPOaGnK60Dfx8JFGkysuTmFlNFk1yulMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXJyd3TdJzbSW; Mon, 21 Oct 2024 15:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFOvtW084169; Mon, 21 Oct 2024 15:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFOvp7084166; Mon, 21 Oct 2024 15:24:57 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:24:57 GMT Message-Id: <202410211524.49LFOvp7084166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: fabc189f2adf - stable/13 - igc: txrx function prototype cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fabc189f2adfe339e713fbb0ee6847baa9f73b64 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fabc189f2adfe339e713fbb0ee6847baa9f73b64 commit fabc189f2adfe339e713fbb0ee6847baa9f73b64 Author: Kevin Bowling AuthorDate: 2024-10-14 16:10:10 +0000 Commit: Kevin Bowling CommitDate: 2024-10-21 15:22:08 +0000 igc: txrx function prototype cleanup Drop variable names of function prototypes since the file is mixed in listing them or not and they fall out of sync. Sponsored by: BBOX.io (cherry picked from commit 7763b194d8de6fe8034f754064449a7510ca16b9) --- sys/dev/igc/igc_txrx.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c index a95b34702e24..59f4725388ee 100644 --- a/sys/dev/igc/igc_txrx.c +++ b/sys/dev/igc/igc_txrx.c @@ -44,29 +44,27 @@ /********************************************************************* * Local Function prototypes *********************************************************************/ -static int igc_isc_txd_encap(void *arg, if_pkt_info_t pi); -static void igc_isc_txd_flush(void *arg, uint16_t txqid, qidx_t pidx); -static int igc_isc_txd_credits_update(void *arg, uint16_t txqid, bool clear); +static int igc_isc_txd_encap(void *, if_pkt_info_t); +static void igc_isc_txd_flush(void *, uint16_t, qidx_t); +static int igc_isc_txd_credits_update(void *, uint16_t, bool); -static void igc_isc_rxd_refill(void *arg, if_rxd_update_t iru); +static void igc_isc_rxd_refill(void *, if_rxd_update_t); -static void igc_isc_rxd_flush(void *arg, uint16_t rxqid, uint8_t flid __unused, - qidx_t pidx); -static int igc_isc_rxd_available(void *arg, uint16_t rxqid, qidx_t idx, - qidx_t budget); +static void igc_isc_rxd_flush(void *, uint16_t, uint8_t, qidx_t); +static int igc_isc_rxd_available(void *, uint16_t, qidx_t, qidx_t); -static int igc_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri); +static int igc_isc_rxd_pkt_get(void *, if_rxd_info_t); -static int igc_tx_ctx_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); -static int igc_tso_setup(struct tx_ring *txr, if_pkt_info_t pi, - uint32_t *cmd_type_len, uint32_t *olinfo_status); +static int igc_tx_ctx_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); +static int igc_tso_setup(struct tx_ring *, if_pkt_info_t, uint32_t *, + uint32_t *); -static void igc_rx_checksum(uint32_t staterr, if_rxd_info_t ri, uint32_t ptype); -static int igc_determine_rsstype(uint16_t pkt_info); +static void igc_rx_checksum(uint32_t, if_rxd_info_t, uint32_t); +static int igc_determine_rsstype(uint16_t); -extern void igc_if_enable_intr(if_ctx_t ctx); -extern int igc_intr(void *arg); +extern void igc_if_enable_intr(if_ctx_t); +extern int igc_intr(void *); struct if_txrx igc_txrx = { .ift_txd_encap = igc_isc_txd_encap, From nobody Mon Oct 21 15:47: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 4XXKSC0wMqz5ZRXh; Mon, 21 Oct 2024 15:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXKSC0MHDz4tZV; Mon, 21 Oct 2024 15:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YwC8n1jBgBPV7A1/azSX4ydW2jYMpfv8mwbjdbnzTi4=; b=r5so6X5fBfErbzV8HV05kly6F+Oke9uP6MPd42vbPmvjP0ApLSHvW9wgKmyD0cB+3Y8pOg kALTEBrNAjqXslXfI30sNt0/e6eFcHHop7wCNjqT8dwV62MFk+V0ytWdj3g0nGGyfHurUh PEUZbtJUBgckhMsjMYcbUSV6eK9noF9cOwocGhDA9aedgS5ga2YpbN5vO+Clip4i4hJ7mt gRmIfm9orReLX3rBHSrPbKm1RNCcTASESzDroTqzg5bQcLEuSpMg/ZlKNOP0PKTPV8hBYI CRRtVnnbzpEkA4LXBKZPDTGEXZmbbCHWRiheic54trNaraChwqqkdHAh1PSQ9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YwC8n1jBgBPV7A1/azSX4ydW2jYMpfv8mwbjdbnzTi4=; b=h/MwoWbz/ZXZQeGLf4asKLcMcHWOUCUgwKXfSi8sNxogkolJ2ynjdhl79/PrIbOS0u8SNJ acoBX70ehCw0SHVl2K3yFrpAjgdL/v4L5l/JLYMTI5aRAxmSzQSALRthQnyltFJalRv0Us bODDKAqkYT6GTBJ/4tbqdL0ZMSjRqCqmAhT4ZTCAk8XAOihm1fnJTmRd8RpyJiY5R8AyaR B9i+vSTlAJwuWaLonIIYW25Je3Xqg1vak0MQjhKNl749KbK/UyysLbgBABXN1VWNT5XSoT Pac3JG4AaC/y/ZuEazmKoAGIl+MgcAXKG0czs3WGv7Lh0a/9JfUShN+YublTsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525627; a=rsa-sha256; cv=none; b=xL4zCdRPrtjOJuir+DL013IqcHEExFldW3Mpzodjp0VjWdAlOFCsJ7jHRfkgbS2ccElCOW OsmNl3Y8E+yvERQDOe8iasPHjGngrrjU5qLVL3dE4QqLBNqmK1rnSKSHX8EnsQvUrxzLXT nZVWkql27HfZb/cf2rrRprOWQYcn/T+GFDcmdBbBMg0eB+7O0Qt10/7Iw0/mflnLUVnpRt SRqx7fmp8XTgLnKpoWJi375NISwgxcMQvw12EB38t2Y0HQtn9cRcP8ArcDZ97qWtM75dZL grjjTC92GPmZagoId1VQ+210bXUfk11u3wjgPPops5EwYv7CiJcbwoowH8bBxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXKSB74rkzbvq; Mon, 21 Oct 2024 15:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFl6vb021815; Mon, 21 Oct 2024 15:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFl69f021812; Mon, 21 Oct 2024 15:47:06 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:47:06 GMT Message-Id: <202410211547.49LFl69f021812@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: 85f889aa9cda - stable/14 - freebsd-update(8): Explain conflicts in /etc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 85f889aa9cdad831a68b42050d1adb47d4eb960d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=85f889aa9cdad831a68b42050d1adb47d4eb960d commit 85f889aa9cdad831a68b42050d1adb47d4eb960d Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:46:41 +0000 freebsd-update(8): Explain conflicts in /etc Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 (cherry picked from commit a8c1ffca7a594733a91c1513d0185be174d1115f) --- usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 0d50ac8822de..1960b0ee95fe 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -264,3 +264,12 @@ required. .Xr nextboot 8 .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org +.Sh BUGS +In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in +.Pa /etc/ +will conflict with an available update, then +.Nm +will make no attempt to merge. +Instead: +.Nm +will print a list of affected locally-modified files. From nobody Mon Oct 21 15:47: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 4XXKSD2fx4z5ZR12; Mon, 21 Oct 2024 15:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXKSD1Km9z4tWy; Mon, 21 Oct 2024 15:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjalPciVCQZ/fWj5KSeRgCHBi7zTLso9ZisLZBNvA90=; b=HBrWhA54GThFlPJPtdITWvCBauJTRu2AxibyPK443onvZYjhkIYdomXpTCO7tHA9bgHEvD lZAJGH3b0acgMbvSK+aN2BsffYu6Waj2lP8W17vpiPdNrsCBttkK8PVb4JKJCG6U0/tMjZ YmiqAIBH3FYGq6Bpli9SqRx/UnWtHUXxhgFLhzeslIRQkXLh045Fuo/YSMX407CZGS68P/ LVoawWGErqZNHTeOrSK/pSwK5BZa+tgydoaz52VcVta0CoO8y0WL4nd9DINnS5Ju6mb3RU FClcg/Ao1cJtV6VMIwkFoRr4ifquGHgXrOwxnqLcGFOp8ESmQX9fFJFWTtiIdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjalPciVCQZ/fWj5KSeRgCHBi7zTLso9ZisLZBNvA90=; b=JDL/VcdXtdzQvyp1M6ipYAF2ag4lH+tKD1Qqb6gfTdD0FsAZu5bq1qHPfAKUUH+/C6RDEP UR49Zbi6eVnrnlDXbLqPX5Hg4dkpw9+Wc+L1ypHsCNjY6M/Oyj2qvgtOJyOXNNOkreoUO9 PSLokZtpvP39/id5TCs5QYH+uoQiMypdWIekG84FhfeOmdIneZCrbja9KK7fmrPeTBRnpd g+4+ZkIbLt5u028CIS8UPNmUMruG4Q5aDV6dx8DBCj0hPKWhuEEYMg5TYiPYC4DT8MiXNO AVEHAwrDj0jB9W1A3w+Mv8cQlZ0uaP2/K6KWTxjrOp645kJZGUSk6dF4tV2Low== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525628; a=rsa-sha256; cv=none; b=vBMTVZKaCALjtFl17oVLqSU5eOBopdTLa/yQWJLO14dszLAwXTHcIWnQN2Wvrl0hVX8Rzg YFPOF9tji0P5eIVOBfmoXAV82u1m8D9T4oNEUMxFEIwklAOkY21ju0Z720rro8njXWiFVK FoW8Zc1fQcElLvfV5Dv2Wbw/gzvs9r+oa6os/iTHKN2UXn63NoYVhkfv/U2pU0AEdqWgWI 9DFBDVEHfRGdLASGQcnTyxTHbpREzhZIy+TLlSF638SoEOnwoH6/rNzwqixMltreEnu/5D 2Pu7tNS7yI8DeDHbWPsI7FjMCh3lSqmy3535DLgEZKtabXQ5T3O6xURFpmRc9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXKSD0x5CzbWN; Mon, 21 Oct 2024 15:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFl8fP021860; Mon, 21 Oct 2024 15:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFl800021857; Mon, 21 Oct 2024 15:47:08 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:47:08 GMT Message-Id: <202410211547.49LFl800021857@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: e18ba5c5555a - stable/14 - freebsd-update(8): wrap to 80 columns List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: e18ba5c5555a52e5603f0ce1f76b63f1ffe4b645 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e18ba5c5555a52e5603f0ce1f76b63f1ffe4b645 commit e18ba5c5555a52e5603f0ce1f76b63f1ffe4b645 Author: Graham Perrin AuthorDate: 2023-08-20 10:01:05 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:46:41 +0000 freebsd-update(8): wrap to 80 columns Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 (cherry picked from commit 4c1c516c1a0760de2c86c073e8e74e297a71b088) --- usr.sbin/freebsd-update/freebsd-update.8 | 62 ++++++++++++++------------------ 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 1960b0ee95fe..024185198342 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -82,8 +82,7 @@ e.g.: .Pp In particular, the .Fx -Security Team only builds updates for releases shipped in binary form -by the +Security Team only builds updates for releases shipped in binary form by the .Fx Release Engineering Team. .Sh OPTIONS @@ -149,8 +148,8 @@ from or similar using this flag, see: .Nm Cm cron .It Fl -currently-running Ar release -Do not detect the currently-running release; instead, assume that the -system is running the specified +Do not detect the currently-running release; instead, assume that the system is +running the specified .Ar release . This is most likely to be useful when upgrading jails. .El @@ -160,28 +159,26 @@ The can be any one of the following: .Bl -tag -width "rollback" .It Cm fetch -Based on the currently installed world and the configuration -options set, fetch all available binary updates. +Based on the currently installed world and the configuration options set, fetch +all available binary updates. .It Cm cron -Sleep a random amount of time between 1 and 3600 seconds, -then download updates as if the +Sleep a random amount of time between 1 and 3600 seconds, then download updates +as if the .Cm fetch command was used. -If updates are downloaded, an email will be sent -(to root or a different address if specified via the +If updates are downloaded, an email will be sent (to root or a different +address if specified via the .Fl t option or in the configuration file). -As the name suggests, this command is designed for running -from +As the name suggests, this command is designed for running from .Xr cron 8 ; -the random delay serves to minimize the probability that -a large number of machines will simultaneously attempt to -fetch updates. +the random delay serves to minimize the probability that a large number of +machines will simultaneously attempt to fetch updates. .It Cm upgrade Fetch files necessary for upgrading to a new release. -Before using this command, make sure that you read the -announcement and release notes for the new release in -case there are any special steps needed for upgrading. +Before using this command, make sure that you read the announcement and release +notes for the new release in case there are any special steps needed for +upgrading. Note that this command may require up to 500 MB of space in .Ar workdir depending on which components of the @@ -192,19 +189,15 @@ Check if there are fetched updates ready to install. Returns exit code 2 if there are no updates to install. .It Cm install Install the most recently fetched updates or upgrade. -Returns exit code 2 if there are no updates to install -and the +Returns exit code 2 if there are no updates to install and the .Cm fetch -command wasn't passed as an earlier argument in the same -invocation. +command wasn't passed as an earlier argument in the same invocation. .It Cm rollback Uninstall the most recently installed updates. .It Cm IDS -Compare the system against a "known good" index of the -installed release. +Compare the system against a "known good" index of the installed release. .It Cm showconfig -Show configuration options after parsing conffile and command -line options. +Show configuration options after parsing conffile and command line options. .El .Sh TIPS .Bl -bullet @@ -216,17 +209,15 @@ If your clock is set to local time, adding the line to .Pa /etc/crontab will check for updates every night. -If your clock is set to UTC, please pick a random time -other than 3AM, to avoid overly imposing an uneven load -on the server(s) hosting the updates. +If your clock is set to UTC, please pick a random time other than 3AM, to avoid +overly imposing an uneven load on the server(s) hosting the updates. .It In spite of its name, .Nm -IDS should not be relied upon as an "Intrusion Detection -System", since if the system has been tampered with -it cannot be trusted to operate correctly. -If you intend to use this command for intrusion-detection -purposes, make sure you boot from a secure disk (e.g., a CD). +IDS should not be relied upon as an "Intrusion Detection System", since if the +system has been tampered with it cannot be trusted to operate correctly. +If you intend to use this command for intrusion-detection purposes, make sure +you boot from a secure disk (e.g., a CD). .El .Sh ENVIRONMENT .Bl -tag -width "PAGER" @@ -265,7 +256,8 @@ required. .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org .Sh BUGS -In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in +In patch level situations – for example, 13.2-RELEASE-p1 up to +13.2-RELEASE-p2: if any previous modification to a file in .Pa /etc/ will conflict with an available update, then .Nm From nobody Mon Oct 21 15:48: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 4XXKVJ3y7Mz5ZRF0; Mon, 21 Oct 2024 15:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXKVJ319Wz4vKC; Mon, 21 Oct 2024 15:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4NSgPJCWkC5UtL6f+88Qc6FsqBIVhOZrkfwWfvbKsc=; b=buaKiOIKIvWV7a9A0JMuIYIH1vswboh7JCMxmLtgNyYDY7ouJwrmrLG9RMSNPwG2IJL4o9 HQDuXzmlFcnjBLJPCGgpxQmRmf1sbwZpu8M9PMvikuPNhq5nI6Qalj7bnbfHvsTqaFMuas nHLTWpRWN1pqRQBZkPLoC8Q9Acv3HGAOQnIZ3/LDiFVLM8Wfy3nobvn/NM7tsvl1VXkR7+ CvcZwjQdh9ryxTK3sM36F5yCXJssn6x+h3cWYxWtzci8b3fbEAR502gRsJU7CxRwnum5pY DaQZjm4YrOXSFDJzYVIpFNWR6yCDpHUWTPK03IxFHVlUJojaAVA8j4m980R0rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4NSgPJCWkC5UtL6f+88Qc6FsqBIVhOZrkfwWfvbKsc=; b=ng6g9TFSJFHt2nz8y/CdgKJsq4xJoatyHR7GXz/QpCZRY2XIv/1tGa9ERTycvPdUqjq534 VUpBeSOtPg+Xt2wgpY1vLQNthFxy9fuLy2JVG2QWbqdkXiso2jChVPz3gi/fQwBPVMeeeG pVw9wocbGn179CE0BCYlklD0b4p5f5KnNyJnhxyRKJreBAY/d63iy+khk2rTif0vJvr0VN 1Oe5G0UF7bhdv91wbqDBWyAG+fG9ZP/kU6hX4fHeArKb/ATQzXr0DdhEVcoJ5u0b+csJdS 5Whl6r1L7Eo9SmYrECMAeEf+v939WMgEriqN0wej2WgbV+A1QtOaf6FXa2HU3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525736; a=rsa-sha256; cv=none; b=yjj3MNeZvhziY4h7DKoDknQDpgVF8wwoiFdAlOACjOJHKl8AE40UejFDZ/uSadIq1EA562 0zygSNQfkbiw/yZ/N4Ghz7MeJ4OCmj1kALaB6bPPOVHitbkLQikTG7/wLyNXpLCRIJKghZ dAMmkZpyisasf1Uujshx0eUx/TVoiJazLY77Z7ESNgn7qmMrqEoQyi/07/fzgldlfITlWm ix7drPSerenNC5HUOlSgWPw9lSG5PKlpFUsINyvJQMqF1YG6O2ZHYNbBnuHMPDf+spJtdc KmPgNySVyyLwkDtK7lrwl/vS4KmcUZJhHaPBE1vx5zgz23ZD2elA1bKtw0Jr1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXKVJ2PRczbhy; Mon, 21 Oct 2024 15:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFmu35022552; Mon, 21 Oct 2024 15:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFmuYJ022549; Mon, 21 Oct 2024 15:48:56 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:48:56 GMT Message-Id: <202410211548.49LFmuYJ022549@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: b9c3f49fac75 - stable/13 - freebsd-update(8): Explain conflicts in /etc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b9c3f49fac756f98555c516b54b680c625becb61 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c3f49fac756f98555c516b54b680c625becb61 commit b9c3f49fac756f98555c516b54b680c625becb61 Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:48:45 +0000 freebsd-update(8): Explain conflicts in /etc Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 (cherry picked from commit a8c1ffca7a594733a91c1513d0185be174d1115f) (cherry picked from commit 85f889aa9cdad831a68b42050d1adb47d4eb960d) --- usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 0d50ac8822de..1960b0ee95fe 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -264,3 +264,12 @@ required. .Xr nextboot 8 .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org +.Sh BUGS +In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in +.Pa /etc/ +will conflict with an available update, then +.Nm +will make no attempt to merge. +Instead: +.Nm +will print a list of affected locally-modified files. From nobody Mon Oct 21 15:48: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 4XXKVK6CTYz5ZRCb; Mon, 21 Oct 2024 15:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXKVK4Jlyz4vMC; Mon, 21 Oct 2024 15:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejnsguXa12PqbsRpALWBk73cqwZuF8zfC9fzKZsNTH8=; b=GKbc+H5WDZXFDoIRjAo2TL09me9SSpucp/dSeE1ixOCxYn4nlWdqYW98tA/WfP5EE709cM EHHSVtzStMnffiPMeaUDlq0VqMnpYt4imgM/ArM4Tg7hKak9Nmj/Kv+vsQEQNyVHOeCGZX u3xF8BNuCt1pHFnKQ/9z6BqZFNW3ovho1kV/3N2fgCiPUsVcaQkZ25XhScmh76mLADfXyo uuYVxBokWHIfWz8VJKM9kA2OXmmGAgGm6QjIjRXnF2p9IKtlSWXapFqNTDjUXElgWDjIdR 0EyovIy8rrS/fomF+PdwTc09XuF6qFacZl9EMQsm1Utu3fJQYUUmhqlmudpHKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729525737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejnsguXa12PqbsRpALWBk73cqwZuF8zfC9fzKZsNTH8=; b=Hg0FNuQk+x7xRpTXahtKDJxbEtuAfYb0jb0YDM9r9AjKRv7pAX1xoQAxhlnmGaFGJyIBjZ xYYisb8yO97Rf77pjcwNkYHBbhR+SDbStp2O/+rVNIu95D7JuKzOQ329EB405cyt5PhyjJ IUBcDo3ORDvB0oXGW9enBKqKa3n9ls9bFBTvOdJ4GF6waBjr7cATDEbp/boaENhc4EeuCJ +4Gp6GSsfAk4Z2Xj6E8tNfMfQMvSifU6jfXbE4oqnjL8J/QX9zH3RJD86C8pAakeMHAcHx iaSiyb+IhQGHSQMx45mriI29R6GHa/iQod67kOt/KOoQsH+KPXc5o6f/fkNsDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525737; a=rsa-sha256; cv=none; b=sLS/eFYhHELR5s2yyxMVz27uysGpReZiFT7x5Aa8MvDTN2PkECr7OHElN551zU8WudKYdh nT9Z9ZyqLj02QPTl2ejBQzM7NSrsRsG+qe2f1LgLJpYlKtpz8V2ZniqnejuR1hXxPBjYSh pdABTuBunfsKqYquFWv46RBXNuJPZslhPDnnwvn5clDsPizJSY+VFANQKk8EGF6ffom+FW fH+yIixtsuIPv1VCZDsbY1bqW8WvVujYdTH37GYEYnVvmgSWeXg14/tG0d6qQ+uNmFSqqb 002YktPwg90uMkrjeaAS3wbDFRarDk1kgNCx2CJpKMoZ+h1U2xyOyaWMj7hOlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXKVK3Dd9zcDm; Mon, 21 Oct 2024 15:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LFmvV3022596; Mon, 21 Oct 2024 15:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LFmvf4022593; Mon, 21 Oct 2024 15:48:57 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:48:57 GMT Message-Id: <202410211548.49LFmvf4022593@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: 9db8fd4c2adc - stable/13 - freebsd-update(8): wrap to 80 columns List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9db8fd4c2adc9544e7bb2a5faccc90c99cdc2305 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9db8fd4c2adc9544e7bb2a5faccc90c99cdc2305 commit 9db8fd4c2adc9544e7bb2a5faccc90c99cdc2305 Author: Graham Perrin AuthorDate: 2023-08-20 10:01:05 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:48:45 +0000 freebsd-update(8): wrap to 80 columns Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 (cherry picked from commit 4c1c516c1a0760de2c86c073e8e74e297a71b088) (cherry picked from commit e18ba5c5555a52e5603f0ce1f76b63f1ffe4b645) --- usr.sbin/freebsd-update/freebsd-update.8 | 62 ++++++++++++++------------------ 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 1960b0ee95fe..024185198342 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -82,8 +82,7 @@ e.g.: .Pp In particular, the .Fx -Security Team only builds updates for releases shipped in binary form -by the +Security Team only builds updates for releases shipped in binary form by the .Fx Release Engineering Team. .Sh OPTIONS @@ -149,8 +148,8 @@ from or similar using this flag, see: .Nm Cm cron .It Fl -currently-running Ar release -Do not detect the currently-running release; instead, assume that the -system is running the specified +Do not detect the currently-running release; instead, assume that the system is +running the specified .Ar release . This is most likely to be useful when upgrading jails. .El @@ -160,28 +159,26 @@ The can be any one of the following: .Bl -tag -width "rollback" .It Cm fetch -Based on the currently installed world and the configuration -options set, fetch all available binary updates. +Based on the currently installed world and the configuration options set, fetch +all available binary updates. .It Cm cron -Sleep a random amount of time between 1 and 3600 seconds, -then download updates as if the +Sleep a random amount of time between 1 and 3600 seconds, then download updates +as if the .Cm fetch command was used. -If updates are downloaded, an email will be sent -(to root or a different address if specified via the +If updates are downloaded, an email will be sent (to root or a different +address if specified via the .Fl t option or in the configuration file). -As the name suggests, this command is designed for running -from +As the name suggests, this command is designed for running from .Xr cron 8 ; -the random delay serves to minimize the probability that -a large number of machines will simultaneously attempt to -fetch updates. +the random delay serves to minimize the probability that a large number of +machines will simultaneously attempt to fetch updates. .It Cm upgrade Fetch files necessary for upgrading to a new release. -Before using this command, make sure that you read the -announcement and release notes for the new release in -case there are any special steps needed for upgrading. +Before using this command, make sure that you read the announcement and release +notes for the new release in case there are any special steps needed for +upgrading. Note that this command may require up to 500 MB of space in .Ar workdir depending on which components of the @@ -192,19 +189,15 @@ Check if there are fetched updates ready to install. Returns exit code 2 if there are no updates to install. .It Cm install Install the most recently fetched updates or upgrade. -Returns exit code 2 if there are no updates to install -and the +Returns exit code 2 if there are no updates to install and the .Cm fetch -command wasn't passed as an earlier argument in the same -invocation. +command wasn't passed as an earlier argument in the same invocation. .It Cm rollback Uninstall the most recently installed updates. .It Cm IDS -Compare the system against a "known good" index of the -installed release. +Compare the system against a "known good" index of the installed release. .It Cm showconfig -Show configuration options after parsing conffile and command -line options. +Show configuration options after parsing conffile and command line options. .El .Sh TIPS .Bl -bullet @@ -216,17 +209,15 @@ If your clock is set to local time, adding the line to .Pa /etc/crontab will check for updates every night. -If your clock is set to UTC, please pick a random time -other than 3AM, to avoid overly imposing an uneven load -on the server(s) hosting the updates. +If your clock is set to UTC, please pick a random time other than 3AM, to avoid +overly imposing an uneven load on the server(s) hosting the updates. .It In spite of its name, .Nm -IDS should not be relied upon as an "Intrusion Detection -System", since if the system has been tampered with -it cannot be trusted to operate correctly. -If you intend to use this command for intrusion-detection -purposes, make sure you boot from a secure disk (e.g., a CD). +IDS should not be relied upon as an "Intrusion Detection System", since if the +system has been tampered with it cannot be trusted to operate correctly. +If you intend to use this command for intrusion-detection purposes, make sure +you boot from a secure disk (e.g., a CD). .El .Sh ENVIRONMENT .Bl -tag -width "PAGER" @@ -265,7 +256,8 @@ required. .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org .Sh BUGS -In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in +In patch level situations – for example, 13.2-RELEASE-p1 up to +13.2-RELEASE-p2: if any previous modification to a file in .Pa /etc/ will conflict with an available update, then .Nm From nobody Mon Oct 21 18:18: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 4XXNps2Ykwz5Zc0c for ; Mon, 21 Oct 2024 18:18:29 +0000 (UTC) (envelope-from pfg@freebsd.org) Received: from sonic322-56.consmr.mail.ne1.yahoo.com (sonic322-56.consmr.mail.ne1.yahoo.com [66.163.189.31]) (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 4XXNpr2QFSz4Ckr for ; Mon, 21 Oct 2024 18:18:28 +0000 (UTC) (envelope-from pfg@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=mX42J68E; spf=softfail (mx1.freebsd.org: 66.163.189.31 is neither permitted nor denied by domain of pfg@freebsd.org) smtp.mailfrom=pfg@freebsd.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1729534706; bh=ZnUHvfpPOeXwjkMCG7jqKH/HOLS/R+7CxSd+mtt+fuk=; h=Date:From:To:Cc:In-Reply-To:References:Subject:From:Subject:Reply-To; b=mX42J68EYDlSwtcnrB+IgjY5H1Xzu5KB+637Yxb0XgF6A6/9qv/gLBKN0q88K6jhin+WQpVSjxXaIW4EjPA32CE8EDRF1iZQJ4QK7V0OsDY9JFD6ijaNgplHGdoprlxS0yNFiH276SQZHCoHgOYbf8NCuSgGqbjadVQsLDDxFA0XxK/jPKnbuwvlhg7NMr2Zfwh3f2ZqDaoSBfs5WDktniHNRBflojJFtS+fwcj4MO45k6qsl9mbslJij/EWh3S9LUqOYwafnBXGByBobY0mZOw4NdaA+kx0Cn02wjmacokDp7BPMgxClaneKwTwtV9b1LrfQW09q/wA4ttVWWaPYg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1729534706; bh=COuYO2IMOiGWdDCuJ/pv4Nkjw8MAMazTU6Ds0IMXE2N=; h=X-Sonic-MF:Date:From:To:Subject:From:Subject; b=O1a3xrJIGUSv0FWKHUntZsfg3Eb5qX4fF9cGgem2PhI4vIor4qe6+XfzTvmLiT6Z3PHZe3NI5l55c97Mmf8jCz7VTFwFC5u+x1gFWxIWXHDPvkokeji2W9wSyeXAnGuj9dA+NUVw5HynYUS47RHoi+sOwVTCZNO3Mi42M2IE2dkpp/27wJMWHE8s2eKA8mIa8FvjcDannlMhw3ZWRrVC9Kq8pjFgX574o62rEc698TDv1PZZn+GzlmHqPd4JWLLdfTlx7S2wwYRABsM+PW6r/B9J/qfRbqqlc6BrSHlLoXi1E8uaSwjgvInHpxZOVLluPCQ6zsPi2p9HnKSVDFQ76g== X-YMail-OSG: HAfTTBcVM1niQOQ3sY5niWWYuf1lt9X3NPsez4IU8nVR517_2sT6snOrAgiEfQY escppGEZuaF_f.9EQ3aU0nRWSnhHt5PcMQBF6nbiYw_qq.oUnJV73nL45hMC73dMNvANq_rCG.wX pQWoGZo6PwCs1sd.z0eSVePbEqv5vkVY1hmXpIA8Kwwqgs11vHpzH6i_StUb5HX7fUMGYiNQVDcV Lw3gwJLDurwW8s4ea3zr54WYl4KoLvEE_QiBhPfEOwcoDd6cAGNcIxF9s96dCTBEJ0I7ePbWOGFu pnfoQxGvnhVlpaoehyoFw29zvYdOI1UusRPaI5BI7HZILHJ2CO61TdP8YVMvDRSpmUQfMTZJTewS xr1QeOA606.VEwmfiIYarBRFTQVxor8fNYs7NrGBXwWSqcfrm8Bnr8EA1tRA9d8B0_XnimLzZGuV XByuTLCVDZGkhtQiS9v6giR_zj4eRdgcEY160JR.vcyQA9mTr7rB3T0_uCf0LTTGDICopdtXqj2H usOoSf811lfgRSrBxoH_DRi4.ad_rQUQ8R3ycgKaGDL2CqStyqVeWyJAx.FjNRLBfoqcGOWL_Az. kr.ZryIiadG.BWvMnS7Ti1Gs_dWRO.02xpCRs2rjoXPSA0u2Zk7RhgOlkAsnN4d6F_nPKrqLlCOZ Dekzv.mvr1THfyFTusfEU3EoY88Zt9y98TDMhg0mSltG2wIO5oRspfosr_1Qkq0PQK0HNxHrzPZv yK2W2fDcFbg2L4REccnz.LCDKRcGQe8GDdMJn0o0z0ufP34txPEFiE_MUmkwMrR02zUdae3_EmSW 9pLFCZwY99U10vXXoE3Yc4TQLJGt2JWlUZyOC2iu0cI0OK4xtGTgEvjTxLZxXX.R1qptTk3DGV06 aLKcHVZ..K1.1glVU19QOxF1wwaes3SPDE.dfv5hDDTT0HLWITt81MBJZoFWZX7xzGfzCzvdOc4c 6ZKIQMqSuJEl27_rLshdX4LFYKOg4OkfFR6p7rzKTZoad_U1p0ClPM0eskycIEt4wE1dvEXIVaYC 18cLOVCM1orkoszIrreHVhpUiS1OwIQ6Rxg5bu.rINd6lWmjg2emPO0spYhPrxDY63uadmFGVp1g T0bjjzQuPmfdx5uP3BKASescPlwvRY_3LRSEz49y9fEuZ4a_xPOqBcchBgwUAWlhlLcxMX8vmsIp 3VBrt4J.IUhr3ljoGiJVZh0.ZbfzyQjsHMfHtz0NJMkIw6L79ls9dcJ9yYrksnSKl2_1neuAEZRg wqnhYkKqTJwMyUMp0KN.20Ado59Lx33q0NSSMrgC7jN7MwotaSfF45yiib_2vwnLVd8fQvBw1qkM 0U.q2IWidh3gXN2EOE8ku5DR9H2UG5JyaUh0YZzWbF973minZ4c.q2qwIbnLF9wx0Na2twbuxttw wsZlgo_TiZGHeht1CYPVDD0sHaxdLlFmsVhuSdhqbLgkzEHcbRfILytV0oqdQg8TWPoyrrh3_vrk MrcTjRdSP7gM2cYyjRBXjmnjTEBQc6zQzMTuniaZDHfjUB_iN0cQRz.Sz37qEdFdy31iJqv5kZrp qpLJLZASNoVxdA0KFoE1Tumjnl6IhqcfJGiU6D5ZL2fEkOlf1tgv7BrGot.jcvWBrbT7nG2YKWTq lRZgIkFyZx5qZWom_FG7zgrzk2GcCCc9Oo48iYuZ2a9KdfWXsWmcfJJmAk9yUHcJ0tYso5d10xPm KzznakaGbSU0fgX5hs5YvaREvP8qUbfgYi5_LOqjrjc_M16mXeFIDGYVnbmAeqaykgsj8dLMpbeB AFg5FuBeb1Wzj4abSFSuiPT_Cx912KUgTC5lnNMdd6dK2_BQxlV8uYO1SimDRYs2pCT8Pb3lPmRB wchXbXNbDeH3BzxkQg25foeA8AVDhWNLAKP6i9HSi5xzMxOhaE2zu4GWso.nmUB7zlGFH6Y1S83V 1jsOIpyxcIMtJ8DZsRWdVjNRFKTOhlfxjdnI6JSoqOECH62apSodQ8OAsJx04bizQhaRRRayiew5 _1IDTF7Lv_qbiGwUPBWVpHliHX0f552BnyfXyK3hjXlKKlV73UO9f8VlmIWABeYy73z5BXEh5lRl gnP_CWJs_zSCIksZNaUS.1zcjSntYln_5mfPdA_.S3jVQvFOOWPPknbp0MnI2kun96AhT6KfDJ79 zD4N0otehy2ibwucqbMPeYgyTWajHmXdgqM5P3DaaNQN0lGrEH4ZjSm3S5s7qbgxKkW.Y9nw2vtx aUjbikR1Iw9vf2msm X-Sonic-MF: X-Sonic-ID: d0dcd9e7-ffa8-4b78-891d-626e07def985 Received: from sonic.gate.mail.ne1.yahoo.com by sonic322.consmr.mail.ne1.yahoo.com with HTTP; Mon, 21 Oct 2024 18:18:26 +0000 Date: Mon, 21 Oct 2024 18:18:23 +0000 (UTC) From: Pedro Giffuni To: "maxim@freebsd.org" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-ID: <1791968192.4471640.1729534703845@mail.yahoo.com> In-Reply-To: <39113afb-66e8-da08-14ab-83564c1271b2@maxim.int.ru> References: <202410161840.49GIe8CR000407@gitrepo.freebsd.org> <39113afb-66e8-da08-14ab-83564c1271b2@maxim.int.ru> Subject: Re: git: b88df1e893c4 - main - Reapply "sbin/ping: allow normal users to specify larger packets" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_4471639_1666353488.1729534703844" X-Mailer: WebService/1.1.22806 YMailNorrin X-Spamd-Result: default: False [-3.20 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : No valid SPF, DKIM not aligned (relaxed),none]; RCVD_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:36646, ipnet:66.163.184.0/21, country:US]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[66.163.189.31:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEFALL_USER(0.00)[pfg]; RWL_MAILSPIKE_POSSIBLE(0.00)[66.163.189.31:from]; FROM_HAS_DN(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; TO_DN_EQ_ADDR_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+] X-Rspamd-Queue-Id: 4XXNpr2QFSz4Ckr X-Spamd-Bar: --- ------=_Part_4471639_1666353488.1729534703844 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sorry ... I completely missed this was causing any trouble. My filters threw the repl= y into a folder that I don't look at regularly. Thanks to markj@ for backing it out.=C2=A0 Pedro. On Friday, October 18, 2024 at 02:41:12 PM GMT-5, maxim@freebsd.org wrote: =20 =20 Hi Pedro, Unless you have a plan to address this issue please backout this code as it is clearly wrong. Thanks, Maxim On Wed, 16 Oct 2024, 19:04-0000, Maxim Konovalov wrote: > Hi Pedro, > > No, this is not right.=C2=A0 Let me clarify: > > (1) I never told that there are any issues with the tests.=C2=A0 I just > mumbled that the tests should catch such regression though I never > checked if they actually did. > > (2) The MAXPAYLOAD calculation in the code below is not fully correct. > > It should be > > 65535 - 20 (ip header) - 8 (icmp part) =3D 65507 without IP options > > OR > > 65535 - 20 (ip header) - 40 (ip options) - 8 (icmp part) =3D 65467 with > IP options, ie. whenever you run ping -R. > > The code below hardcoded the latter value which is simply wrong. > > I wouldn't rely on the fact that you get it from other BSD flavours > and would recommend to have this code reviewed before committing it. > > Maxim > --=20 Maxim Konovalov =20 ------=_Part_4471639_1666353488.1729534703844 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Sorry ...

= I completely missed this was causing any trouble. My filters threw the repl= y into a folder that I don't look at regularly.

Thanks to= markj@ for backing it out. 

Pedro.

=20
=20
On Friday, October 18, 2024 at 02:41:12 PM GMT-5, m= axim@freebsd.org <maxim@freebsd.org> wrote:


=20 =20
Hi Pedro,

Unless you have a plan to address this issue please backout this = code
as it is clearly wrong.

Thanks,

Maxim
On Wed, 16 Oct 2024, 19:04-0000, Maxim Konovalov wrote:
> Hi Pedro,
>> No, this is not right.  Let me clarify:
>
> (1) I never told that there are any i= ssues with the tests.  I just
> mumbled that the = tests should catch such regression though I never
> ch= ecked if they actually did.
>
> (= 2) The MAXPAYLOAD calculation in the code below is not fully correct.
>
> It should be
>= ;
> 65535 - 20 (ip header) - 8 (icmp part) =3D 65507 w= ithout IP options
>
> OR
>
> 65535 - 20 (ip header) - 40 (ip optio= ns) - 8 (icmp part) =3D 65467 with
> IP options, ie. w= henever you run ping -R.
>
> The = code below hardcoded the latter value which is simply wrong.
>
> I wouldn't rely on the fact that you get it= from other BSD flavours
> and would recommend to have= this code reviewed before committing it.
>
> Maxim
>

--
Maxim Konovalov
<= /div>
------=_Part_4471639_1666353488.1729534703844-- From nobody Mon Oct 21 18:21: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 4XXNtb01HNz5Zc7s; Mon, 21 Oct 2024 18:21:43 +0000 (UTC) (envelope-from maxim@freebsd.org) Received: from maxim.int.ru (maxim.int.ru [167.71.75.67]) (using TLSv1.3 with cipher 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 "maxim.int.ru", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXNtZ4Sz9z4Cxd; Mon, 21 Oct 2024 18:21:42 +0000 (UTC) (envelope-from maxim@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from localhost (maxim@localhost [127.0.0.1]) by maxim.int.ru (8.17.1/8.17.1) with ESMTPS id 49LILe3M079848 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 21 Oct 2024 18:21:40 GMT (envelope-from maxim@freebsd.org) Date: Mon, 21 Oct 2024 18:21:40 +0000 (UTC) From: Maxim Konovalov To: Pedro Giffuni cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: b88df1e893c4 - main - Reapply "sbin/ping: allow normal users to specify larger packets" In-Reply-To: <1791968192.4471640.1729534703845@mail.yahoo.com> Message-ID: <1e630992-e41c-2edd-ef48-61396146f72c@maxim.int.ru> References: <202410161840.49GIe8CR000407@gitrepo.freebsd.org> <39113afb-66e8-da08-14ab-83564c1271b2@maxim.int.ru> <1791968192.4471640.1729534703845@mail.yahoo.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT 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:14061, ipnet:167.71.64.0/20, country:US] X-Rspamd-Queue-Id: 4XXNtZ4Sz9z4Cxd X-Spamd-Bar: ---- Hi Pedro, No worries at all! Maxim On Mon, 21 Oct 2024, 18:18-0000, Pedro Giffuni wrote: > Sorry ... > I completely missed this was causing any trouble. My filters threw the reply into a folder that I don't look at regularly. > Thanks to markj@ for backing it out.  > Pedro. > On Friday, October 18, 2024 at 02:41:12 PM GMT-5, maxim@freebsd.org wrote: > > Hi Pedro, > > Unless you have a plan to address this issue please backout this code > as it is clearly wrong. > > Thanks, > > Maxim > > On Wed, 16 Oct 2024, 19:04-0000, Maxim Konovalov wrote: > > > Hi Pedro, > > > > No, this is not right.  Let me clarify: > > > > (1) I never told that there are any issues with the tests.  I just > > mumbled that the tests should catch such regression though I never > > checked if they actually did. > > > > (2) The MAXPAYLOAD calculation in the code below is not fully correct. > > > > It should be > > > > 65535 - 20 (ip header) - 8 (icmp part) = 65507 without IP options > > > > OR > > > > 65535 - 20 (ip header) - 40 (ip options) - 8 (icmp part) = 65467 with > > IP options, ie. whenever you run ping -R. > > > > The code below hardcoded the latter value which is simply wrong. > > > > I wouldn't rely on the fact that you get it from other BSD flavours > > and would recommend to have this code reviewed before committing it. > > > > Maxim > > > > -- Maxim Konovalov From nobody Mon Oct 21 18:39: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 4XXPGb4Yy2z5Zd1l; Mon, 21 Oct 2024 18:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGb3YD1z4Fcj; Mon, 21 Oct 2024 18:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PxMWUvEJqbaGZyCsL2WOf8SICL93lvwzjktg5MtJjUc=; b=Abuq9/jQpJS+BW52MyLjRdt8UHXId0z2p7RpR60NFr/81N26ddv4PNbzjIvM7n0iAQ8Vit 0vTgWFvaOAz2YtWRnnxw/HNVGKnaoF4PjTBgcaEQYmJ1+9S2BMBLT4E5czrqfmG7jgH8it 5El4YQnIk6AhJnB/8Posh/vo5/LU8mtcLKKOhHxqWWC2y8SHWMMg6UyeqVmFEeMHjybvEb d6mQSN9XvEGuSjpta0l1vYE1b0rBiDfHqVFRT+0wJ0nRZ6fuXAezgLl2F95foNRhVVo9z0 2XF/3HFjCdM6UnmH3YkhhXpDzUinwAXnxSIYbfctmMi3nuj+7xo1dtJXYrT00w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PxMWUvEJqbaGZyCsL2WOf8SICL93lvwzjktg5MtJjUc=; b=Bj4H+h2G3l2iGk3xxw2TwneooffMt3Y758ryUOQ7Mb/HNanp4xy66C3NLEHwwMlz8jm1xe jluHr+AYWAQdxZ8wTBUmNC583gghGQiAh0a8qvxfXnBYdobXr79wCXo+DLCIJDdYxMuD4D hUrIHhi+bH9xmdRrOehpniD4cAIQLHVC3TWl5ZEkKuq9buQWFICcRi+3vYgIlNFqNjZn2/ yduhRy7TpMmHWl5Ed+E0nGqcCThdA2pxfbxDZAY+yXfMYW9YjAz15nHjOR3/n8mkzjephE Oe39WXUbjtjhhxgpbNbbzaG36wkpPWybu7cdwiBiCqiv18puplSUPTGwkQczlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535943; a=rsa-sha256; cv=none; b=ad+yGbWEKq/8zW+R1KR/w8LokOEekxeob6yl6ARJgaTg1vuuKvGMrdyejp6qIGDn5mMDK6 /YBDcrAGLIg6k7OlwwmNrKjiMf0DT5uSKKYaxqyqK2/FGygXzVZQrG29VSDAwToW07frlg Z+8W1RqJtK4VsEpeqgRojXXjCQLZ9X0d20+jV8YMOrzMetZFtD0YRp1L+6cBmh8whnHKCj v1xWEPmTFETDHeCWanubuPhUL2T4wrpnl2SCAZAPQ+1YELcmRXdkqBOFAAEBYTCPrwwANX cIzPclNzFJZbJaMcqC+JOAmxe9AZreKWFd5mlRY2D3rw/x9yq4h+XpbN8XzkVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGb32lrzhjH; Mon, 21 Oct 2024 18:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LId36J035768; Mon, 21 Oct 2024 18:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LId3iH035765; Mon, 21 Oct 2024 18:39:03 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:03 GMT Message-Id: <202410211839.49LId3iH035765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 032bd06d9858 - stable/14 - cxgbe(4): Tidy up t4_l2t.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 032bd06d985834b83057b1ca579a87dbe3fe608e Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=032bd06d985834b83057b1ca579a87dbe3fe608e commit 032bd06d985834b83057b1ca579a87dbe3fe608e Author: Navdeep Parhar AuthorDate: 2024-07-17 17:41:37 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 16:46:29 +0000 cxgbe(4): Tidy up t4_l2t.h Align the comment for if_t with the rest and remove the declaration of t4_l2t_set_switching, which was removed in 061bbaf7e7fe. No functional change. Sponsored by: Chelsio Communications (cherry picked from commit b3bbc6cc79a3b76d342b2a8fd68e5266eb50ff11) --- sys/dev/cxgbe/t4_l2t.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/t4_l2t.h b/sys/dev/cxgbe/t4_l2t.h index be6337a60eab..36a41e459a5d 100644 --- a/sys/dev/cxgbe/t4_l2t.h +++ b/sys/dev/cxgbe/t4_l2t.h @@ -64,7 +64,7 @@ struct l2t_entry { uint32_t addr[4]; /* next hop IP or IPv6 address */ uint32_t iqid; /* iqid for reply to write_l2e */ struct sge_wrq *wrq; /* queue to use for write_l2e */ - if_t ifp; /* outgoing interface */ + if_t ifp; /* outgoing interface */ uint16_t smt_idx; /* SMT index */ uint16_t vlan; /* VLAN TCI (id: 0-11, prio: 13-15) */ struct l2t_entry *first; /* start of hash chain */ @@ -94,8 +94,6 @@ struct l2t_entry *t4_l2t_alloc_switching(struct adapter *, uint16_t, uint8_t, uint8_t *); struct l2t_entry *t4_l2t_alloc_tls(struct adapter *, struct sge_txq *, void *, int *, uint16_t, uint8_t, uint8_t *); -int t4_l2t_set_switching(struct adapter *, struct l2t_entry *, uint16_t, - uint8_t, uint8_t *); int t4_write_l2e(struct l2t_entry *, int); int do_l2t_write_rpl(struct sge_iq *, const struct rss_header *, struct mbuf *); From nobody Mon Oct 21 18:39: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 4XXPGc5yl2z5ZcYC; Mon, 21 Oct 2024 18:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGc5QLNz4FLR; Mon, 21 Oct 2024 18:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XfcBgsAn58luW6hzIaWGsbqvFD7N7UgdUp2409cxEE4=; b=okQaAgB9TeXGQBCimpfPZwGdnobHIPJjyYbMOqopgll7yZ1mOnC5wwqhQfn+cZH5WIW1F1 etPNKBrWg2E4da7KMErjtOdilPQVj7nX4D+v8upV9FQl0wEx+0piflreJxpmbZIVMjw0KE OjxFPQtgRnmcMjfQVm1qeHWY9Ma90oeQ4E8qF0j3ohxOEeRC+naYp9s7RJ8IzLMAGUqIUe Rgq2Mh+mLxhv0swSjENxSlAeW2nG8r0IJ7uBPQOtP9UAIMzRe8Ew4KC/W+w9JAh4MWzRZJ GrHqDiyylNtPFhnQHiCCgUSmCK+f3f5UVsbMhlVPOk0xPp/3CoGdH5LFb2zyzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XfcBgsAn58luW6hzIaWGsbqvFD7N7UgdUp2409cxEE4=; b=jsHxZqHH0JT+bnkNAC+GB1t37p1K5vjKSJMFkwx5CjNeSb+mYVAb8CHFuEkzjmPf9GZopS C66mecxQDTEzbuOl4aSfCVFDUzvHHqqk3NJSHRRtOfWr5i0gglMLE2chw7mm4hU1c+smzf +qAbNE2vMIhVP83mGulUN90cKWZ4Oj4j46r8ejXPt/aWBZUhFDMssBnhrfCWZYJtIOG7ar bgLzsEictSZHYn3GeM8KkrY17X2JO08IDhQlNmzc9u3HD7V/BShfG/B0Gicf1tZImqmFWI WPQCtTeZ8qVi7pX5oaDAHmyDmkaDCRpo1EJLIolQz8xSocC5HZKz1l25uTT5Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535944; a=rsa-sha256; cv=none; b=ZwF5qgGI2X0dL/n0dH3tUCcMkmnR2u3u37uEzY/XgPD3zSUY+0I6RuviGXHqqQ+1SMeDD5 KOxM8dSLUkJSPxVn6/CP4xK3ve4bsucCSS7bzOnObAEt14YzH5zk2tShDKn7wBZEDoMXQ8 QjrDy6Q3RQGY3FmDaqeQjlgZJXCruIDb4ScD3TaFvRaCG0fPyGO8hx+FhmRirUzBs/oBcY lxiYDVwiHoSqfXGBbY/Jc+4tXSGqn4wmZecuq1K+vL4YgeGhjaIHqo9du1lG+6UST0eP8f F35ExqLqZpsP6O9xO6sjG2dvbx59Q2flWLEPD6uqHDDSLomQ/ljsWzhEVtJdVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGc42vLzhYH; Mon, 21 Oct 2024 18:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LId4dW035832; Mon, 21 Oct 2024 18:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LId4KG035829; Mon, 21 Oct 2024 18:39:04 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:04 GMT Message-Id: <202410211839.49LId4KG035829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: c18966b3dce0 - stable/14 - cxgbe/t4_tom: Detach the toep from the tcpcb when entering TIME_WAIT. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c18966b3dce0e5110c79b23d290d453c22b49252 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c18966b3dce0e5110c79b23d290d453c22b49252 commit c18966b3dce0e5110c79b23d290d453c22b49252 Author: Navdeep Parhar AuthorDate: 2024-07-17 05:23:33 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 16:46:29 +0000 cxgbe/t4_tom: Detach the toep from the tcpcb when entering TIME_WAIT. The kernel used to call tod_pcb_detach when entering TIME_WAIT but that seems to have changed, likely with the TIME_WAIT overhaul in the kernel some time ago. Catch up by having the driver perform the detach. The hardware does not handle TIME_WAIT so it's important to detach and let the kernel arm the 2MSL timer to deal with it. Reported by: Sony Arpita Das @ Chelsio Reviewed by: jhb Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D45990 (cherry picked from commit bbc326241d91ab2cee2ec2c5c0aa8a906480132f) --- sys/dev/cxgbe/tom/t4_cpl_io.c | 2 ++ sys/dev/cxgbe/tom/t4_tom.c | 2 +- sys/dev/cxgbe/tom/t4_tom.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 0d42c89dcf93..0a40bbda3f3f 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -1393,6 +1393,7 @@ do_peer_close(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) case TCPS_FIN_WAIT_2: restore_so_proto(so, inp->inp_vflag & INP_IPV6); + t4_pcb_detach(NULL, tp); tcp_twstart(tp); INP_UNLOCK_ASSERT(inp); /* safe, we have a ref on the inp */ NET_EPOCH_EXIT(et); @@ -1454,6 +1455,7 @@ do_close_con_rpl(struct sge_iq *iq, const struct rss_header *rss, switch (tp->t_state) { case TCPS_CLOSING: /* see TCPS_FIN_WAIT_2 in do_peer_close too */ restore_so_proto(so, inp->inp_vflag & INP_IPV6); + t4_pcb_detach(NULL, tp); tcp_twstart(tp); release: INP_UNLOCK_ASSERT(inp); /* safe, we have a ref on the inp */ diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 3fe34c7c01a3..10ee78681365 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -359,7 +359,7 @@ release_offload_resources(struct toepcb *toep) * Also gets called when an offloaded active open fails and the TOM wants the * kernel to take the TCP PCB back. */ -static void +void t4_pcb_detach(struct toedev *tod __unused, struct tcpcb *tp) { #if defined(KTR) || defined(INVARIANTS) diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index 805d8bc0d644..fb74642d61f7 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -468,6 +468,7 @@ __be32 calc_options2(struct vi_info *, struct conn_params *); uint64_t select_ntuple(struct vi_info *, struct l2t_entry *); int negative_advice(int); int add_tid_to_history(struct adapter *, u_int); +void t4_pcb_detach(struct toedev *, struct tcpcb *); /* t4_connect.c */ void t4_init_connect_cpl_handlers(void); From nobody Mon Oct 21 18:39: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 4XXPGf0VbSz5Zcqf; Mon, 21 Oct 2024 18:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGd5Vn2z4Fck; Mon, 21 Oct 2024 18:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=purmNPisT3LcWzQShj8z5zeMlzxNDyV0xefsd0yRc5g=; b=lncxcwPwTTSfoZht7Y5p7Ea1Jr3MAbm5Al7jddZACCxTdEqNHyyK9ZVtlgCGo6Vc0aJ7+M oTYModo8Abd7HG843uLh6lRxis1xW/dJ5sCuB5OEHEesTWfjLu0xGjejjbZkG6o4DZ+BHr y/+cMPaAEnlcgs3kN5NzO2tIqZnndmE3xiJdkPtlreoj+6wEqLyLo9OElJ7qtv/x+57s8L eYj1df4PcYCTECLaSWvaIbKPvxh4RseLUa3ieJP1ZQ7vXdbyaQNGXFKuJthm3pRjvohwGk 6vcNzzcusOdt/slzdSIiWOcwm3yCj967F6qrBk+qzkXjj4sHUPYuctziQmGSXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=purmNPisT3LcWzQShj8z5zeMlzxNDyV0xefsd0yRc5g=; b=MsluKs5PU2UdWO9V8GSl/ePHczcr+LjtsgoYuaW/IZl3zXvqHcf6qAIc94yRMhRgbugEj2 zgg+ejTcJ2HDSrMNtH7nLnJKNiRXIxcsd8bQ8GKWc6h9XtqFflsngqwoxo25LsFh1eAn93 2k5Vz4DmVCyjrlmc88w/l+JwudGwAoxj2d4aoCw9QoGu5zsBK/Ewej7NFKBFBOP09Qhw3K VtERVA5D6/6SB7WZoYJaDOYZp5WOJiq2XOU9zR7lWirBYTR1KFSfEIx1hmD6iMaZxTrz5E EAWoeFzWPMDJa3wJErDpS+AzCySiClZdejV+x3xjypEwD14Tt+91KWJPDB+ENA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535945; a=rsa-sha256; cv=none; b=wwshjIAiN/QM672528p0S5YpEG3miV8QKKzQ4FOdw1jJDIQWuJ2zFvvF/o5LytDsnG52Ht 6JKejR9pMEbfpWCGB3H1ZXE/yjWMRPgzxuoI3WK/gBmqirSNz3jsXW6QE86mRYx4uA1fe0 fxdp17Qx4/HOXDU2vTAT6vegkgTgtHsmuCQb70kO2nKr1On4YKFj0vtOY/+tC+gmlnfPJj 0ILsT2Tarv80aafWg9WHq+bdLHNPXhMNraa8Lcvd8BmO+xjZQF5H7gq7MtuQ33As5dvmDl 5vGMF06E+bWlCy2hfhel0ItUrF3WlZs2hpkVNbdVpMa0F71A86+cS3cv+KFkWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGd5743zh5k; Mon, 21 Oct 2024 18:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LId5PG035893; Mon, 21 Oct 2024 18:39:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LId5HZ035890; Mon, 21 Oct 2024 18:39:05 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:05 GMT Message-Id: <202410211839.49LId5HZ035890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: e867a2503153 - stable/14 - cxgbe/t4_tom: Free up hardware resources when the final CPL is received. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e867a25031532f3e54d61a23c6057362c66a6584 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=e867a25031532f3e54d61a23c6057362c66a6584 commit e867a25031532f3e54d61a23c6057362c66a6584 Author: Navdeep Parhar AuthorDate: 2024-07-16 00:39:40 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 16:46:30 +0000 cxgbe/t4_tom: Free up hardware resources when the final CPL is received. Final CPL means the tid is done in the hardware and other resources associated with it can be freed right away. There is no need to wait for the kernel to detach the toepcb. Reviewed by: jhb MFC after: 1 week Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D45991 (cherry picked from commit 27479403a764cf3b97194887a1f819c1e35357aa) --- sys/dev/cxgbe/tom/t4_tom.c | 58 +++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 10ee78681365..645822b6f781 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -97,6 +97,7 @@ static struct uld_info tom_uld_info = { }; static void release_offload_resources(struct toepcb *); +static void done_with_toepcb(struct toepcb *); static int alloc_tid_tabs(struct tid_info *); static void free_tid_tabs(struct tid_info *); static void free_tom_data(struct adapter *, struct tom_data *); @@ -311,12 +312,42 @@ release_offload_resources(struct toepcb *toep) KASSERT(!(toep->flags & TPF_CPL_PENDING), ("%s: %p has CPL pending.", __func__, toep)); - KASSERT(!(toep->flags & TPF_ATTACHED), - ("%s: %p is still attached.", __func__, toep)); CTR5(KTR_CXGBE, "%s: toep %p (tid %d, l2te %p, ce %p)", __func__, toep, tid, toep->l2te, toep->ce); + if (toep->l2te) { + t4_l2t_release(toep->l2te); + toep->l2te = NULL; + } + if (tid >= 0) { + remove_tid(sc, tid, toep->ce ? 2 : 1); + release_tid(sc, tid, toep->ctrlq); + toep->tid = -1; + } + if (toep->ce) { + t4_release_clip_entry(sc, toep->ce); + toep->ce = NULL; + } + if (toep->params.tc_idx != -1) + t4_release_cl_rl(sc, toep->vi->pi->port_id, toep->params.tc_idx); +} + +/* + * Both the driver and kernel are done with the toepcb. + */ +static void +done_with_toepcb(struct toepcb *toep) +{ + struct tom_data *td = toep->td; + + KASSERT(!(toep->flags & TPF_CPL_PENDING), + ("%s: %p has CPL pending.", __func__, toep)); + KASSERT(!(toep->flags & TPF_ATTACHED), + ("%s: %p is still attached.", __func__, toep)); + + CTR(KTR_CXGBE, "%s: toep %p (0x%x)", __func__, toep, toep->flags); + /* * These queues should have been emptied at approximately the same time * that a normal connection's socket's so_snd would have been purged or @@ -329,20 +360,9 @@ release_offload_resources(struct toepcb *toep) ddp_assert_empty(toep); #endif MPASS(TAILQ_EMPTY(&toep->aiotx_jobq)); - - if (toep->l2te) - t4_l2t_release(toep->l2te); - - if (tid >= 0) { - remove_tid(sc, tid, toep->ce ? 2 : 1); - release_tid(sc, tid, toep->ctrlq); - } - - if (toep->ce) - t4_release_clip_entry(sc, toep->ce); - - if (toep->params.tc_idx != -1) - t4_release_cl_rl(sc, toep->vi->pi->port_id, toep->params.tc_idx); + MPASS(toep->tid == -1); + MPASS(toep->l2te == NULL); + MPASS(toep->ce == NULL); mtx_lock(&td->toep_list_lock); TAILQ_REMOVE(&td->toep_list, toep, link); @@ -392,7 +412,7 @@ t4_pcb_detach(struct toedev *tod __unused, struct tcpcb *tp) toep->flags &= ~TPF_ATTACHED; if (!(toep->flags & TPF_CPL_PENDING)) - release_offload_resources(toep); + done_with_toepcb(toep); } /* @@ -988,9 +1008,9 @@ final_cpl_received(struct toepcb *toep) toep->flags &= ~(TPF_CPL_PENDING | TPF_WAITING_FOR_FINAL); mbufq_drain(&toep->ulp_pduq); mbufq_drain(&toep->ulp_pdu_reclaimq); - + release_offload_resources(toep); if (!(toep->flags & TPF_ATTACHED)) - release_offload_resources(toep); + done_with_toepcb(toep); if (!in_pcbrele_wlocked(inp)) INP_WUNLOCK(inp); From nobody Mon Oct 21 18:39: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 4XXPGg471cz5ZcwT; Mon, 21 Oct 2024 18:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGf6vBfz4FlD; Mon, 21 Oct 2024 18:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yueS7QgRWadoWM42MzTh3V36VmfkVVI6Z9ND/xBlaSM=; b=A81K7cnr5ajEEpc3Vw7R2eaziFjfYKCfjuBbB03slrUyNzuylR9eCKr7WlYLb/QxTYwlbO P5AF2th1VE8lUdeW0sW87HDMZHIJwu2L2WRq+uPY7giFV99zrJCL7YpYSO8IKOgG9TtP4Y qIdstXao9Y0bfaRab6p1WB7N//XpLvlcmA/29HRJ3lx4ZJDi/JA/Hs8bAcl8TnR6IdOJHB DrTkBDzgbwaDS3gwuToAfBTouWTS9bJ+uKAnfucQ0f7mKcKm2lLiNyOAFoqf55cnB06WKK jSpRjnpqtYW6YQ7eHBBSsUuVGQr56DJ64nfcA9d7h3kT8NUPOIrm29X/bt3ciw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yueS7QgRWadoWM42MzTh3V36VmfkVVI6Z9ND/xBlaSM=; b=m65NP/5NIzqt8WZI+rFre00XVfJbR+8on4MIq7gYUv5yf8qlmXikBx1QgBnpliNK2t2v+w xy9eMASq87VUh/Yu4mxVgtAh3ckEJYAertfyLzk9KhxsH/8cd68fys4YJQtZhoYq0tTDYM ZhJNim0YgotGPCJ5zdg7zsB1ktcZLqdB4nA9F2JfrHJ0RwvX4rInWPhjGvV0JBObphiB5T k4Wfuk1oe58D94FbqVf8tXk1aASDVLfCSIDScAv8jBAhtAags6+bjLH4ZllxiBvn2MbHxY lwZyYnWtjULqvsrlDialFipBIWMCU3RZXFeG+9NnxVpDQIfq4J5Kr+LgKO/mVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535947; a=rsa-sha256; cv=none; b=EbmOLTTncYGKsIaW0J+Pb5anaOSaT0Z1Ft/2MwdOCqM4hZQFT5rgDTZfs6lB4YiGBz3Erd Fg2qaczcOMSohjqBjZOxtMMx6MiauSJIgxdSJTcw2y8VcaBtudb6mo86Hxa3ilY1Lu/iZs Q9HgtYbaZab3+XLlN8Udu6BfsWwITe8DnhXRcO3MwMZ0cDqRJlBsUX30+m34CmCTaeoyEk WKAslZEpW1mlpMnGa2Lm86htyqdG9BewsL3djlU1cgsHFArmSR6t8gDYMXj6OEo3a4jEAF xqtslxpmFVbEo0CG6yBf9NHN75j0NghAtxyJ5CIeJxySQ8sRlcrXZB3Jg8gtdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGf6GvxzhSN; Mon, 21 Oct 2024 18:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LId6tG035961; Mon, 21 Oct 2024 18:39:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LId6IS035958; Mon, 21 Oct 2024 18:39:06 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:06 GMT Message-Id: <202410211839.49LId6IS035958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 85a5adf4ed39 - stable/14 - cxgbe(4): Make no assumptions about the start and size of the L2T table. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85a5adf4ed39923fc70640a1fd26fb7aca120e3b Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=85a5adf4ed39923fc70640a1fd26fb7aca120e3b commit 85a5adf4ed39923fc70640a1fd26fb7aca120e3b Author: Navdeep Parhar AuthorDate: 2024-07-18 20:16:30 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 16:46:30 +0000 cxgbe(4): Make no assumptions about the start and size of the L2T table. Do not assume that the table starts at index 0 and is typically 4K in size. The only thing the driver needs to verify is that its use of F_SYNC_WR doesn't collide with the L2T hwidx range. Reviewed by: jhb Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D46028 (cherry picked from commit cfcfd3c7bf5b60da42b13ac5d8085c762613c302) --- sys/dev/cxgbe/t4_l2t.c | 17 +++++++++++------ sys/dev/cxgbe/t4_l2t.h | 2 -- sys/dev/cxgbe/t4_main.c | 6 +++--- sys/dev/cxgbe/tom/t4_tom_l2t.c | 21 +++++++++++++-------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/sys/dev/cxgbe/t4_l2t.c b/sys/dev/cxgbe/t4_l2t.c index 005dce826ccb..90f184f5e666 100644 --- a/sys/dev/cxgbe/t4_l2t.c +++ b/sys/dev/cxgbe/t4_l2t.c @@ -369,14 +369,19 @@ int do_l2t_write_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) { + struct adapter *sc = iq->adapter; const struct cpl_l2t_write_rpl *rpl = (const void *)(rss + 1); - unsigned int tid = GET_TID(rpl); - unsigned int idx = tid % L2T_SIZE; + const u_int hwidx = GET_TID(rpl) & ~(F_SYNC_WR | V_TID_QID(M_TID_QID)); + const bool sync = GET_TID(rpl) & F_SYNC_WR; - if (__predict_false(rpl->status != CPL_ERR_NONE)) { - log(LOG_ERR, - "Unexpected L2T_WRITE_RPL (%u) for entry at hw_idx %u\n", - rpl->status, idx); + MPASS(iq->abs_id == G_TID_QID(GET_TID(rpl))); + + if (__predict_false(hwidx < sc->vres.l2t.start) || + __predict_false(hwidx >= sc->vres.l2t.start + sc->vres.l2t.size) || + __predict_false(rpl->status != CPL_ERR_NONE)) { + CH_ERR(sc, "%s: hwidx %u, rpl %u, sync %u; L2T st %u, sz %u\n", + __func__, hwidx, rpl->status, sync, sc->vres.l2t.start, + sc->vres.l2t.size); return (EINVAL); } diff --git a/sys/dev/cxgbe/t4_l2t.h b/sys/dev/cxgbe/t4_l2t.h index 36a41e459a5d..991b4476eb61 100644 --- a/sys/dev/cxgbe/t4_l2t.h +++ b/sys/dev/cxgbe/t4_l2t.h @@ -35,8 +35,6 @@ #define V_SYNC_WR(x) ((x) << S_SYNC_WR) #define F_SYNC_WR V_SYNC_WR(1) -enum { L2T_SIZE = 4096 }; /* # of L2T entries */ - enum { L2T_STATE_VALID, /* entry is up to date */ L2T_STATE_STALE, /* entry may be used but needs revalidation */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index b60eda504b6b..5bfcb2f4f8c2 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -5264,9 +5264,9 @@ get_params__post_init(struct adapter *sc) } sc->vres.l2t.start = val[4]; sc->vres.l2t.size = val[5] - val[4] + 1; - KASSERT(sc->vres.l2t.size <= L2T_SIZE, - ("%s: L2 table size (%u) larger than expected (%u)", - __func__, sc->vres.l2t.size, L2T_SIZE)); + /* val[5] is the last hwidx and it must not collide with F_SYNC_WR */ + if (sc->vres.l2t.size > 0) + MPASS(fls(val[5]) <= S_SYNC_WR); sc->params.core_vdd = val[6]; param[0] = FW_PARAM_PFVF(IQFLINT_END); diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.c b/sys/dev/cxgbe/tom/t4_tom_l2t.c index c397196d9cca..ee442f023970 100644 --- a/sys/dev/cxgbe/tom/t4_tom_l2t.c +++ b/sys/dev/cxgbe/tom/t4_tom_l2t.c @@ -318,18 +318,23 @@ do_l2t_write_rpl2(struct sge_iq *iq, const struct rss_header *rss, { struct adapter *sc = iq->adapter; const struct cpl_l2t_write_rpl *rpl = (const void *)(rss + 1); - unsigned int tid = GET_TID(rpl); - unsigned int idx = tid % L2T_SIZE; + const u_int hwidx = GET_TID(rpl) & ~(F_SYNC_WR | V_TID_QID(M_TID_QID)); + const bool sync = GET_TID(rpl) & F_SYNC_WR; - if (__predict_false(rpl->status != CPL_ERR_NONE)) { - log(LOG_ERR, - "Unexpected L2T_WRITE_RPL (%u) for entry at hw_idx %u\n", - rpl->status, idx); + MPASS(iq->abs_id == G_TID_QID(GET_TID(rpl))); + + if (__predict_false(hwidx < sc->vres.l2t.start) || + __predict_false(hwidx >= sc->vres.l2t.start + sc->vres.l2t.size) || + __predict_false(rpl->status != CPL_ERR_NONE)) { + CH_ERR(sc, "%s: hwidx %u, rpl %u, sync %u; L2T st %u, sz %u\n", + __func__, hwidx, rpl->status, sync, sc->vres.l2t.start, + sc->vres.l2t.size); return (EINVAL); } - if (tid & F_SYNC_WR) { - struct l2t_entry *e = &sc->l2t->l2tab[idx - sc->vres.l2t.start]; + if (sync) { + const u_int idx = hwidx - sc->vres.l2t.start; + struct l2t_entry *e = &sc->l2t->l2tab[idx]; mtx_lock(&e->lock); if (e->state != L2T_STATE_SWITCHING) { From nobody Mon Oct 21 18:39: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 4XXPGh2B85z5ZctK; Mon, 21 Oct 2024 18:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGh0xPXz4FnV; Mon, 21 Oct 2024 18:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whXMhLxhUP3hlmblJ1zJ2QGK7ajC0/IZ/RgWGvFMlXA=; b=HsBoW7cmnFAP5C5qQ5Qt4aSFdI5PICdXmkkwUfioRvTK6mYxgeMbNTJazlgqbSx6b9SqDR xxv3ew4E7xEVCI9RyCURdFij/OU2onmHSfWz5661z5A6CWUfb5rUpj3+ZinJeEFwtCdDNi 9ZKR08jruxydlVyVXJURIwzk5NDERcBY3Mz6STCwCmP/+xwMhXr4sbcKFUTCh1fQ0JblpV j4IEwbbAq81XukucQjfBu93IwAsxcGPFGkPF4cQyYqNVg8jQGDa4lV/kTJ3huFrZJyt24k waee+6FxgH63hwrv63/3y3EtnM1TiJLn4W1ADwYdaLbiNkPWs5GJ4IgbOEdKrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whXMhLxhUP3hlmblJ1zJ2QGK7ajC0/IZ/RgWGvFMlXA=; b=gS9nX9Y1+sJBp2mH/LberhJRAgzEeWhdTnAibLou9OB18H5oMXE9UhbME980tz+hTenM2w T3LIZ/WCa/zbrKlo+cC1MbCB5CK2oSRuCOkV8qz6JvJdaPR22vU1WE+slg3JvtZyU4NFor BHYqFtO/vcgLNNFz4Xf86lNADqKofhHGtbtOFcR4D0JKFkSSizfoIVuYXtFzuiiS8FDnP5 /yA80JJEoRGJ+c4v11KPWazv/RO7LoI2vXeJ6hbWr/A3FDMLI44EI0j53kV7e39PP0JZqM mvG+408pYOdcCR4OiMrGAsOG3xlCYvu6VcdwCD/rtk/gmZfBHp0XWIdRWnR0UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535948; a=rsa-sha256; cv=none; b=okoqPVTvs393GmEL6Jhuo+L/jtS8FsKI2dWENkvSRUg4JYtJjGBVznZHvSYfBHugj6lt6R 3oYL/QYq/i0NcxLYcphJMODD11UvwGQ+Ddf93AEITIT4t09t5+bvv+My/pCLqee6+Q2iXp cyiEafigodQlV7nG1JBuv3DR0S2a/nrrfn90UjIJFCsqnCMThWDtkJvxvYZGRy1Dq7sRC5 HmY0UQzBHaaZBhMwNgMlPyL3K2k+CkhJkSqNNK/wAUJwVbyIn88lWbAfD+UBBRrXBhvuQ5 hu+h6z4ZXF9B8EzfJ6nm/EmfQp+9kQlS9Xzhh0e7sIOZglskRuIOh7WtrxSDYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGh0FgYzhYJ; Mon, 21 Oct 2024 18:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LId7AZ036009; Mon, 21 Oct 2024 18:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LId7mj036006; Mon, 21 Oct 2024 18:39:07 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:07 GMT Message-Id: <202410211839.49LId7mj036006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 4f1b1077fbb9 - stable/14 - cxgbe(4): Changes to ULD list management. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f1b1077fbb9062f9f54ccc1ccd07dc33e09b45d Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=4f1b1077fbb9062f9f54ccc1ccd07dc33e09b45d commit 4f1b1077fbb9062f9f54ccc1ccd07dc33e09b45d Author: Navdeep Parhar AuthorDate: 2024-07-06 20:43:17 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:00:26 +0000 cxgbe(4): Changes to ULD list management. * Convert t4_uld_list to an array. There will be at most 3 items in the list and it's simpler to track them in an array with a fixed slot for each ULD. * There is no need to refcount ULDs so stop doing that. * Add uld_ prefix to all members of uld_info. * Rename async_event to uld_stop to match its actual purpose. Call it for all ULDs and not just ULD_IWARP. Reviewed by: jhb Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D46029 (cherry picked from commit cf5e6370f15cffabbbf508083ba7d48ec8abfa79) --- sys/dev/cxgbe/cxgbei/cxgbei.c | 9 +- sys/dev/cxgbe/iw_cxgbe/device.c | 19 +++-- sys/dev/cxgbe/offload.h | 13 ++- sys/dev/cxgbe/t4_main.c | 177 +++++++++++++++++----------------------- sys/dev/cxgbe/tom/t4_tom.c | 9 +- 5 files changed, 97 insertions(+), 130 deletions(-) diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c index 4ae0e4da717b..ccca45f5f761 100644 --- a/sys/dev/cxgbe/cxgbei/cxgbei.c +++ b/sys/dev/cxgbe/cxgbei/cxgbei.c @@ -898,9 +898,8 @@ cxgbei_deactivate_all(struct adapter *sc, void *arg __unused) } static struct uld_info cxgbei_uld_info = { - .uld_id = ULD_ISCSI, - .activate = cxgbei_activate, - .deactivate = cxgbei_deactivate, + .uld_activate = cxgbei_activate, + .uld_deactivate = cxgbei_deactivate, }; static int @@ -913,7 +912,7 @@ cxgbei_mod_load(void) t4_register_cpl_handler(CPL_RX_ISCSI_DDP, do_rx_iscsi_ddp); t4_register_cpl_handler(CPL_RX_ISCSI_CMP, do_rx_iscsi_cmp); - rc = t4_register_uld(&cxgbei_uld_info); + rc = t4_register_uld(&cxgbei_uld_info, ULD_ISCSI); if (rc != 0) return (rc); @@ -928,7 +927,7 @@ cxgbei_mod_unload(void) t4_iterate(cxgbei_deactivate_all, NULL); - if (t4_unregister_uld(&cxgbei_uld_info) == EBUSY) + if (t4_unregister_uld(&cxgbei_uld_info, ULD_ISCSI) == EBUSY) return (EBUSY); t4_register_cpl_handler(CPL_ISCSI_HDR, NULL); diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c index fa886766e383..28d6d0f2d00c 100644 --- a/sys/dev/cxgbe/iw_cxgbe/device.c +++ b/sys/dev/cxgbe/iw_cxgbe/device.c @@ -259,13 +259,12 @@ static int c4iw_mod_load(void); static int c4iw_mod_unload(void); static int c4iw_activate(struct adapter *); static int c4iw_deactivate(struct adapter *); -static void c4iw_async_event(struct adapter *); +static int c4iw_stop(struct adapter *); static struct uld_info c4iw_uld_info = { - .uld_id = ULD_IWARP, - .activate = c4iw_activate, - .deactivate = c4iw_deactivate, - .async_event = c4iw_async_event, + .uld_activate = c4iw_activate, + .uld_deactivate = c4iw_deactivate, + .uld_stop = c4iw_stop, }; static int @@ -326,8 +325,8 @@ c4iw_deactivate(struct adapter *sc) return (0); } -static void -c4iw_async_event(struct adapter *sc) +static int +c4iw_stop(struct adapter *sc) { struct c4iw_dev *iwsc = sc->iwarp_softc; @@ -341,6 +340,8 @@ c4iw_async_event(struct adapter *sc) event.device = &iwsc->ibdev; ib_dispatch_event(&event); } + + return (0); } static void @@ -379,7 +380,7 @@ c4iw_mod_load(void) if (rc != 0) return (rc); - rc = t4_register_uld(&c4iw_uld_info); + rc = t4_register_uld(&c4iw_uld_info, ULD_IWARP); if (rc != 0) { c4iw_cm_term(); return (rc); @@ -398,7 +399,7 @@ c4iw_mod_unload(void) c4iw_cm_term(); - if (t4_unregister_uld(&c4iw_uld_info) == EBUSY) + if (t4_unregister_uld(&c4iw_uld_info, ULD_IWARP) == EBUSY) return (EBUSY); return (0); diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index a8b243b764c8..a55d6f45cabf 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -209,12 +209,9 @@ enum { struct adapter; struct port_info; struct uld_info { - SLIST_ENTRY(uld_info) link; - int refcount; - int uld_id; - int (*activate)(struct adapter *); - int (*deactivate)(struct adapter *); - void (*async_event)(struct adapter *); + int (*uld_activate)(struct adapter *); + int (*uld_deactivate)(struct adapter *); + int (*uld_stop)(struct adapter *); }; struct tom_tunables { @@ -242,8 +239,8 @@ struct tls_tunables { }; #ifdef TCP_OFFLOAD -int t4_register_uld(struct uld_info *); -int t4_unregister_uld(struct uld_info *); +int t4_register_uld(struct uld_info *, int); +int t4_unregister_uld(struct uld_info *, int); int t4_activate_uld(struct adapter *, int); int t4_deactivate_uld(struct adapter *, int); int uld_active(struct adapter *, int); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 5bfcb2f4f8c2..60572d0c25e8 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -263,7 +263,7 @@ static struct sx t4_list_lock; SLIST_HEAD(, adapter) t4_list; #ifdef TCP_OFFLOAD static struct sx t4_uld_list_lock; -SLIST_HEAD(, uld_info) t4_uld_list; +struct uld_info *t4_uld_list[ULD_MAX + 1]; #endif /* @@ -864,7 +864,7 @@ static int release_clip_addr(struct adapter *, struct t4_clip_addr *); #ifdef TCP_OFFLOAD static int toe_capability(struct vi_info *, bool); static int t4_deactivate_all_uld(struct adapter *); -static void t4_async_event(struct adapter *); +static void stop_all_uld(struct adapter *); #endif #ifdef KERN_TLS static int ktls_capability(struct adapter *, bool); @@ -3616,7 +3616,7 @@ fatal_error_task(void *arg, int pending) int rc; #ifdef TCP_OFFLOAD - t4_async_event(sc); + stop_all_uld(sc); #endif if (atomic_testandclear_int(&sc->error_flags, ilog2(ADAP_CIM_ERR))) { dump_cim_regs(sc); @@ -12515,82 +12515,61 @@ toe_capability(struct vi_info *vi, bool enable) * Add an upper layer driver to the global list. */ int -t4_register_uld(struct uld_info *ui) +t4_register_uld(struct uld_info *ui, int id) { - int rc = 0; - struct uld_info *u; + int rc; + if (id < 0 || id > ULD_MAX) + return (EINVAL); sx_xlock(&t4_uld_list_lock); - SLIST_FOREACH(u, &t4_uld_list, link) { - if (u->uld_id == ui->uld_id) { - rc = EEXIST; - goto done; - } + if (t4_uld_list[id] != NULL) + rc = EEXIST; + else { + t4_uld_list[id] = ui; + rc = 0; } - - SLIST_INSERT_HEAD(&t4_uld_list, ui, link); - ui->refcount = 0; -done: sx_xunlock(&t4_uld_list_lock); return (rc); } int -t4_unregister_uld(struct uld_info *ui) +t4_unregister_uld(struct uld_info *ui, int id) { - int rc = EINVAL; - struct uld_info *u; + if (id < 0 || id > ULD_MAX) + return (EINVAL); sx_xlock(&t4_uld_list_lock); - - SLIST_FOREACH(u, &t4_uld_list, link) { - if (u == ui) { - if (ui->refcount > 0) { - rc = EBUSY; - goto done; - } - - SLIST_REMOVE(&t4_uld_list, ui, uld_info, link); - rc = 0; - goto done; - } - } -done: + MPASS(t4_uld_list[id] == ui); + t4_uld_list[id] = NULL; sx_xunlock(&t4_uld_list_lock); - return (rc); + return (0); } int t4_activate_uld(struct adapter *sc, int id) { int rc; - struct uld_info *ui; ASSERT_SYNCHRONIZED_OP(sc); if (id < 0 || id > ULD_MAX) return (EINVAL); - rc = EAGAIN; /* kldoad the module with this ULD and try again. */ - - sx_slock(&t4_uld_list_lock); - SLIST_FOREACH(ui, &t4_uld_list, link) { - if (ui->uld_id == id) { - if (!(sc->flags & FULL_INIT_DONE)) { - rc = adapter_init(sc); - if (rc != 0) - break; - } - - rc = ui->activate(sc); - if (rc == 0) { - setbit(&sc->active_ulds, id); - ui->refcount++; - } - break; - } + /* Adapter needs to be initialized before any ULD can be activated. */ + if (!(sc->flags & FULL_INIT_DONE)) { + rc = adapter_init(sc); + if (rc != 0) + return (rc); } + sx_slock(&t4_uld_list_lock); + if (t4_uld_list[id] == NULL) + rc = EAGAIN; /* load the KLD with this ULD and try again. */ + else { + rc = t4_uld_list[id]->uld_activate(sc); + if (rc == 0) + setbit(&sc->active_ulds, id); + } sx_sunlock(&t4_uld_list_lock); return (rc); @@ -12600,27 +12579,20 @@ int t4_deactivate_uld(struct adapter *sc, int id) { int rc; - struct uld_info *ui; ASSERT_SYNCHRONIZED_OP(sc); if (id < 0 || id > ULD_MAX) return (EINVAL); - rc = ENXIO; sx_slock(&t4_uld_list_lock); - - SLIST_FOREACH(ui, &t4_uld_list, link) { - if (ui->uld_id == id) { - rc = ui->deactivate(sc); - if (rc == 0) { - clrbit(&sc->active_ulds, id); - ui->refcount--; - } - break; - } + if (t4_uld_list[id] == NULL) + rc = ENXIO; + else { + rc = t4_uld_list[id]->uld_deactivate(sc); + if (rc == 0) + clrbit(&sc->active_ulds, id); } - sx_sunlock(&t4_uld_list_lock); return (rc); @@ -12629,25 +12601,20 @@ t4_deactivate_uld(struct adapter *sc, int id) static int t4_deactivate_all_uld(struct adapter *sc) { - int rc; - struct uld_info *ui; + int i, rc; rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4detuld"); if (rc != 0) return (ENXIO); - sx_slock(&t4_uld_list_lock); - - SLIST_FOREACH(ui, &t4_uld_list, link) { - if (isset(&sc->active_ulds, ui->uld_id)) { - rc = ui->deactivate(sc); - if (rc != 0) - break; - clrbit(&sc->active_ulds, ui->uld_id); - ui->refcount--; - } + for (i = 0; i <= ULD_MAX; i++) { + if (t4_uld_list[i] == NULL || !uld_active(sc, i)) + continue; + rc = t4_uld_list[i]->uld_deactivate(sc); + if (rc != 0) + break; + clrbit(&sc->active_ulds, i); } - sx_sunlock(&t4_uld_list_lock); end_synchronized_op(sc, 0); @@ -12655,30 +12622,30 @@ t4_deactivate_all_uld(struct adapter *sc) } static void -t4_async_event(struct adapter *sc) +stop_all_uld(struct adapter *sc) { - struct uld_info *ui; + int i; - if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4async") != 0) + if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4uldst") != 0) return; sx_slock(&t4_uld_list_lock); - SLIST_FOREACH(ui, &t4_uld_list, link) { - if (ui->uld_id == ULD_IWARP) { - ui->async_event(sc); - break; - } + for (i = 0; i <= ULD_MAX; i++) { + if (t4_uld_list[i] == NULL || !uld_active(sc, i) || + t4_uld_list[i]->uld_stop == NULL) + continue; + (void) t4_uld_list[i]->uld_stop(sc); } sx_sunlock(&t4_uld_list_lock); end_synchronized_op(sc, 0); } int -uld_active(struct adapter *sc, int uld_id) +uld_active(struct adapter *sc, int id) { - MPASS(uld_id >= 0 && uld_id <= ULD_MAX); + MPASS(id >= 0 && id <= ULD_MAX); - return (isset(&sc->active_ulds, uld_id)); + return (isset(&sc->active_ulds, id)); } #endif @@ -13170,7 +13137,6 @@ mod_event(module_t mod, int cmd, void *arg) callout_init(&fatal_callout, 1); #ifdef TCP_OFFLOAD sx_init(&t4_uld_list_lock, "T4/T5 ULDs"); - SLIST_INIT(&t4_uld_list); #endif #ifdef INET6 t4_clip_modload(); @@ -13199,9 +13165,20 @@ mod_event(module_t mod, int cmd, void *arg) case MOD_UNLOAD: sx_xlock(&mlu); if (--loaded == 0) { +#ifdef TCP_OFFLOAD + int i; +#endif int tries; taskqueue_free(reset_tq); + + tries = 0; + while (tries++ < 5 && t4_sge_extfree_refs() != 0) { + uprintf("%ju clusters with custom free routine " + "still is use.\n", t4_sge_extfree_refs()); + pause("t4unload", 2 * hz); + } + sx_slock(&t4_list_lock); if (!SLIST_EMPTY(&t4_list)) { rc = EBUSY; @@ -13210,20 +13187,14 @@ mod_event(module_t mod, int cmd, void *arg) } #ifdef TCP_OFFLOAD sx_slock(&t4_uld_list_lock); - if (!SLIST_EMPTY(&t4_uld_list)) { - rc = EBUSY; - sx_sunlock(&t4_uld_list_lock); - sx_sunlock(&t4_list_lock); - goto done_unload; - } -#endif - tries = 0; - while (tries++ < 5 && t4_sge_extfree_refs() != 0) { - uprintf("%ju clusters with custom free routine " - "still is use.\n", t4_sge_extfree_refs()); - pause("t4unload", 2 * hz); + for (i = 0; i <= ULD_MAX; i++) { + if (t4_uld_list[i] != NULL) { + rc = EBUSY; + sx_sunlock(&t4_uld_list_lock); + sx_sunlock(&t4_list_lock); + goto done_unload; + } } -#ifdef TCP_OFFLOAD sx_sunlock(&t4_uld_list_lock); #endif sx_sunlock(&t4_list_lock); diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 645822b6f781..f9d8dcd706b7 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -91,9 +91,8 @@ static int t4_tom_activate(struct adapter *); static int t4_tom_deactivate(struct adapter *); static struct uld_info tom_uld_info = { - .uld_id = ULD_TOM, - .activate = t4_tom_activate, - .deactivate = t4_tom_deactivate, + .uld_activate = t4_tom_activate, + .uld_deactivate = t4_tom_deactivate, }; static void release_offload_resources(struct toepcb *); @@ -2013,7 +2012,7 @@ t4_tom_mod_load(void) toe6_protosw.pr_ctloutput = t4_ctloutput_tom; toe6_protosw.pr_aio_queue = t4_aio_queue_tom; - return (t4_register_uld(&tom_uld_info)); + return (t4_register_uld(&tom_uld_info, ULD_TOM)); } static void @@ -2034,7 +2033,7 @@ t4_tom_mod_unload(void) { t4_iterate(tom_uninit, NULL); - if (t4_unregister_uld(&tom_uld_info) == EBUSY) + if (t4_unregister_uld(&tom_uld_info, ULD_TOM) == EBUSY) return (EBUSY); t4_tls_mod_unload(); From nobody Mon Oct 21 18:39: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 4XXPGk45nBz5ZcwX; Mon, 21 Oct 2024 18:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGk2MLvz4Fgh; Mon, 21 Oct 2024 18:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vd40LtQelcIzY3YrYnSf619dbmJQ2zmD6j1r3A15mwA=; b=i/dO0UBz8ge4qokGdq7XDWOv/cPuO9EyJxtIpqZNzaoO+UIKaTspukmbNFPIvbyUhPF2AM VrKCr6qE7L2uyaB+w+SEzOZPoepAzuhexdHtQRE3BXgvCDH4phWbQ65xG4rLo7M2i6xYWR hnZRmZc3/43GobuLt06ZeocqgYCK6epK43G7TECa03tvlsAUpSeJ+SIO0YuFFOYXwSCFYO uZ5EYXUv2i13KHVvBWck3l6n5qSPJNYnrxV4Y/H2DOZisXOk5/MNuGodrDlEgYltp+EfW2 KW4dJ+2rPF5yRQn0OOIojaufy3hb4nwoSdrg3WXv2QG3a9Otj7yAG26F1EWM4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vd40LtQelcIzY3YrYnSf619dbmJQ2zmD6j1r3A15mwA=; b=jf8IhMaSvL/+cq4x0sGnaw1nI+50YA/IKkLNvlHGPL09+7u/BpCpaLP4l/NhbjcPJhfMqF SOQJiadtTYfiY0c33T0ExZM8cWoxEQ1HGi17V0On/v3X3xqSuDNnJ/ndnHKFVcIRClPwGw 9drGgf95ahSG+HjaCMtOJvZD0KLcwHhvukHSfTPf/i6VWQkKJFuM5wfsko6A4tcQzP75bl q9L+AFmVY8Ay5kKF3bMhOnHZVM4o/7lb2SmaJA3RXJuS66sv0aAFNzczplQTu6rhVXxACc glUAW9OEDe45NWw21xOV765sP7mzqbcmyJKn5aqzBZzSpOfH7lh3GsPmoxIUJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535950; a=rsa-sha256; cv=none; b=BNH529b9Pf2j3/d29LoPNA9xQrtaOLCph2aw1Fk3iI0ddQF2u/NJMvBG+CvPi05HRls66t 134rJeUNM++25IWUwYInYtYaeZBc34rz60ackto8DYlJ5kt6vcECBbEwtwTSj0WVqI7xfA tOngixLvzilcNPOwqcrCbZCimmJ8MF0ZNdkGnuG0q+umdIQuvX0f8yE7JI/QR+bKM8v3Va 3V0ncyShgHEQdWI8mLF/qhiWampTW3S6WtotzY+qHyys7NnhdnkMqmnIOjGtisMn5diEaP 2zPEvHWsBiOinopwHSZv5aqDILDesW9DZdPQGG+r8FgLb9tvJWKlTo6DewOZ5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGk1wxNzhYK; Mon, 21 Oct 2024 18:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdAhL036128; Mon, 21 Oct 2024 18:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdA0I036125; Mon, 21 Oct 2024 18:39:10 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:10 GMT Message-Id: <202410211839.49LIdA0I036125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: fb313ad44d51 - stable/14 - cxgbe(4): Stop and restart the atid allocator with the LLD. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb313ad44d5143cc03446bc239fd2437f0e03bd8 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=fb313ad44d5143cc03446bc239fd2437f0e03bd8 commit fb313ad44d5143cc03446bc239fd2437f0e03bd8 Author: Navdeep Parhar AuthorDate: 2024-07-12 23:53:22 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:01:50 +0000 cxgbe(4): Stop and restart the atid allocator with the LLD. atids are used by both filters and TOE and the atid table is in the base driver (LLD). New atids cannot be allocated when the allocator is stopped but existing ones can still be freed. It is expected that the owners of outstanding atids will release them in their own stop processing, before the adapter is restarted. Sponsored by: Chelsio Communications (cherry picked from commit fd3aca5b41968421f243b760ac5733f39f25cc56) --- sys/dev/cxgbe/offload.h | 1 + sys/dev/cxgbe/t4_main.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index 877fdb6b0a89..b17056dc0338 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -151,6 +151,7 @@ struct tid_info { union aopen_entry *atid_tab; union aopen_entry *afree; u_int atids_in_use; + bool atid_alloc_stopped; /* High priority filters and normal filters share the lock and cv. */ struct mtx ftid_lock __aligned(CACHE_LINE_SIZE); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 2388f0863e77..f1f1cccb93c2 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -780,6 +780,8 @@ static int t4_alloc_irq(struct adapter *, struct irq *, int rid, static int t4_free_irq(struct adapter *, struct irq *); static void t4_init_atid_table(struct adapter *); static void t4_free_atid_table(struct adapter *); +static void stop_atid_allocator(struct adapter *); +static void restart_atid_allocator(struct adapter *); static void get_regs(struct adapter *, struct t4_regdump *, uint8_t *); static void vi_refresh_stats(struct vi_info *); static void cxgbe_refresh_stats(struct vi_info *); @@ -2097,6 +2099,9 @@ stop_lld(struct adapter *sc) } end_synchronized_op(sc, 0); + + stop_atid_allocator(sc); + return (rc); } @@ -2447,6 +2452,9 @@ restart_lld(struct adapter *sc) done: end_synchronized_op(sc, 0); free(old_state, M_CXGBE); + + restart_atid_allocator(sc); + return (rc); } @@ -3941,6 +3949,7 @@ t4_init_atid_table(struct adapter *sc) mtx_init(&t->atid_lock, "atid lock", NULL, MTX_DEF); t->afree = t->atid_tab; t->atids_in_use = 0; + t->atid_alloc_stopped = false; for (i = 1; i < t->natids; i++) t->atid_tab[i - 1].next = &t->atid_tab[i]; t->atid_tab[t->natids - 1].next = NULL; @@ -3962,6 +3971,28 @@ t4_free_atid_table(struct adapter *sc) t->atid_tab = NULL; } +static void +stop_atid_allocator(struct adapter *sc) +{ + struct tid_info *t = &sc->tids; + + mtx_lock(&t->atid_lock); + t->atid_alloc_stopped = true; + mtx_unlock(&t->atid_lock); +} + +static void +restart_atid_allocator(struct adapter *sc) +{ + struct tid_info *t = &sc->tids; + + mtx_lock(&t->atid_lock); + KASSERT(t->atids_in_use == 0, + ("%s: %d atids still in use.", __func__, t->atids_in_use)); + t->atid_alloc_stopped = false; + mtx_unlock(&t->atid_lock); +} + int alloc_atid(struct adapter *sc, void *ctx) { @@ -3969,7 +4000,7 @@ alloc_atid(struct adapter *sc, void *ctx) int atid = -1; mtx_lock(&t->atid_lock); - if (t->afree) { + if (t->afree && !t->atid_alloc_stopped) { union aopen_entry *p = t->afree; atid = p - t->atid_tab; From nobody Mon Oct 21 18:39: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 4XXPGj3rV2z5ZctN; Mon, 21 Oct 2024 18:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGj1xCfz4FxB; Mon, 21 Oct 2024 18:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIgtfmVEIPLUh4nH3TmJnsNUKxwdIKyI4kqmoCRIGUQ=; b=s7zH0W/IeumIDkhFqNaupSq7dNZbQQWeFa1VBawXtJJuM3CnqcDXXi3Mwskan5Q1jTBwVE 5fCdQ0T3RT+F6cB4p1k/DLbVGoKh3ULf5yZWcKqgvVLMIKUqBrb+H6VpsLT0qdyqm/sPJA kpiXbbJ9LbvPjYmCJW9WqVn6P2fGK6Y5ZXTVPByhK8z/hJlewAdsZFuoAKvfnHEASsTfG9 zXfjKRNmEhDsqAqiMI20GfFVeQR1IovcoNte1ba65VzZddB8md6d0+9TEeFNIcMq7ajrMa BZSkGAAaOIDIagxtI7K6/0E4NY3tlgcheuV7p+tT3Ajy4JWL/9D+CRLIpz7cwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIgtfmVEIPLUh4nH3TmJnsNUKxwdIKyI4kqmoCRIGUQ=; b=NQ1pYgzqHzWXDAo/F5WcEZe87wP4emCuMsYa5ERwK0HvjLiP3AgNeg+RvD6mWiayryYeMs h3mmj+JxxjdYLSUQGPwB44UntfXZUZXadjhMxlsMmN9I55P+jkZL8iz3zq7TGz2K9+gAeB MkSiL65qQwWOrgvVkUw4NP7YcTMnYNgu2+w43HlYChIyU7pQr5JxyuLNY4EpKknquU8l/E iz33oMWJAZYXwBCxflTjdMidkPobBmhnM61jFBwQRGm5P4U7LmL+Pkql42wI5/wUXr+bT8 sxXIlPXjc0mVBbSKaqRl32vL8A+uPX0mwWMrjTRAAARiS8RpzK9ZDAj0DZcX4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535949; a=rsa-sha256; cv=none; b=Tub50TVuFDtp/TxUd30Pot9RX1d1Jzq09ki5RIQ5cCt+DiezfOZ0BhGs46/nJ1I8fqgJ5G I1cRxFpaIU2tJpYWwH7fTA4RC4ytGir6Pt9y/1JuHDJWl94u+6BlYn/7enWn4ZqWElvV1U pbrcrtnE/Qaa6X7n9eqwRAb6JGqKVQ/Ml7RTxTSUyJV3m2eYI92/q01AeyWVxeQEAhVoxM r0V1rU1UukYHDVm7+lFaQvdri2i1EFWUqR2ZVR3di73Z2Cq/YTdzCMJ7cUt9inr7gLes1C DMwlOUXi2Z0QBs7aHMwT9kHk2mzYvb7jSmV9POy2Mn/77fZHrLgB4ifXPC9+vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGj0qMrzhjJ; Mon, 21 Oct 2024 18:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LId9ED036066; Mon, 21 Oct 2024 18:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LId9dr036063; Mon, 21 Oct 2024 18:39:09 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:09 GMT Message-Id: <202410211839.49LId9dr036063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 41e9881bf7a2 - stable/14 - cxgbe(4): Basic infrastructure for ULDs to participate in adapter reset. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 41e9881bf7a2e6c97327a4c331bba86e3a6b6ed2 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=41e9881bf7a2e6c97327a4c331bba86e3a6b6ed2 commit 41e9881bf7a2e6c97327a4c331bba86e3a6b6ed2 Author: Navdeep Parhar AuthorDate: 2024-07-08 17:42:49 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:01:06 +0000 cxgbe(4): Basic infrastructure for ULDs to participate in adapter reset. The suspend/resume/reset implementation in the base driver (LLD) currently works when only stateless features are in use. This commit adds basic infrastructure for stateful upper layer drivers (ULDs) to participate in suspend/resume/reset. * Add a uld_restart to indicate that the adapter has been restarted after a stop and the ULD should resume operations. * Move the existing functionality in t4_suspend/t4_resume to stop_lld and restart_lld. Use these and the new uld restart routines everywhere the adapter has to be stopped abruptly and restarted, namely: 1. PCIE bus suspend/resume/reset methods invoked by the kernel. 2. Manual internal-reset using driver sysctl. 3. Automatic internal-reset on a fatal error. * Implement an alternate internal-reset for use in VMs and for testing. Typical reset sequence is: stop_adapter(sc); stop_lld(sc); stop_all_uld(sc); set_adapter_hwstatus(sc, false); /* hw reset takes place here. */ restart_adapter(sc); restart_lld(sc); set_adapter_hwstatus(sc, true); restart_all_uld(sc); Sponsored by: Chelsio Communications (cherry picked from commit 5241b210a4e1029f3005faf82cd74965645c401b) --- sys/dev/cxgbe/adapter.h | 10 +- sys/dev/cxgbe/offload.h | 1 + sys/dev/cxgbe/t4_main.c | 334 ++++++++++++++++++++++++++---------------------- 3 files changed, 191 insertions(+), 154 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 36529601dffa..0d731e736823 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1122,11 +1122,19 @@ forwarding_intr_to_fwq(struct adapter *sc) static inline bool hw_off_limits(struct adapter *sc) { - int off_limits = atomic_load_int(&sc->error_flags) & HW_OFF_LIMITS; + const int off_limits = atomic_load_int(&sc->error_flags) & HW_OFF_LIMITS; return (__predict_false(off_limits != 0)); } +static inline bool +adapter_stopped(struct adapter *sc) +{ + const int stopped = atomic_load_int(&sc->error_flags) & ADAP_STOPPED; + + return (__predict_false(stopped != 0)); +} + static inline int mbuf_nsegs(struct mbuf *m) { diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index a55d6f45cabf..877fdb6b0a89 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -212,6 +212,7 @@ struct uld_info { int (*uld_activate)(struct adapter *); int (*uld_deactivate)(struct adapter *); int (*uld_stop)(struct adapter *); + int (*uld_restart)(struct adapter *); }; struct tom_tunables { diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 60572d0c25e8..2388f0863e77 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -861,10 +861,16 @@ static int read_i2c(struct adapter *, struct t4_i2c_data *); static int clear_stats(struct adapter *, u_int); static int hold_clip_addr(struct adapter *, struct t4_clip_addr *); static int release_clip_addr(struct adapter *, struct t4_clip_addr *); +static inline int stop_adapter(struct adapter *); +static inline void set_adapter_hwstatus(struct adapter *, const bool); +static int stop_lld(struct adapter *); +static inline int restart_adapter(struct adapter *); +static int restart_lld(struct adapter *); #ifdef TCP_OFFLOAD static int toe_capability(struct vi_info *, bool); -static int t4_deactivate_all_uld(struct adapter *); +static int deactivate_all_uld(struct adapter *); static void stop_all_uld(struct adapter *); +static void restart_all_uld(struct adapter *); #endif #ifdef KERN_TLS static int ktls_capability(struct adapter *, bool); @@ -1764,7 +1770,7 @@ t4_detach_common(device_t dev) sc = device_get_softc(dev); #ifdef TCP_OFFLOAD - rc = t4_deactivate_all_uld(sc); + rc = deactivate_all_uld(sc); if (rc) { device_printf(dev, "failed to detach upper layer drivers: %d\n", rc); @@ -1909,57 +1915,77 @@ t4_detach_common(device_t dev) return (0); } -static inline bool -ok_to_reset(struct adapter *sc) +static inline int +stop_adapter(struct adapter *sc) { - struct tid_info *t = &sc->tids; - struct port_info *pi; - struct vi_info *vi; - int i, j; - int caps = IFCAP_TOE | IFCAP_NETMAP | IFCAP_TXRTLMT; - - if (is_t6(sc)) - caps |= IFCAP_TXTLS; + if (atomic_testandset_int(&sc->error_flags, ilog2(ADAP_STOPPED))) { + CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x, EALREADY\n", + __func__, curthread, sc->flags, sc->error_flags); + return (EALREADY); + } + CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x\n", __func__, curthread, + sc->flags, sc->error_flags); + return (t4_shutdown_adapter(sc)); +} - ASSERT_SYNCHRONIZED_OP(sc); - MPASS(!(sc->flags & IS_VF)); +static inline int +restart_adapter(struct adapter *sc) +{ + uint32_t val; - for_each_port(sc, i) { - pi = sc->port[i]; - for_each_vi(pi, j, vi) { - if (if_getcapenable(vi->ifp) & caps) - return (false); - } + if (!atomic_testandclear_int(&sc->error_flags, ilog2(ADAP_STOPPED))) { + CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x, EALREADY\n", + __func__, curthread, sc->flags, sc->error_flags); + return (EALREADY); } + CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x\n", __func__, curthread, + sc->flags, sc->error_flags); + + MPASS(hw_off_limits(sc)); + MPASS((sc->flags & FW_OK) == 0); + MPASS((sc->flags & MASTER_PF) == 0); + MPASS(sc->reset_thread == NULL); - if (atomic_load_int(&t->tids_in_use) > 0) - return (false); - if (atomic_load_int(&t->stids_in_use) > 0) - return (false); - if (atomic_load_int(&t->atids_in_use) > 0) - return (false); - if (atomic_load_int(&t->ftids_in_use) > 0) - return (false); - if (atomic_load_int(&t->hpftids_in_use) > 0) - return (false); - if (atomic_load_int(&t->etids_in_use) > 0) - return (false); + /* + * The adapter is supposed to be back on PCIE with its config space and + * BARs restored to their state before reset. Register access via + * t4_read_reg BAR0 should just work. + */ + sc->reset_thread = curthread; + val = t4_read_reg(sc, A_PL_WHOAMI); + if (val == 0xffffffff || val == 0xeeeeeeee) { + CH_ERR(sc, "%s: device registers not readable.\n", __func__); + sc->reset_thread = NULL; + atomic_set_int(&sc->error_flags, ADAP_STOPPED); + return (ENXIO); + } + atomic_clear_int(&sc->error_flags, ADAP_FATAL_ERR); + atomic_add_int(&sc->incarnation, 1); + atomic_add_int(&sc->num_resets, 1); - return (true); + return (0); } -static inline int -stop_adapter(struct adapter *sc) +static inline void +set_adapter_hwstatus(struct adapter *sc, const bool usable) { - if (atomic_testandset_int(&sc->error_flags, ilog2(ADAP_STOPPED))) - return (1); /* Already stopped. */ - return (t4_shutdown_adapter(sc)); + mtx_lock(&sc->reg_lock); + if (usable) { + /* Must be marked reusable by the designated thread. */ + MPASS(sc->reset_thread == curthread); + atomic_clear_int(&sc->error_flags, HW_OFF_LIMITS); + } else { + /* Mark the adapter totally off limits. */ + atomic_set_int(&sc->error_flags, HW_OFF_LIMITS); + sc->flags &= ~(FW_OK | MASTER_PF); + sc->reset_thread = NULL; + } + mtx_unlock(&sc->reg_lock); } static int -t4_suspend(device_t dev) +stop_lld(struct adapter *sc) { - struct adapter *sc = device_get_softc(dev); struct port_info *pi; struct vi_info *vi; if_t ifp; @@ -1974,25 +2000,20 @@ t4_suspend(device_t dev) #endif int rc, i, j, k; - CH_ALERT(sc, "suspend requested\n"); - - rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4sus"); + /* + * XXX: Can there be a synch_op in progress that will hang because + * hardware has been stopped? We'll hang too and the solution will be + * to use a version of begin_synch_op that wakes up existing synch_op + * with errors. Maybe stop_adapter should do this wakeup? + * + * I don't think any synch_op could get stranded waiting for DMA or + * interrupt so I think we're okay here. Remove this comment block + * after testing. + */ + rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4slld"); if (rc != 0) return (ENXIO); - /* XXX: Can the kernel call suspend repeatedly without resume? */ - MPASS(!hw_off_limits(sc)); - - if (!ok_to_reset(sc)) { - /* XXX: should list what resource is preventing suspend. */ - CH_ERR(sc, "not safe to suspend.\n"); - rc = EBUSY; - goto done; - } - - /* No more DMA or interrupts. */ - stop_adapter(sc); - /* Quiesce all activity. */ for_each_port(sc, i) { pi = sc->port[i]; @@ -2069,25 +2090,33 @@ t4_suspend(device_t dev) callout_stop(&sc->cal_callout); callout_drain(&sc->cal_callout); - /* Mark the adapter totally off limits. */ - mtx_lock(&sc->reg_lock); - atomic_set_int(&sc->error_flags, HW_OFF_LIMITS); - sc->flags &= ~(FW_OK | MASTER_PF); - sc->reset_thread = NULL; - mtx_unlock(&sc->reg_lock); - if (t4_clock_gate_on_suspend) { t4_set_reg_field(sc, A_PMU_PART_CG_PWRMODE, F_MA_PART_CGEN | F_LE_PART_CGEN | F_EDC1_PART_CGEN | F_EDC0_PART_CGEN | F_TP_PART_CGEN | F_PDP_PART_CGEN | F_SGE_PART_CGEN, 0); } - CH_ALERT(sc, "suspend completed.\n"); -done: end_synchronized_op(sc, 0); return (rc); } +static int +t4_suspend(device_t dev) +{ + struct adapter *sc = device_get_softc(dev); + + CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); + stop_adapter(sc); + stop_lld(sc); +#ifdef TCP_OFFLOAD + stop_all_uld(sc); +#endif + set_adapter_hwstatus(sc, false); + CH_ALERT(sc, "%s end (thread %p).\n", __func__, curthread); + + return (0); +} + struct adapter_pre_reset_state { u_int flags; uint16_t nbmcaps; @@ -2240,9 +2269,8 @@ compare_caps_and_params(struct adapter *sc, struct adapter_pre_reset_state *o) } static int -t4_resume(device_t dev) +restart_lld(struct adapter *sc) { - struct adapter *sc = device_get_softc(dev); struct adapter_pre_reset_state *old_state = NULL; struct port_info *pi; struct vi_info *vi; @@ -2250,37 +2278,18 @@ t4_resume(device_t dev) struct sge_txq *txq; int rc, i, j, k; - CH_ALERT(sc, "resume requested.\n"); - - rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4res"); + rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4rlld"); if (rc != 0) return (ENXIO); - MPASS(hw_off_limits(sc)); - MPASS((sc->flags & FW_OK) == 0); - MPASS((sc->flags & MASTER_PF) == 0); - MPASS(sc->reset_thread == NULL); - sc->reset_thread = curthread; - - /* Register access is expected to work by the time we're here. */ - if (t4_read_reg(sc, A_PL_WHOAMI) == 0xffffffff) { - CH_ERR(sc, "%s: can't read device registers\n", __func__); - rc = ENXIO; - goto done; - } - - /* Note that HW_OFF_LIMITS is cleared a bit later. */ - atomic_clear_int(&sc->error_flags, ADAP_FATAL_ERR | ADAP_STOPPED); /* Restore memory window. */ setup_memwin(sc); /* Go no further if recovery mode has been requested. */ if (TUNABLE_INT_FETCH("hw.cxgbe.sos", &i) && i != 0) { - CH_ALERT(sc, "recovery mode on resume.\n"); + CH_ALERT(sc, "%s: recovery mode during restart.\n", __func__); rc = 0; - mtx_lock(&sc->reg_lock); - atomic_clear_int(&sc->error_flags, HW_OFF_LIMITS); - mtx_unlock(&sc->reg_lock); + set_adapter_hwstatus(sc, true); goto done; } @@ -2346,9 +2355,7 @@ t4_resume(device_t dev) * want to access the hardware too. It is safe to do so. Note that * this thread is still in the middle of a synchronized_op. */ - mtx_lock(&sc->reg_lock); - atomic_clear_int(&sc->error_flags, HW_OFF_LIMITS); - mtx_unlock(&sc->reg_lock); + set_adapter_hwstatus(sc, true); if (sc->flags & FULL_INIT_DONE) { rc = adapter_full_init(sc); @@ -2437,95 +2444,101 @@ t4_resume(device_t dev) /* Reset all calibration */ t4_calibration_start(sc); - done: - if (rc == 0) { - sc->incarnation++; - CH_ALERT(sc, "resume completed.\n"); - } end_synchronized_op(sc, 0); free(old_state, M_CXGBE); return (rc); } static int -t4_reset_prepare(device_t dev, device_t child) +t4_resume(device_t dev) { struct adapter *sc = device_get_softc(dev); - CH_ALERT(sc, "reset_prepare.\n"); + CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); + restart_adapter(sc); + restart_lld(sc); +#ifdef TCP_OFFLOAD + restart_all_uld(sc); +#endif + CH_ALERT(sc, "%s end (thread %p).\n", __func__, curthread); + return (0); } static int -t4_reset_post(device_t dev, device_t child) +t4_reset_prepare(device_t dev, device_t child) { struct adapter *sc = device_get_softc(dev); - CH_ALERT(sc, "reset_post.\n"); + CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); return (0); } static int -reset_adapter(struct adapter *sc) +t4_reset_post(device_t dev, device_t child) { - int rc, oldinc, error_flags; - - CH_ALERT(sc, "reset requested.\n"); - - rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4rst1"); - if (rc != 0) - return (EBUSY); - - if (hw_off_limits(sc)) { - CH_ERR(sc, "adapter is suspended, use resume (not reset).\n"); - rc = ENXIO; - goto done; - } + struct adapter *sc = device_get_softc(dev); - if (!ok_to_reset(sc)) { - /* XXX: should list what resource is preventing reset. */ - CH_ERR(sc, "not safe to reset.\n"); - rc = EBUSY; - goto done; - } + CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); + return (0); +} -done: - oldinc = sc->incarnation; - end_synchronized_op(sc, 0); - if (rc != 0) - return (rc); /* Error logged already. */ +static int +reset_adapter_with_pci_bus_reset(struct adapter *sc) +{ + int rc; - atomic_add_int(&sc->num_resets, 1); mtx_lock(&Giant); rc = BUS_RESET_CHILD(device_get_parent(sc->dev), sc->dev, 0); mtx_unlock(&Giant); - if (rc != 0) - CH_ERR(sc, "bus_reset_child failed: %d.\n", rc); - else { - rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4rst2"); - if (rc != 0) - return (EBUSY); - error_flags = atomic_load_int(&sc->error_flags); - if (sc->incarnation > oldinc && error_flags == 0) { - CH_ALERT(sc, "bus_reset_child succeeded.\n"); - } else { - CH_ERR(sc, "adapter did not reset properly, flags " - "0x%08x, error_flags 0x%08x.\n", sc->flags, - error_flags); - rc = ENXIO; - } - end_synchronized_op(sc, 0); - } - return (rc); } +static int +reset_adapter_with_pl_rst(struct adapter *sc) +{ + stop_adapter(sc); + stop_lld(sc); +#ifdef TCP_OFFLOAD + stop_all_uld(sc); +#endif + set_adapter_hwstatus(sc, false); + + /* This is a t4_write_reg without the hw_off_limits check. */ + MPASS(sc->error_flags & HW_OFF_LIMITS); + bus_space_write_4(sc->bt, sc->bh, A_PL_RST, + F_PIORSTMODE | F_PIORST | F_AUTOPCIEPAUSE); + pause("pl_rst", 1 * hz); /* Wait 1s for reset */ + + restart_adapter(sc); + restart_lld(sc); +#ifdef TCP_OFFLOAD + restart_all_uld(sc); +#endif + + return (0); +} + static void reset_adapter_task(void *arg, int pending) { - /* XXX: t4_async_event here? */ - reset_adapter(arg); + struct adapter *sc = arg; + const int flags = sc->flags; + const int eflags = sc->error_flags; + int rc; + + if (pending > 1) + CH_ALERT(sc, "%s: pending %d\n", __func__, pending); + if (vm_guest == 0) + rc = reset_adapter_with_pci_bus_reset(sc); + else + rc = reset_adapter_with_pl_rst(sc); + if (rc != 0) { + CH_ERR(sc, "adapter did not reset properly, rc = %d, " + "flags 0x%08x -> 0x%08x, err_flags 0x%08x -> 0x%08x.\n", + rc, flags, sc->flags, eflags, sc->error_flags); + } } static int @@ -3615,9 +3628,6 @@ fatal_error_task(void *arg, int pending) struct adapter *sc = arg; int rc; -#ifdef TCP_OFFLOAD - stop_all_uld(sc); -#endif if (atomic_testandclear_int(&sc->error_flags, ilog2(ADAP_CIM_ERR))) { dump_cim_regs(sc); dump_cimla(sc); @@ -3625,8 +3635,8 @@ fatal_error_task(void *arg, int pending) } if (t4_reset_on_fatal_err) { - CH_ALERT(sc, "resetting on fatal error.\n"); - rc = reset_adapter(sc); + CH_ALERT(sc, "resetting adapter after fatal error.\n"); + rc = reset_adapter_with_pci_bus_reset(sc); if (rc == 0 && t4_panic_on_fatal_err) { CH_ALERT(sc, "reset was successful, " "system will NOT panic.\n"); @@ -12599,7 +12609,7 @@ t4_deactivate_uld(struct adapter *sc, int id) } static int -t4_deactivate_all_uld(struct adapter *sc) +deactivate_all_uld(struct adapter *sc) { int i, rc; @@ -12639,6 +12649,24 @@ stop_all_uld(struct adapter *sc) end_synchronized_op(sc, 0); } +static void +restart_all_uld(struct adapter *sc) +{ + int i; + + if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4uldre") != 0) + return; + sx_slock(&t4_uld_list_lock); + for (i = 0; i <= ULD_MAX; i++) { + if (t4_uld_list[i] == NULL || !uld_active(sc, i) || + t4_uld_list[i]->uld_restart == NULL) + continue; + (void) t4_uld_list[i]->uld_restart(sc); + } + sx_sunlock(&t4_uld_list_lock); + end_synchronized_op(sc, 0); +} + int uld_active(struct adapter *sc, int id) { From nobody Mon Oct 21 18:39: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 4XXPGl4Tkvz5Zcdd; Mon, 21 Oct 2024 18:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGl3QWSz4G0R; Mon, 21 Oct 2024 18:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ULQGTgAAf3kdMcN8bnQC0xJ3MIT06YkAy/Wc2kBBh2o=; b=p9O1gwv5lZ2ejBFJVxcYeWk002AVZViWnrj2a0S71QedeLLUStGpSHzYAus/s94gAUUbTS MUQNoyemC1iS2dm87rdT7slQJdWlmhjHjkdmmiwoEwp24lSROYbewG2guP+TR2o5qL0fmw KEfib2p/px1fS7xCvJGj9ve8Zb7EBlIdjj9HUwmrhAx78xo9rmf5K5a6i7idwqqtWpWB5k EWuOnPDFtXylJHjrlU4Da4+jDlbE5j3DLtXlmm/vkT7SExUnvsXgPnInINFnDVzP/tXofG ea/k6q/1Ngawoz1spcvsbwe/bwrRVCCGNSHty+DnerFmZ8s+SHYpkv7hoSgetQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ULQGTgAAf3kdMcN8bnQC0xJ3MIT06YkAy/Wc2kBBh2o=; b=ELPJHYnv2Fp4yZN7I7fCjny/0Giv323gxkXgxvzRGpp8UoWD69nF0O/6FAI0Xq0L0O2YWZ nLXtjTxwIjUNHNIfpJXrCouHEOMoJWG02nT9aNk10HViBwCjReD5t4WyYrleGFIYhkBiPb lNKTRBF5estSp1dsTYWOWel8fSyjwGPfRIGwB1W8dUvieuP5nq6uNadMFVUJX/cyTcM/cO meGjvAWqD0PW8MnCnBALyGyBT+xGknBkVV8DZT3F1hdLRlPb1j1WHDi6FWmnjyS/bmaZ2l cvouQkTerbsG8oE16LcgvqlKwmzCsusPp8ajmiHgW6WudwSOhHLuqFbXbo7xBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535951; a=rsa-sha256; cv=none; b=RU7ktkbT5BQXkeWrtmx0G8Z6OJY/JNUfojlUp1syH9Ws3MZhac1pswF/bd1LD9CIvybdvs R9b7t4vg6woVhbB8qH7SzjtNEKN/dwVdZVAO4uy0/QJZzUvx5MT7BMOu1tMokWnZHFKpwE VgcjE1DlM30yn70udQNdSf483GcfGb7jP3UiId9LMp6CV8ev6XXjMavMcnzI72++DQNgRB Du1OEDle/WoOxTZ14F2jZA7eeYNwkFqggmt7Gt1HpuUD3AzbVZ7iZNbBCjw5McIyyIAurs StDcBCmW3ttwmYfhl/C+wVS03g7DstXu5pqR0yuSftUlQqgTthPmsmHT32lyNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGl2zXvzhSP; Mon, 21 Oct 2024 18:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdBeG036186; Mon, 21 Oct 2024 18:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdBb7036183; Mon, 21 Oct 2024 18:39:11 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:11 GMT Message-Id: <202410211839.49LIdBb7036183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: da45eba6d1de - stable/14 - cxgbe(4): Stop and restart the L2T allocator with the LLD. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: da45eba6d1de7fd334f1928258117d6b5b61f856 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=da45eba6d1de7fd334f1928258117d6b5b61f856 commit da45eba6d1de7fd334f1928258117d6b5b61f856 Author: Navdeep Parhar AuthorDate: 2024-07-19 16:40:44 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:02:17 +0000 cxgbe(4): Stop and restart the L2T allocator with the LLD. L2T entries are used by both filters and TOE and the L2T is shared between the base driver (LLD) and the TOM ULD. Add a flag to indicate that the L2T is stopped, which means: * t4_alloc_l2e and t4_l2t_alloc_switching will not allocate new entries. * t4_tom will ignore all ARP/NDP updates from the kernel. * Previously allocated L2T entries can still be freed. Sponsored by: Chelsio Communications (cherry picked from commit cd93fdee5c8bbdb00d10f8a1fa43f30f151a1ef7) --- sys/dev/cxgbe/t4_l2t.c | 36 +++++++++++++++++++++++++++++++++--- sys/dev/cxgbe/t4_l2t.h | 5 ++++- sys/dev/cxgbe/t4_main.c | 4 +++- sys/dev/cxgbe/tom/t4_tom_l2t.c | 7 +++++++ 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/t4_l2t.c b/sys/dev/cxgbe/t4_l2t.c index 90f184f5e666..b210003cfac0 100644 --- a/sys/dev/cxgbe/t4_l2t.c +++ b/sys/dev/cxgbe/t4_l2t.c @@ -73,7 +73,8 @@ t4_alloc_l2e(struct l2t_data *d) struct l2t_entry *end, *e, **p; rw_assert(&d->lock, RA_WLOCKED); - + if (__predict_false(d->l2t_stopped)) + return (NULL); if (!atomic_load_acq_int(&d->nfree)) return (NULL); @@ -291,7 +292,10 @@ t4_l2t_alloc_switching(struct adapter *sc, uint16_t vlan, uint8_t port, int rc; rw_wlock(&d->lock); - e = find_or_alloc_l2e(d, vlan, port, eth_addr); + if (__predict_false(d->l2t_stopped)) + e = NULL; + else + e = find_or_alloc_l2e(d, vlan, port, eth_addr); if (e) { if (atomic_load_acq_int(&e->refcnt) == 0) { mtx_lock(&e->lock); /* avoid race with t4_l2t_free */ @@ -333,6 +337,7 @@ t4_init_l2t(struct adapter *sc, int flags) return (ENOMEM); d->l2t_size = l2t_size; + d->l2t_stopped = false; d->rover = d->l2tab; atomic_store_rel_int(&d->nfree, l2t_size); rw_init(&d->lock, "L2T"); @@ -353,8 +358,9 @@ t4_init_l2t(struct adapter *sc, int flags) } int -t4_free_l2t(struct l2t_data *d) +t4_free_l2t(struct adapter *sc) { + struct l2t_data *d = sc->l2t; int i; for (i = 0; i < d->l2t_size; i++) @@ -365,6 +371,30 @@ t4_free_l2t(struct l2t_data *d) return (0); } +int +t4_stop_l2t(struct adapter *sc) +{ + struct l2t_data *d = sc->l2t; + + rw_wlock(&d->lock); + d->l2t_stopped = true; + rw_wunlock(&d->lock); + + return (0); +} + +int +t4_restart_l2t(struct adapter *sc) +{ + struct l2t_data *d = sc->l2t; + + rw_wlock(&d->lock); + d->l2t_stopped = false; + rw_wunlock(&d->lock); + + return (0); +} + int do_l2t_write_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) diff --git a/sys/dev/cxgbe/t4_l2t.h b/sys/dev/cxgbe/t4_l2t.h index 991b4476eb61..f8681a4ab556 100644 --- a/sys/dev/cxgbe/t4_l2t.h +++ b/sys/dev/cxgbe/t4_l2t.h @@ -79,6 +79,7 @@ struct l2t_entry { struct l2t_data { struct rwlock lock; u_int l2t_size; + bool l2t_stopped; volatile int nfree; /* number of free entries */ struct l2t_entry *rover;/* starting point for next allocation */ struct l2t_entry l2tab[]; @@ -86,7 +87,9 @@ struct l2t_data { int t4_init_l2t(struct adapter *, int); -int t4_free_l2t(struct l2t_data *); +int t4_free_l2t(struct adapter *); +int t4_stop_l2t(struct adapter *); +int t4_restart_l2t(struct adapter *); struct l2t_entry *t4_alloc_l2e(struct l2t_data *); struct l2t_entry *t4_l2t_alloc_switching(struct adapter *, uint16_t, uint8_t, uint8_t *); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index f1f1cccb93c2..c02fe8372946 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1847,7 +1847,7 @@ t4_detach_common(device_t dev) sc->msix_res); if (sc->l2t) - t4_free_l2t(sc->l2t); + t4_free_l2t(sc); if (sc->smt) t4_free_smt(sc->smt); t4_free_atid_table(sc); @@ -2101,6 +2101,7 @@ stop_lld(struct adapter *sc) end_synchronized_op(sc, 0); stop_atid_allocator(sc); + t4_stop_l2t(sc); return (rc); } @@ -2454,6 +2455,7 @@ done: free(old_state, M_CXGBE); restart_atid_allocator(sc); + t4_restart_l2t(sc); return (rc); } diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.c b/sys/dev/cxgbe/tom/t4_tom_l2t.c index ee442f023970..749e5704863e 100644 --- a/sys/dev/cxgbe/tom/t4_tom_l2t.c +++ b/sys/dev/cxgbe/tom/t4_tom_l2t.c @@ -380,6 +380,10 @@ t4_l2t_get(struct port_info *pi, if_t ifp, struct sockaddr *sa) hash = l2_hash(d, sa, if_getindex(ifp)); rw_wlock(&d->lock); + if (__predict_false(d->l2t_stopped)) { + e = NULL; + goto done; + } for (e = d->l2tab[hash].first; e; e = e->next) { if (l2_cmp(sa, e) == 0 && e->ifp == ifp && e->vlan == vtag && e->smt_idx == smt_idx) { @@ -429,6 +433,8 @@ t4_l2_update(struct toedev *tod, if_t ifp, struct sockaddr *sa, hash = l2_hash(d, sa, if_getindex(ifp)); rw_rlock(&d->lock); + if (__predict_false(d->l2t_stopped)) + goto done; for (e = d->l2tab[hash].first; e; e = e->next) { if (l2_cmp(sa, e) == 0 && e->ifp == ifp) { mtx_lock(&e->lock); @@ -439,6 +445,7 @@ t4_l2_update(struct toedev *tod, if_t ifp, struct sockaddr *sa, break; } } +done: rw_runlock(&d->lock); /* From nobody Mon Oct 21 18:39: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 4XXPGn09S4z5Zctc; Mon, 21 Oct 2024 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGm4T5zz4FpQ; Mon, 21 Oct 2024 18:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZwwZQSxoqXf4+ZRVjxVbs+YrudIQ5vcx0xkYUtSxhHk=; b=oZL8GbnDASkc7ShA+Ae6U12H0OBeH+FKoPMWNOQtaoShHe4LHEeeiHL2XQdRLRYrkxxMcV h/UMX32Dm+gb2GwRGvdLtRtSIyz4mx0zmLjJHqaKQiMyVknOg+dJd8rnUBogsQa3+vXQwH zarcL4MDrplFkEeKjDMuAvVSBfKsK+R9Vv+w+XgqBlTeLQbGzZXDwPu6gKzkH/f8JKIfna QpwNa+F3u6HGeiFJIc0Yx8R6AKp0LKXS8x3n0H85kdrXfA84FV6k1p+VqHf6YPvhU8MLkj nXkpSeKNdBzOgavSKwRWAdPrkvpSLN6Up6tl1ZmtCPRqLgxoSIJ8Hdur9detcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZwwZQSxoqXf4+ZRVjxVbs+YrudIQ5vcx0xkYUtSxhHk=; b=VSYe5sJHd2GsCk85wDc3LXW3+3qdSUsmDc8UZR1IhoXr5hosCRfCNenfapbZA+Hay+9Mnu AjtB9ajonF7DDvCmlNtHEmr+rNmvu2aINsNdQYjSnHtCUXCqUQa9u2Geh0rvCP6hy8sv1k VPgDegD3IiDMTeZyJVaETO1stUUhC2XpuRZhvkXA61RKjbnJoA75IGt9zKcFyIR2HtOHun IfhYNOCcjwJpQNYTb6i89frHw9yoAR0e6SlOkjZoeFmWh8DMJ6bqdN+3eWeTPTLH14TU7E IwqTAbUWjcMK4SJKp4GfwSI9q7pIkVI//3in96uEACW3zKbrN0bGLV+co0w7Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535952; a=rsa-sha256; cv=none; b=IDph2D2E+UK4LYb7lvGbzBkHBQqsX1obEmo/M/fscovqJOPNALlfRlBvH5aqNKjuXU9Dqh c7G/H2sSbKRu1kVHk2ckkAqkj7Zfb2geMDadTgyny/U24kAznnNApLpsLUyaPei4p29Iv6 cOEOcJwxCAMb8Q6TtQ0oRsU8PaWoQ7rdwNAHfAUCM+4scUr1Pjp9MrksRjtQXDzrKEXEEg cmw0kG9Dkw0spxjHyIagENr8nOcs87UUJIA4ojQ3Zo2McEXdht4ijLBhx327mHy9bc89R2 IaNekbdqMYm7B8zGH5rS0c97K8Y/YnWI0fOvgEnxGZJ5Oy6q5z8gGvv4y9bEvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGm44gmzhQP; Mon, 21 Oct 2024 18:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdCNo036252; Mon, 21 Oct 2024 18:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdCpJ036249; Mon, 21 Oct 2024 18:39:12 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:12 GMT Message-Id: <202410211839.49LIdCpJ036249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: fcda529bf01a - stable/14 - cxgbe/t4_tom: Track all synq entries in a per-adapter 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fcda529bf01aa1ad2dd44c5209b92992b5531f24 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=fcda529bf01aa1ad2dd44c5209b92992b5531f24 commit fcda529bf01aa1ad2dd44c5209b92992b5531f24 Author: Navdeep Parhar AuthorDate: 2024-07-20 19:38:42 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:02:37 +0000 cxgbe/t4_tom: Track all synq entries in a per-adapter list. Live tid entries in tid_tab are either full fledged connections or synq entries. toep_list tracks the connections already and this change adds a synqe_list to track the synq entries. These two lists can be used to enumerate and iterate over all live tids. Sponsored by: Chelsio Communications (cherry picked from commit 283333c0e329fd7aceff16fa3bf2b9892744d883) --- sys/dev/cxgbe/tom/t4_listen.c | 12 ++++++++++++ sys/dev/cxgbe/tom/t4_tom.c | 2 ++ sys/dev/cxgbe/tom/t4_tom.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c index d25c161d3f8d..6e8361734db7 100644 --- a/sys/dev/cxgbe/tom/t4_listen.c +++ b/sys/dev/cxgbe/tom/t4_listen.c @@ -849,6 +849,7 @@ do_close_server_rpl(struct sge_iq *iq, const struct rss_header *rss, static void done_with_synqe(struct adapter *sc, struct synq_entry *synqe) { + struct tom_data *td = sc->tom_softc; struct listen_ctx *lctx = synqe->lctx; struct inpcb *inp = lctx->inp; struct l2t_entry *e = &sc->l2t->l2tab[synqe->params.l2t_idx]; @@ -858,6 +859,9 @@ done_with_synqe(struct adapter *sc, struct synq_entry *synqe) ntids = inp->inp_vflag & INP_IPV6 ? 2 : 1; remove_tid(sc, synqe->tid, ntids); + mtx_lock(&td->toep_list_lock); + TAILQ_REMOVE(&td->synqe_list, synqe, link); + mtx_unlock(&td->toep_list_lock); release_tid(sc, synqe->tid, lctx->ctrlq); t4_l2t_release(e); inp = release_synqe(sc, synqe); @@ -961,6 +965,7 @@ void t4_offload_socket(struct toedev *tod, void *arg, struct socket *so) { struct adapter *sc = tod->tod_softc; + struct tom_data *td = sc->tom_softc; struct synq_entry *synqe = arg; struct inpcb *inp = sotoinpcb(so); struct toepcb *toep = synqe->toep; @@ -976,6 +981,9 @@ t4_offload_socket(struct toedev *tod, void *arg, struct socket *so) toep->flags |= TPF_CPL_PENDING; update_tid(sc, synqe->tid, toep); synqe->flags |= TPF_SYNQE_EXPANDED; + mtx_lock(&td->toep_list_lock); + TAILQ_REMOVE(&td->synqe_list, synqe, link); + mtx_unlock(&td->toep_list_lock); inp->inp_flowtype = (inp->inp_vflag & INP_IPV6) ? M_HASHTYPE_RSS_TCP_IPV6 : M_HASHTYPE_RSS_TCP_IPV4; inp->inp_flowid = synqe->rss_hash; @@ -1177,6 +1185,7 @@ do_pass_accept_req(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) { struct adapter *sc = iq->adapter; + struct tom_data *td = sc->tom_softc; struct toedev *tod; const struct cpl_pass_accept_req *cpl = mtod(m, const void *); unsigned int stid = G_PASS_OPEN_TID(be32toh(cpl->tos_stid)); @@ -1383,6 +1392,9 @@ found: REJECT_PASS_ACCEPT_REQ(true); } + mtx_lock(&td->toep_list_lock); + TAILQ_INSERT_TAIL(&td->synqe_list, synqe, link); + mtx_unlock(&td->toep_list_lock); CTR6(KTR_CXGBE, "%s: stid %u, tid %u, synqe %p, opt0 %#016lx, opt2 %#08x", __func__, stid, tid, synqe, be64toh(opt0), be32toh(opt2)); diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index f9d8dcd706b7..fb92c88aa358 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1831,6 +1831,7 @@ t4_tom_activate(struct adapter *sc) /* List of TOE PCBs and associated lock */ mtx_init(&td->toep_list_lock, "PCB list lock", NULL, MTX_DEF); TAILQ_INIT(&td->toep_list); + TAILQ_INIT(&td->synqe_list); /* Listen context */ mtx_init(&td->lctx_hash_lock, "lctx hash lock", NULL, MTX_DEF); @@ -1915,6 +1916,7 @@ t4_tom_deactivate(struct adapter *sc) mtx_lock(&td->toep_list_lock); if (!TAILQ_EMPTY(&td->toep_list)) rc = EBUSY; + MPASS(TAILQ_EMPTY(&td->synqe_list)); mtx_unlock(&td->toep_list_lock); mtx_lock(&td->lctx_hash_lock); diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index fb74642d61f7..0bc368fe3d56 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -269,6 +269,7 @@ struct synq_entry { struct listen_ctx *lctx; /* backpointer to listen ctx */ struct mbuf *syn; int flags; /* same as toepcb's tp_flags */ + TAILQ_ENTRY(synq_entry) link; /* synqe_list */ volatile int ok_to_respond; volatile u_int refcnt; int tid; @@ -329,6 +330,7 @@ struct tom_data { /* toepcb's associated with this TOE device */ struct mtx toep_list_lock; TAILQ_HEAD(, toepcb) toep_list; + TAILQ_HEAD(, synq_entry) synqe_list; struct mtx lctx_hash_lock; LIST_HEAD(, listen_ctx) *listen_hash; From nobody Mon Oct 21 18:39: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 4XXPGn6l2pz5Zcdl; Mon, 21 Oct 2024 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGn5SBVz4Fvg; Mon, 21 Oct 2024 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9Vw88g7p8ApH+rSFU0BaLPpeNBRJ7Xl3H2dlmzkxzU=; b=JOaLtAygNMSz19eTh92W105P94i24ilBwZfI8yrUvvUyygwUVF514MTVSchlFXlg1pEqeh DFtnEtsVKLB0r2AwwfhYca9nCC+AqeiPd/XR7pzLrYubqnQYV0vTWsIs8seKrH4LsKdB1D hgvy0Fer0bL4RTA5oXQ3TZ7bnjVI43SLBj95pkeeYd+BLkycgrs27h1NqUJqJGbj51Z/8I 90avBg2v1Cx3AYQQlZ5W8Pb56B1xX/KSaXQxW4Rxdpou1fHaveWCBwEmQGnF7Xe+c2sd7i FwsihB3ybMH1APxTmR36qRWnOsy4iFK+9V0LnhLmfIwu1ha580rHV7XUkA0njQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9Vw88g7p8ApH+rSFU0BaLPpeNBRJ7Xl3H2dlmzkxzU=; b=aFo/wrc6IkXInI/yuifTIplKZDtXIwYT/to5nC5PvJCO6WQlawZbPddkdfiStVdaZJ9GW6 peyxtNtmcXqHGFl0hE1jahqzZsitcswQAQsTee5KP8lRh+8dZj13bwYHRFBCVP7XIKmZGx O4pL89yd4skV8Aalj0yH+lNAy7jipQ2wFF1QL/usIAjUtuAlGY6xjs9jN8nPvOejD0R8Od 6Ju52UDYGla7uTUotWmxEJ29fBEg72YGjRXSBTDlYYbUlP7rbcOGpOEGx/Cvb7bjd3ygPK eXvbLb2zJShKk23NZJ5DxfE6ylcIAWBVDZWp8U1ZvsQINTWPUviy6x/JOYuxCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535953; a=rsa-sha256; cv=none; b=W2zi8YW6zk/3WA80j42Q1Ku8mybpnIgLFstw+v0Zb5GYejP7eW446f8oTqq5p1N6rNOdR6 VLVtJww1nkFyH4cn+p4rTMrYfXP5hAuMFYl5Bkb9KB8rxIci3sEkCmkyh4VUWIqQeyfrrI TC8fll9KDjCoio4eVTc3vHFRJUcTQRFhpUO0turSAjXUUZyZIVE5c+YbjVUNB+ZMPwq0ff AkNqqPxGb3+5igy8WVM7MS5EBapppTkIo99/VCOzlUMMJEGP4rCeKwgcU/lmN/Th8DHQtM CnGfqXfBgKaRVPLSzT1BVvP5DFoq+zYal6+GJeYQrjTm0uOKPghy/iLELGsyFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGn51sszh86; Mon, 21 Oct 2024 18:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdDjq036300; Mon, 21 Oct 2024 18:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdDt1036297; Mon, 21 Oct 2024 18:39:13 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:13 GMT Message-Id: <202410211839.49LIdDt1036297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: b836830270f5 - stable/14 - cxgbe/t4_tom: Implement uld_stop and uld_restart for ULD_TOM. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b836830270f5c736430fd9358dc26ffad1537a3f Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=b836830270f5c736430fd9358dc26ffad1537a3f commit b836830270f5c736430fd9358dc26ffad1537a3f Author: Navdeep Parhar AuthorDate: 2024-07-12 23:56:15 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:03:14 +0000 cxgbe/t4_tom: Implement uld_stop and uld_restart for ULD_TOM. This allows the adapter to be suspended or reset even when stateful TOE is active, in some limited configurations. The LLD has already stopped the adapter hardware and all its queues by the time these ULD routines get called. The general approach in t4_tom is to purge the lookup tables immediately so that they are ready for operation by the time the adapter resumes, and park all the resources left hanging by the stopped hardware into separate "stranded" queues that can be dealt with at leisure. Outstanding active opens, live connections, and synq entries (for connections in the middle of the 3-way handshake) are all treated as if the hardware had reported an abrupt error for the tid. The servers/listeners are a bit different in that no error is reported. They're just noted as non-functional when the hardware stops and are recreated by the driver during restart. Sponsored by: Chelsio Communications (cherry picked from commit c1c524852f625cf5f420653f7850d1fe3ff6b4ca) --- sys/dev/cxgbe/offload.h | 1 + sys/dev/cxgbe/tom/t4_connect.c | 11 +- sys/dev/cxgbe/tom/t4_listen.c | 136 ++++++++++++++++-- sys/dev/cxgbe/tom/t4_tom.c | 314 ++++++++++++++++++++++++++++++++++------- sys/dev/cxgbe/tom/t4_tom.h | 19 ++- 5 files changed, 409 insertions(+), 72 deletions(-) diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index b17056dc0338..c13901ee1a59 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -146,6 +146,7 @@ struct tid_info { u_int stids_in_use; u_int nstids_free_head; /* # of available stids at the beginning */ struct stid_head stids; + bool stid_tab_stopped; struct mtx atid_lock __aligned(CACHE_LINE_SIZE); union aopen_entry *atid_tab; diff --git a/sys/dev/cxgbe/tom/t4_connect.c b/sys/dev/cxgbe/tom/t4_connect.c index 4e81f23dc267..1c98e70a4df5 100644 --- a/sys/dev/cxgbe/tom/t4_connect.c +++ b/sys/dev/cxgbe/tom/t4_connect.c @@ -110,15 +110,16 @@ done: } void -act_open_failure_cleanup(struct adapter *sc, u_int atid, u_int status) +act_open_failure_cleanup(struct adapter *sc, struct toepcb *toep, u_int status) { - struct toepcb *toep = lookup_atid(sc, atid); struct inpcb *inp = toep->inp; struct toedev *tod = &toep->td->tod; struct epoch_tracker et; - free_atid(sc, atid); - toep->tid = -1; + if (toep->tid >= 0) { + free_atid(sc, toep->tid); + toep->tid = -1; + } CURVNET_SET(toep->vnet); if (status != EAGAIN) @@ -158,7 +159,7 @@ do_act_open_rpl(struct sge_iq *iq, const struct rss_header *rss, release_tid(sc, GET_TID(cpl), toep->ctrlq); rc = act_open_rpl_status_to_errno(status); - act_open_failure_cleanup(sc, atid, rc); + act_open_failure_cleanup(sc, toep, rc); return (0); } diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c index 6e8361734db7..897c5bcaab1e 100644 --- a/sys/dev/cxgbe/tom/t4_listen.c +++ b/sys/dev/cxgbe/tom/t4_listen.c @@ -88,6 +88,111 @@ static struct inpcb *release_lctx(struct adapter *, struct listen_ctx *); static void send_abort_rpl_synqe(struct toedev *, struct synq_entry *, int); +static int create_server6(struct adapter *, struct listen_ctx *); +static int create_server(struct adapter *, struct listen_ctx *); + +int +alloc_stid_tab(struct adapter *sc) +{ + struct tid_info *t = &sc->tids; + + MPASS(t->nstids > 0); + MPASS(t->stid_tab == NULL); + + t->stid_tab = malloc(t->nstids * sizeof(*t->stid_tab), M_CXGBE, + M_ZERO | M_NOWAIT); + if (t->stid_tab == NULL) + return (ENOMEM); + mtx_init(&t->stid_lock, "stid lock", NULL, MTX_DEF); + t->stids_in_use = 0; + TAILQ_INIT(&t->stids); + t->nstids_free_head = t->nstids; + + return (0); +} + +void +free_stid_tab(struct adapter *sc) +{ + struct tid_info *t = &sc->tids; + + KASSERT(t->stids_in_use == 0, + ("%s: %d tids still in use.", __func__, t->stids_in_use)); + + if (mtx_initialized(&t->stid_lock)) + mtx_destroy(&t->stid_lock); + free(t->stid_tab, M_CXGBE); + t->stid_tab = NULL; +} + +void +stop_stid_tab(struct adapter *sc) +{ + struct tid_info *t = &sc->tids; + struct tom_data *td = sc->tom_softc; + struct listen_ctx *lctx; + struct synq_entry *synqe; + int i, ntids; + + mtx_lock(&t->stid_lock); + t->stid_tab_stopped = true; + mtx_unlock(&t->stid_lock); + + mtx_lock(&td->lctx_hash_lock); + for (i = 0; i <= td->listen_mask; i++) { + LIST_FOREACH(lctx, &td->listen_hash[i], link) + lctx->flags &= ~(LCTX_RPL_PENDING | LCTX_SETUP_IN_HW); + } + mtx_unlock(&td->lctx_hash_lock); + + mtx_lock(&td->toep_list_lock); + TAILQ_FOREACH(synqe, &td->synqe_list, link) { + MPASS(sc->incarnation == synqe->incarnation); + MPASS(synqe->tid >= 0); + MPASS(synqe == lookup_tid(sc, synqe->tid)); + /* Remove tid from the lookup table immediately. */ + CTR(KTR_CXGBE, "%s: tid %d@%d STRANDED, removed from table", + __func__, synqe->tid, synqe->incarnation); + ntids = synqe->lctx->inp->inp_vflag & INP_IPV6 ? 2 : 1; + remove_tid(sc, synqe->tid, ntids); +#if 0 + /* synqe->tid is stale now but left alone for debug. */ + synqe->tid = -1; +#endif + } + MPASS(TAILQ_EMPTY(&td->stranded_synqe)); + TAILQ_CONCAT(&td->stranded_synqe, &td->synqe_list, link); + MPASS(TAILQ_EMPTY(&td->synqe_list)); + mtx_unlock(&td->toep_list_lock); +} + +void +restart_stid_tab(struct adapter *sc) +{ + struct tid_info *t = &sc->tids; + struct tom_data *td = sc->tom_softc; + struct listen_ctx *lctx; + int i; + + mtx_lock(&td->lctx_hash_lock); + for (i = 0; i <= td->listen_mask; i++) { + LIST_FOREACH(lctx, &td->listen_hash[i], link) { + MPASS((lctx->flags & (LCTX_RPL_PENDING | LCTX_SETUP_IN_HW)) == 0); + lctx->flags |= LCTX_RPL_PENDING; + if (lctx->inp->inp_vflag & INP_IPV6) + create_server6(sc, lctx); + else + create_server(sc, lctx); + } + } + mtx_unlock(&td->lctx_hash_lock); + + mtx_lock(&t->stid_lock); + t->stid_tab_stopped = false; + mtx_unlock(&t->stid_lock); + +} + static int alloc_stid(struct adapter *sc, struct listen_ctx *lctx, int isipv6) { @@ -107,7 +212,7 @@ alloc_stid(struct adapter *sc, struct listen_ctx *lctx, int isipv6) __func__, t->stid_base, t->nstids, n)); mtx_lock(&t->stid_lock); - if (n > t->nstids - t->stids_in_use) { + if (n > t->nstids - t->stids_in_use || t->stid_tab_stopped) { mtx_unlock(&t->stid_lock); return (-1); } @@ -632,12 +737,13 @@ t4_listen_stop(struct toedev *tod, struct tcpcb *tp) return (EINPROGRESS); } - destroy_server(sc, lctx); + if (lctx->flags & LCTX_SETUP_IN_HW) + destroy_server(sc, lctx); return (0); } static inline struct synq_entry * -alloc_synqe(struct adapter *sc __unused, struct listen_ctx *lctx, int flags) +alloc_synqe(struct adapter *sc, struct listen_ctx *lctx, int flags) { struct synq_entry *synqe; @@ -647,6 +753,7 @@ alloc_synqe(struct adapter *sc __unused, struct listen_ctx *lctx, int flags) synqe = malloc(sizeof(*synqe), M_CXGBE, flags); if (__predict_true(synqe != NULL)) { synqe->flags = TPF_SYNQE; + synqe->incarnation = sc->incarnation; refcount_init(&synqe->refcnt, 1); synqe->lctx = lctx; hold_lctx(lctx); /* Every synqe has a ref on its lctx. */ @@ -761,8 +868,9 @@ do_pass_open_rpl(struct sge_iq *iq, const struct rss_header *rss, __func__, stid, status, lctx->flags); lctx->flags &= ~LCTX_RPL_PENDING; - - if (status != CPL_ERR_NONE) + if (status == CPL_ERR_NONE) + lctx->flags |= LCTX_SETUP_IN_HW; + else log(LOG_ERR, "listener (stid %u) failed: %d\n", stid, status); #ifdef INVARIANTS @@ -856,13 +964,15 @@ done_with_synqe(struct adapter *sc, struct synq_entry *synqe) int ntids; INP_WLOCK_ASSERT(inp); - ntids = inp->inp_vflag & INP_IPV6 ? 2 : 1; - remove_tid(sc, synqe->tid, ntids); - mtx_lock(&td->toep_list_lock); - TAILQ_REMOVE(&td->synqe_list, synqe, link); - mtx_unlock(&td->toep_list_lock); - release_tid(sc, synqe->tid, lctx->ctrlq); + if (synqe->tid != -1) { + ntids = inp->inp_vflag & INP_IPV6 ? 2 : 1; + remove_tid(sc, synqe->tid, ntids); + mtx_lock(&td->toep_list_lock); + TAILQ_REMOVE(&td->synqe_list, synqe, link); + mtx_unlock(&td->toep_list_lock); + release_tid(sc, synqe->tid, lctx->ctrlq); + } t4_l2t_release(e); inp = release_synqe(sc, synqe); if (inp) @@ -870,10 +980,8 @@ done_with_synqe(struct adapter *sc, struct synq_entry *synqe) } void -synack_failure_cleanup(struct adapter *sc, int tid) +synack_failure_cleanup(struct adapter *sc, struct synq_entry *synqe) { - struct synq_entry *synqe = lookup_tid(sc, tid); - INP_WLOCK(synqe->lctx->inp); done_with_synqe(sc, synqe); } diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index fb92c88aa358..58a77ff93c86 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -89,18 +89,23 @@ static int t4_tom_modevent(module_t, int, void *); /* ULD ops and helpers */ static int t4_tom_activate(struct adapter *); static int t4_tom_deactivate(struct adapter *); +static int t4_tom_stop(struct adapter *); +static int t4_tom_restart(struct adapter *); static struct uld_info tom_uld_info = { .uld_activate = t4_tom_activate, .uld_deactivate = t4_tom_deactivate, + .uld_stop = t4_tom_stop, + .uld_restart = t4_tom_restart, }; static void release_offload_resources(struct toepcb *); static void done_with_toepcb(struct toepcb *); -static int alloc_tid_tabs(struct tid_info *); -static void free_tid_tabs(struct tid_info *); +static int alloc_tid_tabs(struct adapter *); +static void free_tid_tabs(struct adapter *); static void free_tom_data(struct adapter *, struct tom_data *); static void reclaim_wr_resources(void *, int); +static void cleanup_stranded_tids(void *, int); struct toepcb * alloc_toepcb(struct vi_info *vi, int flags) @@ -135,6 +140,7 @@ alloc_toepcb(struct vi_info *vi, int flags) refcount_init(&toep->refcount, 1); toep->td = sc->tom_softc; + toep->incarnation = sc->incarnation; toep->vi = vi; toep->tid = -1; toep->tx_total = tx_credits; @@ -254,6 +260,7 @@ offload_socket(struct socket *so, struct toepcb *toep) /* Add the TOE PCB to the active list */ mtx_lock(&td->toep_list_lock); TAILQ_INSERT_HEAD(&td->toep_list, toep, link); + toep->flags |= TPF_IN_TOEP_LIST; mtx_unlock(&td->toep_list_lock); } @@ -298,6 +305,7 @@ undo_offload_socket(struct socket *so) panic("%s: inp freed.", __func__); mtx_lock(&td->toep_list_lock); + toep->flags &= ~TPF_IN_TOEP_LIST; TAILQ_REMOVE(&td->toep_list, toep, link); mtx_unlock(&td->toep_list_lock); } @@ -364,7 +372,10 @@ done_with_toepcb(struct toepcb *toep) MPASS(toep->ce == NULL); mtx_lock(&td->toep_list_lock); - TAILQ_REMOVE(&td->toep_list, toep, link); + if (toep->flags & TPF_IN_TOEP_LIST) { + toep->flags &= ~TPF_IN_TOEP_LIST; + TAILQ_REMOVE(&td->toep_list, toep, link); + } mtx_unlock(&td->toep_list_lock); free_toepcb(toep); @@ -1449,14 +1460,15 @@ negative_advice(int status) } static int -alloc_tid_tab(struct tid_info *t, int flags) +alloc_tid_tab(struct adapter *sc) { + struct tid_info *t = &sc->tids; MPASS(t->ntids > 0); MPASS(t->tid_tab == NULL); t->tid_tab = malloc(t->ntids * sizeof(*t->tid_tab), M_CXGBE, - M_ZERO | flags); + M_ZERO | M_NOWAIT); if (t->tid_tab == NULL) return (ENOMEM); atomic_store_rel_int(&t->tids_in_use, 0); @@ -1465,8 +1477,9 @@ alloc_tid_tab(struct tid_info *t, int flags) } static void -free_tid_tab(struct tid_info *t) +free_tid_tab(struct adapter *sc) { + struct tid_info *t = &sc->tids; KASSERT(t->tids_in_use == 0, ("%s: %d tids still in use.", __func__, t->tids_in_use)); @@ -1475,62 +1488,29 @@ free_tid_tab(struct tid_info *t) t->tid_tab = NULL; } -static int -alloc_stid_tab(struct tid_info *t, int flags) -{ - - MPASS(t->nstids > 0); - MPASS(t->stid_tab == NULL); - - t->stid_tab = malloc(t->nstids * sizeof(*t->stid_tab), M_CXGBE, - M_ZERO | flags); - if (t->stid_tab == NULL) - return (ENOMEM); - mtx_init(&t->stid_lock, "stid lock", NULL, MTX_DEF); - t->stids_in_use = 0; - TAILQ_INIT(&t->stids); - t->nstids_free_head = t->nstids; - - return (0); -} - static void -free_stid_tab(struct tid_info *t) +free_tid_tabs(struct adapter *sc) { - - KASSERT(t->stids_in_use == 0, - ("%s: %d tids still in use.", __func__, t->stids_in_use)); - - if (mtx_initialized(&t->stid_lock)) - mtx_destroy(&t->stid_lock); - free(t->stid_tab, M_CXGBE); - t->stid_tab = NULL; -} - -static void -free_tid_tabs(struct tid_info *t) -{ - - free_tid_tab(t); - free_stid_tab(t); + free_tid_tab(sc); + free_stid_tab(sc); } static int -alloc_tid_tabs(struct tid_info *t) +alloc_tid_tabs(struct adapter *sc) { int rc; - rc = alloc_tid_tab(t, M_NOWAIT); + rc = alloc_tid_tab(sc); if (rc != 0) goto failed; - rc = alloc_stid_tab(t, M_NOWAIT); + rc = alloc_stid_tab(sc); if (rc != 0) goto failed; return (0); failed: - free_tid_tabs(t); + free_tid_tabs(sc); return (rc); } @@ -1587,7 +1567,7 @@ free_tom_data(struct adapter *sc, struct tom_data *td) mtx_destroy(&td->toep_list_lock); free_tcb_history(sc, td); - free_tid_tabs(&sc->tids); + free_tid_tabs(sc); free(td, M_CXGBE); } @@ -1792,13 +1772,14 @@ reclaim_wr_resources(void *arg, int count) case CPL_ACT_OPEN_REQ6: atid = G_TID_TID(be32toh(OPCODE_TID(cpl))); CTR2(KTR_CXGBE, "%s: atid %u ", __func__, atid); - act_open_failure_cleanup(sc, atid, EHOSTUNREACH); + act_open_failure_cleanup(sc, lookup_atid(sc, atid), + EHOSTUNREACH); free(wr, M_CXGBE); break; case CPL_PASS_ACCEPT_RPL: tid = GET_TID(cpl); CTR2(KTR_CXGBE, "%s: tid %u ", __func__, tid); - synack_failure_cleanup(sc, tid); + synack_failure_cleanup(sc, lookup_tid(sc, tid)); free(wr, M_CXGBE); break; default: @@ -1809,6 +1790,83 @@ reclaim_wr_resources(void *arg, int count) } } +/* + * Based on do_abort_req. We treat an abrupt hardware stop as a connection + * abort from the hardware. + */ +static void +live_tid_failure_cleanup(struct adapter *sc, struct toepcb *toep, u_int status) +{ + struct inpcb *inp; + struct tcpcb *tp; + struct epoch_tracker et; + + MPASS(!(toep->flags & TPF_SYNQE)); + + inp = toep->inp; + CURVNET_SET(toep->vnet); + NET_EPOCH_ENTER(et); /* for tcp_close */ + INP_WLOCK(inp); + tp = intotcpcb(inp); + toep->flags |= TPF_ABORT_SHUTDOWN; + if ((inp->inp_flags & INP_DROPPED) == 0) { + struct socket *so = inp->inp_socket; + + if (so != NULL) + so_error_set(so, status); + tp = tcp_close(tp); + if (tp == NULL) + INP_WLOCK(inp); /* re-acquire */ + } + final_cpl_received(toep); + NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); +} + +static void +cleanup_stranded_tids(void *arg, int count) +{ + TAILQ_HEAD(, toepcb) tlist = TAILQ_HEAD_INITIALIZER(tlist); + TAILQ_HEAD(, synq_entry) slist = TAILQ_HEAD_INITIALIZER(slist); + struct tom_data *td = arg; + struct adapter *sc = td_adapter(td); + struct toepcb *toep; + struct synq_entry *synqe; + + /* Clean up synq entries. */ + mtx_lock(&td->toep_list_lock); + TAILQ_SWAP(&td->stranded_synqe, &slist, synq_entry, link); + mtx_unlock(&td->toep_list_lock); + while ((synqe = TAILQ_FIRST(&slist)) != NULL) { + TAILQ_REMOVE(&slist, synqe, link); + MPASS(synqe->tid >= 0); /* stale, was kept around for debug */ + synqe->tid = -1; + synack_failure_cleanup(sc, synqe); + } + + /* Clean up in-flight active opens. */ + mtx_lock(&td->toep_list_lock); + TAILQ_SWAP(&td->stranded_atids, &tlist, toepcb, link); + mtx_unlock(&td->toep_list_lock); + while ((toep = TAILQ_FIRST(&tlist)) != NULL) { + TAILQ_REMOVE(&tlist, toep, link); + MPASS(toep->tid >= 0); /* stale, was kept around for debug */ + toep->tid = -1; + act_open_failure_cleanup(sc, toep, EHOSTUNREACH); + } + + /* Clean up live connections. */ + mtx_lock(&td->toep_list_lock); + TAILQ_SWAP(&td->stranded_tids, &tlist, toepcb, link); + mtx_unlock(&td->toep_list_lock); + while ((toep = TAILQ_FIRST(&tlist)) != NULL) { + TAILQ_REMOVE(&tlist, toep, link); + MPASS(toep->tid >= 0); /* stale, was kept around for debug */ + toep->tid = -1; + live_tid_failure_cleanup(sc, toep, ECONNABORTED); + } +} + /* * Ground control to Major TOM * Commencing countdown, engines on @@ -1832,6 +1890,9 @@ t4_tom_activate(struct adapter *sc) mtx_init(&td->toep_list_lock, "PCB list lock", NULL, MTX_DEF); TAILQ_INIT(&td->toep_list); TAILQ_INIT(&td->synqe_list); + TAILQ_INIT(&td->stranded_atids); + TAILQ_INIT(&td->stranded_tids); + TASK_INIT(&td->cleanup_stranded_tids, 0, cleanup_stranded_tids, td); /* Listen context */ mtx_init(&td->lctx_hash_lock, "lctx hash lock", NULL, MTX_DEF); @@ -1844,7 +1905,7 @@ t4_tom_activate(struct adapter *sc) TASK_INIT(&td->reclaim_wr_resources, 0, reclaim_wr_resources, td); /* TID tables */ - rc = alloc_tid_tabs(&sc->tids); + rc = alloc_tid_tabs(sc); if (rc != 0) goto done; @@ -1917,6 +1978,8 @@ t4_tom_deactivate(struct adapter *sc) if (!TAILQ_EMPTY(&td->toep_list)) rc = EBUSY; MPASS(TAILQ_EMPTY(&td->synqe_list)); + MPASS(TAILQ_EMPTY(&td->stranded_tids)); + mtx_unlock(&td->toep_list_lock); mtx_unlock(&td->toep_list_lock); mtx_lock(&td->lctx_hash_lock); @@ -1925,6 +1988,7 @@ t4_tom_deactivate(struct adapter *sc) mtx_unlock(&td->lctx_hash_lock); taskqueue_drain(taskqueue_thread, &td->reclaim_wr_resources); + taskqueue_drain(taskqueue_thread, &td->cleanup_stranded_tids); mtx_lock(&td->unsent_wr_lock); if (!STAILQ_EMPTY(&td->unsent_wr_list)) rc = EBUSY; @@ -1939,6 +2003,156 @@ t4_tom_deactivate(struct adapter *sc) return (rc); } +static void +stop_atids(struct adapter *sc) +{ + struct tom_data *td = sc->tom_softc; + struct tid_info *t = &sc->tids; + struct toepcb *toep; + int atid; + + /* + * Hashfilters and T6-KTLS are the only other users of atids but they're + * both mutually exclusive with TOE. That means t4_tom owns all the + * atids in the table. + */ + MPASS(!is_hashfilter(sc)); + if (is_t6(sc)) + MPASS(!(sc->flags & KERN_TLS_ON)); + + /* New atids are not being allocated. */ +#ifdef INVARIANTS + mtx_lock(&t->atid_lock); + MPASS(t->atid_alloc_stopped == true); + mtx_unlock(&t->atid_lock); +#endif + + /* + * In-use atids fall in one of these two categories: + * a) Those waiting for L2 resolution before being submitted to + * hardware. + * b) Those that have been submitted to hardware and are awaiting + * replies that will never arrive because the LLD is stopped. + */ + for (atid = 0; atid < t->natids; atid++) { + toep = lookup_atid(sc, atid); + if ((uintptr_t)toep >= (uintptr_t)&t->atid_tab[0] && + (uintptr_t)toep < (uintptr_t)&t->atid_tab[t->natids]) + continue; + MPASS(toep->tid == atid); + MPASS(toep->incarnation == sc->incarnation); + /* + * Take the atid out of the lookup table. toep->tid is stale + * after this but useful for debug. + */ + CTR(KTR_CXGBE, "%s: atid %d@%d STRANDED, removed from table", + __func__, atid, toep->incarnation); + free_atid(sc, toep->tid); +#if 0 + toep->tid = -1; +#endif + mtx_lock(&td->toep_list_lock); + TAILQ_INSERT_TAIL(&td->stranded_atids, toep, link); + mtx_unlock(&td->toep_list_lock); + } + MPASS(atomic_load_int(&t->atids_in_use) == 0); +} + +static void +stop_tids(struct adapter *sc) +{ + struct tom_data *td = sc->tom_softc; + struct toepcb *toep; +#ifdef INVARIANTS + struct tid_info *t = &sc->tids; +#endif + + /* + * The LLD's offload queues are stopped so do_act_establish and + * do_pass_accept_req cannot run and insert tids in parallel with this + * thread. stop_stid_tab has also run and removed the synq entries' + * tids from the table. The only tids in the table are for connections + * at or beyond ESTABLISHED that are still waiting for the final CPL. + */ + mtx_lock(&td->toep_list_lock); + TAILQ_FOREACH(toep, &td->toep_list, link) { + MPASS(sc->incarnation == toep->incarnation); + MPASS(toep->tid >= 0); + MPASS(toep == lookup_tid(sc, toep->tid)); + /* Remove tid from the lookup table immediately. */ + CTR(KTR_CXGBE, "%s: tid %d@%d STRANDED, removed from table", + __func__, toep->tid, toep->incarnation); + remove_tid(sc, toep->tid, toep->ce ? 2 : 1); +#if 0 + /* toep->tid is stale now but left alone for debug. */ + toep->tid = -1; +#endif + /* All toep in this list will get bulk moved to stranded_tids */ + toep->flags &= ~TPF_IN_TOEP_LIST; + } + MPASS(TAILQ_EMPTY(&td->stranded_tids)); + TAILQ_CONCAT(&td->stranded_tids, &td->toep_list, link); + MPASS(TAILQ_EMPTY(&td->toep_list)); + mtx_unlock(&td->toep_list_lock); + + MPASS(atomic_load_int(&t->tids_in_use) == 0); +} + +/* + * L2T is stable because + * 1. stop_lld stopped all new allocations. + * 2. stop_lld also stopped the tx wrq so nothing is enqueueing new WRs to the + * queue or to l2t_entry->wr_list. + * 3. t4_l2t_update is ignoring all L2 updates. + */ +static void +stop_tom_l2t(struct adapter *sc) +{ + struct l2t_data *d = sc->l2t; + struct l2t_entry *e; + int i; + + for (i = 0; i < d->l2t_size; i++) { + e = &d->l2tab[i]; + mtx_lock(&e->lock); + if (e->state == L2T_STATE_VALID) + e->state = L2T_STATE_RESOLVING; + if (!STAILQ_EMPTY(&e->wr_list)) + CXGBE_UNIMPLEMENTED("l2t e->wr_list"); + mtx_unlock(&e->lock); + } +} + +static int +t4_tom_stop(struct adapter *sc) +{ + struct tid_info *t = &sc->tids; + struct tom_data *td = sc->tom_softc; + + ASSERT_SYNCHRONIZED_OP(sc); + + stop_tom_l2t(sc); + if (atomic_load_int(&t->atids_in_use) > 0) + stop_atids(sc); + if (atomic_load_int(&t->stids_in_use) > 0) + stop_stid_tab(sc); + if (atomic_load_int(&t->tids_in_use) > 0) + stop_tids(sc); + taskqueue_enqueue(taskqueue_thread, &td->cleanup_stranded_tids); + + return (0); +} + +static int +t4_tom_restart(struct adapter *sc) +{ + ASSERT_SYNCHRONIZED_OP(sc); + + restart_stid_tab(sc); + + return (0); +} + static int t4_ctloutput_tom(struct socket *so, struct sockopt *sopt) { diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index 0bc368fe3d56..8debab4940b1 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -76,6 +76,7 @@ enum { TPF_TLS_RX_QUIESCING = (1 << 14), /* RX quiesced for TLS RX startup */ TPF_TLS_RX_QUIESCED = (1 << 15), /* RX quiesced for TLS RX startup */ TPF_WAITING_FOR_FINAL = (1<< 16), /* waiting for wakeup on final CPL */ + TPF_IN_TOEP_LIST = (1 << 17), /* toep is in the main td->toep_list */ }; enum { @@ -210,7 +211,7 @@ struct toepcb { struct tom_data *td; struct inpcb *inp; /* backpointer to host stack's PCB */ u_int flags; /* miscellaneous flags */ - TAILQ_ENTRY(toepcb) link; /* toep_list */ + TAILQ_ENTRY(toepcb) link; /* toep_list or stranded_toep_list */ int refcount; struct vnet *vnet; struct vi_info *vi; /* virtual interface */ @@ -220,6 +221,7 @@ struct toepcb { struct l2t_entry *l2te; /* L2 table entry used by this connection */ struct clip_entry *ce; /* CLIP table entry used by this tid */ int tid; /* Connection identifier */ + int incarnation; /* sc->incarnation when toepcb was allocated */ /* tx credit handling */ u_int tx_total; /* total tx WR credits (in 16B units) */ @@ -278,6 +280,7 @@ struct synq_entry { uint32_t ts; uint32_t rss_hash; __be16 tcp_opt; /* from cpl_pass_establish */ + int incarnation; struct toepcb *toep; struct conn_params params; @@ -285,6 +288,7 @@ struct synq_entry { /* listen_ctx flags */ #define LCTX_RPL_PENDING 1 /* waiting for a CPL_PASS_OPEN_RPL */ +#define LCTX_SETUP_IN_HW 2 /* stid entry is setup in hardware */ struct listen_ctx { LIST_ENTRY(listen_ctx) link; /* listen hash linkage */ @@ -331,6 +335,11 @@ struct tom_data { struct mtx toep_list_lock; TAILQ_HEAD(, toepcb) toep_list; TAILQ_HEAD(, synq_entry) synqe_list; + /* List of tids left stranded because hw stopped abruptly. */ + TAILQ_HEAD(, toepcb) stranded_atids; + TAILQ_HEAD(, toepcb) stranded_tids; + TAILQ_HEAD(, synq_entry) stranded_synqe; + struct task cleanup_stranded_tids; struct mtx lctx_hash_lock; LIST_HEAD(, listen_ctx) *listen_hash; @@ -477,7 +486,7 @@ void t4_init_connect_cpl_handlers(void); void t4_uninit_connect_cpl_handlers(void); int t4_connect(struct toedev *, struct socket *, struct nhop_object *, struct sockaddr *); -void act_open_failure_cleanup(struct adapter *, u_int, u_int); +void act_open_failure_cleanup(struct adapter *, struct toepcb *, u_int); /* t4_listen.c */ void t4_init_listen_cpl_handlers(void); @@ -492,7 +501,11 @@ int do_abort_req_synqe(struct sge_iq *, const struct rss_header *, int do_abort_rpl_synqe(struct sge_iq *, const struct rss_header *, struct mbuf *); void t4_offload_socket(struct toedev *, void *, struct socket *); -void synack_failure_cleanup(struct adapter *, int); +void synack_failure_cleanup(struct adapter *, struct synq_entry *); +int alloc_stid_tab(struct adapter *); +void free_stid_tab(struct adapter *); +void stop_stid_tab(struct adapter *); +void restart_stid_tab(struct adapter *); /* t4_cpl_io.c */ void aiotx_init_toep(struct toepcb *); From nobody Mon Oct 21 18:39: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 4XXPGq1y0Mz5Zd25; Mon, 21 Oct 2024 18:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGp6dsTz4Fmm; Mon, 21 Oct 2024 18:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBMgZn+smYuXwCssHcKq3d/9Lj/44bl+igdR0iIRwNU=; b=Wjfd4xfBSEx1r9qS8Ce7/vGKns9foWvQdQ4DGfVRVAKez9RfCh19wVGIKh9Sv71HAakpf4 /g6OVmFwz4oVupv842IepKd3EnEvrySVdWOtrT0aeJgqhKQUnhGCqO4gwO9jOzru4jt60N EGsXri5rmLXkwaoMUewiEWb9+2X5efRjJtJbxZlxz/6qnTXPah6SvJn7KUXV/OKrw2S3GL tEhCnLSFsAo3FqysTBaGafiD27D51pEbpxOFzoCYcxEyfZjEv4c1LLW58mHnBWVsMMdn8s MpSB0cV0p09FHk9Wchmg0wzHLhgxp/rwv3wJlWIMr/gjMH0OngdphKhuNeHtLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBMgZn+smYuXwCssHcKq3d/9Lj/44bl+igdR0iIRwNU=; b=rcKv9ydEpDt5bLF1/OObI17T9x8nWtIx0P8w7d3ZURvfukkQBwIsB1MncdlfXjZzJe1q+1 FXfrFAquCUgPUIVGbDXUThUP3joO3efQGSBheiRVm1tw33NDrQJaLUaifcOtD0xMEHLpP5 3GbvnM7yHbFTYF2rqfL5b7d5LZec80oM3/vA56MuU7hMHoVfGP0kzBthPA7abYlIfiRgn/ atR/B6mLcj1h93JQFrqAyyUw2OiU7LBTeosj7OA5ngZZWH6YbY7Cg1dPJfdumM/N20RWOf oZLLxyjVujDrJX7pDMruI+Wei8e9aye9y0xbHMh9uaZy71g1Iz2d+l56ptdi1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535954; a=rsa-sha256; cv=none; b=Va9JvEbApZqHu4rOtBl/0v8WYHGK7k+mzGjtLQa19q7l+aLzDtskyGjdDF70UDqe0A35JZ 9oRkjdpcVly+P50Mv44jMWUs6+dHTcBagnEJAYP8Xa0dr/pXiTG1XqSPSU8liIyjTdtit2 i/Egp+d5thsyOkTWKuMUTQU2MXWN+hWC43fiecBeepRJBWr9/YONHhe201bD0fDiCDx7oU Yp6M0XAcNivO6bNS963fROTR4oWCmZDnqAFlHzpBO8ACrMO0NrWYxlHtKrnqOEH7yNv497 HwxSBK19eJjkzmocXyEWbS3SAQ8sF91VfJxk/w95CT2xqmR4xoNEs7yaUlaHGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGp69Btzh87; Mon, 21 Oct 2024 18:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdE30036350; Mon, 21 Oct 2024 18:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdE00036347; Mon, 21 Oct 2024 18:39:14 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:14 GMT Message-Id: <202410211839.49LIdE00036347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 788088340cdc - stable/14 - cxgbe/iw_cxgbe: Add a placeholder uld_restart. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 788088340cdc0919c13cb8849614db69fa3324f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=788088340cdc0919c13cb8849614db69fa3324f8 commit 788088340cdc0919c13cb8849614db69fa3324f8 Author: Navdeep Parhar AuthorDate: 2024-07-07 00:15:22 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:03:34 +0000 cxgbe/iw_cxgbe: Add a placeholder uld_restart. Sponsored by: Chelsio Communications (cherry picked from commit f1c4ed150334ae2844810a58b7384cb0e3abe664) --- sys/dev/cxgbe/iw_cxgbe/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c index 28d6d0f2d00c..279bdb20d511 100644 --- a/sys/dev/cxgbe/iw_cxgbe/device.c +++ b/sys/dev/cxgbe/iw_cxgbe/device.c @@ -260,11 +260,13 @@ static int c4iw_mod_unload(void); static int c4iw_activate(struct adapter *); static int c4iw_deactivate(struct adapter *); static int c4iw_stop(struct adapter *); +static int c4iw_restart(struct adapter *); static struct uld_info c4iw_uld_info = { .uld_activate = c4iw_activate, .uld_deactivate = c4iw_deactivate, .uld_stop = c4iw_stop, + .uld_restart = c4iw_restart, }; static int @@ -344,6 +346,12 @@ c4iw_stop(struct adapter *sc) return (0); } +static int +c4iw_restart(struct adapter *sc) +{ + return (0); +} + static void c4iw_activate_all(struct adapter *sc, void *arg __unused) { From nobody Mon Oct 21 18:39: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 4XXPGr2t9pz5Zcqp; Mon, 21 Oct 2024 18:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGr11nJz4FyV; Mon, 21 Oct 2024 18:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cnwp2Wi+S+uKYHvNreMnx3ftqbhykSJXpj3H0uQp68E=; b=RfcC7VOQWggwqsETlLM2aKu1H/tQBMk4TvWryr/LAjrrhf5x9zK8ZktUU0YRi6DNY/m6u8 A7BBjUFxhwjelfilH9rtodIk8aQhKb9dSbmCJosha1Lx+wy0d41usYevs1/z6WXnZT7KIl WtYIHmBJ0ASeX767CMTrSNLcsYLMPxqTmf+rCs+6vCPF654/7bJnTHA9yJQpmj9naOvofM sKG7llEk3uInJN/dqIgbd/fajdRmS4t4/jLhVb40r/ILgA8jjewV7ig0NxAUAPAxxCOxmn zqKEQKQwdk5epTRAPCqWeQA29lUq/m9dI15aKw7ESiCt33c5hs6tLTwPI+j3bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cnwp2Wi+S+uKYHvNreMnx3ftqbhykSJXpj3H0uQp68E=; b=aOlQabZYqD4USzaDX46+YYAbl299x0MQrqlGeI0HQr16gJlSThQK+U6v27rtLEuiSyaasb O1SBQPPJEQvsSRKmWh4qwSkY+dk5KI/Kzt9sS6g43FH1ZNLU+cBwPiQqirGbl0kRecsSJD t/Tkk0/Nt5wi4iIxutt8n0OtED7Z137VeNkU7ro1pBxG7NKc6qM2X/GMgJL3LM2oKdVym7 2MQScVteVrKenpZk4epriDz1QoNGwmVDw8kTfpe6lxVOX44V1XgMLDLLwCvFOf6kaRGDSR kox/PA1s9g4/FqGU/PfaxIDecyXJFdanTSfZOg7JUzfqMy5NUy+aTCk25EIkYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535956; a=rsa-sha256; cv=none; b=N43Ht6SZ72XZalcOundVlmiRa0E9Q4fPlQoQVhP4JgWH+jqf6e114CTBgocqzBieahqdqJ StBKNosy6fKh7Y/UswkS1F6iWv9tmm6P7TTxfWaoPj8l6aPjIvbzSzD0inlehrxVPURk9p 6XYp7f7nilOr2zuZ0Uh+Zhbkxh5ZFDvdNiqqGCODI9xOpvC+4K9Ez48vpFlKx34fcx+vdH Dc5osqEFAFwcyTb1TdPphJhP9HGqa94fSuFa7UeyV2Hini9F4dvAmRXQcLK8ZlwjTlBa/5 uV2VtejIpyAr27K/WXC91iVFykyg/NcppHcZoAkiKqGDT4iquLf+sLMJRIYaLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGr064pzhQQ; Mon, 21 Oct 2024 18:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdF9Y036395; Mon, 21 Oct 2024 18:39:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdFbq036392; Mon, 21 Oct 2024 18:39:15 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:15 GMT Message-Id: <202410211839.49LIdFbq036392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 3b600c38d837 - stable/14 - cxgbe/t4_tom: bugfixes in stop/restart. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b600c38d8379d88937997496a2de03c0196e4aa Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=3b600c38d8379d88937997496a2de03c0196e4aa commit 3b600c38d8379d88937997496a2de03c0196e4aa Author: Navdeep Parhar AuthorDate: 2024-07-25 01:43:54 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:05:39 +0000 cxgbe/t4_tom: bugfixes in stop/restart. 1. Remove toepcb from the toep_list on active open failure. 2. Purge the wr_list for an L2T entry on an adpater stop. Fixes: c1c524852f62 cxgbe/t4_tom: Implement uld_stop and uld_restart for ULD_TOM. Sponsored by: Chelsio Communications (cherry picked from commit fef0e39f64a1db796ded8777dbee71fc287f6107) --- sys/dev/cxgbe/tom/t4_connect.c | 14 ++++++++++ sys/dev/cxgbe/tom/t4_listen.c | 3 +++ sys/dev/cxgbe/tom/t4_tom.c | 58 +++++++++++++++++++++++++----------------- 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_connect.c b/sys/dev/cxgbe/tom/t4_connect.c index 1c98e70a4df5..99e4c222996d 100644 --- a/sys/dev/cxgbe/tom/t4_connect.c +++ b/sys/dev/cxgbe/tom/t4_connect.c @@ -115,10 +115,17 @@ act_open_failure_cleanup(struct adapter *sc, struct toepcb *toep, u_int status) struct inpcb *inp = toep->inp; struct toedev *tod = &toep->td->tod; struct epoch_tracker et; + struct tom_data *td = sc->tom_softc; if (toep->tid >= 0) { free_atid(sc, toep->tid); toep->tid = -1; + mtx_lock(&td->toep_list_lock); + if (toep->flags & TPF_IN_TOEP_LIST) { + toep->flags &= ~TPF_IN_TOEP_LIST; + TAILQ_REMOVE(&td->toep_list, toep, link); + } + mtx_unlock(&td->toep_list_lock); } CURVNET_SET(toep->vnet); @@ -234,6 +241,7 @@ t4_connect(struct toedev *tod, struct socket *so, struct nhop_object *nh, struct sockaddr *nam) { struct adapter *sc = tod->tod_softc; + struct tom_data *td; struct toepcb *toep = NULL; struct wrqe *wr = NULL; if_t rt_ifp = nh->nh_ifp; @@ -380,6 +388,12 @@ t4_connect(struct toedev *tod, struct socket *so, struct nhop_object *nh, } offload_socket(so, toep); + /* Add the TOE PCB to the active list */ + td = toep->td; + mtx_lock(&td->toep_list_lock); + TAILQ_INSERT_TAIL(&td->toep_list, toep, link); + toep->flags |= TPF_IN_TOEP_LIST; + mtx_unlock(&td->toep_list_lock); NET_EPOCH_ENTER(et); rc = t4_l2t_send(sc, wr, toep->l2te); NET_EPOCH_EXIT(et); diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c index 897c5bcaab1e..f91d193c0fed 100644 --- a/sys/dev/cxgbe/tom/t4_listen.c +++ b/sys/dev/cxgbe/tom/t4_listen.c @@ -1090,7 +1090,10 @@ t4_offload_socket(struct toedev *tod, void *arg, struct socket *so) update_tid(sc, synqe->tid, toep); synqe->flags |= TPF_SYNQE_EXPANDED; mtx_lock(&td->toep_list_lock); + /* Remove synqe from its list and add the TOE PCB to the active list. */ TAILQ_REMOVE(&td->synqe_list, synqe, link); + TAILQ_INSERT_TAIL(&td->toep_list, toep, link); + toep->flags |= TPF_IN_TOEP_LIST; mtx_unlock(&td->toep_list_lock); inp->inp_flowtype = (inp->inp_vflag & INP_IPV6) ? M_HASHTYPE_RSS_TCP_IPV6 : M_HASHTYPE_RSS_TCP_IPV4; diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 58a77ff93c86..9b1dcf304196 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -256,12 +256,6 @@ offload_socket(struct socket *so, struct toepcb *toep) toep->inp = inp; toep->flags |= TPF_ATTACHED; in_pcbref(inp); - - /* Add the TOE PCB to the active list */ - mtx_lock(&td->toep_list_lock); - TAILQ_INSERT_HEAD(&td->toep_list, toep, link); - toep->flags |= TPF_IN_TOEP_LIST; - mtx_unlock(&td->toep_list_lock); } void @@ -280,7 +274,6 @@ undo_offload_socket(struct socket *so) struct inpcb *inp = sotoinpcb(so); struct tcpcb *tp = intotcpcb(inp); struct toepcb *toep = tp->t_toe; - struct tom_data *td = toep->td; struct sockbuf *sb; INP_WLOCK_ASSERT(inp); @@ -303,11 +296,6 @@ undo_offload_socket(struct socket *so) toep->flags &= ~TPF_ATTACHED; if (in_pcbrele_wlocked(inp)) panic("%s: inp freed.", __func__); - - mtx_lock(&td->toep_list_lock); - toep->flags &= ~TPF_IN_TOEP_LIST; - TAILQ_REMOVE(&td->toep_list, toep, link); - mtx_unlock(&td->toep_list_lock); } static void @@ -331,6 +319,12 @@ release_offload_resources(struct toepcb *toep) remove_tid(sc, tid, toep->ce ? 2 : 1); release_tid(sc, tid, toep->ctrlq); toep->tid = -1; + mtx_lock(&td->toep_list_lock); + if (toep->flags & TPF_IN_TOEP_LIST) { + toep->flags &= ~TPF_IN_TOEP_LIST; + TAILQ_REMOVE(&td->toep_list, toep, link); + } + mtx_unlock(&td->toep_list_lock); } if (toep->ce) { t4_release_clip_entry(sc, toep->ce); @@ -346,8 +340,6 @@ release_offload_resources(struct toepcb *toep) static void done_with_toepcb(struct toepcb *toep) { - struct tom_data *td = toep->td; - KASSERT(!(toep->flags & TPF_CPL_PENDING), ("%s: %p has CPL pending.", __func__, toep)); KASSERT(!(toep->flags & TPF_ATTACHED), @@ -370,13 +362,7 @@ done_with_toepcb(struct toepcb *toep) MPASS(toep->tid == -1); MPASS(toep->l2te == NULL); MPASS(toep->ce == NULL); - - mtx_lock(&td->toep_list_lock); - if (toep->flags & TPF_IN_TOEP_LIST) { - toep->flags &= ~TPF_IN_TOEP_LIST; - TAILQ_REMOVE(&td->toep_list, toep, link); - } - mtx_unlock(&td->toep_list_lock); + MPASS((toep->flags & TPF_IN_TOEP_LIST) == 0); free_toepcb(toep); } @@ -2039,6 +2025,8 @@ stop_atids(struct adapter *sc) if ((uintptr_t)toep >= (uintptr_t)&t->atid_tab[0] && (uintptr_t)toep < (uintptr_t)&t->atid_tab[t->natids]) continue; + if (__predict_false(toep == NULL)) + continue; MPASS(toep->tid == atid); MPASS(toep->incarnation == sc->incarnation); /* @@ -2052,6 +2040,8 @@ stop_atids(struct adapter *sc) toep->tid = -1; #endif mtx_lock(&td->toep_list_lock); + toep->flags &= ~TPF_IN_TOEP_LIST; + TAILQ_REMOVE(&td->toep_list, toep, link); TAILQ_INSERT_TAIL(&td->stranded_atids, toep, link); mtx_unlock(&td->toep_list_lock); } @@ -2109,16 +2099,32 @@ static void stop_tom_l2t(struct adapter *sc) { struct l2t_data *d = sc->l2t; + struct tom_data *td = sc->tom_softc; struct l2t_entry *e; + struct wrqe *wr; int i; + /* + * This task cannot be enqueued because L2 state changes are not being + * processed. But if it's already scheduled or running then we need to + * wait for it to cleanup the atids in the unsent_wr_list. + */ + taskqueue_drain(taskqueue_thread, &td->reclaim_wr_resources); + MPASS(STAILQ_EMPTY(&td->unsent_wr_list)); + for (i = 0; i < d->l2t_size; i++) { e = &d->l2tab[i]; mtx_lock(&e->lock); if (e->state == L2T_STATE_VALID) e->state = L2T_STATE_RESOLVING; - if (!STAILQ_EMPTY(&e->wr_list)) - CXGBE_UNIMPLEMENTED("l2t e->wr_list"); + /* + * stop_atids is going to clean up _all_ atids in use, including + * these that were pending L2 resolution. Just discard the WRs. + */ + while ((wr = STAILQ_FIRST(&e->wr_list)) != NULL) { + STAILQ_REMOVE_HEAD(&e->wr_list, link); + free(wr, M_CXGBE); + } mtx_unlock(&e->lock); } } @@ -2140,6 +2146,12 @@ t4_tom_stop(struct adapter *sc) stop_tids(sc); taskqueue_enqueue(taskqueue_thread, &td->cleanup_stranded_tids); + /* + * L2T and atid_tab are restarted before t4_tom_restart so this assert + * is not valid in t4_tom_restart. This is the next best place for it. + */ + MPASS(STAILQ_EMPTY(&td->unsent_wr_list)); + return (0); } From nobody Mon Oct 21 18:39: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 4XXPGs3kPyz5Zd03; Mon, 21 Oct 2024 18:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGs1gTzz4G5x; Mon, 21 Oct 2024 18:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF0lBxiMX9TxoDpwu4V300Pxv+FuUMmYw87HhheNUe0=; b=RZ5Hh0Ya9x38WfhZ8PL8me4t+lscXOcBe6s5B8MLsU3sc7zwnvAO35DuyY1AsfU1lK4VFr w1YDVcYxqImIgxxsGgmdWE2m2XDueMbVMWk92TG8tYl7a//eGnQPgewmHbB5XQAj1/S834 3qsVTB6hkCE6cr3Tgkv/FZ9fw/YTHVwt5DvI+QIf/5trEXVlW7C/H5m+NyTqlx8rGe7IEE qVdh+5cu3tayvBq7Ak8xflhGigavy4err4J8Zp9Yj6NdugGBrwoQDuAX1wnxENzXgYO1l/ TybqLTXVjNQfaUpYE7jhbL8zGAOW4UM+kAlgCuJ44p0AwfeU2OxlMoRsaVMMIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF0lBxiMX9TxoDpwu4V300Pxv+FuUMmYw87HhheNUe0=; b=jBdHOsLEVH24u7K1NXFzkwvHHcJai2R8r0HtXUk6jHT9KB8pz1jM7ar4/sVLskkEYCiVZA aLhiyDlRJciBkngE1Tn2XrkOaQTyI/zZrQKJQgBaQqEcmnZKZHM6HVbZaX5gF3woUUves9 UJN4Ktk0Y+1zsjV1KWDnaeiIQ67hCErIoxOFBvLt1zokJoPYJajR1XH8nfENFD/qF/bcJw dE5hBlInOsnmeMWhiawxrvpjlkwrW+9QiFnVtCuOIV59io7Dr1kTdOR2fM6L2iDCc7BPPD qO0pjwKZTdtOoKPsJX8iunpNsvOy13eHnvCyNE5A6JynAyYA1d7Kx20U9do4Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535957; a=rsa-sha256; cv=none; b=CKxd5IH6OU1HHxzcDgGIyvDrYxo6hwbdm6iCFAikSEReH/gXsagPtw6yd1Xikcx3J1V7oj qLdKrWVzULsQUlqxoQQfJ84OF+/DWrsLBq+w98ISN1OQ/r5dzAT19LK7xPTLdlrfljTLFD 4KM2fb2Cmoc91EiooHlhf0oO435gziIcQqZs3aerNKBIu/5ArQBrLbQwgkc8JCFkEwdyWr COvzrCa7n+Btpki2MdONeTUOKeM54t5mLOSKY/5pglUFmjGr6KfobrOKrLB/9GE77I0Lww gy6YOU8kZaloQn/vMvcvfLoIvkjwexNWZMo3KYAR9X05D2P2eA3mjXHmmW/IeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGs16R7zhVj; Mon, 21 Oct 2024 18:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdHKK036449; Mon, 21 Oct 2024 18:39:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdHZq036446; Mon, 21 Oct 2024 18:39:17 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:17 GMT Message-Id: <202410211839.49LIdHZq036446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 40162251383e - stable/14 - cxgbe/iw_cxgbe: Fix typo in assertion. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 40162251383edd4294a4f454c6c20d16e73497f4 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=40162251383edd4294a4f454c6c20d16e73497f4 commit 40162251383edd4294a4f454c6c20d16e73497f4 Author: Navdeep Parhar AuthorDate: 2024-07-22 17:19:58 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:05:56 +0000 cxgbe/iw_cxgbe: Fix typo in assertion. eanbled -> enabled (cherry picked from commit b5332809c633e7e37715f7823a8a8ee9799910a4) --- sys/dev/cxgbe/iw_cxgbe/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c index 279bdb20d511..209d12767a1c 100644 --- a/sys/dev/cxgbe/iw_cxgbe/device.c +++ b/sys/dev/cxgbe/iw_cxgbe/device.c @@ -284,7 +284,7 @@ c4iw_activate(struct adapter *sc) } if (uld_active(sc, ULD_IWARP)) { - KASSERT(0, ("%s: RDMA already eanbled on sc %p", __func__, sc)); + KASSERT(0, ("%s: RDMA already enabled on sc %p", __func__, sc)); return (0); } From nobody Mon Oct 21 18:39: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 4XXPGt5Jnyz5ZcYS; Mon, 21 Oct 2024 18:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGt454Nz4G49; Mon, 21 Oct 2024 18:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyJIGzfalcs1CJJj8ULUQKN9Hg9sCIlGos8XJWKL92o=; b=bG9o04NT7qjhaqvOgJrdH6i0g8kUDuFTE8kKdNeWf3sR26etvVGKVY3UZF6bB9ZFUmGeRX m7W1zL+BVsYGptdOUG3R03lRXGnHQHuK/66lulI4PMcw1ZfaKbVZ1G4oUfRjtovslEzRO1 sTHGVOoDWA7EnlURyX39ncl2rBDLUFjItCmrp7+C3ldg6q2X6T8pOvHYvAdv9zlT43VKiG OrimkrGNF7u3rT7Eeapbm8gmmQ0eUEjR8LeZa2PKJsM69iZIH+vEzMj3LKeu76nxpurzJ8 p3okw98INYMopu+I673lR17C4uDpcXOo56GCHtD53UHL7jUDXYOMR8DgolhEVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyJIGzfalcs1CJJj8ULUQKN9Hg9sCIlGos8XJWKL92o=; b=o4akQVjcB9fcqpBT5/84sktVW78Rjz3NVjWspn+n0Z6TEzlWrVO6FJqqUpOfJ4gWMb/YQY 1K0PxqfKrbcQoAZPIdRQDWIzCHPfKseN2b4ZIMFru9tKMiOsI9aXCm8iVMAYqbg3dhZlMe ee03JcwlaLqocWIInlehBCAmANv1NlO0kiTV/fDGUjMDwm+NjWRVkd71HX+IKOqIr2Q0JU W1hIbzHqprO2UMm4KOzSWDKdS/bSDRvTwLZ6o4nZ4go1DX9TfN+0sIZHGqmPWrue8SHJb9 yRGo0RV7wnc7SZvsb5gJp4aq9JNjZI4iF554is0O9/3aMKxsgbx4EAsCdpIK+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535958; a=rsa-sha256; cv=none; b=TLAMfgqdEBYkv9yUUlXXzSY8WCkj+C0b2GfbZfZAnDDdrKyyewaiB2oT4WlmiOE8H700TK tTPG9Z1kIPkdWKQnQAd0hNEGBmeHsPLYkJFK3Fu3aEGJ8py4AebSsHpnM2wBsFsHcCLLk/ x/LNOYJajKVv6+4Yy2pfFuqFhU6MaGZ9bfTspy1fX3Ef3WADb04EVdpkD0el+ZxuvftZcp bLgd0hkddWDyc5rjrgv02+Pb66jsNUhoDNTO9VZxc9QALrSGAdKYYw1saBGq9XkSy7nfNE ih9S4zkkRDM+V91h9XbVsMgJA0MW+I5F7jq3vfzRjvpOmubMKl+6uFq14Mef0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGt2Gg8zh88; Mon, 21 Oct 2024 18:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdI0t036503; Mon, 21 Oct 2024 18:39:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdIEe036500; Mon, 21 Oct 2024 18:39:18 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:18 GMT Message-Id: <202410211839.49LIdIEe036500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 888858a7bfbf - stable/14 - cxgbe(4): Stop work request queues in a reliable manner. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 888858a7bfbf3112ea314cc0d7f12d385c4c39de Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=888858a7bfbf3112ea314cc0d7f12d385c4c39de commit 888858a7bfbf3112ea314cc0d7f12d385c4c39de Author: Navdeep Parhar AuthorDate: 2024-07-31 19:27:18 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:06:19 +0000 cxgbe(4): Stop work request queues in a reliable manner. Clear the EQ_HW_ALLOCATED flag with the wrq lock held and discard all work requests, pending or new, when it's not set. Sponsored by: Chelsio Communications (cherry picked from commit 0a9d1da6e6cede5e9c0ff63240d724049ad72b5b) --- sys/dev/cxgbe/adapter.h | 5 ++++- sys/dev/cxgbe/t4_main.c | 20 +++++++++++++++++++- sys/dev/cxgbe/t4_sge.c | 15 ++++++++++++++- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 0d731e736823..3922bd3909fe 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1561,7 +1561,10 @@ t4_wrq_tx(struct adapter *sc, struct wrqe *wr) struct sge_wrq *wrq = wr->wrq; TXQ_LOCK(wrq); - t4_wrq_tx_locked(sc, wrq, wr); + if (__predict_true(wrq->eq.flags & EQ_HW_ALLOCATED)) + t4_wrq_tx_locked(sc, wrq, wr); + else + free(wr, M_CXGBE); TXQ_UNLOCK(wrq); } diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index c02fe8372946..4a9e64efcacf 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2060,7 +2060,9 @@ stop_lld(struct adapter *sc) } #if defined(TCP_OFFLOAD) || defined(RATELIMIT) for_each_ofld_txq(vi, k, ofld_txq) { + TXQ_LOCK(&ofld_txq->wrq); ofld_txq->wrq.eq.flags &= ~EQ_HW_ALLOCATED; + TXQ_UNLOCK(&ofld_txq->wrq); } #endif for_each_rxq(vi, k, rxq) { @@ -2078,7 +2080,9 @@ stop_lld(struct adapter *sc) if (sc->flags & FULL_INIT_DONE) { /* Control queue */ wrq = &sc->sge.ctrlq[i]; + TXQ_LOCK(wrq); wrq->eq.flags &= ~EQ_HW_ALLOCATED; + TXQ_UNLOCK(wrq); quiesce_wrq(wrq); } } @@ -7049,8 +7053,22 @@ quiesce_txq(struct sge_txq *txq) static void quiesce_wrq(struct sge_wrq *wrq) { + struct wrqe *wr; - /* XXXTX */ + TXQ_LOCK(wrq); + while ((wr = STAILQ_FIRST(&wrq->wr_list)) != NULL) { + STAILQ_REMOVE_HEAD(&wrq->wr_list, link); +#ifdef INVARIANTS + wrq->nwr_pending--; + wrq->ndesc_needed -= howmany(wr->wr_len, EQ_ESIZE); +#endif + free(wr, M_CXGBE); + } + MPASS(wrq->nwr_pending == 0); + MPASS(wrq->ndesc_needed == 0); + wrq->nwr_pending = 0; + wrq->ndesc_needed = 0; + TXQ_UNLOCK(wrq); } static void diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 614aa1f7508c..cc927f27d318 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -2921,6 +2921,10 @@ start_wrq_wr(struct sge_wrq *wrq, int len16, struct wrq_cookie *cookie) MPASS(ndesc > 0 && ndesc <= SGE_MAX_WR_NDESC); EQ_LOCK(eq); + if (__predict_false((eq->flags & EQ_HW_ALLOCATED) == 0)) { + EQ_UNLOCK(eq); + return (NULL); + } if (TAILQ_EMPTY(&wrq->incomplete_wrs) && !STAILQ_EMPTY(&wrq->wr_list)) drain_wrq_wr_list(sc, wrq); @@ -3016,7 +3020,10 @@ commit_wrq_wr(struct sge_wrq *wrq, void *w, struct wrq_cookie *cookie) F_FW_WR_EQUEQ); } - ring_eq_db(wrq->adapter, eq, ndesc); + if (__predict_true(eq->flags & EQ_HW_ALLOCATED)) + ring_eq_db(wrq->adapter, eq, ndesc); + else + IDXINCR(eq->dbidx, ndesc, eq->sidx); } else { MPASS(IDXDIFF(next->pidx, pidx, eq->sidx) == ndesc); next->pidx = pidx; @@ -3852,6 +3859,8 @@ alloc_ctrlq(struct adapter *sc, int idx) if (!(ctrlq->eq.flags & EQ_HW_ALLOCATED)) { MPASS(ctrlq->eq.flags & EQ_SW_ALLOCATED); + MPASS(ctrlq->nwr_pending == 0); + MPASS(ctrlq->ndesc_needed == 0); rc = alloc_eq_hwq(sc, NULL, &ctrlq->eq); if (rc != 0) { @@ -4556,6 +4565,7 @@ free_wrq(struct adapter *sc, struct sge_wrq *wrq) { free_eq(sc, &wrq->eq); MPASS(wrq->nwr_pending == 0); + MPASS(wrq->ndesc_needed == 0); MPASS(TAILQ_EMPTY(&wrq->incomplete_wrs)); MPASS(STAILQ_EMPTY(&wrq->wr_list)); bzero(wrq, sizeof(*wrq)); @@ -4850,6 +4860,9 @@ alloc_ofld_txq(struct vi_info *vi, struct sge_ofld_txq *ofld_txq, int idx) } if (!(eq->flags & EQ_HW_ALLOCATED)) { + MPASS(eq->flags & EQ_SW_ALLOCATED); + MPASS(ofld_txq->wrq.nwr_pending == 0); + MPASS(ofld_txq->wrq.ndesc_needed == 0); rc = alloc_eq_hwq(sc, vi, eq); if (rc != 0) { CH_ERR(vi, "failed to create hw ofld_txq%d: %d\n", idx, From nobody Mon Oct 21 18:39: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 4XXPGv6CJ0z5Zd2C; Mon, 21 Oct 2024 18:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGv32H1z4G4M; Mon, 21 Oct 2024 18:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqBZ9OBMNJLMKHTmJxYMREjf8pBzypslMRWvqF44um4=; b=tlDEGN9dtX7niPdQiSoH0Tq0eoPrCGjgHbe/pFfDF9DyvhHyWsVFMXMxzJBX67K8mNU/Zw E8ifqijk0rJsOc4xT0P566E4E7GR+Qsgu1MTfuiPjv4HGF5lnKki8MfCe3a8qzsQ8Ma7OP 4iYlynILeepWuCF0YatUR18b4x344E5EvI03kSTYnApBzHvMlCy0AF3ypjD29Akx5TYBGl w24suxWzPcwmua3MR6oKSXfXU4hIcfiL61Qvg8uPcN47eksB0xZhy3AxtkiC+dtmH/DBFT aLbGe21QJ1CVNFcedV/82cnReGXl85o6ARnYoSW4zcOkx5+VNcHM7WMfb+9Z1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqBZ9OBMNJLMKHTmJxYMREjf8pBzypslMRWvqF44um4=; b=Jo1IjIPPlX5pgLDXDLipmXyrNDE/gFMYBChXF8Tfp3OYjYZfcBeu5OGlermSgTv9dfQSmZ V7CZYRQdDNGnSdZje2qJa7biBIQDgm+Kh0rq/qEUL1i+yKnlfCbT8Zdv4vxdziELAYOQls lOebABHp8bHyszj/Ijv1nvZPOspmeYhOl4kg3wEm6vkmYM+s0tgF4Tbmwid6+DobTkZPc8 9paIkLPCn5G4zM9rEB52sJAwH1RpadUlpsyecURXG5BcvluvFW/8VjlDDngmCDz/00alzH bz1eC66hg+btQK61kxqUagIQEsclL9PmbxL6VpSVnRkM7sUj6M6DswmlY32YDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535959; a=rsa-sha256; cv=none; b=VHfs42Ap1gBk2P+F5049CDwF2xmuMHwCv7Na4G/DzNwWMQl9OTF1FYE41d8w9CO+ur6gU2 UqYew1ZrGxO6A+eVKBB3KW9IhGD8VAd8z/34r0AFqqL4HYo0ceQsWhDWRUO3U1za4yrvOy fk1w9mUV07xXs3oZnrZ18EiCho6kTfdLpgySNDlMFFXRpU9ERbbVls9NcHJSk4W5dpAt7K piUFVOko41A0BeKtjiwWInfthArnULRzRmm/jkS225DHKRbkpLdX14aWI3y2n94iUYm7/Q +etyIk933VTEpGY7//iwcA76aRLjzpMCOIyDte+aV0sr+8tcxsWzqlPvQfrRFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGv2fT3zh89; Mon, 21 Oct 2024 18:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdJGl036549; Mon, 21 Oct 2024 18:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdJJu036546; Mon, 21 Oct 2024 18:39:19 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:19 GMT Message-Id: <202410211839.49LIdJJu036546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: ccd65f200cb1 - stable/14 - cxgbe(4): reset routine for general use. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ccd65f200cb12e1f6ebf11d59899d24f8e58b43a Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd65f200cb12e1f6ebf11d59899d24f8e58b43a commit ccd65f200cb12e1f6ebf11d59899d24f8e58b43a Author: Navdeep Parhar AuthorDate: 2024-07-26 22:39:35 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:06:40 +0000 cxgbe(4): reset routine for general use. Add a reset_adapter wrapper that picks the most suitable reset routine internally. Use it in the fatal error handler as well as the sysctl based reset. Sponsored by: Chelsio Communications (cherry picked from commit d668a0b0abe4b079ac2a0d9cd0d7b71bd4a043c6) --- sys/dev/cxgbe/t4_main.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 4a9e64efcacf..7531168ca36d 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2534,6 +2534,15 @@ reset_adapter_with_pl_rst(struct adapter *sc) return (0); } +static inline int +reset_adapter(struct adapter *sc) +{ + if (vm_guest == 0) + return (reset_adapter_with_pci_bus_reset(sc)); + else + return (reset_adapter_with_pl_rst(sc)); +} + static void reset_adapter_task(void *arg, int pending) { @@ -2544,10 +2553,7 @@ reset_adapter_task(void *arg, int pending) if (pending > 1) CH_ALERT(sc, "%s: pending %d\n", __func__, pending); - if (vm_guest == 0) - rc = reset_adapter_with_pci_bus_reset(sc); - else - rc = reset_adapter_with_pl_rst(sc); + rc = reset_adapter(sc); if (rc != 0) { CH_ERR(sc, "adapter did not reset properly, rc = %d, " "flags 0x%08x -> 0x%08x, err_flags 0x%08x -> 0x%08x.\n", @@ -3650,7 +3656,7 @@ fatal_error_task(void *arg, int pending) if (t4_reset_on_fatal_err) { CH_ALERT(sc, "resetting adapter after fatal error.\n"); - rc = reset_adapter_with_pci_bus_reset(sc); + rc = reset_adapter(sc); if (rc == 0 && t4_panic_on_fatal_err) { CH_ALERT(sc, "reset was successful, " "system will NOT panic.\n"); From nobody Mon Oct 21 18:39: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 4XXPGw6dRKz5Zcwc; Mon, 21 Oct 2024 18:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGw47LFz4G4W; Mon, 21 Oct 2024 18:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Jju3y0c8R3wOwy+dFScvUCAPwqGSQmMNVfFIpq7wHc=; b=oB0ikBGz3vbL9IbT4hbtxYwmc1DeQzc9vyRU2R07TsXnX0yohPmKM7NHuzokmBR2mVJn1H JYbWo9XqBCsGSMNMF1um+u+0hQkqFulMA5OD+XP+0S0IEClJRLa/cKxRfjNObYO1Z3vKjK mi5TZ91/CmJ04vFtamsmmDPHGQlHcLC9wG9yGLj6S2N4LyE6HVbY1ucaGcJKvxHPq03G3O xkQ3YAYElKaqM5dGnMVAGmaqgSSscNmBHKhDBHcXRybJ1Mty2T6dKVxs/j9kXkz4wkkHpE WtcWnmSQgrlBafbZf/rzBlGkaG94LaP3PvjoU0BhozsLod/vg/KNoC4Kh96kCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Jju3y0c8R3wOwy+dFScvUCAPwqGSQmMNVfFIpq7wHc=; b=uLtUccAZudqSyIYBIO54ysEMZ/Is7tNByNId1Un8xNrQGwTcoXO+kj+g2pj/v6TXFykbmZ awfbem1mC5vELHLT6RJw39ZniWEVTX+mUyXfyoEdR/mAWQAIujjWJt116weTNtULzNwDdn 1HWO4gSer0psyIxXHp92MqgZJFK62nx3JSAjZ+m/V1ooGPZhi7XGA2zyre6c2w5T/iQJud YH5vBZ4JQeZh88rGv9Nxf3vuLZJYa45QyghwC91HoCcUoxHXduyJTn+Go01VTgJk3NT/Dz 1jLCWdxu0L4DpMIcAXoEtmryVVCgfBSsFXEXIHk84R7Y3g7/kAQZIUmFzrx+Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535960; a=rsa-sha256; cv=none; b=OZAsC+zgXI5ecWqNlWJj8a2ENwS81QhycxxUHI5xfU99x+LFpxtkCg7R5JPhpZYcMunJCL 08MZfttuLxSS6zthBWpCfejd93L2Mr5yJE+6gCoP7F3TefNuRdjWPRdfE+uTuFYd7uyf8g 6ZsEfEBFkE0yeFvdai3zA9+4ccOLXT3uMAVYpEN5T0kDk75MCz2ZPVscPx/xlTU7yxHidU hCEfwwjZddBH9Gi1tozIfnAZFYpLS3Scsbfo2TMB/ycPNS0be78AWDioglBSSWuYhbCK1A /JBXgXSmSrpFL1rf8fjxNYqIgvSu2RqTyZXTtooRchkXyb8At+l9NfmIBLixjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGw3lSWzh8B; Mon, 21 Oct 2024 18:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdKUk036613; Mon, 21 Oct 2024 18:39:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdKHD036610; Mon, 21 Oct 2024 18:39:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:20 GMT Message-Id: <202410211839.49LIdKHD036610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: a7b24758d035 - stable/14 - cxgbe(4): Export the core suspend/resume functionality to other modules. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7b24758d035a48cb3638e9a77db039361eb1c7a Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b24758d035a48cb3638e9a77db039361eb1c7a commit a7b24758d035a48cb3638e9a77db039361eb1c7a Author: Navdeep Parhar AuthorDate: 2024-08-28 17:18:03 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:07:20 +0000 cxgbe(4): Export the core suspend/resume functionality to other modules. Sponsored by: Chelsio Communications (cherry picked from commit 1e584ca30e3a97eedf37368e7ad75c31f08be039) --- sys/dev/cxgbe/adapter.h | 2 ++ sys/dev/cxgbe/t4_main.c | 54 ++++++++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 3922bd3909fe..2769277e8411 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1392,6 +1392,8 @@ void release_tid(struct adapter *, int, struct sge_wrq *); int cxgbe_media_change(if_t); void cxgbe_media_status(if_t, struct ifmediareq *); void t4_os_cim_err(struct adapter *); +int suspend_adapter(struct adapter *); +int resume_adapter(struct adapter *); #ifdef KERN_TLS /* t6_kern_tls.c */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 7531168ca36d..f3841a23df71 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2110,23 +2110,32 @@ stop_lld(struct adapter *sc) return (rc); } -static int -t4_suspend(device_t dev) +int +suspend_adapter(struct adapter *sc) { - struct adapter *sc = device_get_softc(dev); - - CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); stop_adapter(sc); stop_lld(sc); #ifdef TCP_OFFLOAD stop_all_uld(sc); #endif set_adapter_hwstatus(sc, false); - CH_ALERT(sc, "%s end (thread %p).\n", __func__, curthread); return (0); } +static int +t4_suspend(device_t dev) +{ + struct adapter *sc = device_get_softc(dev); + int rc; + + CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); + rc = suspend_adapter(sc); + CH_ALERT(sc, "%s end (thread %p).\n", __func__, curthread); + + return (rc); +} + struct adapter_pre_reset_state { u_int flags; uint16_t nbmcaps; @@ -2464,20 +2473,28 @@ done: return (rc); } -static int -t4_resume(device_t dev) +int +resume_adapter(struct adapter *sc) { - struct adapter *sc = device_get_softc(dev); - - CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); restart_adapter(sc); restart_lld(sc); #ifdef TCP_OFFLOAD restart_all_uld(sc); #endif + return (0); +} + +static int +t4_resume(device_t dev) +{ + struct adapter *sc = device_get_softc(dev); + int rc; + + CH_ALERT(sc, "%s from thread %p.\n", __func__, curthread); + rc = resume_adapter(sc); CH_ALERT(sc, "%s end (thread %p).\n", __func__, curthread); - return (0); + return (rc); } static int @@ -2512,12 +2529,7 @@ reset_adapter_with_pci_bus_reset(struct adapter *sc) static int reset_adapter_with_pl_rst(struct adapter *sc) { - stop_adapter(sc); - stop_lld(sc); -#ifdef TCP_OFFLOAD - stop_all_uld(sc); -#endif - set_adapter_hwstatus(sc, false); + suspend_adapter(sc); /* This is a t4_write_reg without the hw_off_limits check. */ MPASS(sc->error_flags & HW_OFF_LIMITS); @@ -2525,11 +2537,7 @@ reset_adapter_with_pl_rst(struct adapter *sc) F_PIORSTMODE | F_PIORST | F_AUTOPCIEPAUSE); pause("pl_rst", 1 * hz); /* Wait 1s for reset */ - restart_adapter(sc); - restart_lld(sc); -#ifdef TCP_OFFLOAD - restart_all_uld(sc); -#endif + resume_adapter(sc); return (0); } From nobody Mon Oct 21 18:39: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 4XXPGx6Fmcz5Zd2D; Mon, 21 Oct 2024 18:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGx59dqz4Fqp; Mon, 21 Oct 2024 18:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uA0on8Z4bPyZzzg8TEYWQukcQ0DRYVzjSzxBTkuj/FQ=; b=qfiuyYLKWDIvPb9YlVbwgXuXSIGvQFZ6y9Vyi2NdQn1fhtJXQ0J4vD7C94tV+cRLNX6Z4m Qr4Ju4OIS1PbA2E+t3x5brasA/TfyUwbWrrAhVUPZzkfglndrBy1h3mojYgbsTHZWK0LwU RDfWW3g5u+hsFPja6BKZ9AQ377++KgTJyiu6GPGGE2RcVwqri+ymgG7QwRdQVAwOSft2tU ycZgfpkNvj4r3fRGY2A8fAkQLspu7hyzLgWeQJ/XMVz+W4u7ZuG2/uZ1mmvdi2s7m+/46j gaFzN8l+ysi8sTp/WR1Rfzdjec2jO4XylSxNplADl+Kgupm9dmC9EU20XOha8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uA0on8Z4bPyZzzg8TEYWQukcQ0DRYVzjSzxBTkuj/FQ=; b=VDxSAV6+Vv169ylMPyCvAfV012Pp0wlWCjHKpplOpN4eTnGz5ni1IC/eJN3vzvgxubylLO jw9Scmt5E1OBUqOY6FXNLlJjm68FWiM+KnrKmD/L6bs6g/+ZDNY5VyMKOCO71/kmv67wPo lXZIgEML+SS+eH2yXuwJYOp01bbIPPAmlKMRtRhhAwW0c8g0DbWFPxXdUNkFrQXDI24Ups ZS040a6uC6VHI6FuTdcwbg2VGEeQRqSsMLX0pb9bRr3vCMtHEUDjnCsRx0+tbsubSWe14V 6GDhW2DBStkLZrRGKGwFugxcuqByjcxdRitszVHKsgVN1Xq4Y7M8OeehfJltkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535961; a=rsa-sha256; cv=none; b=e628B0yUisQOihqyMg25oMRA4C2R9quq6ArsmsV6BtiSQvtnCb5uVu6o1pABOpNpVlY39D cwR2jmcfdbh9HCaJJI36mtAAspmSWkQrYB2xmUWriaxznfH9SPd5pRP9LDf3UWB5wSSkcy K+00/iUsOaitWqcJvE/347T6AeEJPB/8l01UzEQmNcpA6hbVOrMxH4qZPVEzBWz9abEFQc 7y8Z7dYIEmTEPsZG0vABVwAQgQnv+s7IO0yGXMiwtbIU/XHLWcSHM0k/QmkcIeWyD2+bBX NGNNMKyMnooiRq2drt0dZG5aSqlmZ0GcCk+8EmSIgzll7HnI9823xW++p1j6CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGx4mzXzhjK; Mon, 21 Oct 2024 18:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdLUs036676; Mon, 21 Oct 2024 18:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdLXn036672; Mon, 21 Oct 2024 18:39:21 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:21 GMT Message-Id: <202410211839.49LIdLXn036672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: cd2ae696295f - stable/14 - cxgbe/iw_cxgbe: Replace the fatal error flag with a stopped 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd2ae696295f22db7ee72f528cea646c9c6cdcfb Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2ae696295f22db7ee72f528cea646c9c6cdcfb commit cd2ae696295f22db7ee72f528cea646c9c6cdcfb Author: Navdeep Parhar AuthorDate: 2024-08-28 18:41:10 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:07:49 +0000 cxgbe/iw_cxgbe: Replace the fatal error flag with a stopped flag. Now that suspend/resume is supported by the base driver, a fatal error isn't the only reason that the RNIC can stop abruptly. Also, this state is no longer permanent as it's possible to resume operations after a stop. Rename the flag and associated routines to match the new state of affairs. Sponsored by: Chelsio Communications (cherry picked from commit 8254a276ad893ae2a1b35fcbbad255f06e29b8c6) --- sys/dev/cxgbe/iw_cxgbe/cm.c | 10 +++++----- sys/dev/cxgbe/iw_cxgbe/device.c | 11 ++++++++--- sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h | 10 +++++----- sys/dev/cxgbe/iw_cxgbe/mem.c | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 77158eb855df..2ca2fcb8041f 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -1089,7 +1089,7 @@ c4iw_so_upcall(struct socket *so, void *arg, int waitflag) * Wake up any threads waiting in rdma_init()/rdma_fini(), * with locks held. */ - if (so->so_error || (ep->com.dev->rdev.flags & T4_FATAL_ERROR)) + if (so->so_error || c4iw_stopped(&ep->com.dev->rdev)) c4iw_wake_up(&ep->com.wr_wait, -ECONNRESET); add_ep_to_req_list(ep, C4IW_EVENT_SOCKET); @@ -2717,8 +2717,8 @@ c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) CTR3(KTR_IW_CXGBE, "%s: cm_id %p, backlog %s", __func__, cm_id, backlog); - if (c4iw_fatal_error(&dev->rdev)) { - CTR2(KTR_IW_CXGBE, "%s: cm_id %p, fatal error", __func__, + if (c4iw_stopped(&dev->rdev)) { + CTR2(KTR_IW_CXGBE, "%s: cm_id %p, stopped", __func__, cm_id); return -EIO; } @@ -2830,8 +2830,8 @@ int c4iw_ep_disconnect(struct c4iw_ep *ep, int abrupt, gfp_t gfp) rdev = &ep->com.dev->rdev; - if (c4iw_fatal_error(rdev)) { - CTR3(KTR_IW_CXGBE, "%s:ced1 fatal error %p %s", __func__, ep, + if (c4iw_stopped(rdev)) { + CTR3(KTR_IW_CXGBE, "%s:ced1 stopped %p %s", __func__, ep, states[ep->com.state]); if (ep->com.state != DEAD) { send_abort(ep); diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c index 209d12767a1c..3c4d269f6c69 100644 --- a/sys/dev/cxgbe/iw_cxgbe/device.c +++ b/sys/dev/cxgbe/iw_cxgbe/device.c @@ -335,9 +335,8 @@ c4iw_stop(struct adapter *sc) if (iwsc) { struct ib_event event = {0}; - device_printf(sc->dev, - "iWARP driver received FATAL ERROR event.\n"); - iwsc->rdev.flags |= T4_FATAL_ERROR; + device_printf(sc->dev, "iWARP driver stopped.\n"); + iwsc->rdev.flags |= T4_IW_STOPPED; event.event = IB_EVENT_DEVICE_FATAL; event.device = &iwsc->ibdev; ib_dispatch_event(&event); @@ -349,6 +348,12 @@ c4iw_stop(struct adapter *sc) static int c4iw_restart(struct adapter *sc) { + struct c4iw_dev *iwsc = sc->iwarp_softc; + + if (iwsc) { + device_printf(sc->dev, "iWARP driver restarted.\n"); + iwsc->rdev.flags &= ~T4_IW_STOPPED; + } return (0); } diff --git a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h index 5715b7e53863..ca2595b65b02 100644 --- a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h +++ b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h @@ -116,7 +116,7 @@ struct c4iw_dev_ucontext { }; enum c4iw_rdev_flags { - T4_FATAL_ERROR = (1<<0), + T4_IW_STOPPED = (1<<0), T4_STATUS_PAGE_DISABLED = (1<<1), }; @@ -167,9 +167,9 @@ struct c4iw_rdev { struct workqueue_struct *free_workq; }; -static inline int c4iw_fatal_error(struct c4iw_rdev *rdev) +static inline int c4iw_stopped(struct c4iw_rdev *rdev) { - return rdev->flags & T4_FATAL_ERROR; + return rdev->flags & T4_IW_STOPPED; } static inline int c4iw_num_stags(struct c4iw_rdev *rdev) @@ -214,7 +214,7 @@ c4iw_wait_for_reply(struct c4iw_rdev *rdev, struct c4iw_wr_wait *wr_waitp, int timedout = 0; struct timeval t1, t2; - if (c4iw_fatal_error(rdev)) { + if (c4iw_stopped(rdev)) { wr_waitp->ret = -EIO; goto out; } @@ -240,7 +240,7 @@ c4iw_wait_for_reply(struct c4iw_rdev *rdev, struct c4iw_wr_wait *wr_waitp, "seconds - tid %u qpid %u\n", func, device_get_nameunit(sc->dev), t2.tv_sec, t2.tv_usec, hwtid, qpid); - if (c4iw_fatal_error(rdev)) { + if (c4iw_stopped(rdev)) { wr_waitp->ret = -EIO; break; } diff --git a/sys/dev/cxgbe/iw_cxgbe/mem.c b/sys/dev/cxgbe/iw_cxgbe/mem.c index 5b8c7391514f..348cd3985e87 100644 --- a/sys/dev/cxgbe/iw_cxgbe/mem.c +++ b/sys/dev/cxgbe/iw_cxgbe/mem.c @@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry, u32 stag_idx; static atomic_t key; - if (c4iw_fatal_error(rdev)) + if (c4iw_stopped(rdev)) return -EIO; stag_state = stag_state > 0; From nobody Mon Oct 21 18:39: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 4XXPGz0rTDz5Zd2G; Mon, 21 Oct 2024 18:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPGy6CMhz4GHf; Mon, 21 Oct 2024 18:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERtjKsgJnbH/MXG/yZdlskNQaibSyfjRezx9nswQ9L0=; b=uJBCrg2J9Y4bFUMGALpbb7DqA948yKTifzVofq+LOCE6N5bNpf7S5FIkg3Cq6jcK8JP6FX Z3OSDHPIhjdnuJ48RA/ZhabwUOsLKyKtlKqXSHSkOEe/vskHn4aRgPNB+UNawt2sv7cbGV 8EiVQLOtXcEJY5vZ24Uyx5jUds+ImHJNQTDkELLjD3ydaP6JaJ8Py5W/O3VDnzMDuL9fVa Q9ew4+I4qlO0opw3AuTuo84VwW7RYQXqtUp1XSnDYpBrRnDEVGYjswy5ouSZhCrreKNRWv 1/BBOi+aPojZntmV669U6ZDo3uFptlRpiIamYPfUdHnAFQ0fvsDOdUrsAZHwFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERtjKsgJnbH/MXG/yZdlskNQaibSyfjRezx9nswQ9L0=; b=wcw0vwIUnhIZwugJ8gElRmOV7/pnDnGXz/+P/tcHiwME/i/dHsg9hr+sUkAhR7j5j56yvC 1tQhQKndOTAkN3dpoVRudyAXClN9xzLe8qF9BZISZdpnYHEYhKsJjWiK8TH73KZsapjVFV nSfkXl6OsjEUum/HDnhYW9iArGPKpdzALONrikkIokY4Wo9MtiE06URcSP1e0wDqeNBWbc sqAE1Bv3Qn7cn88mhs+IyM3zoL4Vqs1JO6YN+rc47Lc1bDsECIVIDrCpJ7mWOX4v+Rwk60 Wzeymkx+m4KLh6g9YO+Ag9Ll6d3YTEAl0db6qfGmz3LyzsJKgdcZ6Kdu55C+uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535962; a=rsa-sha256; cv=none; b=IFDlbrEGGix8hKcyXxyvk6Ol3IiBvCZQG2hCHOGnQdttfTueBmGpTUmkczvIIhhELDb+lU D5uVTsyt8FB4XJNHUiJqSQLfbEM0VqwHiT9bbjPVWnfgDKNRACh+I2K1FXhfiWazoZ2waO RJWboVbknf33qGBjixTe0EfCIcxGU7ADUaagUdftPgCyRr7fQ2x+fQnp1zKraXknKI0tFc 590+D2UJp4gXN5LQqzFjyLNvZJXSTWRi2SZJi1hki/NxrIEhw9JiGGvXE11gxIbWQGnB0h RUbe5cFZ2acCbkYhOJntSUQ6ZUodHMoqhBnvBE6Cvoj4a5/QMPub0Tnz4KbZOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGy5pZpzh8C; Mon, 21 Oct 2024 18:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdMlT036733; Mon, 21 Oct 2024 18:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdM6L036730; Mon, 21 Oct 2024 18:39:22 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:22 GMT Message-Id: <202410211839.49LIdM6L036730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 11dc811bb86a - stable/14 - cxgbe/iw_cxgbe: Tidy up a couple of CTRs in c4iw_create_listen. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 11dc811bb86a704b3c426d5416cbe3befc3d8b0a Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=11dc811bb86a704b3c426d5416cbe3befc3d8b0a commit 11dc811bb86a704b3c426d5416cbe3befc3d8b0a Author: Navdeep Parhar AuthorDate: 2024-08-29 02:33:09 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:08:09 +0000 cxgbe/iw_cxgbe: Tidy up a couple of CTRs in c4iw_create_listen. backlog is an int and not a string. While here, fix an adjacent CTR that was spread over two lines even though it fits in one. Sponsored by: Chelsio Communications (cherry picked from commit 3f250bb6f05b57890215398767bbb8aa00c888f3) --- sys/dev/cxgbe/iw_cxgbe/cm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 2ca2fcb8041f..62961ca88aab 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -2715,11 +2715,10 @@ c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) struct listen_port_info *port_info = NULL; int rc = 0; - CTR3(KTR_IW_CXGBE, "%s: cm_id %p, backlog %s", __func__, cm_id, + CTR3(KTR_IW_CXGBE, "%s: cm_id %p, backlog %d", __func__, cm_id, backlog); if (c4iw_stopped(&dev->rdev)) { - CTR2(KTR_IW_CXGBE, "%s: cm_id %p, stopped", __func__, - cm_id); + CTR2(KTR_IW_CXGBE, "%s: cm_id %p, stopped", __func__, cm_id); return -EIO; } lep = alloc_ep(sizeof(*lep), GFP_KERNEL); From nobody Mon Oct 21 18:39: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 4XXPH00wSDz5Zcr9; Mon, 21 Oct 2024 18:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH006cpz4G95; Mon, 21 Oct 2024 18:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZLlJdjXbO/aDrE717pnobQ0fTaPEeqaRfRk9J9LOZQ8=; b=aXKuB7LI7lKqtGJpbbmKhh45f0QzOO7553nQ6Fbatpvjuk+HwkBgw1/WkT9lI+qfyJvnxR 1eL416IZVcdIO6sNA56a/XbCP0Z9h2Wkol/cDRl+rucBDzaCShDd5+HgmTkMwjxzsb4t6g 0Q03eXdvCe/iNcbm19LICVIqisySAXyO9mb92yj7cH/tq1hFbW4DfuJeSN4kJlgdvjfjhL kgrIlMxa60CEpViQji2l7iJrLNw0ESvmCKDMxqqMDvrGevKE9RmHGyZqk/wKeHy4CwKQMX nufNZ7GQ3bcCbykyzrnE/q4Mvfhl3gfqRPeMTm2Gq6U5tWuL988IZRZee3JaCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZLlJdjXbO/aDrE717pnobQ0fTaPEeqaRfRk9J9LOZQ8=; b=m8PaOJg3j5DdhRoJTGB75m+OGAmtwjRDE+MCc1BkdDXc6BZC0/M/Zx5sfW0XhvUd+FT369 3GoOXSWBQvQg2h1i6FGnyucYSr30jP2FlHXPE8DsKYZEI138jEg1ehRXo8ip8uu0ewJxtn eq2I73Ga70IOsW8ZSto6MKc8Swc815VUjxSIAHhbezqQfkmIGcLUz6C9uD700Qv05qnY9C mybM+cx+RGljQXDdlDsGS6AAIrLD3McCfv304FsemYuaL9ZvUbHtgyEsPydf7R9PqfgXET cDVjxpAX7I5Y9Q8G/OM8IOtMQebbABUf6CnMlqrJgpKsKAcssicHQaTd0IaVag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535964; a=rsa-sha256; cv=none; b=nlt/gDsBDEOnTYWbJSpasFWHF3myIHyS4Fm7Tn6FmXDpOgrqM+BL6DXqFYkfJopLRYgO42 ahI2SFEFpASB64rymhmZTwyl/1/XgsVE8RI7xWeSSZ4rAKcf7kJ9tJOx6mTxAzgJOZS31Y Vykq6lqGrg6dAwWHa+W8PFOFEBuVm4pLLDbGlWrcOuP3brXJOsBn5phTxJoAoElMHbVFft L5F36ixRlph2a2V88yy+NAf5wi33J0nFlvRO5bOELgobJ3eXsk1jFKtqIz3DoJLyEe4xa3 ldj3I8rztfGSWvQuh2BpR+cy3EMKRwoK9lwiiLdNyYiuZxKGUlcnFH3aZca3YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPGz6qMnzhVk; Mon, 21 Oct 2024 18:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdNaM036781; Mon, 21 Oct 2024 18:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdNVG036778; Mon, 21 Oct 2024 18:39:23 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:23 GMT Message-Id: <202410211839.49LIdNVG036778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 0366d0bd5028 - stable/14 - cxgbe/iw_cxgbe: c4iw_connect should return a negative errno. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0366d0bd50281cff65e3856f238e250dba39adfa Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=0366d0bd50281cff65e3856f238e250dba39adfa commit 0366d0bd50281cff65e3856f238e250dba39adfa Author: Navdeep Parhar AuthorDate: 2024-08-30 00:43:43 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:08:27 +0000 cxgbe/iw_cxgbe: c4iw_connect should return a negative errno. Avoid a pointless assignment while here. Sponsored by: Chelsio Communications (cherry picked from commit 3b4dcc0feb41120017381681d612d3cc21beb1d7) --- sys/dev/cxgbe/iw_cxgbe/cm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 62961ca88aab..cf4a8f1aa87b 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -2664,8 +2664,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) CTR2(KTR_IW_CXGBE, "%s:cc7 %p", __func__, ep); printk(KERN_ERR MOD "%s - cannot find route.\n", __func__); - err = EHOSTUNREACH; - return err; + return -EHOSTUNREACH; } if (!(if_getcapenable(nh_ifp) & IFCAP_TOE) || From nobody Mon Oct 21 18:39: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 4XXPH14Wrgz5Zd2L; Mon, 21 Oct 2024 18:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH111y8z4GLZ; Mon, 21 Oct 2024 18:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIRtHyYYLiu9H6mZcF5+MvzPszJMFPRkuYWGqwbmITI=; b=kBJHp/rMbvYOVCc4lgR9+8JTkfMBbdetG2XFlAwpXyEMJOewp9mSB6FA2P8IcrdTCYEP2M 8PSHdFtzQkkD/mvXeKzBix1K6zsnQXPHZL3WZs+KvkE0hF85QdesAMyzQs6EnvdD37Gl+z CTJYcAwpWylpPYI6g5gJl5Wu/lckQCjDM+jjfESk32y+auZo3a/YfEeWVY7oNQFSbXhtnb yvWheWc4Z6LBIMeVPYyIhH5xeuqsKMXY3K6a2xMWmf4P9x4JUPOnCTUOm7OkV+JU4BWxmS QHwGiqvteVKh0v+Mb60C/Q1TC3VT9q8/kk8P/AnFDpLOm1LyRqMvuTMewZt7mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIRtHyYYLiu9H6mZcF5+MvzPszJMFPRkuYWGqwbmITI=; b=kmNZg6ZMlDfpU3n4SBx9gAHkWdotqRZNc/DrxtIQggbXPAKzmQBhK5CIfkIXW/++rxW9OD v5UtbgtMQIfqIkjiSpq7uWfbAJOGG09dl6Ayv4tIKbrtKYA0Sug+4X9bJ1sQMtY1bLL6rQ vhLsLPhTWxooZh5Dp3zbeDcujazSJwwPi/0Z0c37LlE+F0W17GtqeI4MP1HkuUSIMc7vlG 3TXBN7cOLUi4Dopb1wqrcDLUSTur7L6DDHGgJUFfvFCvr+AOFdRmthp3RekIthbZdfjdoJ UlUt33ejeXmqsNA0sT56FkHfba+qpSCzwKARj0R1uoCe2/cfs+vKQmxr3KK+uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535965; a=rsa-sha256; cv=none; b=wJ9kEWQaRZar4pCFi3Y12u5hDJCSHUxEPsKs8cLtIQvrxdCYnv2Vs8ugf96LdGo1Oa8I2M I+iDeaXO2xqkX1fvoxzif1qbo/5MLOjJVPnKcp+Jr5oEh1x2H3kxUg3Yreq59aZzhsIHY6 c1LueFdd01kpnaZc+wOBFB4Idsz3I4HTLnzoWs74P2QHzxJdKeDz8jY1B5DQkLpBkHdINn dJ8NSUiEZFj94lAqrb3vl06m6rcA8I9QGc3v1cWnjlc+qNNKbXzaYEPkmnVggxWDEJ8054 RX4SeLodm+G2ZEL1+NNcHHODj/kbNVRhPrSWZNfiPQ++9RxHE2OXiAFnu40Nbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH10b1Fzh9W; Mon, 21 Oct 2024 18:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdPoG036843; Mon, 21 Oct 2024 18:39:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdPTq036840; Mon, 21 Oct 2024 18:39:25 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:25 GMT Message-Id: <202410211839.49LIdPTq036840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: c7550138e5b5 - stable/14 - cxgbe/iw_cxgbe: Fail early in some callbacks when the RNIC is stopped. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c7550138e5b55f77bf5c8a7907c2f5f6134b4ddd Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c7550138e5b55f77bf5c8a7907c2f5f6134b4ddd commit c7550138e5b55f77bf5c8a7907c2f5f6134b4ddd Author: Navdeep Parhar AuthorDate: 2024-08-30 00:23:16 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:08:56 +0000 cxgbe/iw_cxgbe: Fail early in some callbacks when the RNIC is stopped. Stop allocating new resources when the RNIC is stopped but continue to allow previously allocated resources to be freed. Note that t4_tom's uld_stop tears down all TOE connections, including those being used for iWARP, and that triggers the cleanup of iWARP resources. Fail post_send/post_recv early too to avoid the SQ doorbell. Sponsored by: Chelsio Communications (cherry picked from commit 9fdb683d92b36cbd20bbd8d61f0c1138f8348dd4) --- sys/dev/cxgbe/iw_cxgbe/cm.c | 2 ++ sys/dev/cxgbe/iw_cxgbe/cq.c | 4 ++++ sys/dev/cxgbe/iw_cxgbe/mem.c | 3 +++ sys/dev/cxgbe/iw_cxgbe/provider.c | 2 ++ sys/dev/cxgbe/iw_cxgbe/qp.c | 7 +++++++ 5 files changed, 18 insertions(+) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index cf4a8f1aa87b..a343014f0b6d 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -2611,6 +2611,8 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) CTR2(KTR_IW_CXGBE, "%s:ccB %p", __func__, cm_id); + if (__predict_false(c4iw_stopped(&dev->rdev))) + return -EIO; if ((conn_param->ord > c4iw_max_read_depth) || (conn_param->ird > c4iw_max_read_depth)) { diff --git a/sys/dev/cxgbe/iw_cxgbe/cq.c b/sys/dev/cxgbe/iw_cxgbe/cq.c index 9339d083cae3..197f2bcf8af0 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cq.c +++ b/sys/dev/cxgbe/iw_cxgbe/cq.c @@ -106,6 +106,8 @@ create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, struct wrqe *wr; u64 cq_bar2_qoffset = 0; + if (__predict_false(c4iw_stopped(rdev))) + return -EIO; cq->cqid = c4iw_get_cqid(rdev, uctx); if (!cq->cqid) { ret = -ENOMEM; @@ -1037,6 +1039,8 @@ int c4iw_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags) unsigned long flag; chp = to_c4iw_cq(ibcq); + if (__predict_false(c4iw_stopped(chp->cq.rdev))) + return -EIO; spin_lock_irqsave(&chp->lock, flag); t4_arm_cq(&chp->cq, (flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED); diff --git a/sys/dev/cxgbe/iw_cxgbe/mem.c b/sys/dev/cxgbe/iw_cxgbe/mem.c index 348cd3985e87..4a1adc118b7c 100644 --- a/sys/dev/cxgbe/iw_cxgbe/mem.c +++ b/sys/dev/cxgbe/iw_cxgbe/mem.c @@ -621,6 +621,9 @@ struct ib_mr *c4iw_alloc_mr(struct ib_pd *pd, php = to_c4iw_pd(pd); rhp = php->rhp; + if (__predict_false(c4iw_stopped(&rhp->rdev))) + return ERR_PTR(-EIO); + if (mr_type != IB_MR_TYPE_MEM_REG || max_num_sg > t4_max_fr_depth(&rhp->rdev, use_dsgl)) return ERR_PTR(-EINVAL); diff --git a/sys/dev/cxgbe/iw_cxgbe/provider.c b/sys/dev/cxgbe/iw_cxgbe/provider.c index 729733a040d5..511caa436969 100644 --- a/sys/dev/cxgbe/iw_cxgbe/provider.c +++ b/sys/dev/cxgbe/iw_cxgbe/provider.c @@ -231,6 +231,8 @@ c4iw_allocate_pd(struct ib_pd *pd, struct ib_udata *udata) CTR4(KTR_IW_CXGBE, "%s: ibdev %p, pd %p, data %p", __func__, ibdev, pd, udata); rhp = (struct c4iw_dev *) ibdev; + if (__predict_false(c4iw_stopped(&rhp->rdev))) + return -EIO; pdid = c4iw_get_resource(&rhp->rdev.resource.pdid_table); if (!pdid) return -EINVAL; diff --git a/sys/dev/cxgbe/iw_cxgbe/qp.c b/sys/dev/cxgbe/iw_cxgbe/qp.c index 3aab07755101..0e374bc961c4 100644 --- a/sys/dev/cxgbe/iw_cxgbe/qp.c +++ b/sys/dev/cxgbe/iw_cxgbe/qp.c @@ -138,6 +138,9 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, struct wrqe *wr; u64 sq_bar2_qoffset = 0, rq_bar2_qoffset = 0; + if (__predict_false(c4iw_stopped(rdev))) + return -EIO; + wq->sq.qid = c4iw_get_qpid(rdev, uctx); if (!wq->sq.qid) return -ENOMEM; @@ -785,6 +788,8 @@ int c4iw_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr, qhp = to_c4iw_qp(ibqp); rdev = &qhp->rhp->rdev; + if (__predict_false(c4iw_stopped(rdev))) + return -EIO; spin_lock_irqsave(&qhp->lock, flag); if (t4_wq_in_error(&qhp->wq)) { spin_unlock_irqrestore(&qhp->lock, flag); @@ -920,6 +925,8 @@ int c4iw_post_receive(struct ib_qp *ibqp, const struct ib_recv_wr *wr, u16 idx = 0; qhp = to_c4iw_qp(ibqp); + if (__predict_false(c4iw_stopped(&qhp->rhp->rdev))) + return -EIO; spin_lock_irqsave(&qhp->lock, flag); if (t4_wq_in_error(&qhp->wq)) { spin_unlock_irqrestore(&qhp->lock, flag); From nobody Mon Oct 21 18:39: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 4XXPH25N6Mz5Zd0N; Mon, 21 Oct 2024 18:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH23T9Fz4GJV; Mon, 21 Oct 2024 18:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=be6LBkm/z2lKTYZ8wtuUX5nf22OimBSOgp7AJiSMd4g=; b=anFPj7oDChsXIhCaD+QRWzaGGsB60rw+r75PtsxkKK19zgVOwCLmBoUuwNoiptNjn60/zO 8h5iDT9gIl5h4w1FfT64GfCnwhEh/z2Ish6Kd0RBTXzL5caA1lCurSU7JS3FRPp9KE/Bnz jh6uk8TqV6cbgBboXlT1B3a2PGM0gxZCH4LuvYVoBU0ushZZ916W8Cm0FYpLNYiQO2uKQ7 w/WoxsnJftCY7m1yfspG0ObO4Jj/m0Zq9zq9xbAcFyLOVUb7ZC37UHRsZEOVCHX+BAGu+2 o5cEYmpsIrKjmfhg3lWulus+JtwqgM81rV4HUxnjOu9bbFIvtal5K416fz1y7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=be6LBkm/z2lKTYZ8wtuUX5nf22OimBSOgp7AJiSMd4g=; b=Db3/0ZN6ZQW/L5t9z8ZUYCxh8Eki0Wq9OPYEXZiTbZkuqP5kUHt+V94afiyAF4iat+tmDF ZZf8+BxD//n1FvMbzoGShKS1SyDY3WkgpvT8RM3Fb9SGtoQRkBM/PAsFmV6U6VGcNWRRQ7 w3y5qqptu3sS55zFzLOMxXfnJSI96AhXxesXHkMfD96t9S9Jv3ZF6Z0fqb4wcEFbu1SeCu Mgk5TVRhPElVynUNyJwWnA5/ucKUjXP6flZiVAxMtk1kD+NboPbld23hhJMjcxGn5zMSTu wjT1SqkM9cGr4vEMyBdVmrNMwxBL+nPA/HAHFHb7Foow3/vWEbWQjECijAZGng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535966; a=rsa-sha256; cv=none; b=c3EFk1DcrFbR9u7Ci/2xXOSQXZli9s3V3yWCvVAdwDmy1jgmQiCkS24cKKHoIvZBdO6uK0 WjmWayvTACJZxbww/+rGya/97gpOHpfszIuHU1h1U9L0M9tAyeXrIHPZvBzIFNfcAmRcbU Q7Ag8C0RO7aNyxGt9wS5nBxLTxzqzfWWI4OE3TPjGPQYaXO9HiERf2rBmVbrvWlRkhva2m Ah2CdfuOKsSrSeZo10/nSCG+61NLOy351YUsv1v8J8A3/5FHPPEbzgPM0vGT9Y5Nd+DPFM LJDDd79ThFDgAlYAz0BqncD29Qxp3ge4wDAswqR7w7jJyM9kwb40k5cJ1zMnzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH21rbczhVl; Mon, 21 Oct 2024 18:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdQ93036899; Mon, 21 Oct 2024 18:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdQHR036896; Mon, 21 Oct 2024 18:39:26 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:26 GMT Message-Id: <202410211839.49LIdQHR036896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 3301201fc925 - stable/14 - cxgbe(4): Always report link-down on an abrupt stop. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3301201fc925a98b5ebdafe3f0cded5beef40d4f Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=3301201fc925a98b5ebdafe3f0cded5beef40d4f commit 3301201fc925a98b5ebdafe3f0cded5beef40d4f Author: Navdeep Parhar AuthorDate: 2024-09-05 02:28:09 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:09:14 +0000 cxgbe(4): Always report link-down on an abrupt stop. This fixes a regression in 5241b210a4e1 where the driver stopped reporting link down after a fatal error unless t4_reset_on_fatal_err was also set. Fixes: 5241b210a4e1 cxgbe(4): Basic infrastructure for ULDs to participate in adapter reset. Sponsored by: Chelsio Communications (cherry picked from commit 7aeec281b8b2620d7d88c9abdfadd7e20a485b9c) --- sys/dev/cxgbe/t4_main.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index f3841a23df71..4184900780a1 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1920,6 +1920,9 @@ t4_detach_common(device_t dev) static inline int stop_adapter(struct adapter *sc) { + struct port_info *pi; + int i; + if (atomic_testandset_int(&sc->error_flags, ilog2(ADAP_STOPPED))) { CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x, EALREADY\n", __func__, curthread, sc->flags, sc->error_flags); @@ -1927,7 +1930,24 @@ stop_adapter(struct adapter *sc) } CH_ALERT(sc, "%s from %p, flags 0x%08x,0x%08x\n", __func__, curthread, sc->flags, sc->error_flags); - return (t4_shutdown_adapter(sc)); + t4_shutdown_adapter(sc); + for_each_port(sc, i) { + pi = sc->port[i]; + PORT_LOCK(pi); + if (pi->up_vis > 0 && pi->link_cfg.link_ok) { + /* + * t4_shutdown_adapter has already shut down all the + * PHYs but it also disables interrupts and DMA so there + * won't be a link interrupt. Update the state manually + * if the link was up previously and inform the kernel. + */ + pi->link_cfg.link_ok = false; + t4_os_link_changed(pi); + } + PORT_UNLOCK(pi); + } + + return (0); } static inline int @@ -2020,20 +2040,6 @@ stop_lld(struct adapter *sc) for_each_port(sc, i) { pi = sc->port[i]; pi->vxlan_tcam_entry = false; - - PORT_LOCK(pi); - if (pi->up_vis > 0) { - /* - * t4_shutdown_adapter has already shut down all the - * PHYs but it also disables interrupts and DMA so there - * won't be a link interrupt. So we update the state - * manually and inform the kernel. - */ - pi->link_cfg.link_ok = false; - t4_os_link_changed(pi); - } - PORT_UNLOCK(pi); - for_each_vi(pi, j, vi) { vi->xact_addr_filt = -1; mtx_lock(&vi->tick_mtx); From nobody Mon Oct 21 18:39: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 4XXPH36ylpz5Zcty; Mon, 21 Oct 2024 18:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH33FrWz4GLp; Mon, 21 Oct 2024 18:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQHALfZMw1voDocTbamXJb5OjDxXMY59N+cvS9QFNjE=; b=S1XJzfwMutZrCipKDtGqPzsDFC9ok7n7fSX2hQBXXX82aZ5vQRxSj1sjIB74NojxFtRXrW NpU0gHfgjyyng9QsY8LFlTxwVqlzcZNHPKv6R9keMkP66iezg3R5i1+APTf7L2KLFAzEoO 8iom6I2eWtHlna63xnq9HnvqW4xd+aoGThTFcIoQYbQ4sO5vVC5/ZE3CIJ6U4I+Ep8n2rT 7uN2u/tg/VH23u5btCh9d0b86LXDMgQSa07hsEvWHog1JiuwiS2R7MGcGbI2/7nZrJ+OkS 7+ri4V8FGywkZ1aSqXduITxJdW969DERu6Ud70azFGhVvD4yQ0T2nj9gNHDbwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQHALfZMw1voDocTbamXJb5OjDxXMY59N+cvS9QFNjE=; b=YyCFshAV1LU0Wb45lT7SC3QR1KmK1BiU+YE8I+wJacVfVrRU2coWPI6TCbvmWAvmrUMA0W szz4UJTBjHbClHPIQo2wsNd864oHeSSGhKd8mUuVEiEULnIdZnY4HRMJcCHKekqjMasqOT 5zLJhK6+1FIuo5lnEU35+xHfZhrIO8rovvfK+26pZMxmjMyVe7/h/UYZ40pcx3YOLRi+rV PIXFVv+KU4FVDDQAIqPhPcGQ04Y5qgZRgOz8OPF2YnLhG2z61KRxCgvaWD9XzglKGZ4Eh9 qMzSC45R2KidnlD3cr20HsRix011wg10MGNwCudfIzdCs8y/3qk4BaSJ4H8qWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535967; a=rsa-sha256; cv=none; b=l9paxvVpnqKOPW900fj58eFxpu1QUsMZifnpja7QDnwSqqJIdPtNzPXC+4aOZ86eHGyjBK VbpGP3bu4X92Ju9JeEzuNHJAfzQjvu8o1+qi3xWgrLhNEuibO6NIHSH0pxTKrRHzkE6Hli cc/SYqfMJEmswXzlmXa1gb0uki/0vD1FGgY+XpYyLmNyJN7k8PeIogv7GmCvQ9UOl/L6AR BQZRonOuxR5/aZ18VT+8WlZYtzMjsXk33qCt7ycjbSxvlZq4CDttjgoxxf5V5wRA7vjNNU d78b2XaZShsSGDgOq52LERMi2kgeuv3jTUkWgSHisAWP934G5ZpObLnn0Dl41g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH32qdczhjL; Mon, 21 Oct 2024 18:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdReM036964; Mon, 21 Oct 2024 18:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdRah036961; Mon, 21 Oct 2024 18:39:27 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:27 GMT Message-Id: <202410211839.49LIdRah036961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: b5c08433224b - stable/14 - cxgbe/t4_tom: Add synq entry to the list before calling send_synack. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5c08433224be47da8ce5d4ea66f17e58cfbf650 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c08433224be47da8ce5d4ea66f17e58cfbf650 commit b5c08433224be47da8ce5d4ea66f17e58cfbf650 Author: Navdeep Parhar AuthorDate: 2024-09-06 06:21:59 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:09:37 +0000 cxgbe/t4_tom: Add synq entry to the list before calling send_synack. This fixes a panic where the peer's ack to the synack arrives on a different queue and do_pass_establish tries to remove the synqe from synqe_list before it has been added by do_pass_accept_req. Reported by: Sony Arpita Das @ Chelsio Fixes: 283333c0e329 cxgbe/t4_tom: Track all synq entries in a per-adapter list. Sponsored by: Chelsio Communications (cherry picked from commit 674cbf38f6d0a0b307e52c4265da9f077606b035) --- sys/dev/cxgbe/tom/t4_listen.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_listen.c b/sys/dev/cxgbe/tom/t4_listen.c index f91d193c0fed..8a39218a55ba 100644 --- a/sys/dev/cxgbe/tom/t4_listen.c +++ b/sys/dev/cxgbe/tom/t4_listen.c @@ -1494,18 +1494,20 @@ found: synqe->tid = tid; synqe->syn = m; m = NULL; + mtx_lock(&td->toep_list_lock); + TAILQ_INSERT_TAIL(&td->synqe_list, synqe, link); + mtx_unlock(&td->toep_list_lock); if (send_synack(sc, synqe, opt0, opt2, tid) != 0) { remove_tid(sc, tid, ntids); m = synqe->syn; synqe->syn = NULL; + mtx_lock(&td->toep_list_lock); + TAILQ_REMOVE(&td->synqe_list, synqe, link); + mtx_unlock(&td->toep_list_lock); NET_EPOCH_EXIT(et); REJECT_PASS_ACCEPT_REQ(true); } - - mtx_lock(&td->toep_list_lock); - TAILQ_INSERT_TAIL(&td->synqe_list, synqe, link); - mtx_unlock(&td->toep_list_lock); CTR6(KTR_CXGBE, "%s: stid %u, tid %u, synqe %p, opt0 %#016lx, opt2 %#08x", __func__, stid, tid, synqe, be64toh(opt0), be32toh(opt2)); From nobody Mon Oct 21 18:39: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 4XXPH45xxWz5Zc6q; Mon, 21 Oct 2024 18:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH44G8Lz4GLy; Mon, 21 Oct 2024 18:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=is8illmMqBRebcYT/V+27zA2SV/r5FJueM6hobSGezg=; b=KVH160/TU4TN/dgzzQs/5bHZhCIAflZRqPeBIMJ1l/zthj+rHZvQxpT1/0fgVfTWOiSrhg ge/e9eSVQhrkGkId3+ZFST1UbvBF1BKTQUkjiy//gKGoJ7FiijjaOXajFHN1VXKCqz41pu Tl8YE3Xzri3S69uU2Q7QCqQWh4iKZkZ7AEDy3PK6V/bXTttLtEMFuejJ4V6EYa1LkptXm3 oPET84q+2D72TpuqTZSzLZYvH5xXGqvMLuqdESW5+PVhftuahNKnp6/zxsp1nnpUkJuP7l mNd38n+CK6by+2wLI81BwITJKdAoFIFsZAchZVuKPEmty7c7Qh6hNBKZuVtZuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=is8illmMqBRebcYT/V+27zA2SV/r5FJueM6hobSGezg=; b=Dt3XTA2vv1MJGZCwEHYCJOaIS34pMAOsIPyBX3DDVl0KWCd/bMISzRvgjFGWn1uXPDGFrN nOQAbNqOscnzp5EXJHsO2yA/I4AZ/k+3z+GpXYUPxk32CUfvm0/VFOqC1NSz7TTPlrp+pV JHJokr6uCzrQrGAFCjwcoMRUigT0fttXbajkKAPoaYfFRCxTnvX8ktdTFZwA0VVfDx8ip6 FADRnEI2NBU0U6VeDNIm1OnCIk91vokQm/bQq2/8VIz62DKP+f3JThC3qjuui0h4ZzTBg7 oTE7My1Dv9WHLMOG1xEUbt8fUDIqxwm5QfHKBRrT6szMKy7BMyZB1efM3vftqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535968; a=rsa-sha256; cv=none; b=XAXisKXZ+i199dCmWaWb9zUOYumVPEfK9KyNhk6H6w48e7OhKm3RCdfvTR6Xu0WcdZJbwb kGzZryc/v4v/24B5QP0silvm3+deIfLWN5Jfp0beX1E0pKNMULoHepKFn60S3eiw8A0WdG mJewbCvsp8eUrIt0E75lrFxhhS+QIn8G+DS14jUx3gYmdaTgK3uKfB/rM4aj9R8KNeQJZn ncJ50IGlMGKw+E1e42AkP9ZvEOIj80OWR26HIf5QvWbua51C5vXl7D6RVd8cx1aI2wkLSN siGjWD7n54f4oWq165ZBFeBfDnvoARs9y1o2fXYcnvf8cX+wyf8/jvgcZJnvgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH43tTTzhYL; Mon, 21 Oct 2024 18:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdSmM037030; Mon, 21 Oct 2024 18:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdSIL037027; Mon, 21 Oct 2024 18:39:28 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:28 GMT Message-Id: <202410211839.49LIdSIL037027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 610ff48406ef - stable/14 - cxgbe/t4_tom: Demote STALE L2 table entries to RESOLVING in uld_stop. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 610ff48406ef779922298e3b9759fb0abb57e0eb Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=610ff48406ef779922298e3b9759fb0abb57e0eb commit 610ff48406ef779922298e3b9759fb0abb57e0eb Author: Navdeep Parhar AuthorDate: 2024-09-11 07:11:13 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:09:52 +0000 cxgbe/t4_tom: Demote STALE L2 table entries to RESOLVING in uld_stop. The STALE state means the L2T entry is valid in hardware but needs to be refreshed (ARP/NDP) in software. But stop/suspend wipes the hardware L2T and STALE entries need to be updated just like VALID entries to match actual hardware state. Fixes: c1c524852f62 cxgbe/t4_tom: Implement uld_stop and uld_restart for ULD_TOM. Sponsored by: Chelsio Communications (cherry picked from commit 171e57967b3e53f0fb48116df5003ce17163295c) --- sys/dev/cxgbe/tom/t4_tom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 9b1dcf304196..356ac7edc134 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -2115,7 +2115,7 @@ stop_tom_l2t(struct adapter *sc) for (i = 0; i < d->l2t_size; i++) { e = &d->l2tab[i]; mtx_lock(&e->lock); - if (e->state == L2T_STATE_VALID) + if (e->state == L2T_STATE_VALID || e->state == L2T_STATE_STALE) e->state = L2T_STATE_RESOLVING; /* * stop_atids is going to clean up _all_ atids in use, including From nobody Mon Oct 21 18: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 4XXPH573h9z5Zcv6; Mon, 21 Oct 2024 18:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH55JQCz4GK7; Mon, 21 Oct 2024 18: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=1729535969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoDNgT4K8xOWIxtRMMaH7X2PHmwUDHd1YlGuN2vcrf4=; b=W8XLQAAFhS4HtWLsvzl9av/Jb3VV4h2ZW5lD1zDw9JE+ruMbaLt26iySGnqdlEFjTN5Pkg PVUZmQz2uSOLmP1WtHrZVxxfTbmnAXNI5On+vx6Hg0x405EZaAT3pL9tps82EMMitPBub5 3eAFE8lmmyedgnDKuaLmKj+7xZE6tRYzqTR9OSL8an9WRtvDLxoxw5qJ/67xiuVVzej4UN yVEvRj/sZTF1ShlbyMspgPQ99BxvumcwTyQEIy6ywslx/acaTWJw/p3ELA6mjF55OldN52 aavZ5CdDhD3kYUGfgj98+AGr6b9fyGtvs3GxqdoK2GifwVHJinwOZphuc45z7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoDNgT4K8xOWIxtRMMaH7X2PHmwUDHd1YlGuN2vcrf4=; b=rP+hVH3rUD6seoTYVu6gZLsugUr1NYwpruCUA/Av2DjxIdFpR7X8L9g7IANFekJRG8U58H i6ntJbWFBY3B02JqwZMYNzXYL6jD88QAdfIGxEXf+3V832T4xouMKEtckYIZWXHHd4wQF7 sqj275Qkzefm2vh0F1nGgJAFzPh6qwu1W56tXxEQ13/kSHFnlJ9IMjm5K3vAOaIQSHjxJN 4LtSasEqd0TkkWPFO4fBmbFqot7WxtPGjtjPGlmgCLBrEjv6jImh1FczpjS1A7x6nVEPaV Qwi/BgbOkdboWfABt8VLZA7OezxTZu6Ee4SonxYZP4AGQOTURft3uUNaoZkx3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535969; a=rsa-sha256; cv=none; b=sG+GNKsCEymtfv+M/gCXUtb442v9bW6i+7yOxYreIvXL/HJ76hCMnouYNCzhWx9vUs56sG N1nX/mFAHlAMblJD+bTKXRJ4DvpexAOrioNpfQFQP2q1JPJd9nbISc4+BHL2JU4fKYd33S SWMpdbXIrZ2Nz83UuCMScGBxyHnHA0l//YDKOgBDZqm0m+Zt9hMYD7mQsChi2Tkf6aam8N vQx/yo36qfJOYXbcf3YmnablvywSvY1r+Y1sHkMYhCzx97EWA1GPmgf/Eylk8UAbnuEaBY w9OOknv7x4mvMAk+e/gjgUqGg0XvYVUh4tXcX5eyon4ocQ3nUnlYxIjWzUOxEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH54wjYzhYM; Mon, 21 Oct 2024 18:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdTGN037094; Mon, 21 Oct 2024 18:39:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdTls037091; Mon, 21 Oct 2024 18:39:29 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:29 GMT Message-Id: <202410211839.49LIdTls037091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 261c616077ac - stable/14 - cxgbe(4): Make sure that the tracing filters are usable after restart. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 261c616077acf134a5d8117f6e4cffbd5f970a35 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=261c616077acf134a5d8117f6e4cffbd5f970a35 commit 261c616077acf134a5d8117f6e4cffbd5f970a35 Author: Navdeep Parhar AuthorDate: 2024-09-11 08:01:38 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:13:47 +0000 cxgbe(4): Make sure that the tracing filters are usable after restart. The destination queue for tracing filters is destroyed during stop or suspend and the software state needs to reflect this. A new destination queue will be setup when the adapter resumes operation. Sponsored by: Chelsio Communications (cherry picked from commit d82cb5c608ae9aaced4cb459ca511e62c64dbf74) --- sys/dev/cxgbe/t4_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 4184900780a1..3223d32b5d36 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2091,6 +2091,11 @@ stop_lld(struct adapter *sc) TXQ_UNLOCK(wrq); quiesce_wrq(wrq); } + + if (pi->flags & HAS_TRACEQ) { + pi->flags &= ~HAS_TRACEQ; + sc->traceq = -1; + } } if (sc->flags & FULL_INIT_DONE) { /* Firmware event queue */ From nobody Mon Oct 21 18: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 4XXPH716tJz5ZcYq; Mon, 21 Oct 2024 18:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH65yRcz4GQ3; Mon, 21 Oct 2024 18: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=1729535970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PuDOSCYhTY1SRLEvZ7besxbVTk1RzQnO6I7N6pg83So=; b=CKuJTAdVpW72POJJnfS53Atf3mWbB9D3E4caYvHayIFNIgYfQ9fQ5JuIKMcgrggZv6aAG/ 9a06ZRjv/+yAInQ/aaLwgFHSKPxST3ApMpiAd1sE4OHGtirmkESpnntRbY6S01rrWYCygu kDGZKfoUXABbuEfr1aP0JyH2R9K7pm/f0AWah2QZ1ppszXX54R1xD8DmTfO1TiEvVyFZ5j GLuPUvKs+Enax6YkDx1l9SSdrtr53Eo4u0fFpctoLWCpx/gErVD3J2b3SgRFEEA3w9qemm 4TLyRr1zGb8qFWXym2avWDA5SMIe1Y626bV5oY3rEWKgpwQv5HdDtUuY/OKrfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PuDOSCYhTY1SRLEvZ7besxbVTk1RzQnO6I7N6pg83So=; b=X0z08/P9X9bXfWoZVcL5yP9YwE4or23nFinJuZjs/Gb10vSJxUG5n97TtV8Eut+NTWoMo5 80xEjMfqsXPES0AesfjZ5sZz9dGe514MwQhFmTGBPzB/FJ3+tUDJjsHMxW1bStcV5BCGsE /efD3muqkqnrVrhN4OdoRL1TwiAiTNvff+oA10coD6JdIQaww78aq5AJOoyyLWHQmm/6eu bQ+nt7EyCg82SxMEoHq7+SP7KWnF51yLsalGDHyTkWf2Ov/gRxpnHVK/ndz6bOA826qc6e CVMWBVbXNTDyon3NDFm1wUAu9PBQ1KhuSMwwtFCrkwJVPcgchUIOl/4C2aK+9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535970; a=rsa-sha256; cv=none; b=FD2Cys3FQHT+sEATw0OXNFsEDrQF7r7HOoMwFlPCoZ9XVPCCGilAXrXRCXhLLigj03GQER mkACE1EsL8eADX87/8rUEXHf8UTM1XxwiKJzJUHCrdM/ZaoA5BJR6OqMdyLKFAsbQA96Eq +M5gGsN4KajiFZEMJWdcIcdV9BumkXmx7K2FyMcCIZNzIUqKHKgGnaByvZo4J0Rnue+JRZ Dx6KDILMu6oQkr/NirelD9mavzE4LW9VvdL6HcYk5ulUjPSd1DvNK+10xYrFDH3doem8tq 9WfZ9fiOL98ys36GGhRrLgFU0xSH2t+2zAwWMMo+VvMgPJidsCdTgcZY6z81dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH65ZlgzhQR; Mon, 21 Oct 2024 18:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdUoo037153; Mon, 21 Oct 2024 18:39:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdUCM037149; Mon, 21 Oct 2024 18:39:30 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:30 GMT Message-Id: <202410211839.49LIdUCM037149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 2c9c295f5e95 - stable/14 - cxgbe/t4_tom: completely avoid L2T entries during stop/suspend. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c9c295f5e9555a642de6e9473bf3571f593f4c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=2c9c295f5e9555a642de6e9473bf3571f593f4c4 commit 2c9c295f5e9555a642de6e9473bf3571f593f4c4 Author: Navdeep Parhar AuthorDate: 2024-09-14 04:23:23 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:14:04 +0000 cxgbe/t4_tom: completely avoid L2T entries during stop/suspend. 1. Mark the L2T entry valid only if t4_write_l2e succeeds, which won't happen if the adapter is stopped. This prevents L2T entries from sometimes getting (re)promoted to VALID on Tx activity during stop. 2. Discard a work request immediately instead of enqueueing it to the arp queue if the adapter is stopped. Fixes: c1c524852f62 cxgbe/t4_tom: Implement uld_stop and uld_restart for ULD_TOM. Sponsored by: Chelsio Communications (cherry picked from commit 07f47e8850d0639d474026b203013072aeb32c81) --- sys/dev/cxgbe/tom/t4_tom_l2t.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.c b/sys/dev/cxgbe/tom/t4_tom_l2t.c index 749e5704863e..be42a887323f 100644 --- a/sys/dev/cxgbe/tom/t4_tom_l2t.c +++ b/sys/dev/cxgbe/tom/t4_tom_l2t.c @@ -212,20 +212,18 @@ update_entry(struct adapter *sc, struct l2t_entry *e, uint8_t *lladdr, e->state = L2T_STATE_STALE; - } else { - - if (e->state == L2T_STATE_RESOLVING || - e->state == L2T_STATE_FAILED || - memcmp(e->dmac, lladdr, ETHER_ADDR_LEN)) { + } else if (e->state == L2T_STATE_RESOLVING || + e->state == L2T_STATE_FAILED || + memcmp(e->dmac, lladdr, ETHER_ADDR_LEN)) { - /* unresolved -> resolved; or dmac changed */ + /* unresolved -> resolved; or dmac changed */ - memcpy(e->dmac, lladdr, ETHER_ADDR_LEN); - e->vlan = vtag; - t4_write_l2e(e, 1); - } + memcpy(e->dmac, lladdr, ETHER_ADDR_LEN); + e->vlan = vtag; + if (t4_write_l2e(e, 1) == 0) + e->state = L2T_STATE_VALID; + } else e->state = L2T_STATE_VALID; - } } static int @@ -291,7 +289,10 @@ again: mtx_unlock(&e->lock); goto again; } - arpq_enqueue(e, wr); + if (adapter_stopped(sc)) + free(wr, M_CXGBE); + else + arpq_enqueue(e, wr); mtx_unlock(&e->lock); if (resolve_entry(sc, e) == EWOULDBLOCK) From nobody Mon Oct 21 18:39: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 4XXPH81xn9z5Zd2V; Mon, 21 Oct 2024 18:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH774dHz4GKh; Mon, 21 Oct 2024 18:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4qRN7CkXO8cKfsZIA/yNlFIThz+L6s9HIIdkgFFY4g=; b=eV4d0qihnJht2XWl2vU3bi/j5EgiALSfaQEBXOseQJDr65ZlriN8UwHsHYLsKO3X9IRJxD 2WItoStzcDTGv2EsvR9380r4yIR8HjHyO+S02nAKo2UvikN4TO87Q+hBK5T6TFYpR6mwaW LnqVSMM2UuTyoQ9LVZovolYjWZk4KuIqpnJKQS8zgpesFlkV9nmtIXookY7NLgZR2QzNX6 BoEeZEdw2lrkmaJ2Q8JMTLHnNyKSQwago2OzAgM7oMLtE44Lb8takJBNdjOWHYnNuKWYtz wbEjgOaDNm4sL4I4kdpJFa16biipoQnKvv2ox9t5gvn96U+LPIH0ez3UnWDPLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4qRN7CkXO8cKfsZIA/yNlFIThz+L6s9HIIdkgFFY4g=; b=dw9cPSySix9Mk0Qp2q5786XqKmD5cvzuNR0mpISx0lcWUGbvtlTpjQOqraCfbwy8U+odla 0q7+EkkIrxo5wPYLJv4hHRD3LkOK74dXHfEhkmaziaSzWZkJwQkGm3fIoTAOIC1m8NhjQV P9KYWB8O/erQd+OhZGHCWVm2RPB7tYsXvR9iX22DxMOEbY10EfDUDG1/p46DhvDdMV7gyB XuVegF/cVlKa+O8R+CgJaRdfvR44LTr2FMme4zik0lqzzz3fByMw8jwnwhyw7i6iF6GEBq tDWkpZZO7qzvslRgNLwNQfwUqupe+rSzrCKbVvgE7WWXD4J7yMPXad/CiSvlEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535972; a=rsa-sha256; cv=none; b=bkl9PRMP3DwnxOuwvpfDIYRjbKBRqG6b8hFipLYPGalheplwn3xekk/VbXkqSLVA+yQmho VgD+53PLfrU543ccP0HHs3/DuCQ/1k4lrKa7vhOU6bHHx4ExZy4r44ateUItF7UQzOmRIZ WNprnUDFNgoxog4teY4uK1cHxBO9grt1O8zlqy17LLseTH28XpHiSpHnMf4Or9gh/6lxiG Wc+fuQEgo9Y6YRttDHxxi2i7u3wBzlHc/14zwiUYLyEHwICofsfqFxVLyZ/wUd9wqTyYMp rYDoPj8walirzTtpl97O3JujcfVpU2mA5r1FfF9t00uDL/6SR1JPWQylpoMJow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH76gfWzh9X; Mon, 21 Oct 2024 18:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdV11037223; Mon, 21 Oct 2024 18:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdVZq037220; Mon, 21 Oct 2024 18:39:31 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:31 GMT Message-Id: <202410211839.49LIdVZq037220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: b56fe21c6df2 - stable/14 - cxgbe/t4_tom: Do not set unresolved entries to STALE in t4_l2t_update. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b56fe21c6df2911f96263675298e19e9b8720366 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=b56fe21c6df2911f96263675298e19e9b8720366 commit b56fe21c6df2911f96263675298e19e9b8720366 Author: Navdeep Parhar AuthorDate: 2024-09-24 14:35:09 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:14:23 +0000 cxgbe/t4_tom: Do not set unresolved entries to STALE in t4_l2t_update. An L2 entry in the driver's hash was marked STALE unconditionally if it changed in the kernel when its driver refcount is 0. Fix the driver to do this for VALID entries only. Sponsored by: Chelsio Communications (cherry picked from commit 3883300afe0bff5c5658274c4d8cfe773d08343e) --- sys/dev/cxgbe/tom/t4_tom_l2t.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/tom/t4_tom_l2t.c b/sys/dev/cxgbe/tom/t4_tom_l2t.c index be42a887323f..8cc3e633444a 100644 --- a/sys/dev/cxgbe/tom/t4_tom_l2t.c +++ b/sys/dev/cxgbe/tom/t4_tom_l2t.c @@ -441,7 +441,8 @@ t4_l2_update(struct toedev *tod, if_t ifp, struct sockaddr *sa, mtx_lock(&e->lock); if (atomic_load_acq_int(&e->refcnt)) goto found; - e->state = L2T_STATE_STALE; + if (e->state == L2T_STATE_VALID) + e->state = L2T_STATE_STALE; mtx_unlock(&e->lock); break; } From nobody Mon Oct 21 18:39: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 4XXPH94057z5ZcvF; Mon, 21 Oct 2024 18:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPH90R1Kz4GDv; Mon, 21 Oct 2024 18:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edtjtw6a5aDkQ6V3UPGy4UEG4ZTCmkVN77A5ae0Kq08=; b=xSiGoPjDENnUPQfMTdrhCP2LibQTpykCjfbwd4D7XJLVcdQaDgIjAc33uCHAog7bB2wVYU zOHtE7g0di43IvJd+MyntmieIQdtu7WLgf8JyAfrnYj+MLv085Hp9vV5tYxIZ8lTY9xN1b Aw/cB8PohV52rq98zbwCwW6PsJy3atXRA6pmOMZWB1AKdYFfikYjQhkboO266Dux+CPTDl Cb/yVJE41+FzDa46J7mr6zEailC5mOKLeFX8ySC/ajUs6T7BLcepTxKbBmev1om5BnBh/d WQKc/wwE+jfaToYzg5P3ddjEGWZyz9V1/CuK2JUmwZOyvRe4/axeBCGB32kH4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edtjtw6a5aDkQ6V3UPGy4UEG4ZTCmkVN77A5ae0Kq08=; b=jZUr3EBaqZrOe9apfAZhM6qclAJrfenlslVGZSPDtiL/cfQwwNAePtzOCj0BVGzH8MFBOg oH62F93PbbcGlEmbPmhxgw8MdRb05mYIIu1atKQsxb/wuzMwOBXaZUG49IhSCFvupCQ1dc omKbwn8hHHDSRjhMXx9d2MY5BPG8079H8Vl5N5jT0Om83SQrca54MPaJDjizbZkGMwe51T JP0WWDdmvUV3s4q15XeUrMcUQ4yVJNgAFhArc9AuG3oJXygNHJ8sKumft4DsJNbSi6pIr6 vlxnhdcjt7taMWlZNJoqvLgE1bgRqEjOi83VvDKIix/NHBSwYCO++ld+bzLpFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535973; a=rsa-sha256; cv=none; b=olNj5ckXxDvuEAuUR5ok0+UbGprdXyL3Gi2LzrKgaB7Awha70+hqg0w5gQgkCm3Ktsj6rV RbrgZpXToUnXKPGgbPg76XFLQPFSrAaLkByDxLsn1O78V7ppK3jXfbxXtXlnCyYvBmMs0T LK4/1n1TDexDZdARaIOhQ7vWNudMwyPofzJ4zrKGQBPsficE64bSGbZeCZDe5LaORgDbxU A1wz4AJNtWPS5cbY0hyeZdOXAReBxhuUZOoR6qMHUDn6XRJUQKF0HtMwOWaSLxA9MOZzJb pzy2oqjQCl5XE07xn6BKZ9HE91poCc5CY/deKg43zyYO0h6I7/e5JhLEoB9Cmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPH903R8zh8D; Mon, 21 Oct 2024 18:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdWJG037296; Mon, 21 Oct 2024 18:39:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdWIA037293; Mon, 21 Oct 2024 18:39:32 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:32 GMT Message-Id: <202410211839.49LIdWIA037293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: b9f7a09c490f - stable/14 - cxgbe(4): Clobber all tracer state on stop and redo only traceq on restart. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b9f7a09c490f4eb6b9c179d1dfd756e236494998 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f7a09c490f4eb6b9c179d1dfd756e236494998 commit b9f7a09c490f4eb6b9c179d1dfd756e236494998 Author: Navdeep Parhar AuthorDate: 2024-09-24 23:28:29 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:14:39 +0000 cxgbe(4): Clobber all tracer state on stop and redo only traceq on restart. Tracers have to be recreated after a restart but that's okay given that they are used for debugging only. Sponsored by: Chelsio Communications (cherry picked from commit ee3da604dd016439850dae77366796313e60f0e0) --- sys/dev/cxgbe/t4_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 3223d32b5d36..e33e732a7fa2 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2095,6 +2095,8 @@ stop_lld(struct adapter *sc) if (pi->flags & HAS_TRACEQ) { pi->flags &= ~HAS_TRACEQ; sc->traceq = -1; + sc->tracer_valid = 0; + sc->tracer_enabled = 0; } } if (sc->flags & FULL_INIT_DONE) { @@ -2411,6 +2413,15 @@ restart_lld(struct adapter *sc) "interface: %d\n", rc); goto done; } + if (sc->traceq < 0 && IS_MAIN_VI(vi)) { + sc->traceq = sc->sge.rxq[vi->first_rxq].iq.abs_id; + t4_write_reg(sc, is_t4(sc) ? + A_MPS_TRC_RSS_CONTROL : + A_MPS_T5_TRC_RSS_CONTROL, + V_RSSCONTROL(pi->tx_chan) | + V_QUEUENUMBER(sc->traceq)); + pi->flags |= HAS_TRACEQ; + } ifp = vi->ifp; if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) From nobody Mon Oct 21 18:39: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 4XXPHB54rWz5Zcrd; Mon, 21 Oct 2024 18:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPHB1qZSz4GQg; Mon, 21 Oct 2024 18:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L71lVtnDghIqYfTqS34jccqsxpR5v1pF2vEUt/pLkfw=; b=vyI7SKfDVeLIyoKfJHUW8wQka013hDlVDy8beT9wq7eTmvSMWTqxNxn1cGOsbYi2NzetaE 0AfoSpr5pSZkIoWRf6r81/AX0UJSLzh9ZmDlj7CMKz1xYTPplYvPJo1Gj19mBPfPIWrL8T SA+ao+7lCVE9DHj4S82nkl4zdMge8ISgTHGokC2ZOuJz23pWYe8P8L3oW8fqlDNClg//AA NGd9s2GKc5BkFhH1M9ennrbkukHUdfnLLFcXZVRtOXo3xl5iu79+Ix9tTpC8J+hbK67EjR xKVNc482NxAgRjwcE/efkfSqW6f3dLjkawZDW/5MMkf5O0pJJmscyV1Wx/hccA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L71lVtnDghIqYfTqS34jccqsxpR5v1pF2vEUt/pLkfw=; b=cq1zjqGIsNUQxTd11/dxVgGYBfhM6lwLg5bHKwIV0FsvvmsYbAMTpwWyEnaKvvijOh7ISM GSC3kgPf/N9mCYSbu/jAlsQZriZyAVKMgTy4nisFy33rJFcPpfj+rj+i4zcXmuy2tKVtz+ YKsu9TqJwuicN2dNEpbZOEON1woPiu3GfTo9jMkhGaWco2hjm5mFN+QDTPA4nylc7Qh5KX 850FKQd7Ljb+YPhaqkIcT6NGT1J3PO4OzEIIOu8nFW2Auyv/nC7/PZm+tQ865GrOY4Qxbo pncFaqIZkuul4SSAkvNQ9hnL3BNf4OciZOQ+DHFWPNCI5Fk2ibcoPcBqDglvEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535974; a=rsa-sha256; cv=none; b=pApA77loIcy+tUd3v8mT4RLZROEHdju770AMZMfPHCHSjvzZAKTNT5wwiF5mE4OQA6PtzN uoBwzE+svbAYkTroCuaCSGTrjqlirV/gCY4ruYQGpLyCEm256wsfbXDwLZ5ibfz5lbXDcs HG4qJ4/pklXfox8YIup+ejnFNgifSIgMbDvIb0ZhXNz5hc2KHEpI3D+DeJ1nrJrG42Lksk 6Zui2SzeFqKEeeItaQOwKM4NGh2h3JNXxxK5wnW5atXYfS1hoPtTYnxQDPSgR/lbq6IEpF 4cwt+tGIV4DGzhW44RFd7o+UV5mgcb8H5LV4BrY3Oij+Q3i9UUfIW5V3MAPTRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPHB1KfZzh5l; Mon, 21 Oct 2024 18:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdYIV037352; Mon, 21 Oct 2024 18:39:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdY97037349; Mon, 21 Oct 2024 18:39:34 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:34 GMT Message-Id: <202410211839.49LIdY97037349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 48473a98a993 - stable/14 - cxgbe/t4_tom: Remove duplicate unlock in t4_tom_deactivate. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 48473a98a99355eec1bd029c09cac3dcfeead7d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=48473a98a99355eec1bd029c09cac3dcfeead7d0 commit 48473a98a99355eec1bd029c09cac3dcfeead7d0 Author: Navdeep Parhar AuthorDate: 2024-09-29 20:04:30 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:14:56 +0000 cxgbe/t4_tom: Remove duplicate unlock in t4_tom_deactivate. Fixes: c1c524852f62 cxgbe/t4_tom: Implement uld_stop and uld_restart for ULD_TOM. Sponsored by: Chelsio Communications (cherry picked from commit cc110bbec6d23d8cff47733704c71de641d0c8e8) --- sys/dev/cxgbe/tom/t4_tom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 356ac7edc134..d5b6b6ee2ce0 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1966,7 +1966,6 @@ t4_tom_deactivate(struct adapter *sc) MPASS(TAILQ_EMPTY(&td->synqe_list)); MPASS(TAILQ_EMPTY(&td->stranded_tids)); mtx_unlock(&td->toep_list_lock); - mtx_unlock(&td->toep_list_lock); mtx_lock(&td->lctx_hash_lock); if (td->lctx_count > 0) From nobody Mon Oct 21 18:39: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 4XXPHC48v1z5Zcws; Mon, 21 Oct 2024 18:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPHC2m0qz4GdP; Mon, 21 Oct 2024 18:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lYi8y1pcJlpPtMs9ZXvznZYDr+mpmSfx+2MZOFSrXA=; b=ijpZ9VBJ5rGNFjfWoJ94Mjumqa76lQkRTZz/Ezh6ObW6rtqm2ZS5MTfEsgwtKkIFBYpQMK LfsemJr6N8LIiOILwxjpIqYvUMJrGAs7sw9fhwwiyyYkT2FIu3QiosmIhL6sv34u0JveEl qsUicxygRGOYLWV5qKhC0vZALXw22XZ5R6WoUqpZZkZAayT6hKACHUGG0Hd6NtC4YL7oPm 8fovtVly8tFNXs9uXi2XMIgM/y9YOsC067LiDWi9xnxatjB2jW++bohW6kV4UFBGEZ5JZh GtiLVQvFdblBLhiTx+Np0dM9z94iUtNqrYf6xCd1IaBO8f5/zPyGokZlQ2W8qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lYi8y1pcJlpPtMs9ZXvznZYDr+mpmSfx+2MZOFSrXA=; b=EGK/an5uMeRBw34rVpNTcjMm6sguplpvZHYatf40ih4YA8dtMB4zAM6vHjNdUoeuuig9WY PbOVhaBi8A7TT1vEmcB7Cev1lRFmVE7BG0KRnBcNm4xI2FTrmqc1gYEbYYB6eP4LzTQJkX DcjbvB/fa0tKRY08kygdDoGndkWXf8p4Pw/wBGSJRyw8rQiPoKbkya7vJLaL1ilFZenD3y zV4Va2cnhVM+vrtq4YjSZvYZAbXPssLW4dijxaMMhHvsPBBZhDduFptgOBG7oV2H5eX4UC owo0XMIH7WSMXhtUDpm289rzVTdykvJFiSPtbimlaWP8EWHju/PNBz6avB4ZPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535975; a=rsa-sha256; cv=none; b=ovp8dCVcvheEUH9bxDqQ96R5bOb9lEVzByyVQUhTbMjenRJT+TRHrQqNoecQGB/JbsnxP3 YeEdx+zSXKJIBFaVTN7vrFCWHgM5tRInSl1har7Eg/X/5PUyOImQAHKpCRx1utcClbT4So mTvnh5f/DB2T/9DJdaQs7+NZ/h+3oq9vhbc9a8ymy8W9ZlG4P4XJGcivieQq8vvp1CUP5m DQFSXbOLL6i2sWLqKW+7+6WxNF5WRay1jQDIjDIjR5siCsDDnn51Dj51rCuYNh6k2nmfqx R0BEVy/WgNzx6kLZ36IJHAz7ppRSqE8qLk509t19D4d3X/l2pbFy683P7fJo0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPHC279SzhVm; Mon, 21 Oct 2024 18:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdZtZ037403; Mon, 21 Oct 2024 18:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdZQN037400; Mon, 21 Oct 2024 18:39:35 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:35 GMT Message-Id: <202410211839.49LIdZQN037400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 0eea8754aefc - stable/14 - cxgbe(4): Allow t4_tom to be unloaded safely. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0eea8754aefc64ce862705a13215837f50ee8983 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=0eea8754aefc64ce862705a13215837f50ee8983 commit 0eea8754aefc64ce862705a13215837f50ee8983 Author: Navdeep Parhar AuthorDate: 2024-09-29 23:29:41 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:15:11 +0000 cxgbe(4): Allow t4_tom to be unloaded safely. * Disable IFCAP_TOE automatically on all ifnets on all adapters during unload. This is user-friendly and avoids panics due to stale ifnet state after t4_tom is unloaded. * Do not allow unload if tids are in use by the TOE on any adapter. Reported by: Bimal Abraham @ Chelsio Sponsored by: Chelsio Communications (cherry picked from commit 9ba8670a8b175de79ea087688f51595b4f2db862) --- sys/dev/cxgbe/adapter.h | 1 + sys/dev/cxgbe/t4_main.c | 22 +++++++++++----------- sys/dev/cxgbe/tom/t4_tom.c | 31 +++++++++++++++++++++++-------- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 2769277e8411..862a90e8a441 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1394,6 +1394,7 @@ void cxgbe_media_status(if_t, struct ifmediareq *); void t4_os_cim_err(struct adapter *); int suspend_adapter(struct adapter *); int resume_adapter(struct adapter *); +int toe_capability(struct vi_info *, bool); #ifdef KERN_TLS /* t6_kern_tls.c */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index e33e732a7fa2..f4e6b41d9fb4 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -869,7 +869,6 @@ static int stop_lld(struct adapter *); static inline int restart_adapter(struct adapter *); static int restart_lld(struct adapter *); #ifdef TCP_OFFLOAD -static int toe_capability(struct vi_info *, bool); static int deactivate_all_uld(struct adapter *); static void stop_all_uld(struct adapter *); static void restart_all_uld(struct adapter *); @@ -12501,7 +12500,7 @@ t4_ioctl(struct cdev *dev, unsigned long cmd, caddr_t data, int fflag, } #ifdef TCP_OFFLOAD -static int +int toe_capability(struct vi_info *vi, bool enable) { int rc; @@ -12567,6 +12566,7 @@ toe_capability(struct vi_info *vi, bool enable) if (isset(&sc->offload_map, pi->port_id)) { /* TOE is enabled on another VI of this port. */ + MPASS(pi->uld_vis > 0); pi->uld_vis++; return (0); } @@ -12592,17 +12592,17 @@ toe_capability(struct vi_info *vi, bool enable) if (!uld_active(sc, ULD_ISCSI)) (void) t4_activate_uld(sc, ULD_ISCSI); - pi->uld_vis++; - setbit(&sc->offload_map, pi->port_id); + if (pi->uld_vis++ == 0) + setbit(&sc->offload_map, pi->port_id); } else { - pi->uld_vis--; - - if (!isset(&sc->offload_map, pi->port_id) || pi->uld_vis > 0) + if ((if_getcapenable(vi->ifp) & IFCAP_TOE) == 0) { + /* TOE is already disabled. */ return (0); - - KASSERT(uld_active(sc, ULD_TOM), - ("%s: TOM never initialized?", __func__)); - clrbit(&sc->offload_map, pi->port_id); + } + MPASS(isset(&sc->offload_map, pi->port_id)); + MPASS(pi->uld_vis > 0); + if (--pi->uld_vis == 0) + clrbit(&sc->offload_map, pi->port_id); } return (0); diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index d5b6b6ee2ce0..97cb380d0e71 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1946,20 +1946,29 @@ done: static int t4_tom_deactivate(struct adapter *sc) { - int rc = 0; + int rc = 0, i, v; struct tom_data *td = sc->tom_softc; + struct vi_info *vi; ASSERT_SYNCHRONIZED_OP(sc); if (td == NULL) return (0); /* XXX. KASSERT? */ - if (sc->offload_map != 0) - return (EBUSY); /* at least one port has IFCAP_TOE enabled */ - if (uld_active(sc, ULD_IWARP) || uld_active(sc, ULD_ISCSI)) return (EBUSY); /* both iWARP and iSCSI rely on the TOE. */ + if (sc->offload_map != 0) { + for_each_port(sc, i) { + for_each_vi(sc->port[i], v, vi) { + toe_capability(vi, false); + if_setcapenablebit(vi->ifp, 0, IFCAP_TOE); + SETTOEDEV(vi->ifp, NULL); + } + } + MPASS(sc->offload_map == 0); + } + mtx_lock(&td->toep_list_lock); if (!TAILQ_EMPTY(&td->toep_list)) rc = EBUSY; @@ -2243,14 +2252,16 @@ t4_tom_mod_load(void) } static void -tom_uninit(struct adapter *sc, void *arg __unused) +tom_uninit(struct adapter *sc, void *arg) { + bool *ok_to_unload = arg; + if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4tomun")) return; /* Try to free resources (works only if no port has IFCAP_TOE) */ - if (uld_active(sc, ULD_TOM)) - t4_deactivate_uld(sc, ULD_TOM); + if (uld_active(sc, ULD_TOM) && t4_deactivate_uld(sc, ULD_TOM) != 0) + *ok_to_unload = false; end_synchronized_op(sc, 0); } @@ -2258,7 +2269,11 @@ tom_uninit(struct adapter *sc, void *arg __unused) static int t4_tom_mod_unload(void) { - t4_iterate(tom_uninit, NULL); + bool ok_to_unload = true; + + t4_iterate(tom_uninit, &ok_to_unload); + if (!ok_to_unload) + return (EBUSY); if (t4_unregister_uld(&tom_uld_info, ULD_TOM) == EBUSY) return (EBUSY); From nobody Mon Oct 21 18:39: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 4XXPHF0Szkz5Zc72; Mon, 21 Oct 2024 18:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPHD3T84z4GbD; Mon, 21 Oct 2024 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FdfD/7e71HKMNqcni3COR/2PAIeAIl/a1ScU7++8vHc=; b=TC39NbYvDqk8x6Y/hKb6ASa/dA48wdNQ/K5X75pcbGeRTiE7H21CLE0dJnk3CJsP/7Ga6Z 6xlSTEpYj3M8U6RUeq8XAymXighdX+EVe/MhASO5D5Ql2tDiMw+bTUQxjzUIO3QIg+ZBD9 3TUwAr3aeXPPxVpWq/q9F6HSOZtaQMRdFG6U+0iRuqAiJVEYnZ4VzBgzpNaLeutR0DBqNc L2xDAAR8Gq9Y7RHmvKzFRpT2JFirNoDKpyYm1lHFBZT8NhWXJJViXv9VYucnRJXrDzkKsN bEnFeg+T0QqO0LGQGOmgc+WODtu3/PJCzV6/Tm4qWrMxmFd6/5F0/3GL9dX8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729535976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FdfD/7e71HKMNqcni3COR/2PAIeAIl/a1ScU7++8vHc=; b=yoZUkl4bFP9m3JFbEq30ukIhxmp+5YzuWvw1n2ED5mb0YQyI+mM+JrnDjfmA3Tmvkf3RvK tpLg0M8TkwbgMlrV3DgreUgts5LVLu6u3BXHbgdmHjmi3H1Yi/Rv7UrJUXc61/7WSvRQ2R R91wCsCn1GSCp5PUnvTiIrnQqi2PDxzKwOcVwJwWKdEM/qlG7eclheI3s+Zamq8bIgQKPT 34luGSA0lCOtiSS+BbOEggtuqgbWQFwzwRDa9XR9oRoYtfY+Lz768n0CvAiIYup7LT9ode bohvWJBPTUuSGT8Cf2y4pOkCURX0fUsEz68OKpi8hTwAGkCxXQE9DdL1h48emA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729535976; a=rsa-sha256; cv=none; b=UgReJyMIeOvYJg/EwtI6DtBQtFNsy4c0DUC16tI/GH/g2L5x9EM4ylM4Uz6iEf9a9qMxeR wKf/rJ0jDZMdMJyXhNmKqWzdAJHJHP8NN3mV+aEK6X1UBJjcyYmjX5RTUqaHNAAUDYJcq1 uQd0VDFZbVLD6XYfu4wmq/KFLzjb/qa/aSsmytiGjUqjybDZrf5WOJsdpQzKgN39khj6hu PQT7rJ+L9Vc6WiLUf1Lpc3aZyZ9NvzdF4eHpvcNjeDsI71oCIlJtZPb3GwplxzMhY9FyQz yVrAVRbiUZYx3B0Hg9eyO/6D/H9JiDk3/mfl+/M8rpDTVu6jJyyJwS/1HZiNUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPHD35Hgzh8F; Mon, 21 Oct 2024 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIdaHM037457; Mon, 21 Oct 2024 18:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIdabl037454; Mon, 21 Oct 2024 18:39:36 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:39:36 GMT Message-Id: <202410211839.49LIdabl037454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 42d8f6b75933 - stable/14 - cxgbe(4): Use correct synchronization when marking the adapter offline. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 42d8f6b75933329aaa7fcffed3abc5c7bfb43cb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=42d8f6b75933329aaa7fcffed3abc5c7bfb43cb2 commit 42d8f6b75933329aaa7fcffed3abc5c7bfb43cb2 Author: Navdeep Parhar AuthorDate: 2024-10-04 18:11:22 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 17:15:33 +0000 cxgbe(4): Use correct synchronization when marking the adapter offline. adapter->flags are guarded by a synch_op, as noted in the comment in adapter.h where the flags are defined. Fixes: 5241b210a4e cxgbe(4): Basic infrastructure for ULDs to participate in adapter reset. Sponsored by: Chelsio Communications (cherry picked from commit 52e5a66eac22d24e29f204c5b65232378e71f4cf) --- sys/dev/cxgbe/t4_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index f4e6b41d9fb4..769d4778a8d2 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1990,18 +1990,23 @@ restart_adapter(struct adapter *sc) static inline void set_adapter_hwstatus(struct adapter *sc, const bool usable) { - mtx_lock(&sc->reg_lock); if (usable) { /* Must be marked reusable by the designated thread. */ + ASSERT_SYNCHRONIZED_OP(sc); MPASS(sc->reset_thread == curthread); + mtx_lock(&sc->reg_lock); atomic_clear_int(&sc->error_flags, HW_OFF_LIMITS); + mtx_unlock(&sc->reg_lock); } else { /* Mark the adapter totally off limits. */ + begin_synchronized_op(sc, NULL, SLEEP_OK, "t4hwsts"); + mtx_lock(&sc->reg_lock); atomic_set_int(&sc->error_flags, HW_OFF_LIMITS); + mtx_unlock(&sc->reg_lock); sc->flags &= ~(FW_OK | MASTER_PF); sc->reset_thread = NULL; + end_synchronized_op(sc, 0); } - mtx_unlock(&sc->reg_lock); } static int From nobody Mon Oct 21 18:55: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 4XXPd56LgMz5ZdVh; Mon, 21 Oct 2024 18:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPd55QhJz4Q4Z; Mon, 21 Oct 2024 18:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729536905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeBLDMQGVuJkj4NrKNqSNU+OzfiP7F8qckMDRTaGFxE=; b=MN0J2GsJz+nNHmfgPi8QO4INnc0gYwmWwxEHXgDUPaaH29zUAk4M8T2AVIn3BAOSwVCE84 wOCM+701Jmf7wcbiSFzhmAQTBcyuTDxs7cTki0nuWgVjwV+fKSMDvvvdQ1PEFcLMNXTuZb X4vBxOOWXugTFCrjcACrNCvc2EXQBWGX42wmvpHWG2WLUHsm/9rxLTtZ9PkfqNcnVr/wQL Nw7wGlf34SeORR49MFMUsyJHm1AoVhaKvQFGrZpU8rDUTad8qcZQ8LmTahPHwSv3qiD8Eh Fuv1XoCpUBHjR79+rmufX8PEHrOuR0JUrtmhcFMbDgPGXw+B4u/cy6ftch3mIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729536905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AeBLDMQGVuJkj4NrKNqSNU+OzfiP7F8qckMDRTaGFxE=; b=hI3vFb8UXr01Qy6NLpT92IMOc5iSL3n7gvVKFnZRMXoSiM3r4SO0r9OEhZQsLr7Bw/9F4e pW+EEUIlHLodQXWqYE6bpCIlfiVpcGTOBT6KrxvWfePOyyoZD+pu8WF5lrK3INpIj9iKde b7dQcY/53yDioiVT4AwPOtQBHJWEN/WBwT4LuWtwnLVtlWLoNlLGi1m9gPfd9Ncob3ECVu 3R7vimi+eSCnUkWfTANnLGa5F0GK+R05N+1iuVxW9qwIDKNtP32y4hF7ouCUEy3wdCxKip NonDcxWZWZnKIcSenbOZPxnLz7oLvaavqgOcpifIKZieYMrTkT5j/VVVLrMpWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729536905; a=rsa-sha256; cv=none; b=JMHe9IHuucXb5TqfHy8QPuVN5x9Cbld7kjZzJxM0dBORkmm/xi9CjEjxsEqjczjMJH720q C2K5xGFpaqp7PonMRFW0qg/5DIHNQvpyyJVL66cGEBXvgjmNCKs75GJYBGTemt2fWJgvaQ E7VLL1D60FJKpkjOMxB11NA4mqb9hhXVZoYLhJRXXT2GeSoGqZNyB9Isk/DtO080TNEMy1 H0ofvvhgj+fQo3rINR7Lsmi5KNQwxXzRiGdUHtxMlcgYrwTO1dhcj/TVsBjWwrQQOn2oRl ZG2DylhmABiq9Whw/s52SgbzqZzCIxjd3qdQjL914rtnO5eIjqxGaxKjV0rvtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPd54vQrzj1p; Mon, 21 Oct 2024 18:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LIt5jC073260; Mon, 21 Oct 2024 18:55:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LIt5mo073257; Mon, 21 Oct 2024 18:55:05 GMT (envelope-from git) Date: Mon, 21 Oct 2024 18:55:05 GMT Message-Id: <202410211855.49LIt5mo073257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: e42a182bb7f6 - stable/14 - cxgbe: Add a 'show t4 memdump' DDB command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e42a182bb7f69d53ea35dfe22e16a1944c280066 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=e42a182bb7f69d53ea35dfe22e16a1944c280066 commit e42a182bb7f69d53ea35dfe22e16a1944c280066 Author: John Baldwin AuthorDate: 2024-07-03 15:05:11 +0000 Commit: Navdeep Parhar CommitDate: 2024-10-21 18:49:27 +0000 cxgbe: Add a 'show t4 memdump' DDB command Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D45187 (cherry picked from commit 1edf61f395d98a5abb7d6f38e5e64722b4ddf351) --- sys/dev/cxgbe/t4_main.c | 76 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 769d4778a8d2..3829ea6501cb 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -12939,30 +12939,26 @@ tweak_tunables(void) #ifdef DDB static void -t4_dump_tcb(struct adapter *sc, int tid) +t4_dump_mem(struct adapter *sc, u_int addr, u_int len) { - uint32_t base, i, j, off, pf, reg, save, tcb_addr, win_pos; + uint32_t base, j, off, pf, reg, save, win_pos; reg = PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_OFFSET, 2); save = t4_read_reg(sc, reg); base = sc->memwin[2].mw_base; - /* Dump TCB for the tid */ - tcb_addr = t4_read_reg(sc, A_TP_CMM_TCB_BASE); - tcb_addr += tid * TCB_SIZE; - if (is_t4(sc)) { pf = 0; - win_pos = tcb_addr & ~0xf; /* start must be 16B aligned */ + win_pos = addr & ~0xf; /* start must be 16B aligned */ } else { pf = V_PFNUM(sc->pf); - win_pos = tcb_addr & ~0x7f; /* start must be 128B aligned */ + win_pos = addr & ~0x7f; /* start must be 128B aligned */ } + off = addr - win_pos; t4_write_reg(sc, reg, win_pos | pf); t4_read_reg(sc, reg); - off = tcb_addr - win_pos; - for (i = 0; i < 4; i++) { + while (len > 0 && !db_pager_quit) { uint32_t buf[8]; for (j = 0; j < 8; j++, off += 4) buf[j] = htonl(t4_read_reg(sc, base + off)); @@ -12970,12 +12966,27 @@ t4_dump_tcb(struct adapter *sc, int tid) db_printf("%08x %08x %08x %08x %08x %08x %08x %08x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); + if (len <= sizeof(buf)) + len = 0; + else + len -= sizeof(buf); } t4_write_reg(sc, reg, save); t4_read_reg(sc, reg); } +static void +t4_dump_tcb(struct adapter *sc, int tid) +{ + uint32_t tcb_addr; + + /* Dump TCB for the tid */ + tcb_addr = t4_read_reg(sc, A_TP_CMM_TCB_BASE); + tcb_addr += tid * TCB_SIZE; + t4_dump_mem(sc, tcb_addr, TCB_SIZE); +} + static void t4_dump_devlog(struct adapter *sc) { @@ -13107,6 +13118,51 @@ DB_TABLE_COMMAND_FLAGS(show_t4, tcb, db_show_t4tcb, CS_OWN) t4_dump_tcb(device_get_softc(dev), tid); } + +DB_TABLE_COMMAND_FLAGS(show_t4, memdump, db_show_memdump, CS_OWN) +{ + device_t dev; + int radix, t; + bool valid; + + valid = false; + radix = db_radix; + db_radix = 10; + t = db_read_token(); + if (t == tIDENT) { + dev = device_lookup_by_name(db_tok_string); + t = db_read_token(); + if (t == tNUMBER) { + addr = db_tok_number; + t = db_read_token(); + if (t == tNUMBER) { + count = db_tok_number; + valid = true; + } + } + } + db_radix = radix; + db_skip_to_eol(); + if (!valid) { + db_printf("usage: show t4 memdump \n"); + return; + } + + if (dev == NULL) { + db_printf("device not found\n"); + return; + } + if (addr < 0) { + db_printf("invalid address\n"); + return; + } + if (count <= 0) { + db_printf("invalid length\n"); + return; + } + + t4_dump_mem(device_get_softc(dev), addr, count); +} #endif static eventhandler_tag vxlan_start_evtag; From nobody Mon Oct 21 19: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 4XXPrl3sbTz5ZfXq; Mon, 21 Oct 2024 19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPrl3Qd9z4SSY; Mon, 21 Oct 2024 19: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=1729537511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ENDEbt5fnYirRrM5LFcEwJ3OEYq7aNri0SEz5OfL5KU=; b=QcH9KDXnwBFmS6YfLvi4xGwLwQuJwxXJ6pAfGXOSI4zAp8FGcyUj9JYQS9IyHbYWpSXuI+ eQAZMihamTazM8bBIZE6ydJndRlYOsywQx+kgMC5iDmAT2o5rVwJ8AtGQuFXw/TusAlEW9 PvzM6LwC6Uy6icfv8nvt/gLuIAtmT47104ZhrUzjrwNQyBzcbWMSDiYM2EcVupk5x8JK7S d1KC9zAHpdvnBNjYurHUEjEoZFH9OJjuGwgdC+6vUKWiAAsCZ5v262jfcPLVzchA5/PuhQ Mnh+EtRjFO7nOX1ApaTBnN6wYo9rFB9f3KNCEKJrGmkKn7Vhd/3Lkpl+5JXnXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ENDEbt5fnYirRrM5LFcEwJ3OEYq7aNri0SEz5OfL5KU=; b=v5jRYAHEycXJ8TQGGyK1yY3dJ4FkkrTa9Q3mLFXWKE1W4Vzlv25mIzopltt3czYWUKot4p OuYgmt1oohSnVKBxBdXVWsOcpg1KiTkeF5VDjxIlPbFPfPCpa/4qZTVtiDCJGQpQUxj2F6 Bb3+zJnOkHzvpKfaN/y+n+ccgjZrP0Q8X77B8zRrLa/pMz1o8JoqVvbzTYhc6R+D1jdYpN kPEK7iU3ADgqwGJGq0/Cns+jRXveqamGk/Zavg6R9dt5dihMuy5GU/mT1viHWTRKybZkMh h3bdnJ1JwtS3XUa9iGNXSDNn80y73pZxDEEu8j1HPh7ueMpKMmfTa6vfHPrp4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729537511; a=rsa-sha256; cv=none; b=YfZXb78HSalF9zd0XErNS+Nt8bAyxUpGAFHwuFJbeG0B2mQtqIDIkPg2bd5CDmNuRZsTZ0 hqXBa9pQqbV0pzL/d32vnAiZwc0gax2dtCVVZN+hlS+DpUsGvtHvRyDcILjRIopM1wIPir ttSwKqzAZ5ceT0hWTy25w/p/doI3pEdzMAdyaPvi8bSrG1VDbhk0QQX4JIr3X8NlXSCVmx TKnlZdT2Y6lcoPAeJXyaoS24Mit/TKcnA+IWftAobi1THOX9OfDKdwh2G9zqgHyEui/yeX PiivCegj021PvJ7oZsZw7nykMwHcBhuVBjiL075BgFswFeMdcz1voPXFWiCcBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPrl2vdyzj8Y; Mon, 21 Oct 2024 19:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LJ5BrM092294; Mon, 21 Oct 2024 19:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LJ5BAa092291; Mon, 21 Oct 2024 19:05:11 GMT (envelope-from git) Date: Mon, 21 Oct 2024 19:05:11 GMT Message-Id: <202410211905.49LJ5BAa092291@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: ae9d96dd9f85 - stable/14 - ldd32: place in utilities-lib32 not utilities List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: ae9d96dd9f8599a6fccf190ef6863f1c514a7a27 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ae9d96dd9f8599a6fccf190ef6863f1c514a7a27 commit ae9d96dd9f8599a6fccf190ef6863f1c514a7a27 Author: Isaac Freund AuthorDate: 2024-10-09 13:24:06 +0000 Commit: Ed Maste CommitDate: 2024-10-21 19:04:55 +0000 ldd32: place in utilities-lib32 not utilities The ldd32 binary is currently in the utilities package but belongs in utilities-lib32. This patch corrects the situation. PR: 249145 Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47023 (cherry picked from commit 53bb5613a8a15363718b6e6de8d965bf9a2c5469) --- usr.bin/ldd32/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/ldd32/Makefile b/usr.bin/ldd32/Makefile index 59cfd50d6152..fb737cb15901 100644 --- a/usr.bin/ldd32/Makefile +++ b/usr.bin/ldd32/Makefile @@ -5,6 +5,7 @@ NEED_COMPAT= 32 PROG= ldd32 MAN= MLINKS= ldd.1 ldd32.1 +TAGS+= lib32 .PATH: ${SRCTOP}/usr.bin/ldd .include "${SRCTOP}/usr.bin/ldd/Makefile" From nobody Mon Oct 21 19: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 4XXPrm56vnz5ZfdX; Mon, 21 Oct 2024 19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPrm4242z4Scm; Mon, 21 Oct 2024 19: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=1729537512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ja3WfkqdBHzTnc7IcGfpA3Ri5UP+tFhBQZJnWtkTb5k=; b=vqI8Q4IoMtyddnLWb19gz6U76N1n9i3uNcLg261Ph7ady8MPwDT7WQPRBKrMnTNb3PiZ32 cf9NLKJHRr8pB+ihVI/5h7Ef/8MJwSPadZXLU5C7f1c2ABPMGGhGF/2p5cuawG8EovUS7p E6GAH4c/W3raiDyHgx0OokbkCIDlWJ8pHZbhYDDEqHgsMpNSptTBm8XLXojzcHDxmGNNvw iWjX82fhQzpguKtE063K8JEuZITxi9UOMo7IdmR/3TrdXx8ZoT25hpDokj4NOsu7jSEjbR gBzDDjowpKC+++k7c1+9hDc9dxmXd/L+E+RMVU3VNxRxGXFcZ8H2em+Hdsrpug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ja3WfkqdBHzTnc7IcGfpA3Ri5UP+tFhBQZJnWtkTb5k=; b=PAADBxMVYNsSutmG2drplTF+92y2ognyKGyq8JWEJUpw4LJgQQ2L5Cpkws9VKVtbD739oB yw8wGC6zGd57yBc0R2VBC7TRhPQWkrC1mmQLjbIDd/afn2Zwvv2PVi/yaT9W12KesQCPZy J1rRWDObjUTQZyNqy77FA2mjQ5xjnl0nhHSSWcEY9ZAJJ/dfVd5nJyKehLIgNSK8EN5NrF 1RdW6MTNOx3FHlFMwECTLFfFNQ/PsJDmDBoqpVD6f9oZ3zQDj4z0spxzCQU75wW9hZbSKs H2yASiJ9yi6WdHRNjfv9+tboSfgaqVhWldh4EUrptg94Wb8fMF3tgqNP/hef3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729537512; a=rsa-sha256; cv=none; b=dGwWjsU5eJZgkrHKjHxXPRclbOSidi5ZJy2umQ1jTDYCv2QNA+dIuFSRsi8QKwhLyIXkJC xqZA7TbvJIHfhZkoiloPFrK4jTR7xBgiJF0F/GWtZWkND7qUwJlPTIYOpmh9GL+nKWC3XW B8jCrI4SesoLg75agMvFDO8RgpdG3gAFaRMfhhCxgabNZc22YBL4Z8as4gJCbxq5IXqZBV 3MLWXQdPc4OWjjGH66M7s3qQgcz5SbyvxS6JXA9QQRx3YSx3qvjQtziN3mieufijm9a8UA vRlHbu8TgELIbfCD2M4scKR0P95b7ko0DSZJq3k6kUvq483KiPG7of1iEhEHkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPrm3drNzhmf; Mon, 21 Oct 2024 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LJ5CjH092364; Mon, 21 Oct 2024 19:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LJ5C4x092361; Mon, 21 Oct 2024 19:05:12 GMT (envelope-from git) Date: Mon, 21 Oct 2024 19:05:12 GMT Message-Id: <202410211905.49LJ5C4x092361@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: 85b6bfaac925 - stable/14 - mk: honor TAGS for FILES in default group List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 85b6bfaac92551716cfece08137c3cb4d2261521 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=85b6bfaac92551716cfece08137c3cb4d2261521 commit 85b6bfaac92551716cfece08137c3cb4d2261521 Author: Isaac Freund AuthorDate: 2024-10-07 16:32:46 +0000 Commit: Ed Maste CommitDate: 2024-10-21 19:04:56 +0000 mk: honor TAGS for FILES in default group Currently the lib32 crt files (/usr/lib32/Scrt1.o etc.) are placed in the clibs-dev package rather than the clibs-dev-lib32 package. The /usr/lib32/dtrace/drti.o file is similarly placed in the dtrace package rather than the dtrace-lib32 package. Splitting shared libraries in /usr/lib32 into a -lib32 package is handled in bsd.lib.mk by adding "lib32" to TAGS. However bsd.files.mk ignores TAGS and only honors ${group}TAGS since 144c442. This patch changes the behavior of bsd.files.mk to honor TAGS if the default FILES group is used. This matches the handling of PACKAGE, which is also ignored unless the default FILES group is used. With this patch, both the clibs and dtrace package are split correctly. PR: 249145 Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46991 (cherry picked from commit d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63) --- share/mk/bsd.files.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index 517ecd44f2f3..a330a8dddbbd 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -39,6 +39,7 @@ STAGE_SETS+= ${group:C,[/*],_,g} .if ${group} == "FILES" FILESPACKAGE?= ${PACKAGE:Uutilities} +FILESTAGS+= ${TAGS} .endif .if defined(NO_ROOT) From nobody Mon Oct 21 19:09: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 4XXPxk3281z5ZfZ6; Mon, 21 Oct 2024 19:09:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPxk2NXMz4T3w; Mon, 21 Oct 2024 19:09:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpwBjpvIVqdypjFue/9Lwu+RkgdfCawGjqRobi+gsXo=; b=hMBhifVf4LFMvJIORBxFYTU/8zNx7wFD/sehm6rcbk4Yjoo4diW6acEBzuHyGzXzHrBAbc NjSqx1ca6g8gF0JUSeygf7j1vEYfIHtLpGlkGvd1vCww2dN1OZVfKlgC2sRA13GimtnNv6 +zeSw6IKO40MywXSHrrsu8knbYzDWDJBbcF3mTua/PA2UD7BULBtP1RJJ/SEckXBKSDiel WKlU7RT7246ODgehsP7T1zf5/YwnyyAuYId/1L7MLd+1hqWZtk0ounTFUgqJT9muaXtR0O u2HyuqZi4sUviUVThxgSpBQZA6ymSUVaAFJNOE1j6Jv2WRmZaZqbKacW2ySjYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jpwBjpvIVqdypjFue/9Lwu+RkgdfCawGjqRobi+gsXo=; b=GerVLFm+NKYSH2d4P8DdCh54LMyQMkeV1l34fwaz7j5tUk2BCT2EHSHdj8Xh+jlSijMoRz XaFM9TWAIKDxrR7O2LZl78baBGRZzxSHp/elBR2syflKCJTV5Cr+EOM8TUgrpT1szm8ZHk fOw8UjlOpsyxkEev3J0ZsZDs7LoaxBoYpsm1/ijsBsYVrC7eXo55jfHmddfc//24094uYL mw20NcOSievhxBpCdqDGbo2UMSzprSpCgw/EvjAzp3Emj7nSvgKOBl+AYxcgmvfEPTwp9T gjAZcri85rv4d4ozx/3QBWAs1Fw2R4aW5AOHM8x7AzxQHWqxx/alWOU0ShJqxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729537770; a=rsa-sha256; cv=none; b=cFEGRR/tSsk0olfCrYhpc4iwORZHzX5lA4Qk4hlrZLOW/0Tp0r6oqWg3Ej2pLJmu7GnaXY YAO4MaZDP0iiwwJDtTVS6hYNPgM2RVg8z5m2vdpKalxW3Ni/+a54HYrrxbabQrQ6eaylKQ A6fZefcgJij9L1hPyNHu7ssySOWCsdfeOK9rVEIsuP6FfwTNziRiS3jV1q1Yby+WQOwd1e 4b928WttaOzbrLHs4q3cAnHdd+DNLDWRN8iazpAQuX1skAIUicP+Kx0996iiIkM8wECraf qBa98Ji6mCgDvsIC2MpPLXR2lYXMnpB9HvKYsD+9HwCAg0SS3OmzrN2HBn70GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXPxk1lPMzhC4; Mon, 21 Oct 2024 19:09:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LJ9U97093709; Mon, 21 Oct 2024 19:09:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LJ9UUC093706; Mon, 21 Oct 2024 19:09:30 GMT (envelope-from git) Date: Mon, 21 Oct 2024 19:09:30 GMT Message-Id: <202410211909.49LJ9UUC093706@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: 273c500de2c8 - stable/14 - fdisk: add deprecation/removal notice to man 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 273c500de2c85f14a3971102aae29af765a5002f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=273c500de2c85f14a3971102aae29af765a5002f commit 273c500de2c85f14a3971102aae29af765a5002f Author: Ed Maste AuthorDate: 2024-10-11 20:09:25 +0000 Commit: Ed Maste CommitDate: 2024-10-21 19:08:13 +0000 fdisk: add deprecation/removal notice to man page As of 2015 (commit b8c19fd71994) the fdisk man page claimed the command is obsolete, but had no explicit mention of removal. Add another note that follows our current deprecation notice format. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47067 (cherry picked from commit 255d2d9bbc3756c940462c61d3cd6fb7753aab2c) --- sbin/fdisk/fdisk.8 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 3c6a73318271..ea54a51a43ae 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -15,6 +15,22 @@ .Fl f Ar configfile .Op Fl itv .Op Ar disk +.Sh DEPRECATION NOTICE +.Nm +is deprecated and is not available in +.Fx 15.0 +or later. +Use +.Xr gpart 8 +instead +.Po +with the +.Cm MBR +partitioning scheme +.Pc , +or install the +.Pa freebsd-fdisk +port or package. .Sh PROLOGUE In order for the BIOS to boot the kernel, certain conventions must be adhered to. From nobody Mon Oct 21 19:09: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 4XXPxl58bSz5Zfhl; Mon, 21 Oct 2024 19:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXPxl3WWGz4TKP; Mon, 21 Oct 2024 19:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LCY+9l61FIoy/C+PO0ONgdHtNPZsoXgzBs409osP9kQ=; b=Ee8xmTmfg8UWtrfyIBQ7NdBLdLPXk/jBuwWV9mmBUT2UiZmudSm6MtKsLtj7eUtvEozL/B 4y4yO17j3hCqgaHDX8g+Qk1CN2VlN5qO8v0dUbXcttmUTus+TE3QbnpN45acMEdqhRNKcG e1Z6JtqEfjGEdV9CRGqoCjp/26E3XqQawI9pW2tZ+c2iiTgB8LvxhtmKi9NGu+I0E203OB SwizajKbwKUq7/lP3kvi5nFLOlLEEjxniaw2r7IJen6RUTy2kbJsuZMCQPuR/zA5MrjdVK MAj8oBiO/3Klpn+MMlskeMIz1UZvQoVHHAOgIOaEfQTzUow76rTmdPZ1JrRlBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LCY+9l61FIoy/C+PO0ONgdHtNPZsoXgzBs409osP9kQ=; b=vVU+YiHWCzL1+EjGQ0nOp3FPw+CI8F0ZUdznOdkem39Lk4zl2kbC5YnyHdZoUxpV9snotU /pM/cWvdWgCOKmeJtaEEnOkWDkbIDjjvOGQa1RjvQW4ETl0CpadgANyVLXUOP9MQH/dSCX xYPKMKmQF0XuhEUC/Ss1DZzBpFPNHxwXMNOcAklX2f+Aejhu5eAB4hTsXnFaOTejNHGTTH IjWBBkovjorhsq+9dwoPKvrHkQRtm/WPSonLppDO+TG4hquUVuaVB/9QincPcrMO82diIW WOpCTLunGZYOr8Yfvp0E1sq4bduI17/cSLl5qfyPd/ScNy92t6a9ppJ7I310Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729537771; a=rsa-sha256; cv=none; b=vH94qFUqSmnHvuVDhUbGVKM4eHRh2LAMqMTzSnOYvdxcUAZfbGfNZ9S3Plo6abe19bSqOm mzbRCbZb+YtnEEfDJpCSoEkOFHLRVhbI/Yl6hpy+44deZd9fMJqARUAsJoJNHY9HaJQpYc uEtFNcFt7Lve90TxEsClJucDVNnz9zBDGxFnehQuZxsGE8dIYMWVSYNOkQvYksi6+iCqpw tXZT0TX1p/LEFBguAj/lumSvcxdFeJE1dd+k75ZNdqz/Ki5Gy1Tfq5/C/EFgpQq7ugKss8 ZNaQUrNNgJiiUdgb8B44JALtXqAnSe+qEuKJj/PG+dLFgAOcgx9m8xkuZhol/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 4XXPxl2hgSzhqS; Mon, 21 Oct 2024 19:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LJ9Vw7093768; Mon, 21 Oct 2024 19:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LJ9V6r093765; Mon, 21 Oct 2024 19:09:31 GMT (envelope-from git) Date: Mon, 21 Oct 2024 19:09:31 GMT Message-Id: <202410211909.49LJ9V6r093765@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: 3958be5c29da - stable/14 - fdisk: emit deprecation notice when run List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 3958be5c29dab4abbd7f414f319e11b91db83269 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3958be5c29dab4abbd7f414f319e11b91db83269 commit 3958be5c29dab4abbd7f414f319e11b91db83269 Author: Ed Maste AuthorDate: 2024-01-24 19:12:21 +0000 Commit: Ed Maste CommitDate: 2024-10-21 19:08:13 +0000 fdisk: emit deprecation notice when run Requested by: rgrimes Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43585 (cherry picked from commit 86e66321bb18ffc242eac61ed2ae0543d71918a0) --- sbin/fdisk/fdisk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 6cfa2b510f22..a9295b0d1319 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -265,6 +265,10 @@ main(int argc, char *argv[]) int partition = -1; struct dos_partition *partp; + fprintf(stderr, + "WARNING: fdisk is deprecated and is not available in FreeBSD 15 or later.\n" + "Please use gpart instead.\n\n"); + while ((c = getopt(argc, argv, "BIab:f:ipqstuv1234")) != -1) switch (c) { case 'B': From nobody Mon Oct 21 19:21: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 4XXQCs4vjnz5ZgCR; Mon, 21 Oct 2024 19:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXQCs4FNlz4VB4; Mon, 21 Oct 2024 19:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729538505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=43COYSn7QLlXIiKMyHueuHIDpQZ71aErKeRbM+KS72Q=; b=COz1SPBulyx8RyJ94QtFIn1RlGcbU5pfwgULcSLoBqBBCaYFnkbLI5wONWwX/FOUHJLuHY YdGz4Phfe7CovZonyTealmtTOWCSWcC3q2oJnTIRvQIMye8AIDrn7A/1p0WKtW524Ln071 zl76PZxnMSpCbvZV6JHRBIP2sqFYkk74spy8r3Q9A4DIi2rhm9S6DesTAJSrRJN/SX6aBX vJce1RbfF/2BR2bdDvfH1ScAUkzY/5PX3XMN+ZJBWLU/9I1mXhIWXFqsX78goAHIiO4ZmZ 2qLUMIKcucCWIk0Avtsvr902eNFIrNzp4lI8ZJyTmDTdbbRGwTUqGeADudwBSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729538505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=43COYSn7QLlXIiKMyHueuHIDpQZ71aErKeRbM+KS72Q=; b=D7PN6TUB4bwhh4OU0CfRVdgaCXFnK6VowxlCFQHvKoH+fOrybMEvSdGB8NBh3RcZildoNy TfzT9kltU2Qhl9FnbjRh2l2GTv6InWPinuG9VcPukdRhfCiV39zNwLDyLeb1xCsn0py++1 Hu+8M4Ko5eicq8x/wvnGTA8D7vKeJQMgO7NiPlaIkuCSH1kczDh866cQHSoRsjPqI7qIDl kP+gO5W1OTpt3BEeszUFTN7Vrwbm3rp/eupNkvp0imX2Xi3hhbbpx9LTceAHlwf20qOsFF BZ7eYED7qaNHpqX8NvKKwa1zZFshgY4t9jWFK+jsuJLP6a+j4GP7eo8GihiQtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729538505; a=rsa-sha256; cv=none; b=VUpPRpGvAurXf7uR/3PYIJs2+u7F5cvDIQEWG6LYBKf/jNZV9aNXbW25ZAz5E5XYOWWZU+ mWTBNP288iJEVYcAD1tbT6RJABpeuF5tMOqSGS/LEplI5B4qi0ZHMjZ0bNraKs8RiYgKXF fhGKCvisKdjIGXXIF+qQ7aTygcRt0Uh/Hxr+LlqiW+THAxxYahZ45oGyK0Hbe0L6uakemL PDv3/tFdkLCzDFlHMWZwgey0g3uQSmxETXxnqfUrmbV6A3eb+uUe3913znP50KVsVKv/Tr 6ADWpYQE7Pz25x226znljmUlCpjONn6DTqd/BteK1Mz2hc1+rXaPKRKLl5UKMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXQCs3ZGtzjx7; Mon, 21 Oct 2024 19:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LJLj4K024754; Mon, 21 Oct 2024 19:21:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LJLj5t024751; Mon, 21 Oct 2024 19:21:45 GMT (envelope-from git) Date: Mon, 21 Oct 2024 19:21:45 GMT Message-Id: <202410211921.49LJLj5t024751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d2e7bb630b83 - main - rc.d/sendmail: Return non-zero if the daemon fails to start or is not running List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2e7bb630b83848a774d8213014a9e0747775019 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2e7bb630b83848a774d8213014a9e0747775019 commit d2e7bb630b83848a774d8213014a9e0747775019 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-21 10:10:52 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-21 19:20:36 +0000 rc.d/sendmail: Return non-zero if the daemon fails to start or is not running If you have a mail server that is running sendmail daemon (sendmail_enable=YES) and sendmail queue runner (sendmail_msp_queue=YES) and the sendmail daemon dies, /etc/rc.d/sendmail status does see the daemon is not running but returns 0 as the exit code. This prevents other programs (like puppet) from restarting sendmail to fix the issue. Make sure that the exit code is propagated towards the end of the script if any of the sendmail services fail. This patch does not call exit directly but instead just sets the exit status code by calling exit in a subshell. This way we do not exit the current shell in case the service script is sourced (e.g., when rc_fast_and_loose is active). PR: 223132 MFC after: 2 weeks Reported by: pirzyk Discussed with: jilles, eugen Reviewed by: christos, gshapiro (previous version), markj Approved by: christos (mentor), markj (mentor) Differential Revision: https://reviews.freebsd.org/D46862 Co-authored-by: Jim Pirzyk --- libexec/rc/rc.d/sendmail | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index af84c6d6b548..5a780e5b15a1 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -206,6 +206,7 @@ sendmail_precmd() } run_rc_command "$1" +_ret=$? required_files= @@ -214,6 +215,7 @@ if checkyesno sendmail_submit_enable; then rcvar="sendmail_submit_enable" _rc_restart_done=false run_rc_command "$1" + _ret=$(( _ret > $? ? _ret : $? )) fi if checkyesno sendmail_outbound_enable; then @@ -221,6 +223,7 @@ if checkyesno sendmail_outbound_enable; then rcvar="sendmail_outbound_enable" _rc_restart_done=false run_rc_command "$1" + _ret=$(( _ret > $? ? _ret : $? )) fi name="sendmail_msp_queue" @@ -229,3 +232,6 @@ pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" required_files="/etc/mail/submit.cf" _rc_restart_done=false run_rc_command "$1" +_ret=$(( _ret > $? ? _ret : $? )) + +(exit "$_ret") From nobody Mon Oct 21 20:51: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 4XXSCp10Skz5ZlS8 for ; Mon, 21 Oct 2024 20:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXSCp0XkJz4gVb; Mon, 21 Oct 2024 20:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729543910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRPmcIPV1Ql5PmJh/wQrn5rBfNpSgvB80/n8B2B7HZY=; b=W+6rN6DFtyiClll2vMjXOA9Kj++vJ6ihUowVgrWxfglbBR91/SQVAZ51vyKTxEriotsoQs 1pyrSwUoQL/QGqN87qiL/WJ9S/isuieTIDaxnT7nISU1M/m2iCDubwoxux4716zddKcSOo XiaWNCE0c+XLGrqoC2fkqYXP5XvzYrB/qyDyVzCEPZ7QbOuTdLmmjyhCTGdIerSNjqBDaJ hcQ2mZkfsCzfLmWmEpnN/hXvPQd1WL4ZnZWj2QRyoxDjPjd9cS9FTX9nLvQIcK76DslM26 zl1kI2A2EpzASv1cajdPaymZQ9Pni7W10SB8HqLh7tntXgwq81OqWpD478IWNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729543910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRPmcIPV1Ql5PmJh/wQrn5rBfNpSgvB80/n8B2B7HZY=; b=dpoWN1jT4cjB+1qoC0eavCVFVxMOnBccf30GKy4G//rJAiKTziy+GMULGKUPj1BU4Mwadi icumt/xyZ2ovjtypusAgZNZl3g/sLvGKRNUq/Lme8DaUaY0lRjCJjBPUlNSipwqZ8a5vc/ cff9LRiWE//Yw7QZG79XN762kWYrTGWHbkBQ22UWnQ8CSAqk63uFybOYL6zh5sskBrEc6n eACFlr+0wnRL2mctd/SHM/IMyYRTNtmKjBz+02CUaZ5GmxT645mJa07Hb5gjv5BMZJNdvc Q22EXsFg+nqEqNuktkHSgKYbg66zPy2zu8pq2SrEgwlZPDplDEngE7QGGeVc3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729543910; a=rsa-sha256; cv=none; b=TXSivEoOUlBGgkXT+ph0J4HMaPC/e9bDchIPQktVEBOSoD7Q2cIr3DNbuUhsakxyX93LRT tCUBfYfIbeEiBL0bLq+0pAue8td9xp8yFIsvHa9BjXW/f82y3Ag/L0PoqzV+JErdH+izq9 8+5DVEDxcW/L0CRo2fw/xlDNH7D1U3vVxZ8SLKobWdUeGfD7imEOIseRxSEeJ/3VVeHJta nJe/lE52FJxmP3ukgJtVHYUoXdWO7uZhKWA/bu1pyzsYdyhG/cwY578ml1iM543W4KqMTL IGrpatvUdAYwntEDps713CLOBiLr1PMuFUuOTer9B9RoqrsutOXQFF59KNS44A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXSCp0889zlrw; Mon, 21 Oct 2024 20:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LKpn4f093163; Mon, 21 Oct 2024 20:51:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LKpnHr093160; Mon, 21 Oct 2024 20:51:49 GMT (envelope-from git) Date: Mon, 21 Oct 2024 20:51:49 GMT Message-Id: <202410212051.49LKpnHr093160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Mark Johnston Subject: git: da423e8d28d6 - internal/admin - Take pfg's src commit bit in for safekeeping at his request List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/internal/admin X-Git-Reftype: branch X-Git-Commit: da423e8d28d643e3864955992b7111c7d0328f98 Auto-Submitted: auto-generated The branch internal/admin has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da423e8d28d643e3864955992b7111c7d0328f98 commit da423e8d28d643e3864955992b7111c7d0328f98 Author: Mark Johnston AuthorDate: 2024-10-21 20:50:50 +0000 Commit: Mark Johnston CommitDate: 2024-10-21 20:50:50 +0000 Take pfg's src commit bit in for safekeeping at his request Approved by: srcmgr (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index a78ac76c5a0d..9ae30f664a6b 100644 --- a/access +++ b/access @@ -126,7 +126,6 @@ osamaabb oshogbo peter peter@wemm.org peterj -pfg phil philip phk From nobody Mon Oct 21 22: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 4XXVrc3y24z51jpv; Mon, 21 Oct 2024 22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXVrc34Xlz4nw1; Mon, 21 Oct 2024 22: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=1729551024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/pIKOC/rtX4vHp05psP8toOjOCGXogDEr1wOkpgnv8=; b=RWfzC0FmBHy8dCTnn6jNk8cHtmmkPM2HmiOdDxeRPQuoNGRq3WUavzibtNxrdUWSbRA1Sf Vl94dGIoemrZ1yLD+sew14k2J31xYRsFKW3HlJ68kAOmz2R11VWYEFKjEr/jtwzUFff1IW jMqJSVH+rwm4BiRd+AFcbvkd54PXBs6oxqvvqnKTcDMBvnST38LmtLOBbpKR6TC8otoblG syAtJQ62TNLt2wBMnJ85vCDg2jIODtit7kIXzlugpKMoNlAFwXoMGXyoidvTau0NFsUd5H IuldzN6TvxTkArxjdee56x0I4sPd9Kb0bFPi4XagFtwD5YBnaUiK4ElLdyf04g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729551024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/pIKOC/rtX4vHp05psP8toOjOCGXogDEr1wOkpgnv8=; b=NifCAPXYRxeYj+HjqN9d07BA2lD+fns1RUMlVWyZqxo87d8KQE/y/K3uDwTV9wid3pSi/6 jhj39Hk0xEJti4YYe+t5n4bJM2B0L3V+Jh3FkoDP/dS+n9+Z12i/yEmxe+qZXfTKvIKvRR KxJM23unHxW7gjhrb6CehWYp4GsWw+XM1VwJBUFO3AtKPck5LOnKd2wWqkxxYQ8IVvJ9Ke JQ0S9+gofh26IMJRV7INyAq70LGB5XGh0rMQ4mQ0KXvza4MLf1jNYTSfLpaA61FwwkfB1T eOFFcK66/+oLV2pcCwN5dzsw5sjVw+F8UQm+l3QUerJ5l+8DqhMo5h9j7C2AZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729551024; a=rsa-sha256; cv=none; b=mi/7M79pXifY/WUGyU0GlJNiLWz0nFIEhDwrxWRozegHIVtvtYbRodjwRxAqUH+KRRa50Y /arC2uGozW6Us0YoTWfwuHaZqqWZdWQslViffING6KcWBOfvrO1xlBl6Zq2ul2COiLfoQ7 oyrR3meSPSCesWyFwZCmfs/eunZaVcxawm3GOPb9sZ5wWOKIHGMvfyo7BC64Ma+fLoKS/o keGchwnnyh9Je3KtXDA4Xjx476q6RXQaj7zyX+bDQsnz2bEr/+QMIuS534qa1SZY+MOMZZ naGq8IkgML0hmcZEjUwmUzXsrHVQSA/uPxTFxvlq98SNcWFohj9Qmrkh86vRpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXVrc2csmznj1; Mon, 21 Oct 2024 22:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LMoOBB010087; Mon, 21 Oct 2024 22:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LMoOaG010084; Mon, 21 Oct 2024 22:50:24 GMT (envelope-from git) Date: Mon, 21 Oct 2024 22:50:24 GMT Message-Id: <202410212250.49LMoOaG010084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: caa309c8811d - main - nfsd: Fix handling of credentials with cr_ngroups == 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: caa309c8811d62a24cd07e3a1f6e9095eaf10c90 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=caa309c8811d62a24cd07e3a1f6e9095eaf10c90 commit caa309c8811d62a24cd07e3a1f6e9095eaf10c90 Author: Rick Macklem AuthorDate: 2024-10-21 22:48:39 +0000 Commit: Rick Macklem CommitDate: 2024-10-21 22:48:39 +0000 nfsd: Fix handling of credentials with cr_ngroups == 0 There has been a documented case in the exports(5) man page forever, which specifies that the -maproot or -mapall may have a single user entry, followed by a ':'. This case is defined as specifying no groups (aka cr_ngroups == 0). This patch fixes the NFS server so that it handles this case correctly. After MFC'ng this patch to stable/13 and stable/14, I propose that this unusual case be deprecated and no longer allowed in FreeBSD15. At that point, this patch can be reverted. Reviewed by: brooks MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47204 --- sys/fs/nfsserver/nfs_nfsdsubs.c | 5 ++--- sys/kern/kern_prot.c | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c index d80826993f23..2fd877775c79 100644 --- a/sys/fs/nfsserver/nfs_nfsdsubs.c +++ b/sys/fs/nfsserver/nfs_nfsdsubs.c @@ -1620,7 +1620,7 @@ nfsrv_checkuidgid(struct nfsrv_descript *nd, struct nfsvattr *nvap) if (nd->nd_cred->cr_uid == 0) goto out; if ((NFSVNO_ISSETUID(nvap) && nvap->na_uid != nd->nd_cred->cr_uid) || - (NFSVNO_ISSETGID(nvap) && nvap->na_gid != nd->nd_cred->cr_gid && + (NFSVNO_ISSETGID(nvap) && !groupmember(nvap->na_gid, nd->nd_cred))) error = NFSERR_PERM; @@ -1679,8 +1679,7 @@ nfsrv_fixattr(struct nfsrv_descript *nd, vnode_t vp, } if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_OWNERGROUP) && NFSVNO_ISSETGID(nvap)) { - if (nvap->na_gid == nd->nd_cred->cr_gid || - groupmember(nvap->na_gid, nd->nd_cred)) { + if (groupmember(nvap->na_gid, nd->nd_cred)) { nd->nd_cred->cr_uid = 0; nva.na_gid = nvap->na_gid; change++; diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 40cfa236a07d..95362ce8a310 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1310,6 +1310,13 @@ bool groupmember(gid_t gid, struct ucred *cred) { + /* + * The nfsd server can use a credential with zero groups in it + * when certain mapped export credentials are specified via exports(5). + */ + if (cred->cr_ngroups == 0) + return (false); + if (gid == cred->cr_groups[0]) return (true); From nobody Tue Oct 22 04:33: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 4XXfSF4sRBz52Mb4; Tue, 22 Oct 2024 04:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXfSF4LNNz4395; Tue, 22 Oct 2024 04:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729571597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hmm27BpdwO+Q3GI7oNNHJrqKI3Euxv2GaR3gqZmyAEI=; b=tWDInoGHGGbu7C/UcIxeBIt1R5c25zi3kUtiR3SnQMkghqFph2VPvfy2Vi1IfqrVdbk/rU g7qE58Elgir7hyei75SU1EROOm59vofMGGR7O2yfA6T+wgp/SHTGNedi8QCPhLO7SUqXdb DLgWAJoMAeduc3oN5kbxFwccDj/yqAgh5pLrbyCPWwqX4ehKwdAvwtOD5p26tjp89kPNPQ ilgJ0ZI7JmBA9u/hmjctxB0eJl3NUlr3DHy3RwsVhWWz3/ayZK7IZbtl0lpmr4R1HNKU5J 2cSAJqmtml0PvFM/Gg/AffJsFm+25WVqi0s9uVWoE0AV2gtuEv0EIr4jrO9KEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729571597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hmm27BpdwO+Q3GI7oNNHJrqKI3Euxv2GaR3gqZmyAEI=; b=aBihQQpt6g4UrfBwYnO1PZrI17cHi4w8eO/B8vBdDVyhERTEVDCZjDsKxjN9YfHA4EOtgw HFfQYOP95BDY9Px0yL+JlLabhW+9UEYKbwOB1cfQY5OpBg6Liupg+iTUgB9m1CrQHfxlnl sqQIMyr2LKoalHGI32GHUVrElxCeTB8fEnrb8KODrkQ9jhi7BGtwwOfrLovDxGVKfRirzy Efc3lzFjgb7vwq0CewFM0HHU66FI8CNJo1PABaGAQrZAmS3P+CZfIqh8NSCOc3c8+23fo3 pywPWRjiza9KNurI1fkPGr9Iq6hlQ/Nvj2Xbh34bf5ukZHzRefAJjnFx/CM2hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729571597; a=rsa-sha256; cv=none; b=i3qnQHfXZiXuqmE0eraYpvxG8LoJv6f8mOKeQ+OFjI9a2RYFDjutY/Z0iMZxaTa0aTsY5V YEXUGHdeDxDPHR+YTtoWZ2WXFRScsalN2jQsbkod8cvVEqzPSgtUhA47wceSKm5XnxMlIf HtVP8nk7JwgHVpVqx2FkOkny30b+YQGRw41Pf3Mi5yCxbNASoAFtFMB6YDIN9qTCEF+MWU 9J5bCPc7wuEL8y5Et0IEFfVoJsw5SrC3S7tgdMVMN7OPbZy9wvLRcfHZqUZxsL7qLaN4SE BH4wAlRsm0FBXPoTCvD+f0k/TYFt28lkOuVtwV/5jeuw2EN/PQLJgYO76iI9Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXfSF3yBxzyxj; Tue, 22 Oct 2024 04:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49M4XHZr046640; Tue, 22 Oct 2024 04:33:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49M4XHrg046637; Tue, 22 Oct 2024 04:33:17 GMT (envelope-from git) Date: Tue, 22 Oct 2024 04:33:17 GMT Message-Id: <202410220433.49M4XHrg046637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d1d839d0b593 - main - ifnet: Assert that we are assigning network stack correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1d839d0b593541174ca48c675c9eff4ddb4715e Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d1d839d0b593541174ca48c675c9eff4ddb4715e commit d1d839d0b593541174ca48c675c9eff4ddb4715e Author: Zhenlei Huang AuthorDate: 2024-10-22 04:32:24 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-22 04:32:24 +0000 ifnet: Assert that we are assigning network stack correctly It makes no sense to assign NULL vnet to an interface when the kernel option VIMAGE is enabled. Add an assertion to catch that. This will also help diagnosing problem report [1] and [2]. 1. https://bugs.freebsd.org/275381 2. https://bugs.freebsd.org/282168 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46982 --- sys/net/if.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/if.c b/sys/net/if.c index ebad5c5d16e5..8dc212ae4ac7 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -832,6 +832,7 @@ if_attach_internal(struct ifnet *ifp, bool vmove) MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); #ifdef VIMAGE + CURVNET_ASSERT_SET(); ifp->if_vnet = curvnet; if (ifp->if_home_vnet == NULL) ifp->if_home_vnet = curvnet; From nobody Tue Oct 22 12:06: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 4XXrWY11qFz5FDnx; Tue, 22 Oct 2024 12:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXrWY0N1mz4qj6; Tue, 22 Oct 2024 12:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CQFu27ZnWv6Q0Mi6p/snRyDSzwpmP9edJmljM07Rhc=; b=rkLO9bTi4mZ5Snl75S9RbTaefuxU03rjFaTeCNMyZq85/og3Xs+k/fsw7l/V/b0x/LP0DM oUzY8WJAVszD6JMsT+5y228l57OXLoc2q4JjmDpSGBJzofpvkk8dKCIPq6EPN8mvEx5k5I yqK2FMKHzHkMbNV/IsciBzG6z43R7jNJYSJmktXJQu/dWGAR5lkXcyGTsFW3KUa8ECMeYK kC9bl0DEdzAxx5SAfMKu/EW8RV6w73Ol6jx5tkhZ7UjxuOz5FVg+nm5b/59tABfvPiX5GB 50G3C3WcvFrD1ENEMJ5WBMzI6XMOYG4kfCO/gApktGuC5UOhYyi2/CRU+RNOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CQFu27ZnWv6Q0Mi6p/snRyDSzwpmP9edJmljM07Rhc=; b=T/J4r/Z1bxcQnQeHVlDQPbcXn9Y3mTpCoFxyzBMtsoekT3EE9c39oxmrYBHyCDHP9Wj8rm RJ/L9H1u9DS+mIUdTZ2TV1m8wMBVM7fFTIjRSlKJ+/AePiI4sVAvzlxNnoKnnop4399VSi FmlElzFUM8bE/y9knu6mnLq5znt4s1kEAVTOtPUm0lC2yfUuWieXrFu0k9iaYQUvjVxHAe gX5R/mfGprRr6VAj5/AoS0P7vg9yPSCF5SkLPLeQI2Bml2xB2ZXsk875E29CIdg8aOa8O+ MVG47ldazrRBqNwd2mrKlRGTOrzaiut089gr+25ui2rESDHlWSQ/rQvw6pT0Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729598809; a=rsa-sha256; cv=none; b=ZW4LTyjzGod6fIfkmI4pm21NXoADoQesezJOhlB2mcm3ZryM9xw6wAbYhcEPVkl+SZL5Wz GTwh6sKvLO3uFV2PT013Ieckc4Gj0vYC/ZmaUSsDz9Y9juAO0rkU54YkI2b9VhEY1Tz436 qiiXX+WzgvjU6vUUd02L9NH89mY9ExLtjkoKjM472V0/0YSTEIHG0/b1vqTgoNVWFPbHrG ST32P49nQ5ujdyYa0eot9jKEX4RIXnbs9llRTzFJFhIrB/yw7RMYEg9Euxuuib01pUkTo4 akysC/ZZ8Jo9520cxLe7AZf6GI8dFVsOqznw+3VwwyBQTo/A7T4pVeapntTZLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXrWX753Nz1ChT; Tue, 22 Oct 2024 12:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MC6m08085172; Tue, 22 Oct 2024 12:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MC6mvD085170; Tue, 22 Oct 2024 12:06:48 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:06:48 GMT Message-Id: <202410221206.49MC6mvD085170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 2feea221b248 - main - bhyve: don't crash when guest writes TPM int_enable register List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2feea221b2480f9f97b3bc0f47510b5bdec96b79 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=2feea221b2480f9f97b3bc0f47510b5bdec96b79 commit 2feea221b2480f9f97b3bc0f47510b5bdec96b79 Author: Hans Rosenfeld AuthorDate: 2024-09-09 08:41:31 +0000 Commit: Corvin Köhne CommitDate: 2024-10-22 12:04:21 +0000 bhyve: don't crash when guest writes TPM int_enable register FreeBSD's own TPM driver writes 0 to the INT_ENABLE register during attach, making sure interrupts are off. bhyve really shouldn't kill the VM when that happens just because it doesn't support TPM interrupts. Even if a guest was trying to enable interrupts, we should just ignore it like real TPM hardware would. Reviewed by: corvink MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46562 --- usr.sbin/bhyve/tpm_intf_crb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index 0f9a8d1dd53b..d4ac2b47d28a 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -337,6 +337,10 @@ tpm_crb_mem_handler(struct vcpu *vcpu __unused, const int dir, break; } + case offsetof(struct tpm_crb_regs, int_enable): + /* No interrupt support. Ignore writes to int_enable. */ + break; + case offsetof(struct tpm_crb_regs, ctrl_start): { union tpm_crb_reg_ctrl_start start; From nobody Tue Oct 22 12:06: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 4XXrWZ1z81z5FDw1; Tue, 22 Oct 2024 12:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXrWZ1RRFz4qrS; Tue, 22 Oct 2024 12:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ITD5HwekqWgOBcW18DzdAiVf8zqf4+xwIZc26UVZYek=; b=PNG7sv0CEK7xnkpq2swd3dp2CSWD6X1CyWq3FPKwiwufthn+kF+TL654YErnAebkuVb++m TjjAJIdgqUiAOlgVYBN7hMnsT7yblGrYBS061gMxpRp5n5say2y1wScAQPcnCE16agUVv5 N6u8rRI6eQZNYm9jdKdwLTdRZdI7n7T0E9OnKm2rPITZYFd4SPUfx8JqxbY1rwfNf9yM1K wiEts0K38PR9lnwSVnWmvFRIaSKcV1MHyu+Cgqie/jnyD/ovdpnGB7tu/Of7GeieiFC0Tz pJkkgxv6bkS0kXD4uKqWp1n19Z8x3KApZEnsphaWy4y7ULgNAl8RdsvdxPm+QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ITD5HwekqWgOBcW18DzdAiVf8zqf4+xwIZc26UVZYek=; b=fSW4Ow7T2COIv/Jpq3Bxze7c4eATvAKOTGFlMYka7OO8s9u33opwIkfwrTUwCUQcYVs1gl HCoW2oq2ktQxi3MUkZdxGdBEU8VfZDfHoyTxVHGPQk/mIyEQfPzOixJ7crg5EMXHQBNJaP qRF7h0Jj6l74Eli2m4juXLWc8VP2bes8/p0R7K4wV/WSN0C1xoKhxShvnMz2AZNCr4H4yu OX30fUiv0YrS+nal0wyr8RIvoIDkGbiTdrBDA5hPB5maEW6MtIpTRrPrVMUMwE9pZyOF97 8uNQIUoNss7VFcSdfhj4SUa2hBUZkspvMaakjVSO3VXrIrlGgkDrghH/JGEj/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729598810; a=rsa-sha256; cv=none; b=yRZydazJyS+8M8eF4/lgRFlyKfP6UUrLG+Y0f/gSX0aJl10WlZzgiU15kyoEz1mSgIyGUa xgf4OyAky/ppFEBsmWL6Z23RJ0XPdakYONGIV1HZ9p31knMu/LdvIfwljD1/tTTI/JfPaA dmlf4FuINkbsnS3xKQ+s6b+mRERX/UP82jB+Wnt/qIpmtOZZ146XSUhSpp2xWlOkwQWNn2 yO6RllXRP/jHMcLhWml/nCxbcMRxuc5oVHFhM03Lv6u0k5DRytlZuIGhY4s4aCO40kxJX4 J8amwQMJK69bltoQpTZpzg5RH9jAYex2ocrkM7cx9f6Wmo+yvr0z3AmSpabZDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXrWZ0fmLz1CBM; Tue, 22 Oct 2024 12:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MC6nk2085249; Tue, 22 Oct 2024 12:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MC6njp085246; Tue, 22 Oct 2024 12:06:49 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:06:49 GMT Message-Id: <202410221206.49MC6njp085246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: bc3d09e90b86 - main - bhyve: TPM CRB: pass actual TPM request length to backend execute_cmd() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc3d09e90b8625f17017663fad3e049348b04ded Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=bc3d09e90b8625f17017663fad3e049348b04ded commit bc3d09e90b8625f17017663fad3e049348b04ded Author: Hans Rosenfeld AuthorDate: 2024-09-09 08:42:42 +0000 Commit: Corvin Köhne CommitDate: 2024-10-22 12:04:23 +0000 bhyve: TPM CRB: pass actual TPM request length to backend execute_cmd() The TPM spec (TPM Library, Part3: Commands, Section 5.2: Command Header Validation) requires that no more bytes are written than the size of the commands, as given in the request header. Thus the TPM CRB interface needs to get the command size from the request header and pass that to the emulation backend. As the guest OS driver can set the address and size of the command and response buffers freely within the limits of the provided CRB data buffer, bhyve should verify that the values set in the corresponding registers make sense before processing a command. Reviewed by: corvink MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46564 --- usr.sbin/bhyve/tpm_intf_crb.c | 45 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index d4ac2b47d28a..9b44d1d133b0 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -165,6 +165,15 @@ static_assert(sizeof(struct tpm_crb_regs) == TPM_CRB_REGS_SIZE, regs.rsp_addr = val; \ } while (0) +struct tpm_cmd_hdr { + uint16_t tag; + uint32_t len; + union { + uint32_t ordinal; + uint32_t errcode; + }; +} __packed; + struct tpm_crb { struct tpm_emul *emul; void *emul_sc; @@ -176,6 +185,7 @@ struct tpm_crb { bool closing; }; + static void * tpm_crb_thread(void *const arg) { @@ -200,6 +210,26 @@ tpm_crb_thread(void *const arg) const uint32_t cmd_size = CRB_CMD_SIZE_READ(crb->regs); const uint32_t rsp_size = CRB_RSP_SIZE_READ(crb->regs); + if ((cmd_addr < TPM_CRB_DATA_BUFFER_ADDRESS) || + (cmd_size < sizeof (struct tpm_cmd_hdr)) || + (cmd_size > TPM_CRB_DATA_BUFFER_SIZE) || + (cmd_addr + cmd_size > + TPM_CRB_DATA_BUFFER_ADDRESS + TPM_CRB_DATA_BUFFER_SIZE)) { + warnx("%s: invalid cmd [%16lx/%8x] outside of TPM " + "buffer", __func__, cmd_addr, cmd_size); + break; + } + + if ((rsp_addr < TPM_CRB_DATA_BUFFER_ADDRESS) || + (rsp_size < sizeof (struct tpm_cmd_hdr)) || + (rsp_size > TPM_CRB_DATA_BUFFER_SIZE) || + (rsp_addr + rsp_size > + TPM_CRB_DATA_BUFFER_ADDRESS + TPM_CRB_DATA_BUFFER_SIZE)) { + warnx("%s: invalid rsp [%16lx/%8x] outside of TPM " + "buffer", __func__, rsp_addr, rsp_size); + break; + } + const uint64_t cmd_off = cmd_addr - TPM_CRB_DATA_BUFFER_ADDRESS; const uint64_t rsp_off = rsp_addr - TPM_CRB_DATA_BUFFER_ADDRESS; @@ -217,6 +247,17 @@ tpm_crb_thread(void *const arg) uint8_t cmd[TPM_CRB_DATA_BUFFER_SIZE]; memcpy(cmd, crb->regs.data_buffer, TPM_CRB_DATA_BUFFER_SIZE); + /* + * Do a basic sanity check of the TPM request header. We'll need + * the TPM request length for execute_cmd() below. + */ + struct tpm_cmd_hdr *req = (struct tpm_cmd_hdr *)&cmd[cmd_off]; + if (be32toh(req->len) < sizeof (struct tpm_cmd_hdr) || + be32toh(req->len) > cmd_size) { + warnx("%s: invalid TPM request header", __func__); + break; + } + /* * A TPM command can take multiple seconds to execute. As we've * copied all required values and buffers at this point, we can @@ -237,8 +278,8 @@ tpm_crb_thread(void *const arg) * response. */ uint8_t rsp[TPM_CRB_DATA_BUFFER_SIZE] = { 0 }; - crb->emul->execute_cmd(crb->emul_sc, &cmd[cmd_off], cmd_size, - &rsp[rsp_off], rsp_size); + (void) crb->emul->execute_cmd(crb->emul_sc, req, + be32toh(req->len), &rsp[rsp_off], rsp_size); pthread_mutex_lock(&crb->mutex); memset(crb->regs.data_buffer, 0, TPM_CRB_DATA_BUFFER_SIZE); From nobody Tue Oct 22 12:06: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 4XXrWd5MKhz5FDp0; Tue, 22 Oct 2024 12:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXrWb2XRBz4rD1; Tue, 22 Oct 2024 12:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E/2z700VQghB4E+hu8tBYhaQHgc6elUOeCi9zN0pe7g=; b=GIzcrcU0nnE/WBt/h9Gh3I+sUkj24VMgcBSoFzW40qQLwGxA2pWHESGRSRUT5xf9dIgeRV 2nT237GBpv+9FOCLTs0MK5joYNP6nqW79aHQEdVr8leRqpwoI8/e9vBcX2z9H3w5HgO3EJ 7BmGL+8MO/tt2Iy4BCvp360DXcsHQ8ZZqN3jvcIGiv2hBjVVG48SjfTcWHrgWPHV23PdE8 GJRpUKvBwboQX2Yg9AclNY/bZezwkyB/FPQARBzfE0yLicD5O5BD/KzK2dMpTP1MBiar8w W6AGT972a6AAu17pVvyy+3oX6qp5kUi1Q93ac275lXW4nz4QKp9GPo4v3fw7Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729598811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E/2z700VQghB4E+hu8tBYhaQHgc6elUOeCi9zN0pe7g=; b=CNzt2FmKOseKFYvgNXD7sScXtcDhUwbjvWpsGKmdzDAWTfXGUmjjMSL6XjaL44SW3g9Cqa BUllgX25EnktQoKo+07JohzGKoPPslSFZgHyfqxmMaAs2u5yakXnFxv7B5OavzkMy029NM ZldNRVdv5PH6yvtjBYFeK9DWgSAhOib1OBtHyfjA3Hg4E7g1ZvVYEi6VuZyicflIc/hEUm D9YlMRrhjUZ4sATW3xCuxweKBnwdwiplW6v2QpLDx1Mpm/p+/0ostxTqmnbcmsKF3KX7he SoKslM6+S9UgbH3Wc9cvh599ksBItdZ99rf4uX4bFX4+kEoJ25LoQwpoic332w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729598811; a=rsa-sha256; cv=none; b=RRixh7SqWuFRx/dGEwkIh2rN+Ccstgeu6/xwWOFK48wiTv6PyZ1SNmja8GwZLiQlBOki8V si9BK/rJSukMEA9uhIEAtk2xrA4LtWpJXeHdicAykL4h/en08/a+yzLfqAXM3Y1S7D9qmW 3l6dhnkI7Vw8NLKc9CgwowgYom9fu0OYO/4om1dt/dn1cEWnWxCCAKWH/0Ggz1tlP/VjV2 emSe2+pErYNTbHBn6L0WZz83jDHdyPdJgq5+mCAEJB7NLnjjS4ve3FKIcEBJITyZxrB7sL XuvIZEDDuGqJ/j8WBm/qSetYVCIdd5FZ2AMJXxxMuEf2HoXF2KA3Tp11bUW+Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXrWb1XvLz1Cw3; Tue, 22 Oct 2024 12:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MC6p6k085297; Tue, 22 Oct 2024 12:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MC6pt3085294; Tue, 22 Oct 2024 12:06:51 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:06:51 GMT Message-Id: <202410221206.49MC6pt3085294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: d93fbcf0222b - main - bhyve: TPM 2.0 emulation with swtpm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d93fbcf0222b05fcd7704b35bc94e5513c2682e2 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=d93fbcf0222b05fcd7704b35bc94e5513c2682e2 commit d93fbcf0222b05fcd7704b35bc94e5513c2682e2 Author: Hans Rosenfeld AuthorDate: 2024-09-09 08:45:40 +0000 Commit: Corvin Köhne CommitDate: 2024-10-22 12:04:24 +0000 bhyve: TPM 2.0 emulation with swtpm Implement a TPM 2.0 emulation backend to connect to a running swtpm instance using a UNIX domain socket. Reviewed by: corvink MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46373 --- usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/bhyve.8 | 26 +++++--- usr.sbin/bhyve/bhyve_config.5 | 45 ++++++++++---- usr.sbin/bhyve/tpm_emul_swtpm.c | 132 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 184 insertions(+), 20 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 8b6631de1519..e5e8bf9b5567 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -60,6 +60,7 @@ SRCS= \ sockstream.c \ tpm_device.c \ tpm_emul_passthru.c \ + tpm_emul_swtpm.c \ tpm_intf_crb.c \ tpm_ppi_qemu.c \ uart_backend.c \ diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 5d7462a73c5e..62e567fd359d 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -435,7 +435,7 @@ PCI 16550 serial device. .It Cm lpc LPC PCI-ISA bridge with COM1, COM2, COM3, and COM4 16550 serial ports, a boot ROM, and, -optionally, a fwcfg type, and the debug/test device. +optionally, a TPM module, a fwcfg type, and the debug/test device. The LPC bridge emulation can only be configured on bus 0. .It Cm fbuf Raw framebuffer device attached to VNC server. @@ -636,16 +636,25 @@ access is appropriately restricted. .Sm on .El .Pp -Emulate a TPM device. The argument -.Ar path -needs to point to a valid TPM device path, i.e. -.Pa /dev/tpm0 . -.Pp +Emulate a TPM device. Supported options for .Ar type : .Bl -tag -width 10n .It Cm passthru -pass a physical TPM device through to the guest +Use a physical TPM device. +The argument +.Ar path +needs to point to a valid TPM device path, i.e. +.Pa /dev/tpm0 . +.It Cm swtpm +Connect to a running +.Cm swtpm +instance. +The argument +.Ar path +needs to point to a UNIX domain socket that a +.Cm swtpm +process is listening on. .El .Pp The @@ -655,7 +664,8 @@ are: .It Cm version= Ns Ar version Version of the TPM device according to the TCG specification. Defaults to -.Cm 2.0 +.Cm 2.0 , +which is the only version currently supported. .El .Ss Boot ROM device backends .Sm off diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 51c0751f0f10..3f9d9130787b 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -160,15 +160,6 @@ Message (e.g. TightVNC). .It Va pci.enable_bars Ta bool Ta Ta Enable and map PCI BARs before executing any guest code. This setting is false by default when using a boot ROM and true otherwise. -.It Va tpm.path Ta string Ta Ta -Path to the host TPM device. -This is typically /dev/tpm0. -.It Va tpm.type Ta string Ta Ta -Type of the TPM device passed to the guest. -Currently, only "passthru" is supported. -.It Va tpm.version Ta string Ta 2.0 Ta -Version of the TPM device according to the TCG specification. -Currently, only version 2.0 is supported. .It Va rtc.use_localtime Ta bool Ta true Ta The real time clock uses the local time of the host. If this is set to false, the real time clock uses UTC. @@ -288,9 +279,8 @@ Intel e82545 network interface. VGA framebuffer device attached to VNC server. .It Li lpc LPC PCI-ISA bridge with COM1-COM4 16550 serial ports, -a boot ROM, -an optional fwcfg type, -and an optional debug/test device. +a boot ROM, and, optionally, a TPM module, a fwcfg type, +and a debug/test device. This device must be configured on bus 0. .It Li hda High Definition audio controller. @@ -602,6 +592,37 @@ This value is required for the Intel GOP driver to work properly. .It Va subdevice Ta 0 .El .El +.Ss TPM Device Settings +The TPM device stores its configuration under a top-level +.Va tpm +node rather than under the LPC TPM device's node. +Only one TPM device is supported. +The following nodes are available under +.Va tpm : +.Bl -column "tpm.version" "Format" "Default" +.It Sy Name Ta Sy Format Ta Sy Default Ta Sy Description +.It Va tpm.path Ta string Ta Ta +Path to the TPM backend. +Depending on the +.Va tpm.type , +this is either the host TPM device, typically +.Pa /dev/tpm0 , +or any UNIX domain socket on which a +.Cm swtpm +process is listening. +.It Va tpm.type Ta string Ta Ta +Type of the TPM device passed to the guest. +This can be either +.Dq passthru +to use the host TPM devices, or +.Dq swtpm +to connect to a running +.Cm swtpm +process. +.It Va tpm.version Ta string Ta 2.0 Ta +Version of the TPM device according to the TCG specification. +Currently, only version 2.0 is supported. +.El .Ss NVMe Controller Settings Each NVMe controller supports a single storage device. The device can be backed either by a memory disk described by the diff --git a/usr.sbin/bhyve/tpm_emul_swtpm.c b/usr.sbin/bhyve/tpm_emul_swtpm.c new file mode 100644 index 000000000000..aaa0c9c358cd --- /dev/null +++ b/usr.sbin/bhyve/tpm_emul_swtpm.c @@ -0,0 +1,132 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Hans Rosenfeld + * Author: Hans Rosenfeld + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "config.h" +#include "tpm_device.h" +#include "tpm_emul.h" + +struct tpm_swtpm { + int fd; +}; + +struct tpm_resp_hdr { + uint16_t tag; + uint32_t len; + uint32_t errcode; +} __packed; + +static int +tpm_swtpm_init(void **sc, nvlist_t *nvl) +{ + struct tpm_swtpm *tpm; + const char *path; + struct sockaddr_un tpm_addr; + + tpm = calloc(1, sizeof (struct tpm_swtpm)); + if (tpm == NULL) { + warnx("%s: failed to allocate tpm_swtpm", __func__); + return (ENOMEM); + } + + path = get_config_value_node(nvl, "path"); + if (path == NULL) { + warnx("%s: no socket path specified", __func__); + return (ENOENT); + } + + tpm->fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); + if (tpm->fd < 0) { + warnx("%s: unable to open tpm socket", __func__); + return (ENOENT); + } + + bzero(&tpm_addr, sizeof (tpm_addr)); + tpm_addr.sun_family = AF_UNIX; + strlcpy(tpm_addr.sun_path, path, sizeof (tpm_addr.sun_path) - 1); + + if (connect(tpm->fd, (struct sockaddr *)&tpm_addr, sizeof (tpm_addr)) == + -1) { + warnx("%s: unable to connect to tpm socket \"%s\"", __func__, + path); + return (ENOENT); + } + + *sc = tpm; + + return (0); +} + +static int +tpm_swtpm_execute_cmd(void *sc, void *cmd, uint32_t cmd_size, void *rsp, + uint32_t rsp_size) +{ + struct tpm_swtpm *tpm; + ssize_t len; + + if (rsp_size < (ssize_t)sizeof(struct tpm_resp_hdr)) { + warn("%s: rsp_size of %u is too small", __func__, rsp_size); + return (EINVAL); + } + + tpm = sc; + + len = send(tpm->fd, cmd, cmd_size, MSG_NOSIGNAL|MSG_DONTWAIT); + if (len == -1) + err(1, "%s: cmd send failed, is swtpm running?", __func__); + if (len != cmd_size) { + warn("%s: cmd write failed (bytes written: %zd / %d)", __func__, + len, cmd_size); + return (EFAULT); + } + + len = recv(tpm->fd, rsp, rsp_size, 0); + if (len == -1) + err(1, "%s: rsp recv failed, is swtpm running?", __func__); + if (len < (ssize_t)sizeof(struct tpm_resp_hdr)) { + warn("%s: rsp read failed (bytes read: %zd / %d)", __func__, + len, rsp_size); + return (EFAULT); + } + + return (0); +} + +static void +tpm_swtpm_deinit(void *sc) +{ + struct tpm_swtpm *tpm; + + tpm = sc; + if (tpm == NULL) + return; + + if (tpm->fd >= 0) + close(tpm->fd); + + free(tpm); +} + +static const struct tpm_emul tpm_emul_swtpm = { + .name = "swtpm", + .init = tpm_swtpm_init, + .deinit = tpm_swtpm_deinit, + .execute_cmd = tpm_swtpm_execute_cmd, +}; +TPM_EMUL_SET(tpm_emul_swtpm); From nobody Tue Oct 22 12:18: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 4XXrnK6pdkz5FF1f; Tue, 22 Oct 2024 12:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXrnK4sNXz4ts2; Tue, 22 Oct 2024 12:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729599525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cKX+jzOQp8smUNkBnN9de6BB5SJhc0qJdWlGCh+N5qo=; b=qKBIF0i5tuu0BxjYd5zVoZHzwXaXnG68kGrD+5VXfYeAErm8CMLByqgcdtvj82Zu+rMuj4 JVJp5NnX9G4s8MZsMBkHhOvX7nocQR3R04PLzVcSmvwGEPwSqC7sZRu/+YD+PdLZI2qHfB INtFr3DlWn317EWeNiepE9FHnku0/I127vi4LLd39M+lHuDPOTB5RAfUi3KHg1vQ8KVn80 4XYyxJAC27Db+wnSnXz5RwfJlN/t0yTJqvudZuUmTfVjnuM6vIVlnTakIz0piKqJwof94t 3EyeAFi8Gz20VqLY6XDvfviDsDF1UFK410RRjSVxShziu/L8hN5RcHn4GBP8NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729599525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cKX+jzOQp8smUNkBnN9de6BB5SJhc0qJdWlGCh+N5qo=; b=l8zG0Lg1QuQmrt/tX1NadnoxgrWOBcsccX0pV7MiqdddZM48weSAPRrUKPX3EeZoJjBfrn KKHtYXCYDhFMZ8AX9p3TSatL0JjSPMnQ8A7/80gC+5412WOPSiwLNpJOJZz2FFCOglDrs0 e1SejIQjO1q+NHO1oKiO0RgRxVMg+8V6R85iZ+G1XomLoqmAoikE/6Ws/1NnoC+F5UQBzI 3V8ERJXSXBucB6H/diFx2PuSqT8evN6ee+afaIPCKM6q+jOImBs6AR4rhC5ONT6rvTN2bN CxcqrFuGBwl5P5qRMwnKFQmv7P+0CGIzZSAuECYGPAmBVGJgiCxQ22zqVUofYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729599525; a=rsa-sha256; cv=none; b=u/KBt3BaVlpp9bg8EY9ow7IanaIK10dchnJ2etPQkrZV57h+A8hwSQLtwW5BXtRrO2X9dA JL+jXNsDNjewKwWeQB68EDiSuH+5O2Qsw5mNmjvcim0iwXrf9zVUoR44CJORJnmIGXkc9E +zki48hd0YCj9QmGAVC+oqKxhJ7eUaakVtNHhjU7V/jfue6fN4jmhnhpJTRR/5uBaLeDwb luut7D6SrR/+bHlr+ggfutH7rHdDwL2RAI39pw40RdWx2mQObQPUqQrBf6MZt81kDvQBEU boGTa+3FJw5vZN/MvcPDoFI/cmzQjAnjdLp5cbrub2sk6aQE7v0kUUW2BMOnWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXrnK424Bz1Ctm; Tue, 22 Oct 2024 12:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MCIjX7003732; Tue, 22 Oct 2024 12:18:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MCIjwF003729; Tue, 22 Oct 2024 12:18:45 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:18:45 GMT Message-Id: <202410221218.49MCIjwF003729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 08139140c5f9 - main - bhyve: merge adjacent E820 entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08139140c5f96fd9deb7a8de7a534bccf9a1d0c8 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=08139140c5f96fd9deb7a8de7a534bccf9a1d0c8 commit 08139140c5f96fd9deb7a8de7a534bccf9a1d0c8 Author: Corvin Köhne AuthorDate: 2023-12-19 14:01:45 +0000 Commit: Corvin Köhne CommitDate: 2024-10-22 12:17:02 +0000 bhyve: merge adjacent E820 entries EDKII can allocate adjacent E820 entries only if they are at a page boundary. For some unknown and probably strange reasons, Intel puts it's OpRegion at an offset of 0x18 bytes. If the VBT lays directly behind the OpRegion, we're going to try allocating two adjacent E820 sharing the same page. This causes EDKII to do not properly allocate those entries. A Linux guest then isn't able to map the VBT and those fails to find it. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D45336 --- usr.sbin/bhyve/amd64/e820.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/usr.sbin/bhyve/amd64/e820.c b/usr.sbin/bhyve/amd64/e820.c index 148cae72ca6e..2fad22865ba6 100644 --- a/usr.sbin/bhyve/amd64/e820.c +++ b/usr.sbin/bhyve/amd64/e820.c @@ -156,6 +156,7 @@ e820_add_entry(const uint64_t base, const uint64_t end, { struct e820_element *new_element; struct e820_element *element; + struct e820_element *sib_element; struct e820_element *ram_element; assert(end >= base); @@ -273,6 +274,33 @@ e820_add_entry(const uint64_t base, const uint64_t end, element->base = end; } + /* + * If the previous element has the same type and ends at our base + * boundary, we can merge both entries. + */ + sib_element = TAILQ_PREV(new_element, e820_table, chain); + if (sib_element != NULL && + sib_element->type == new_element->type && + sib_element->end == new_element->base) { + new_element->base = sib_element->base; + TAILQ_REMOVE(&e820_table, sib_element, chain); + free(sib_element); + } + + /* + * If the next element has the same type and starts at our end + * boundary, we can merge both entries. + */ + sib_element = TAILQ_NEXT(new_element, chain); + if (sib_element != NULL && + sib_element->type == new_element->type && + sib_element->base == new_element->end) { + /* Merge new element into subsequent one. */ + new_element->end = sib_element->end; + TAILQ_REMOVE(&e820_table, sib_element, chain); + free(sib_element); + } + return (0); } From nobody Tue Oct 22 12:50: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 4XXsV85MQsz5PQhJ; Tue, 22 Oct 2024 12:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXsV84rxHz41QN; Tue, 22 Oct 2024 12:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19aoPCpMtHJmrHVBBBhLUl/kXWUuz1pXH2BBM9vT9R8=; b=KSiQxezVAwQAWh6pPLuSeoMO34n/4yKBEx92q0gs1USK3y2D5u0nhhLIHv4J6sjZhvKBpa rVrLW2QNCHXdEC6H7rjMFz3fO4wXsr4Ar0Qcop0CJolIXg9VyBAoL1KhwEEQBW6B037/0N kbTTLOvfRxxMoMLNwWY2sjs2wxgMg9aFq7XlVOgljTE7yRCNGAqNmfpJE1Q05ycs7i013W irMQ3btX7DXWAMj7rDBPPPoZeQ9r8urswPxE8ZNJe9ByguHjgEHNI3phpgNrQmGmP15FN4 yUJ5lFiAMm9j+b0Rvw8Es+2mRDAfUxnrWu37Nd6SJn4OHJJeFf4+MnheQDfuFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=19aoPCpMtHJmrHVBBBhLUl/kXWUuz1pXH2BBM9vT9R8=; b=MCsjcLRgw6k79McsqE0t4NpWti6NACuUrb1+9CXLdiRUday1GJYFkTtt0BVrq8lFjjThHH 7PTliflM3Y1WIVZDxHLHEACgEWtQ0KdLczqOx8KwiPmiPnXLWqz8iHpED+Q0nOgCaWIzL2 qY7B3/7rajAK46VnSvANc+vEFRFu+MlfTFLpL333x2TWKYmDONz5QEN5dJ9pcfo3vBJdPY bXOmXh64dyRd4rv/8GvR8gAEDqYfUdB5rfYssxWdKUfE3iUKk5FfAsmgp1TScuj1b1Moy8 QF+nD8SFRErZCyMdeyHvrJAvcKHREjEQ8TkmF+Rw+fW1vLzGebdmP584SXN+yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729601440; a=rsa-sha256; cv=none; b=Pl/kZGrIfz+VG5kQrwsmNYZ//9wGl8mTGUJcWdVu8GPm7zwXijcUDWZxa1BcJ53AyYkuG6 pHBj6Hx7x40DU9BaOR4uDBCMNJP5tD9PtUM1zLHEHA9yCdMN/OGIVy/NrWkijRieISOFBA j/6ao5ouCjEnYCpUn8iP8WiZGlFtt6ex5ioF5sLbInQ6dXEjeRLsV62o6/qlxmfM27Mi1a NfqrdhR7v8v+7Dy1zywWKxos2RX2Io7/H1webTCZyzOlVmw9trpqud80pj8sTiJXdAK+sK f1SvYs842OQQynVo02lq1QpnYh0E8RfCeg0qdsgvtvnH6o60UzmaIHjSDf8URQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXsV84S9RzDyN; Tue, 22 Oct 2024 12:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MCoeXl068188; Tue, 22 Oct 2024 12:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MCoeZT068185; Tue, 22 Oct 2024 12:50:40 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:50:40 GMT Message-Id: <202410221250.49MCoeZT068185@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: a86373bc93ee - main - vm_object: Report laundry pages in kinfo_vmobject List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a86373bc93ee1c850943e8585d0d426479378145 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a86373bc93ee1c850943e8585d0d426479378145 commit a86373bc93ee1c850943e8585d0d426479378145 Author: Mark Johnston AuthorDate: 2024-10-22 12:47:52 +0000 Commit: Mark Johnston CommitDate: 2024-10-22 12:47:52 +0000 vm_object: Report laundry pages in kinfo_vmobject Reviewed by: bnovkov, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47214 --- sys/sys/user.h | 3 ++- sys/vm/vm_object.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/sys/user.h b/sys/sys/user.h index 8f42cfa36476..02ca69968541 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -605,7 +605,8 @@ struct kinfo_vmobject { uint64_t _kvo_backing_obj; /* Handle for the backing obj */ } kvo_type_spec; /* Type-specific union */ uint64_t kvo_me; /* Uniq handle for anon obj */ - uint64_t _kvo_qspare[6]; + uint64_t kvo_laundry; /* Number of laundry pages. */ + uint64_t _kvo_qspare[5]; uint32_t kvo_swapped; /* Number of swapped pages */ uint32_t kvo_flags; uint32_t _kvo_ispare[6]; diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 5ce21a683541..9fbc489a8eed 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2575,10 +2575,12 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) * sysctl is only meant to give an * approximation of the system anyway. */ - if (m->a.queue == PQ_ACTIVE) + if (vm_page_active(m)) kvo->kvo_active++; - else if (m->a.queue == PQ_INACTIVE) + else if (vm_page_inactive(m)) kvo->kvo_inactive++; + else if (vm_page_in_laundry(m)) + kvo->kvo_laundry++; } } From nobody Tue Oct 22 12:50: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 4XXsVB0CR9z5PQdk; Tue, 22 Oct 2024 12:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXsV96kSLz41SY; Tue, 22 Oct 2024 12:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3w5YHcDG8TlultGdCBA+YpJoR88I2etMKPnTp1Vqmqk=; b=OCgiJ7GONUpy5VCpAP+c4g6LRSDQEZp7Ekrn/gizO7JN/IO0AETNdfE/eEKZfI1ViuN3J+ nrD3Pwubpvr8jMnnPPUsZpLGe44H1v22tpmFHTMJiPBvlLEQZGT2hCjHUnswlT+SbgAz22 tnVOVvqOLcOqYqEOoRhAlpuP+BEl4gb0vtelLcFLy2hCOhA0DrbuwC5MZxPEhGqnfw7lBr NENNvKCc6G+dLiJOQa3/Rl8wnMY3PQDArdhJdLFwtxeaLhUsu9j1uKi6CMpTo2T/1T2mz7 ljKkHuN5Zko3DVtlyCJhdFAV+SbTPA+SWrAJulo6UFH6Abxm55YBFhansRBh4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3w5YHcDG8TlultGdCBA+YpJoR88I2etMKPnTp1Vqmqk=; b=lLf340x4Dqy61LceIo2+/S2w8tfahQ+gbq3FvOvJPX7S6FDXYu04xdNnyml6Xz60FmsnG/ /Eh7mJ2wR+su1GBRyml3ConL1+/jwtWzjxvxvneZbrHygNpyQGBLbzonnU9I8JImqHh+pp GJYXvGaKKcO3TGvQAOvqY/WWX1Comirno14qERio2Oa28bAUmgZxzMZKUa/bQN9sTdbQvm 3gXUVIRN0SR6rG4XKl62gcsGRUDsmGGhG7RzQcC/Ty+094rNX+ebQWbHBMOxgwyLH4Rhix 6KQ3i9IsQGA30FyffrpozprVW+yekTGq0QP10EAD/mHkTAfZCWaMDh1OKYtJaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729601441; a=rsa-sha256; cv=none; b=mFzbXYsyXdMmjSQrr+w2svDWTaz6JUKRKW5Tt2dtqjqKfqOiE6XgtHqM2mnQ2DQUKeyVfj n0/FDg5DTpTCFtUZpYG7adDahsNEoaSBpessp5XA6UMU6ozqSZCU/FXgAwLTXVGl4r4XF2 kOBSeSeIxbvu5tphhcPWar9Pgxn/Fh7IimTMJ0W3wrwhyVbZ+TjpVTJ9723Ko37u1OK2II wcE4VGJH68YC8lGGLQ39QWurukLMn00BcHJZXvk4HRYXzxUMMVZDsQ6Tes8uRZ/mUV/GQF a3m90vNwdF3byEYz8ZEcJVHtHDnf0cf5NOvxqo/mYwlBwcAUlgUolYCSmbF/4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXsV95Sl1zFCd; Tue, 22 Oct 2024 12:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MCoffv068262; Tue, 22 Oct 2024 12:50:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MCofDp068259; Tue, 22 Oct 2024 12:50:41 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:50:41 GMT Message-Id: <202410221250.49MCofDp068259@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: 1249ee57e96b - main - vmstat: Add a column to vmstat -o output for laundry pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1249ee57e96b84e84015b433d0a3bfdef0c108bf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1249ee57e96b84e84015b433d0a3bfdef0c108bf commit 1249ee57e96b84e84015b433d0a3bfdef0c108bf Author: Mark Johnston AuthorDate: 2024-10-22 12:48:04 +0000 Commit: Mark Johnston CommitDate: 2024-10-22 12:48:04 +0000 vmstat: Add a column to vmstat -o output for laundry pages Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47215 --- usr.bin/vmstat/vmstat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index bd332c64e7ea..7a7c83fe1ac8 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1464,6 +1464,7 @@ display_object(struct kinfo_vmobject *kvo) xo_emit("{:resident/%5ju} ", (uintmax_t)kvo->kvo_resident); xo_emit("{:active/%5ju} ", (uintmax_t)kvo->kvo_active); xo_emit("{:inactive/%5ju} ", (uintmax_t)kvo->kvo_inactive); + xo_emit("{:laundry/%5ju} ", (uintmax_t)kvo->kvo_laundry); xo_emit("{:refcount/%3d} ", kvo->kvo_ref_count); xo_emit("{:shadowcount/%3d} ", kvo->kvo_shadow_count); @@ -1566,8 +1567,8 @@ doobjstat(void) xo_warn("Failed to fetch VM object list"); return; } - xo_emit("{T:RES/%5s} {T:ACT/%5s} {T:INACT/%5s} {T:REF/%3s} {T:SHD/%3s} " - "{T:CM/%2s} {T:TP/%3s} {T:PATH/%s}\n"); + xo_emit("{T:RES/%5s} {T:ACT/%5s} {T:INACT/%5s} {T:LAUND/%5s} " + "{T:REF/%3s} {T:SHD/%3s} {T:CM/%2s} {T:TP/%3s} {T:PATH/%s}\n"); xo_open_list("object"); for (i = 0; i < cnt; i++) display_object(&kvo[i]); From nobody Tue Oct 22 12:50: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 4XXsVC0pKmz5PQYf; Tue, 22 Oct 2024 12:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXsVB6dy3z41Gq; Tue, 22 Oct 2024 12:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jlPJwp23gjOMguBLxg4isXJXy+MBboZPeyhC4dbujso=; b=oxC2FaB1O8ynxOYMovE8GM2DQKH9yO4lvTrVa/AD4Fz3H8SDWtHl2o2YLAjRduJwyL6Iu2 eZCCRYP4NIIU0yiI6lrku4TT8AeM82IwGgt72hXSgBnjp2jD8dPo4Cl+6YdDlu6e3QdPML 4btmGD60GxQhoCaIw9hFwvW1mA73SP1CBQVC1CVToE0WaN7KtMmmVP2cCRR3BMA3o/+GIG MVNRN2DP4/ssdYHgY2itiPxvrCrYf2jltD2hdiI6wz6SqUyjE8v+YPbpiwLlpDC1v/pkFI NH6bkBwvre9r+rcp3UDJuKCmjKftCGUO2vEsTRIJLl1y0qMJaWblpbQzX4kjeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jlPJwp23gjOMguBLxg4isXJXy+MBboZPeyhC4dbujso=; b=YeR9OZqip26FoSGWk4PMPTVVtC3awhsYvqRsBbEObfnYOw7hHiZNgg0zdcF4qUofiDzi1h q3sIs9qvPfT0QXtMa88JUTdJoyZ6ukbRiBMARseohyy4eDIhHypZV5SjfEhgJHHmxaqH7t T8545XASH/wOLq9vxk6V7jQUgYWKQjO96nMFSqDAIOncLmzdlPeI5i/HGQimQRC82t6J47 irqtScJujnG498k5CvnstWQq+trE7NdzOe997AsfpRsW7pHjuOGgwfgnwZfBfQN7ogiBk8 se2OHuQPxyhU815ntfxpyQsCl79cTfwDNEkYeoBlhhIAGUWSTFXdFdIMzWXhBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729601442; a=rsa-sha256; cv=none; b=VcWS0/vRTTBlhL96P24gALEx9s4pbDOFBEXLCRgPjNfSGnAifLg8qBDztJyrz4yw5NmZwr wSWxjwtBCDogqQPIGhDDaKFW3/+2a8bUL5Ds5VUnEZw6ruPqgkZqZwwnYfDC1V2/W0LIIs zCc5f/v9o1tCRx2gmFClV8nauimEL+qvM4ByPsImTlYjrj905kqgl537m7IWAr06g3icBZ srDsWainAf1Z+VyQ6MTb/1f3UPQl6Jtv6zZaK07XtoiktOcENzy0iWLPuNOJiYQztBW7SV tgEI4qtUqh33JftzqmNsxUxAQ6tScfu1nEclAohLq72H8z1BsxJZ3jkYd4ngww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXsVB62b8zF3Z; Tue, 22 Oct 2024 12:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MCogSr068301; Tue, 22 Oct 2024 12:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MCogNu068298; Tue, 22 Oct 2024 12:50:42 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:50:42 GMT Message-Id: <202410221250.49MCogNu068298@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: 6a07e67fb7a8 - main - vm_meter: Fix laundry accounting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6a07e67fb7a8b5687a492d9d70a10651d5933ff5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6a07e67fb7a8b5687a492d9d70a10651d5933ff5 commit 6a07e67fb7a8b5687a492d9d70a10651d5933ff5 Author: Mark Johnston AuthorDate: 2024-10-22 12:48:43 +0000 Commit: Mark Johnston CommitDate: 2024-10-22 12:48:43 +0000 vm_meter: Fix laundry accounting Pages in PQ_UNSWAPPABLE should be considered part of the laundry. Otherwise, on systems with no swap, the total amount of memory visible to tools like top(1) decreases. It doesn't seem very useful to have a dedicated counter for unswappable pages, and updating applications accordingly would be painful, so just lump them in with laundry for now. PR: 280846 Reviewed by: bnovkov, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47216 --- sys/vm/vm_meter.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index faf4074ef0c6..fef28bb883e4 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -455,7 +455,8 @@ u_int vm_laundry_count(void) { - return (vm_pagequeue_count(PQ_LAUNDRY)); + return (vm_pagequeue_count(PQ_LAUNDRY) + + vm_pagequeue_count(PQ_UNSWAPPABLE)); } static int @@ -477,6 +478,18 @@ SYSCTL_PROC(_vm_stats_vm, OID_AUTO, v_pdpages, CTLTYPE_U64 | CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, sysctl_vm_pdpages, "QU", "Pages analyzed by pagedaemon"); +static int +sysctl_vm_laundry_pages(SYSCTL_HANDLER_ARGS) +{ + struct vm_domain *vmd; + u_int ret; + + vmd = arg1; + ret = vmd->vmd_pagequeues[PQ_LAUNDRY].pq_cnt + + vmd->vmd_pagequeues[PQ_UNSWAPPABLE].pq_cnt; + return (SYSCTL_OUT(req, &ret, sizeof(ret))); +} + static void vm_domain_stats_init(struct vm_domain *vmd, struct sysctl_oid *parent) { @@ -503,8 +516,9 @@ vm_domain_stats_init(struct vm_domain *vmd, struct sysctl_oid *parent) "inactpdpgs", CTLFLAG_RD, &vmd->vmd_pagequeues[PQ_INACTIVE].pq_pdpages, 0, "Inactive pages scanned by the page daemon"); - SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, - "laundry", CTLFLAG_RD, &vmd->vmd_pagequeues[PQ_LAUNDRY].pq_cnt, 0, + SYSCTL_ADD_PROC(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, + "laundry", CTLFLAG_RD | CTLTYPE_UINT, vmd, 0, + sysctl_vm_laundry_pages, "IU", "laundry pages"); SYSCTL_ADD_U64(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, "laundpdpgs", CTLFLAG_RD, From nobody Tue Oct 22 14:56: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 4XXwHJ34Hrz5PYDT; Tue, 22 Oct 2024 14:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXwHJ2Vffz4DtR; Tue, 22 Oct 2024 14:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729608988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZI0DMnhrX8hemQWcsc4EgAv1b+vLL4HqUkdllRK/mE8=; b=oHdQjwTgURNKlqYHupvjtTTILDLi4+6AaNVTlCuSW/vKApjv5DaTNZf2HgZGbr1nshGjqB Q80cj+sHvWikqyn/AfJi14wRUHh5ki+Rwzz19oy9s8AehXH0S/EJYLPDnhbZ6GbXJNZpm4 tFa5ba62DATTmOP+anZicPza7RbidIQjBVDNbK+ud5eLcxlL6uSN5TyfiKkvLiv2vpHg+E UHO+r6qQmaeDIxkMTucQho/zjYUHfu7uzLFO2lwYEuOT0PtukODhsvxKwBNpqkBM1Af2O0 fg1iowhLrgUW1kQI7n/70sP5Ip0WBvwfQ+9EbTeqbQxBMamaoyfu6WZ54kJCpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729608988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZI0DMnhrX8hemQWcsc4EgAv1b+vLL4HqUkdllRK/mE8=; b=VykdggbZ54jjT4OFJ1b0s8rKdR8BvcDaGL6z1qpHcdphzHCReX1sqQJImCXfTnHqj1E8Ph A3QCT97eQ4AxS9CvnHXTz9KNGgFV5An749/6IY28dj4K+LDU31Gg6cFiWsOh3mCPDwa22z UGy2+uEAkFCcBLzK6Baore9FIgGu7Anw/TR3aSTltiXD5oeT1my9tYd5eC7k5RCbNwsl5P JSCIQjuHYZ57VqnfyS3nndCugbcHJmod18CWqJQeeAuOdbgBhESCtIqv0+wbS4YMO8DlL6 +JAr4j4DCij+TEknA+IgEZ35XG2r6oBfrNn/DOcPT/A4pROj7Id6NJ3HrDl3hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729608988; a=rsa-sha256; cv=none; b=IpO9/A0UNhf25jDOAnCaFJy4E16j5dWHMqyxmOK7q7yote3pZZ+6fBrf4KPCh8GilvmIcv U0Dcj+pKnpGnbTdsiMI+//PZqMBZKLKF3UlWT9O2GI+Rx5amyRlG/2sr1seX5eSmNPD64q 7/m7BamelPp02kXhTIqrjApHrQcAba772wH0l570+D+LV052c3pzXKglWeyCuE4tVslJOB ATmiL9vDWuqy9yzpPX2YgWDjq2RsT4CFafLuvZq1bITH3Rz/byX8P+fvvpt7V2U/TOJ19E M5mPk7K/LgOcyJHeqBKJagG3sF9dc4jD00/OfFqClZ2Nek1yivXwxqKWq17Kdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXwHJ25fQzJZq; Tue, 22 Oct 2024 14:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MEuSaS097912; Tue, 22 Oct 2024 14:56:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MEuSdP097909; Tue, 22 Oct 2024 14:56:28 GMT (envelope-from git) Date: Tue, 22 Oct 2024 14:56:28 GMT Message-Id: <202410221456.49MEuSdP097909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: f41ef9d80b3d - main - ACPI: Implement power button on !x86 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f41ef9d80b3d272e08dd9e2ea3c1d8d3f2818066 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f41ef9d80b3d272e08dd9e2ea3c1d8d3f2818066 commit f41ef9d80b3d272e08dd9e2ea3c1d8d3f2818066 Author: Colin Percival AuthorDate: 2024-10-12 17:27:39 +0000 Commit: Colin Percival CommitDate: 2024-10-22 14:56:20 +0000 ACPI: Implement power button on !x86 ACPI sleep states are only implemented on x86 systems, so having the ACPI power button attempt to enter "S5" (or other state as configured via the hw.acpi.power_button_state sysctl) is not useful. On non-x86 systems, implement the power button with a call to shutdown_nice(RB_POWEROFF) to shut down the system. Reviewed by: Andrew Tested on: Graviton 2 MFC after: 2 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D47094 --- sys/dev/acpica/acpi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index b7d7277eb310..ea95f57fc22e 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -3903,13 +3903,22 @@ acpi_invoke_wake_eventhandler(void *context) UINT32 acpi_event_power_button_sleep(void *context) { +#if defined(__amd64__) || defined(__i386__) struct acpi_softc *sc = (struct acpi_softc *)context; +#else + (void)context; +#endif ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); +#if defined(__amd64__) || defined(__i386__) if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, acpi_invoke_sleep_eventhandler, &sc->acpi_power_button_sx))) return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); +#else + shutdown_nice(RB_POWEROFF); +#endif + return_VALUE (ACPI_INTERRUPT_HANDLED); } From nobody Tue Oct 22 15:34: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 4XXx7j1rVDz5Pc8Q; Tue, 22 Oct 2024 15:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXx7j0kP5z4Kcw; Tue, 22 Oct 2024 15:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729611297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvWNRGWRu1wcea6lfrfsI4AZssFpjR2+nXM+syMWSvM=; b=SpQvuyl0iy9t7cX2drCVdmSonunW4p5w65S6v7Ni5K8quqTrLm03BajdDyCBkM/uEtF05d cWa6fIGcWyoS6ibqyMRo6jqbwQtwglOmAKScrORkWCRINO7T8p/uCYF8Dc1Ps5EQA0m42j djGMhH056HfqYBe26R+AWWYh9bEj9R7kyOE3dnd4DfH48Dy87ehgyqU7JNRfRNsl32tJt1 BedhkBotep+FhTHL+k83tLrvaD3FE5hy8pY9zHjAc7WFfjPZGyjfbeWyKnZ97w7+runTmG QE+IfaZdlPk8rSa21wANTIS06JjvYvIUYsjhkdP0zdx7lzV3KYEn8FpH4zUkPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729611297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvWNRGWRu1wcea6lfrfsI4AZssFpjR2+nXM+syMWSvM=; b=nqLkW470hxNP6uV40vPDnJkaN5/EA0QIVnGpc8L4r5jO0lvWJmph+xqf2oAxQ+Jn5C0++G +0/u2dtSVeGSNBsSbIxmTuqppea6RcrF4v6qSZ6uqMpUWyVBi7CgcOiNbbFaNg2Ebzkcw8 avUCXHMPQk7RnJNfbPqvf8eU+SSuvkj0VY1+w1V4QdbyHb2gpnpIpGBV3A6BWEtaGbuvuG yZOzg0NDzV/3QuBu8ivIr39QuTyhDNGcwhK07wTm636EyrTrqGquHK2tJv1FZNJ4LsgCoC b0ygDMhAHRosML39AjY34VtdTtDdPXaNI5eckrb1Ow+d2U8Y2zSy94Fp8STIqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729611297; a=rsa-sha256; cv=none; b=JB3L3RCk7VMAulQ/lq3jJTBogcW8OmNB4pUjK53vSvvUMgHu349Gevgjuf8ah0GzRHUVPR skUNmN5qSbDmyKmhWbAodXWkofuMUB1MGCnlbLx4KOurXugCsHDEOKNDfApJs2LawsMBo0 T4veabxOXGrDA2oSj9HXziGUuhFV0xIfoSNUUNnmhKELxGSqSY3quSC9LaoUEEa8Y1BAio I0nGtWuHk9Y73ZCjO5mtRsMDCv9QMRrvhJJQtp+Qvmbwb+4QDr8RVTM6qN6Uq3qOOgpxqj NKMXjnlK9b7s4pMiO67kaziPpI2OIMrJZoHLDgy54/hJsIVjK50ov497bElmBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXx7j0Km9zKlN; Tue, 22 Oct 2024 15:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MFYuDH071633; Tue, 22 Oct 2024 15:34:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MFYuM2071630; Tue, 22 Oct 2024 15:34:56 GMT (envelope-from git) Date: Tue, 22 Oct 2024 15:34:56 GMT Message-Id: <202410221534.49MFYuM2071630@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: ad0df04a5dc0 - main - da: Add comments about asc/ascq values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ad0df04a5dc05a5dc903f42abf55541ce6328d93 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ad0df04a5dc05a5dc903f42abf55541ce6328d93 commit ad0df04a5dc05a5dc903f42abf55541ce6328d93 Author: Warner Losh AuthorDate: 2024-10-22 14:45:22 +0000 Commit: Warner Losh CommitDate: 2024-10-22 15:33:44 +0000 da: Add comments about asc/ascq values Having had to look some of these up several times, add comments from the latest standard for all the asc/ascq values we test against. In a couple of cases, this is a little redundant with the printf on the following line(s), but makes it clear what the ASC/ASCQ codes are. Sponsored by: Netflix --- sys/cam/scsi/scsi_da.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 1a6df6171b66..5e562122c5d5 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2188,16 +2188,19 @@ daasync(void *callback_arg, uint32_t code, scsi_extract_sense_ccb(ccb, &error_code, &sense_key, &asc, &ascq)) { if (asc == 0x2A && ascq == 0x09) { + /* 2a/9: CAPACITY DATA HAS CHANGED */ xpt_print(ccb->ccb_h.path, "Capacity data has changed\n"); cam_periph_assert(periph, MA_OWNED); softc->flags &= ~DA_FLAG_PROBED; dareprobe(periph); } else if (asc == 0x28 && ascq == 0x00) { + /* 28/0: NOT READY TO READY CHANGE, MEDIUM MAY HAVE CHANGED */ cam_periph_assert(periph, MA_OWNED); softc->flags &= ~DA_FLAG_PROBED; disk_media_changed(softc->disk, M_NOWAIT); } else if (asc == 0x3F && ascq == 0x03) { + /* 3f/3: INQUIRY DATA HAS CHANGED */ xpt_print(ccb->ccb_h.path, "INQUIRY data has changed\n"); cam_periph_assert(periph, MA_OWNED); @@ -4951,15 +4954,18 @@ dadone_proberc(struct cam_periph *periph, union ccb *done_ccb) } /* - * Attach to anything that claims to be a - * direct access or optical disk device, - * as long as it doesn't return a "Logical - * unit not supported" (0x25) error. - * "Internal Target Failure" (0x44) is also - * special and typically means that the - * device is a SATA drive behind a SATL - * translation that's fallen into a + * Attach to anything that claims to be a direct access + * or optical disk device, as long as it doesn't return + * a "Logical unit not supported" (25/0) error. + * "Internal Target Failure" (44/0) is also special and + * typically means that the device is a SATA drive + * behind a SATL translation that's fallen into a * terminally fatal state. + * + * 25/0: LOGICAL UNIT NOT SUPPORTED + * 44/0: INTERNAL TARGET FAILURE + * 44/1: PERSISTENT RESERVATION INFORMATION LOST + * 44/71: ATA DEVICE FAILED SET FEATURES */ if ((have_sense) && (asc != 0x25) && (asc != 0x44) @@ -5995,22 +6001,30 @@ daerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags) */ else if (sense_key == SSD_KEY_UNIT_ATTENTION && asc == 0x2A && ascq == 0x09) { + /* 2a/9: CAPACITY DATA HAS CHANGED */ xpt_print(periph->path, "Capacity data has changed\n"); softc->flags &= ~DA_FLAG_PROBED; dareprobe(periph); sense_flags |= SF_NO_PRINT; } else if (sense_key == SSD_KEY_UNIT_ATTENTION && asc == 0x28 && ascq == 0x00) { + /* 28/0: NOT READY TO READY CHANGE, MEDIUM MAY HAVE CHANGED */ softc->flags &= ~DA_FLAG_PROBED; disk_media_changed(softc->disk, M_NOWAIT); } else if (sense_key == SSD_KEY_UNIT_ATTENTION && asc == 0x3F && ascq == 0x03) { + /* 3f/3: INQUIRY DATA HAS CHANGED */ xpt_print(periph->path, "INQUIRY data has changed\n"); softc->flags &= ~DA_FLAG_PROBED; dareprobe(periph); sense_flags |= SF_NO_PRINT; } else if (sense_key == SSD_KEY_NOT_READY && asc == 0x3a && (softc->flags & DA_FLAG_PACK_INVALID) == 0) { + /* 3a/0: MEDIUM NOT PRESENT */ + /* 3a/1: MEDIUM NOT PRESENT - TRAY CLOSED */ + /* 3a/2: MEDIUM NOT PRESENT - TRAY OPEN */ + /* 3a/3: MEDIUM NOT PRESENT - LOADABLE */ + /* 3a/4: MEDIUM NOT PRESENT - MEDIUM AUXILIARY MEMORY ACCESSIBLE */ softc->flags |= DA_FLAG_PACK_INVALID; disk_media_gone(softc->disk, M_NOWAIT); } From nobody Tue Oct 22 15:34: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 4XXx7k3wg1z5PcBS; Tue, 22 Oct 2024 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXx7k20wcz4Klx; Tue, 22 Oct 2024 15: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=1729611298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWxWscEOP5p5KmwZYMGnFaaiOvSYQYUBN5rNWwH+N3M=; b=yqpTH3+qk2UEYhludTTiZO2iD7nuFfZy3acSR9IZ8HdwKcFPAB8za+YAJfo5Q04aMfah4X bpfn2plhCaqMtNGL6B1n8hMQilALMc1oK0xAVa1NgUoR7GC2fU19LtiThwtkZpB+3l8UdA oFi6rtEVfm003waFHdVeiwPcOikLCfzSNkdNTJVh9s9GRaeoT7HC44jMq6XDqQXbBv4uDv nsxMGbOzqKO7iWL6LCXNwrt3lx2U7OlZfV2mmPeHZq4bO7TXaGl4ZEtm9TzcfSTQcS39Ea EbFAMkzDIpQj1h+COVP9L4uiicH3K8kKpFBsJuwdNyKwS6Bi9TwKwT0mq/jQRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729611298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWxWscEOP5p5KmwZYMGnFaaiOvSYQYUBN5rNWwH+N3M=; b=e/hpz6lw18RSQVxNOIutF4KNNN9FapFbmj4e8RfRktOMTWrsGSlV5MEm8Q5j9flLLbFLi/ r/07osNshrLks9mm8c0FA19OcQJRgMQYIzev1AuP5bPEz34OyzANzhLMCy0nGkqAJD0vIF /B/dugPbwlWwifWmxYZz61CxjwpTsn0s8kdIWcYoZufyPu/MGdAfYojBFe5hd0tMA3pswy TsjFXFceRvZFHCGUS6J/ZUunkblG6oDEszzNl0agDRttWttDqn4orbNCj4MZXHPnrIPTpl kvxzaLplFgpgfj5BpgoAz0mv0Vm7Pjf7Eo7uLgifZ6pK5dyft1XXtRV9tJjbPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729611298; a=rsa-sha256; cv=none; b=Caf9eIU+k82Ll/NFkyF2bn6rc8o7o9+Oamk3+IhP8hm416Dgn1U+91sVN+Leq6NSiLk1Oz 7hVfJu3ZaFgMnz8TMiEAnyjRDAym6DJkl91H1NFockZZ/RwwJRLmtZOrZr0jpPDBeSpb8T chzFJDNuvYzr4qr0cJhPeGDa86BiTSTWkZEOwH87gTRQNDTLmHL7R/ryRxYipjz67Qw0HX bi82ZaJ966dA4lQRCbp+2/VvvDbDxLpiQs/HSOsCmCXvj1UoZwJ8sVrjBOPyT+SxOKAnNP Kja07I8CD/OywXww5uRHzHnOT8FQqvs8VMfrDLadmq1Y4xUXLAITaBayPB/ibA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXx7k1d5nzKQh; Tue, 22 Oct 2024 15:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MFYwBA071681; Tue, 22 Oct 2024 15:34:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MFYwHJ071678; Tue, 22 Oct 2024 15:34:58 GMT (envelope-from git) Date: Tue, 22 Oct 2024 15:34:58 GMT Message-Id: <202410221534.49MFYwHJ071678@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: c1cc3d96da13 - main - scsi: Make asc/ascq 44/0 fatal with ENXIO List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c1cc3d96da135189ab7b0831c7ea11f09afd30a2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1cc3d96da135189ab7b0831c7ea11f09afd30a2 commit c1cc3d96da135189ab7b0831c7ea11f09afd30a2 Author: Warner Losh AuthorDate: 2024-10-22 14:50:10 +0000 Commit: Warner Losh CommitDate: 2024-10-22 15:33:44 +0000 scsi: Make asc/ascq 44/0 fatal with ENXIO 44/0: INTERNAL TARGET FAILURE Several different HGST/WD hard disks report this during geom tasting. Several vendor manuals indicate this is not recoverable as well, though are a bit coy as to whether it's permanant for all I/O or just for this particular one. An internet search resolves the ambiguity in favor of permanant error more generally, rather than for a specific LBA or LBA range. This has the side effect of speeding up boot for systems that have drives that have failed with this symptom. Sponsored by: Netflix --- sys/cam/scsi/scsi_all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 07295f313cca..a26354e3dd97 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -2413,7 +2413,7 @@ static struct asc_table_entry asc_table[] = { { SST(0x43, 0x00, SS_RDEF, "Message error") }, /* DTLPWROMAEBKVF */ - { SST(0x44, 0x00, SS_FATAL | EIO, + { SST(0x44, 0x00, SS_FATAL | ENXIO, "Internal target failure") }, /* DT P MAEBKVF */ { SST(0x44, 0x01, SS_RDEF, /* XXX TBD */ From nobody Tue Oct 22 16:15: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 4XXy2c0Bszz5Pdqf; Tue, 22 Oct 2024 16:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXy2b6jdnz4QHg; Tue, 22 Oct 2024 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729613735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+YtJ4w/HwFoUDOBn5+MkYptxa04TPKynTbGu0zO4GI=; b=Zbj+tyyKLX+RLCxn+9bDJa1oJCGryFkHSYfzk+/GfBnMweJLsWl26JJfWjiP+BsdhgPia9 LncuRthbq8Bj+F23nJHFgvsk8nite6RnV1fYX/H2n1O38MN0+A1ahMASq9fVHl1c4BUs8I jjy4HyclZgfpG8ZpZQnvvXB8IM1cbbwasLfK6JY0PX4lXjZGfs0ZT61q9aK4tC7e6GoDYI IWN+ukmIud7JCVed5C26Llg+Eh7yRLZERUhz4uegvcKVvHcyYBcXglesqtu8sHPicKsS3Z F6tdxAXMkywEeHhwEfjK1Ze+QKdRrI+Rvb7al87Eb+pawYJ2FNU25KKjKua5eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729613735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+YtJ4w/HwFoUDOBn5+MkYptxa04TPKynTbGu0zO4GI=; b=SF3KeP8V/XsDHWlqTR9YSieNqJEjjU2ndA8CGdS+hyqqADFhJNEatgxvrrX7Y2stUI7sxu aOTRtzvJWZyQopNQBeZoNxRHEt05asJgNyR3lfQrkvM8E8umw5O63KnJVOA5vDN7dj7SGw TVyGAPNnnMI5vd13EHvWQ6S+GRKFXuGqkC97OKMc1fLa4Ofy49rUQLtRI4Vp7p6ABS8pAn eldn5fbZ/LSWX+kumsF1AhbE7ejbXtQZOrDW6n4Ziw8fKCnKdUPHh3vghcn2LAFBUIG0h3 iCxx/j1VtBYckIrWmlJNws2LBpKa1yeaMikOd39a7dGxHuxT5vupIjZSPi+4ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729613735; a=rsa-sha256; cv=none; b=Pz+MQK+OFfzjzdGGodBEcVsbbzsazHQZo2YOsQi4LXzzrkzJIvVaHfWyGITfo+jnpl+oIw wwLfV1TZjhwUVFRDBMNAeFr6qOo8FLb1F9tXJ5ZZhvxBNBMVxoEdX2DuqP0zK07UpZmqWc QRm0lByaW5KFtCJJFrp4SRxM/U20tG5h8+4FBBvw9Ac9L0sxj+q7SapSA8aRRDYIs73B9E EPZs8SysJCA6jR8jAP0VvAFaLAIIuv5xCwrOx+GthJ3ydLnklfhcFjn8paXWjcTubGsvzk dkeMwcbGF22mrdec9Uhvd5zIg6ax7/uHKxs/YWOf8H2tR8xACNOUiQKNE8OHzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXy2b67HvzLmP; Tue, 22 Oct 2024 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MGFZ2Z046314; Tue, 22 Oct 2024 16:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MGFZOT046311; Tue, 22 Oct 2024 16:15:35 GMT (envelope-from git) Date: Tue, 22 Oct 2024 16:15:35 GMT Message-Id: <202410221615.49MGFZOT046311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: f6197f2bc05b - main - sys: Add GPIO_INTR_EDGE_MASK define List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6197f2bc05b5a8df260cbf55283fddf7c76fec4 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f6197f2bc05b5a8df260cbf55283fddf7c76fec4 commit f6197f2bc05b5a8df260cbf55283fddf7c76fec4 Author: Colin Percival AuthorDate: 2024-10-22 16:06:41 +0000 Commit: Colin Percival CommitDate: 2024-10-22 16:15:30 +0000 sys: Add GPIO_INTR_EDGE_MASK define This is the GPIO_INTR_EDGE_* flags, just as a convenience to let code test flags for interrupt edginess. Sponsored by: Amazon --- sys/sys/gpio.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/gpio.h b/sys/sys/gpio.h index ba5b362125f8..1a9e998a0e56 100644 --- a/sys/sys/gpio.h +++ b/sys/sys/gpio.h @@ -83,10 +83,10 @@ #define GPIO_INTR_EDGE_FALLING 0x00080000 /* edge trigger, falling */ #define GPIO_INTR_EDGE_BOTH 0x00100000 /* edge trigger, both */ #define GPIO_INTR_ATTACHED 0x00200000 /* interrupt attached to file */ +#define GPIO_INTR_EDGE_MASK (GPIO_INTR_EDGE_RISING | \ + GPIO_INTR_EDGE_FALLING | GPIO_INTR_EDGE_BOTH ) #define GPIO_INTR_MASK (GPIO_INTR_LEVEL_LOW | GPIO_INTR_LEVEL_HIGH | \ - GPIO_INTR_EDGE_RISING | \ - GPIO_INTR_EDGE_FALLING | GPIO_INTR_EDGE_BOTH | \ - GPIO_INTR_ATTACHED) + GPIO_INTR_EDGE_MASK | GPIO_INTR_ATTACHED) struct gpio_pin { uint32_t gp_pin; /* pin number */ From nobody Tue Oct 22 18:08: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 4XY0YR5KTJz5VhJg; Tue, 22 Oct 2024 18:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY0YR4M73z4gdq; Tue, 22 Oct 2024 18:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729620539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fkPVLIWol6YQr8jH0Ws6cNmbcdh6EZefJhJk3gs3Shc=; b=wJgBZhMtXUNj7FCzbMI2ZScyDpseiBc1eeqxoFVy0DR4woY1srC8hfVEWzWY8pCaZEnXcp Bs1BYFqDUq+7MAks4gBOZ5wTNQ6cOJiRrss4TNv5qezlnWNdbToc+6eW7CpR6I67/s2j5d ioyVOwJsaV77A5eaXNXdIyV5DpTV/3OnC0WvxeNd2mWOGtesmDGSy0bhbXywV3klAQb0dc kJZ7V9vj25RuQj2LXOZPkwEl+CCkZ7X6liUSaxzddQGRop5AqnUUa9b/ki2VaPpru2+Yb1 XESce2RZpUC316XOTaQD7A0uR5B8UljnxzEGO/qDQDm1LxDgyxL/ab3TCO+zPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729620539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fkPVLIWol6YQr8jH0Ws6cNmbcdh6EZefJhJk3gs3Shc=; b=P130o1W3z1Jt3mxZITRricBPNNgPzpVcCbYwwEXD2Hh/Rp4ZZXiVIOd7xbIZCOkKjq+N3b 5b6mcEuGcenCBzy2DNbhS9YPqP6TMdW7Aj5wDN/K4CtJATFn9F4SlpDGpllqGQAt3SNcoP 8AJ8ZXl1g31+POUg6eoIL6/o/4MKiV61F/gyMzeGQ/MppPGZBKrsrdcLbaPu/ci7kdtqF6 EkFOP0SwmAVy6L0Jon0NYAdE7Fz8A/loh32ou3y38Tm8/6LzIBe/UGZF/vDQuL0w1VSFZq Zv4cDUpVRhGsIk22CgGJWxQKCQ4WW0aD0qISFg3X17uGDaetaIFoJ5TuMZrlew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729620539; a=rsa-sha256; cv=none; b=bC3SPrJR0GFNEpU+rY/3rAf+3pNHQUyXrPiBEuj6L2ewRxPwFUek0b5yjcgm+QC5RLUAx1 hEo7RLH3cvXL7aJ8fMmb0Q9aRjtznpGaZyo/TVyJLiUH90De194gljYUBJAROtKYR83jXi Y/+PqvhJsBaab/v27zVWLzm3p0cJ33SzVvEB7Ev0QJm1NUqnd1oe7dhvYhk/Ggd3yFyb56 ExFrDvj6ObbrfkjIvR5vOGiXZVoXI/pakpnDCXzk1KJQXday0fOXJJ7MP0cb5Y0q/jl+Cy kn9TIjAEJw8qXrwR35FXG7CnXEdkOk1mlmgTom3QTwjwTFUP/LFaC4I844RyAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY0YR3yCRzP7V; Tue, 22 Oct 2024 18:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MI8xA7050980; Tue, 22 Oct 2024 18:08:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MI8xj2050978; Tue, 22 Oct 2024 18:08:59 GMT (envelope-from git) Date: Tue, 22 Oct 2024 18:08:59 GMT Message-Id: <202410221808.49MI8xj2050978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 02653835cd6f - main - debug.sh add DebugAdd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02653835cd6f1dc4a34f08d3b744fbb7c4b1ecdb Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=02653835cd6f1dc4a34f08d3b744fbb7c4b1ecdb commit 02653835cd6f1dc4a34f08d3b744fbb7c4b1ecdb Author: Simon J. Gerraty AuthorDate: 2024-10-22 18:07:37 +0000 Commit: Simon J. Gerraty CommitDate: 2024-10-22 18:07:37 +0000 debug.sh add DebugAdd Sometimes it is desirable while debugging one script for it to enable debugging of a child. We can do that with $DEBUG_DO DebugAdd tag to add tag to DEBUG_SH but only when we are already debugging. --- libexec/rc/debug.sh | 21 ++++++++++++++++++++- share/man/man8/debug.sh.8 | 11 ++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/libexec/rc/debug.sh b/libexec/rc/debug.sh index eea8a011bc09..b098f0b359b5 100755 --- a/libexec/rc/debug.sh +++ b/libexec/rc/debug.sh @@ -9,6 +9,7 @@ # DebugOn [-eo] "tag" ... # DebugOff [-eo] [rc="rc"] "tag" ... # Debugging +# DebugAdd "tag" # DebugEcho ... # DebugLog ... # DebugShell "tag" ... @@ -39,6 +40,9 @@ # default of 0. Thus if DebugOff is the last operation in a # function, "rc" will be the return code of that function. # +# DebugAdd allows adding a "tag" to "DEBUG_SH" to influence +# later events, possibly in a child process. +# # DebugEcho is just shorthand for: #.nf # $DEBUG_DO echo "$@" @@ -74,7 +78,7 @@ # Simon J. Gerraty # RCSid: -# $Id: debug.sh,v 1.40 2024/09/09 20:06:00 sjg Exp $ +# $Id: debug.sh,v 1.41 2024/10/22 17:57:22 sjg Exp $ # # @(#) Copyright (c) 1994-2024 Simon J. Gerraty # @@ -167,6 +171,21 @@ _debugOff() { DEBUG_X= } +## +# DebugAdd tag +# +# Add tag to DEBUG_SH +# +DebugAdd() { + DEBUG_SH=${DEBUG_SH:+$DEBUG_SH,}$1 + export DEBUG_SH +} + +## +# DebugEcho message +# +# Output message if we are debugging +# DebugEcho() { $DEBUG_DO echo "$@" } diff --git a/share/man/man8/debug.sh.8 b/share/man/man8/debug.sh.8 index 2c137ff3fd42..77a1e06cc56a 100644 --- a/share/man/man8/debug.sh.8 +++ b/share/man/man8/debug.sh.8 @@ -12,7 +12,7 @@ .\" Please send copies of changes and bug-fixes to: .\" sjg@crufty.net .\" -.Dd January 31, 2024 +.Dd October 22, 2024 .Dt DEBUG.SH 8 .Os .Sh NAME @@ -30,6 +30,8 @@ .It .Ic Debugging .It +.Ic DebugAdd Ar tag +.It .Ic DebugEcho Op Ar message .It .Ic DebugLog Op Ar message @@ -110,6 +112,13 @@ It is useful for bounding complex debug actions, rather than using lots of .Ic $DEBUG_DO lines. +.It Ic DebugAdd Ar tag +Add +.Ar tag +to +.Va DEBUG_SH +to influence later output, +possibly in a child process. .It Ic DebugEcho is just shorthand for: .Bd -literal -offset indent From nobody Tue Oct 22 18:24: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 4XY0vC0VF2z5VjWx; Tue, 22 Oct 2024 18:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY0vB73zhz4hw7; Tue, 22 Oct 2024 18:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729621463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXT9GLrE6bVQocfzWNPm+hgDaZ4DXshXLnicNY12QNk=; b=cSUZ7s6l0UmOZO5Lo+QAu6c2m4li4QL0Is19/yUfEIzI4KTzrHRU6A588n4iSc3Cu+YSsK AEy0kZaIM34E13xa2br6FFwDdR5130aesaPPoQlT+YrZ5DmUzdMMvZVbI08nbrMzbNlAhF 9JeoH7HqthhkthUL7eDuBx+4MhqjcrESnVzAwsZagF/+0rdmcHk4mXNstEBWCQpQ/VHlCy 1uBwDulJRkeZ9pkGXbLY20MjV6gtNphc5q4YyYbjXKFaAKUGfAx/7/iWbxDz3N9WmeGFs/ s1Usn4ZtKgEB/Mt8oLGgNdMTe/N9HBgFfLaHQ0isRw5Dz+HhOhHnDpbU4tx4lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729621463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXT9GLrE6bVQocfzWNPm+hgDaZ4DXshXLnicNY12QNk=; b=d1q71T7PHcas/m+6yHoc3q5B/SxNDLAb5U7OyVXeP7rfgCvYQAl+HjDLo5hkHit5EhldZ1 y0imKYtydXqweTq2ykd1ipD/0l1X6ljBGSYJN1ImcyiccCzhXBxO5akcSJ9REZEWY6gF62 0rw6a0yM2RRbA3Jzg2CZv017Iz/RagopnV9w5WdIbEyPMXrFK9Qc9cqGHjq+J7bI8tNDXS EleyREawRaM5TxOSo1xHU2aEo8r3whsy1PtGZ2ChfHiaOVJgaa7JfZsRH5SyxiJmEVardU BzdzELXL00S2E4y0LBhorsZMfZ+fH4Za1+TNmRcybMomvlbYnJLwqAgmoL1HnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729621463; a=rsa-sha256; cv=none; b=Nx1jLavdoF5Z5TivjzraFqljps4590XNwE+045A6y4VxF9TkPo+N4dcutCueg0cjPyfPEs 9R+9p0A1+uhq1GrHDvlU8h9ehnE4kA+lKxj850INnjWW7F13QYBbBcqY6gTweh+9kbq9Dw 1R6OU/fls1eqMbjZdsVfMN4lanWf26E9WVWmb1OA8pnXUur6RVE9c3KhOhRXo2mdFj5hzI w7CP9Y3MspLpARCprhIpj44dCy307k1KD79NSgdv3ekQNhKK0OB2pevmO57LrpqOwabtbA xF4aG9hEdRHmg7cGp0nNplmhimmHij3NKk2jnR34TQl+N0ayAseHNAQZZEaM3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY0vB1j6jzQ4r; Tue, 22 Oct 2024 18:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MIOMYE086728; Tue, 22 Oct 2024 18:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MIOM0X086725; Tue, 22 Oct 2024 18:24:22 GMT (envelope-from git) Date: Tue, 22 Oct 2024 18:24:22 GMT Message-Id: <202410221824.49MIOM0X086725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8bc14f6ba937 - main - makesyscalls.lua: converstion -> conversion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bc14f6ba937dc080b435ac519bed334a4f0b629 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8bc14f6ba937dc080b435ac519bed334a4f0b629 commit 8bc14f6ba937dc080b435ac519bed334a4f0b629 Author: Brooks Davis AuthorDate: 2024-10-22 18:07:06 +0000 Commit: Brooks Davis CommitDate: 2024-10-22 18:21:26 +0000 makesyscalls.lua: converstion -> conversion Reported by: agge3 --- sys/tools/makesyscalls.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 054e19e24d43..7e3116107483 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -1574,7 +1574,7 @@ write_line("libsys_h", string.format([[/* ]], generated_tag)) write_line("systrace", string.format([[/* - * System call argument to DTrace register array converstion. + * System call argument to DTrace register array conversion. * * This file is part of the DTrace syscall provider. * From nobody Tue Oct 22 18:24: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 4XY0vC5nX3z5VjWy; Tue, 22 Oct 2024 18:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY0vC3zb7z4hsh; Tue, 22 Oct 2024 18:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729621463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/JmYw5XW4l0R1ZTYjYai1ATM9ewE2e+olIY6f2oZl8=; b=m+LibHrZaST6vSmsZHZO+RvWLVFVE92VGvNC9ZbTGiO1AkiV5rJRh7BX7+hbt/mhR/d28j zTG/+FLgnOZTjB70MIhvW3VLjZ0FVYV/l3hSX/Puud6cUl9goK8usdWcHlM7rT2XkXlj2C EYbVofFBugNZSsMAiovLuRMyQYjlCVjP4Jn9O27Pl8/1lY4NUGFS2vqMJ/wl3Wfu3htLHa /iT0uUs9v4M2kkQxADwGgavqUyccfrAg46Yt+51DciEhMnPJtoVZ6Pzl61ghv5yzRv+EPf Mp6O0AYR/6Q5gFZqq0KYv/166fl1w3+Gbt3uFAoZITiwC7M0CXjOLeo/X71nEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729621463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/JmYw5XW4l0R1ZTYjYai1ATM9ewE2e+olIY6f2oZl8=; b=rHl5EFe67JUSq4ChIS4CrEgg6xF1xZVGrh7Juof0JOpCHN3LZpYhQJ6DFPMeefMpD8/YHg OQUJbtG5oTIar32a0rouQXLa7F31M/K15zh+Pg7IsD69j1YitCfI89NCY8Z3nsTjNcT20F /pWlvROUystrF6+92hfuowDtsQLlVQX+1BUnSiXOme2E5Thy42k5i3Xom4yRXBgg+Xv5Gg QGoaJ5Fqi4NGwtia7dDDKqBaXh6SJnyZrHm3tFvW2MYsIkhIjlwOKefys3+XLwLL4cukO0 mQge0QRctjXVuj23ACafCpvSnp1rmPTO86J+qtflK1F42TuTocIIvDiBfGvRPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729621463; a=rsa-sha256; cv=none; b=mTqJ35Gl/E9gfN5yFnPZ8foMm2d8WkzCrQv6xSKwzuwgnXq7I529rpLdyEkMv5SyOTeAtm 2lT4zsFpchTTzFzf9IrkQlxleh5fHt8BKxbIgKoNwKlQuKJBuuia7CSLOBeKywtevBK4Tj 9FFs35QGOK0XZWSq6i4IUKrENQzWnWbj4+TO8ik+W4gC6KJ/hx+1yvqdRHiG1rOaz4PozB GIEjYeA6lwCGeU8dStKBAUgVPebcw6dxQPFCeZQ8zmeIEP6oSZQ3CgRcWN8k8wSDtIcYhV oaWl73uyCgjj2VTq7SySRAMRXUoshB2uNV6NEV60iCxYbf2mCqEaczm7h08u3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY0vC3LVzzQFc; Tue, 22 Oct 2024 18:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MIONUo086779; Tue, 22 Oct 2024 18:24:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MIONFW086776; Tue, 22 Oct 2024 18:24:23 GMT (envelope-from git) Date: Tue, 22 Oct 2024 18:24:23 GMT Message-Id: <202410221824.49MIONFW086776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 76ab72e82837 - main - sysent: regen for typo fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76ab72e8283712e508bc3f4c2b8c219b49b64d4c Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=76ab72e8283712e508bc3f4c2b8c219b49b64d4c commit 76ab72e8283712e508bc3f4c2b8c219b49b64d4c Author: Brooks Davis AuthorDate: 2024-10-22 18:08:03 +0000 Commit: Brooks Davis CommitDate: 2024-10-22 18:21:26 +0000 sysent: regen for typo fix --- sys/amd64/linux/linux_systrace_args.c | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 2 +- sys/arm64/linux/linux_systrace_args.c | 2 +- sys/compat/freebsd32/freebsd32_systrace_args.c | 2 +- sys/i386/linux/linux_systrace_args.c | 2 +- sys/kern/systrace_args.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index d0738267b35a..20322f7a8660 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -1,5 +1,5 @@ /* - * System call argument to DTrace register array converstion. + * System call argument to DTrace register array conversion. * * This file is part of the DTrace syscall provider. * diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index cf9d5b64a87f..7793124e6935 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1,5 +1,5 @@ /* - * System call argument to DTrace register array converstion. + * System call argument to DTrace register array conversion. * * This file is part of the DTrace syscall provider. * diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 9e7b0935e560..54e4dd82355d 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1,5 +1,5 @@ /* - * System call argument to DTrace register array converstion. + * System call argument to DTrace register array conversion. * * This file is part of the DTrace syscall provider. * diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 80b4a2ed0109..ce0b37b178f9 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -2,7 +2,7 @@ #define PAD64_REQUIRED #endif /* - * System call argument to DTrace register array converstion. + * System call argument to DTrace register array conversion. * * This file is part of the DTrace syscall provider. * diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 041ee80fd4ff..f3e3c32a2bbf 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1,5 +1,5 @@ /* - * System call argument to DTrace register array converstion. + * System call argument to DTrace register array conversion. * * This file is part of the DTrace syscall provider. * diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index c2e1f22cbf87..d70d7942ff58 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -1,5 +1,5 @@ /* - * System call argument to DTrace register array converstion. + * System call argument to DTrace register array conversion. * * This file is part of the DTrace syscall provider. * From nobody Tue Oct 22 18:24: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 4XY0vD6pB3z5VjC0; Tue, 22 Oct 2024 18:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY0vD4ZcZz4hq6; Tue, 22 Oct 2024 18:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729621464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VY5wnRIJNic3f9tEVN71fx5H/JnU03WRolBO2DFhkRg=; b=qKc+O0bdAL+v9qNlEnNVsgM3qDd4LQcszgmbavh6POl7q77iRqLXr0K7gdIh2R6gnXCGTC S6wtc20gCOSeoeA8DZKOPIF8X12C/UZw1KJQDjCmz7rJSiXjqcWT1iqF7zxdieSfy88lhr fxbh9cC6ZTvip27YuPE17hGIEC4lHJmLHdKt3itPHs6blu7OeIiZWsVCis+f4SdmQbzqha ZYGHOvPEbXjJDDd2p0DunNrhrNIYfSF4IqEr0JUUAjxOzQZ6cgjFEP1nzv06r2uDSpD7Y4 O7BFF52BfH6IpHtwjWXipYUxxn0pa7g9ThnTqvlCalQroeiZ+KtEUM49lmQIJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729621464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VY5wnRIJNic3f9tEVN71fx5H/JnU03WRolBO2DFhkRg=; b=eP7TuIvfVIYP8iK/cCtoGrXHalw+oUYMhOX3YJOdldcEwADKUWDw/hB2+/4zwtpgZRu8/4 22VA/w64DC7C4/RhjygKpqgGZ8gOL9MsjooU6cgNZHTr49IdyDoX+mAkjfX+oso6ar20bU RxRatB3J3Bn8EAghAtq1VmRtEkPvLHZUhpO5jMaluyrd3KoCEIKWm0XepOGKvpHzpTcIwN jC9PfplA6+ZAVNl0tWP04Ye0xaSYPivnPjDd0OYqf0jaLTJWj9JuON4rG0M7AAHQ77JzPh UQBmXpqU1N6mXHL3nXvF3hsE/HX14YN7SMg9sr+jVwsKJ2TKRr3P7+d6JTIx+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729621464; a=rsa-sha256; cv=none; b=QDXMy+tVqvf5iWdzmfFwyE9dyzVdxx0LkUsSVq17gOfZAqUYGDaFO5uiFmcqBqHoT9b4o5 fHhUwdM9fVKOKnRNG08pUQC/No4vDzTK2kd6dB7qkczmK/KA/b7W5s4yMljv6frmyuF8Ls gSfp/sh4mPHEOEFBuJxGnkSwj02hDmwNgDhLHSxrYHDiKHw4NOh4x4a/+UIEAH16+HMOyp cJ0wlBzTc5EBnHROAZZlmwzS4lZvFlHJOOPZ1VvYs/Es6uPkDp/6gTonrhqxDdvWhlXAYD MaWq6LjSmAY/91k1RFo+kcF6W6tXHigaNoXq1kBvZprHsK1PqcyyTcdlCv1zww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY0vD3mz4zPnt; Tue, 22 Oct 2024 18:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MIOONf086821; Tue, 22 Oct 2024 18:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MIOOV4086818; Tue, 22 Oct 2024 18:24:24 GMT (envelope-from git) Date: Tue, 22 Oct 2024 18:24:24 GMT Message-Id: <202410221824.49MIOOV4086818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3dd490e800d1 - main - DS3231: converstion -> conversion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dd490e800d10fbc784e6a8d98a6b96de61c0a92 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3dd490e800d10fbc784e6a8d98a6b96de61c0a92 commit 3dd490e800d10fbc784e6a8d98a6b96de61c0a92 Author: Brooks Davis AuthorDate: 2024-10-22 18:23:45 +0000 Commit: Brooks Davis CommitDate: 2024-10-22 18:23:45 +0000 DS3231: converstion -> conversion --- sys/dev/iicbus/rtc/ds3231.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/rtc/ds3231.c b/sys/dev/iicbus/rtc/ds3231.c index 23e88eb7ecd3..eca408aab7cb 100644 --- a/sys/dev/iicbus/rtc/ds3231.c +++ b/sys/dev/iicbus/rtc/ds3231.c @@ -450,7 +450,7 @@ ds3231_start(void *xdev) SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "temp_conv", CTLFLAG_RW | CTLTYPE_UINT | CTLFLAG_MPSAFE, sc, 0, ds3231_conv_sysctl, "IU", - "DS3231 start a new temperature converstion"); + "DS3231 start a new temperature conversion"); SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "bbsqw", CTLFLAG_RW | CTLTYPE_UINT | CTLFLAG_MPSAFE, sc, 0, ds3231_bbsqw_sysctl, "IU", From nobody Tue Oct 22 18:34: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 4XY1715F8Nz5Vk3v; Tue, 22 Oct 2024 18:34:37 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY1714QJHz4klw; Tue, 22 Oct 2024 18:34:37 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729622077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=STcvMEaZnXjPP1p/P0J9gFFxiIFFd/DEcMWXTY9z8Rs=; b=D3oBKnToYvj0LHmwuiru0yhGvakFQPrP+8zv+TgF93TZMv8PJDzHJKXSc2tp4GHGiE5EUz ismhBwNZ5O5V3pgg4CB8xnkMkYZ59w+1Na5WLh7auuXHOhLmjDkpE1TJv4cR0+lXiXZzbF 7a4zCDZdN4tgNowsozzhPKBU1lqlpeqT8l9J/0RZBeO/eZ77O/NxfqNd2it4lYryKWU11Y 8kt0+DYH9nFvitLwX1bDBt1RHJZn+FIcgqjrYQnWGjJzhvKhj101yk+cmBlurcE+5R1NC+ OCqsWy2g9JybskisYOQwwuKD//ShkWDwlEDllNwozZH22UmFCmKfnR+N72uRkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729622077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=STcvMEaZnXjPP1p/P0J9gFFxiIFFd/DEcMWXTY9z8Rs=; b=VeY0d2YQzDadM9Dlu0NZVE6HnZbzwblN0OryC4KzFNvBMDJup812zp36reE9/hhI3xS/Bh T8ryL4EeCMUQ6GvRIv+e6BYA8oChG611jPLlD4jn2+OMcAlnPhKoS2/8zD0bPrMpQqSqlp uxPHVyw5GMW5aoa+94KoVVX9sDTd4OL0dVeMyU77d92eXptliOkIDxlmT7tvmMNprC5AKK ldpe8QeW4wdHpLK/3ESYl6VLUBgzA1oNYpQLR9CPALCGhWbH9M8Yhnkiux9XNLIvKYOBdQ PQLwEohLCh0Jo6dorMoTPozWkOaZ/tP/leZtRjT/PTbq4cYND/zLSIuRYZMxmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729622077; a=rsa-sha256; cv=none; b=Hi+bnFbqFZ1axr5XiIb/2+BnWK1PGsh2JfRZ7PaYlXyu3EpLZw1Ev9XVbh2y3C2+ceik/L TkvEXyHGAji1DPRIXMBq7moYnTG+7a+/ylHZyo01Qvo2Ha22TAcPIWKp+3D791GRF/UFbt XDyQ9Jo9CzAcun4z/mDOgUwSXFaqJW9SjctbxjWn59WyrkSFaVwkDV/t715NRisKAlIs4Z B4KlUR2v6VqE/9YrG8ln3bp+/xPQNguh6GdkwqzIo3Ifqw0x+jz6Q+JiZ8HCLCCy/jwULf GZCtnr+KQ3d7KkekcWcdowvsJRJJFfE9RJk9YveUTbH/7CqVzbP+jjyTLbI8ww== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_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: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XY1713mJqzLT1; Tue, 22 Oct 2024 18:34:37 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id AA07E3C019B; Tue, 22 Oct 2024 18:34:36 +0000 (UTC) Date: Tue, 22 Oct 2024 18:34:36 +0000 From: Brooks Davis To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3dd490e800d1 - main - DS3231: converstion -> conversion Message-ID: References: <202410221824.49MIOOV4086818@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202410221824.49MIOOV4086818@gitrepo.freebsd.org> On Tue, Oct 22, 2024 at 06:24:24PM +0000, Brooks Davis wrote: > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3dd490e800d10fbc784e6a8d98a6b96de61c0a92 > > commit 3dd490e800d10fbc784e6a8d98a6b96de61c0a92 > Author: Brooks Davis > AuthorDate: 2024-10-22 18:23:45 +0000 > Commit: Brooks Davis > CommitDate: 2024-10-22 18:23:45 +0000 > > DS3231: converstion -> conversion This is a pretty common typo, but all the rest are in contrib comments and not worth fixing. -- Brooks From nobody Tue Oct 22 18:45: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 4XY1MR6v3Gz5Vk5w; Tue, 22 Oct 2024 18:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY1MR6LlDz4lYg; Tue, 22 Oct 2024 18:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729622723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AoxMbN7Pd43zSpoF8/ZcnqhxuKG4EQJqtlSUytMaws=; b=K1OEyGnyye0aTlOSaA5kT90xGXGAL2p6fRtoZTfKTjixQ5eFhh9h8/KGLJFV4W7S3DZHjn 1SRuKpL/WP4meGUgJ03WzbIBAonP837UgSY3lA3eh0K6SvEpZkdUBAbxbyWJPIpM/v9h5j /ulroRPFBJoynCtQL/7Eavq8Ol3p+FBcv8O4bFAM3gySg/bnFiut+W0vqwUm2aonoo6JdG vSYr0JJs5XZSn8XEQq33aguLpdWFG6vWjNVPep3xuRlhxsgnBS9HB2maqOfdpS16nKuZaS Bclr02FHWQaQanv53FILfsGbY2MdRGmexuMa1aIdqXQ0BeiSyzTGf21LJG9I5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729622723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AoxMbN7Pd43zSpoF8/ZcnqhxuKG4EQJqtlSUytMaws=; b=bsp82TeC3Nn7br7/Q3MexfbIlsqE0TlHMnTbfro/OsTe9CECnxOVfh37bXFJ9tzICqZBx+ Hc3AI/nQT2uGxuEm9P6Bh6gO/VXtZuBoxcxcIOSXk1ALI7jbsbEmgu35Qnco8wVB7wtNst UxPjRKZlaQAR7MzctemX33XKUH0XWmJ3w8KJE0ZjF97k7LI+65yYNeXlLD3oQkgGh63hHL jksK5PqN5d6FoP69fAgOJBbhHEbotQmS0QpZMlGJm8xcSqaZOAmiI1XJ0t5BCec+5Rpawe IxxdnRT+m5N3Qxewh3vgGnFAsG2KY38H+6nVrNEHjB86jgI3cJytdBIFIg7wtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729622723; a=rsa-sha256; cv=none; b=oKc9VAC0ejs2Ns01MWHuAusDJSmhk9RWLwg30yuGBueH6kEizrXOeQGvQQRO8hmIZO4gHv L13L6iPvt6y/K5l9A/xAiQwJzaGX0P/iGutxbazv4w6RTwhJ3ZA4B7VZV8BHOujy87aKUw k/sQArNSkCZsQlxK7CCdQhWZOzuUr7IIhN2RjSTq8W4myUtw99HO6oHT1c0WiSLQ32gAgc ICY6e7jpBAjQ4ZOgN/ltKyDvQWMoF9WOCCj1yi9g8heDqEY5fnWGm4mL5gkjGeSWhc5xpN 9YD5eCqo14jv/kt4XTfzp7vVVLuglOIrtlZlxHCEQK9bkajcreoS0ApeFwmp3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY1MR5qbCzQGK; Tue, 22 Oct 2024 18:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MIjNMS023948; Tue, 22 Oct 2024 18:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MIjNga023945; Tue, 22 Oct 2024 18:45:23 GMT (envelope-from git) Date: Tue, 22 Oct 2024 18:45:23 GMT Message-Id: <202410221845.49MIjNga023945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8ae9921f2e9e - main - sys_capability.c: update the source of CAPENABLED List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ae9921f2e9e770462613bb6bae76a470dbdfcbd Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae9921f2e9e770462613bb6bae76a470dbdfcbd commit 8ae9921f2e9e770462613bb6bae76a470dbdfcbd Author: Brooks Davis AuthorDate: 2024-10-22 17:49:43 +0000 Commit: Brooks Davis CommitDate: 2024-10-22 18:44:41 +0000 sys_capability.c: update the source of CAPENABLED System calls allowed in capability mode have been specified by the CAPENABLED flag in syscalls.master since 2021. --- sys/kern/sys_capability.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index e71dc4f3285b..d43102ab7849 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -50,11 +50,12 @@ * derived from existing capabilities, but only if they have the same or a * strict subset of the rights on the original capability. * - * System calls permitted in capability mode are defined in capabilities.conf; - * calls must be carefully audited for safety to ensure that they don't allow - * escape from a sandbox. Some calls permit only a subset of operations in - * capability mode -- for example, shm_open(2) is limited to creating - * anonymous, rather than named, POSIX shared memory objects. + * System calls permitted in capability mode are defined by CAPENABLED + * flags in syscalls.master; calls must be carefully audited for safety + * to ensure that they don't allow escape from a sandbox. Some calls + * permit only a subset of operations in capability mode -- for example, + * shm_open(2) is limited to creating anonymous, rather than named, + * POSIX shared memory objects. */ #include From nobody Tue Oct 22 19:35: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 4XY2T739F6z5VpWr; Tue, 22 Oct 2024 19:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY2T72Wcfz4ttW; Tue, 22 Oct 2024 19:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729625723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=584DWcIR7x/F9WyygfAIY98PQUm3705xplLWkkSt54A=; b=LGSeX9efhQv7daBjzuKKCxuIK3FhFrALub1pyTJgn9bd7Q4quX9W1SsjPmyk+1TJq9uvxX zkP10neaCmHKDFZxUP9i7vsfX3XrjxfSlt7gxU24Ez9EaaN1eNccYNLyDCBdeMXset1UGy CHTb5fvCJe2yEu5kfi7buDvdKC25bP/aAYp7gBLslzbhW9UURqb+uFXsAYDXuzGgkBfXkI EoLn4Vp391xwXIeUZp/uuSb/fiVsGupN/umvUSq7R/L3tdbVpLYx3nGdwkIv3rPg/trajt wHVHTVKNACAOKEgD+Jx6lja2UBQwvyc1B1D+t/zRi/fjPnDlvpkunE+WzRW9lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729625723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=584DWcIR7x/F9WyygfAIY98PQUm3705xplLWkkSt54A=; b=FCVtlfQfQ6lOkVCBk9QUHMGQqFvZLHa4fD96KwFzoLTTGppwYLxC8iVPwJrFnjPz+uTpmE mh/1gpFJgCw6vdMTW7f1oPnrvJt/FJHa8VcJN/bgT7UOybLKzhSFAJEXNVATGyDd1SOkl1 yf+JbvICNllwMCs2tIfa769oJBvId+r8qu343LH3AKhNFGWh6ROiV4o3vDqdPj413cadGP HY4aPIjdMLR+YQxmGXqBLAwhCfLWqboqJfBeElsZKlHlWERzpFPu0IX/6749rXwALOjqKb 1JAJlecczR1EpuyA4g5KVc5Gd7o6WjZHknDGVLVHCVGm0E8M798VGXonhl27HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729625723; a=rsa-sha256; cv=none; b=wq3cXy9XQ7k2Oj1NBF8sG5M3FH0x3Kzm0TolkHd4kqX5zxIlV6xx3CxUJRAThoTyqAJyce u7ShLwWCOQDW7QRpbI51DPj/PYw61t7/z1UOZI9XDFuuOOaUoNkRc7YUfkqfGYmcUcUJqv GnPt/bEAPTfR9xyQDcb8I6yY4UWKSUBhyAGp7q9Pr0+McPP9L+hirErUH4tVllvrNfze5h JnCx+UkNGDhUo1JRvxjwbvUppCqcPbIYZIi4tASmBAUv9O6zlXyvlLEr8L1iXCtUcNEVnD pVlmfY6xfJVHj29F1K9pkp/3DWNolwfXJdmhc6p6b0zH2W9WW++tqaIY4R4b/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 4XY2T727hmzS4Q; Tue, 22 Oct 2024 19:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MJZNuo018257; Tue, 22 Oct 2024 19:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MJZNOe018254; Tue, 22 Oct 2024 19:35:23 GMT (envelope-from git) Date: Tue, 22 Oct 2024 19:35:23 GMT Message-Id: <202410221935.49MJZNOe018254@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: 8f553746b412 - main - acpidump: correct memcmp() result 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8f553746b4120a6a9d2ffa12d6755c13705a03fa Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8f553746b4120a6a9d2ffa12d6755c13705a03fa commit 8f553746b4120a6a9d2ffa12d6755c13705a03fa Author: Konstantin Belousov AuthorDate: 2024-10-22 19:29:52 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-22 19:34:33 +0000 acpidump: correct memcmp() result check Fixes: e9ab827df94fed8f129ca4f7756e23ce77d8a655 Sponsored by: The FreeBSD Foundation --- usr.sbin/acpi/acpidump/acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 18a0ae486387..7ebd3e764005 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -2574,7 +2574,8 @@ static void acpi_report_sdp(ACPI_TABLE_HEADER *sdp) { for (u_int i = 0; i < nitems(known); i++) { - if (memcmp(sdp->Signature, known[i].sig, ACPI_NAMESEG_SIZE) != 0) { + if (memcmp(sdp->Signature, known[i].sig, ACPI_NAMESEG_SIZE) + == 0) { known[i].fnp(sdp); return; } From nobody Tue Oct 22 19:35: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 4XY2T849tGz5Vpw5; Tue, 22 Oct 2024 19:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY2T83WSdz4tbw; Tue, 22 Oct 2024 19:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729625724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcNpy9nHGOSvQI01G+06gFk77Fwa7NXPeOSKFtzvo5Q=; b=CJjygb9yADdjrBzM0TubP28CGdeiTMMBo7hNqN3tdP6Vh37NojititSbcY28ZVzMDAd+3s xjde32MlwIcte8QC2k4m9jhM+6iGT2NbNYdJLmJcatnpX5hv5p7fKZOY/lhSwnRPdGMbj8 wbVyB2hn8LCvvd8ZhFnHXyJ2An635ghky6cGOTdtO35GK8gFtAgIsdk0loEy6UodWuWBji 8gLu47xAfe7Rb9b9mPHb3pqMM+dunuKxwjQnlZvy0rwS90ZxxGKJrAqHkCWB57RPx2L8DX 3N/aVRFoJlLk41M0w0okA0R2sirnlmAjaYN62xeIESkOYhq+ra8QvOS6wSRTPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729625724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcNpy9nHGOSvQI01G+06gFk77Fwa7NXPeOSKFtzvo5Q=; b=nvezE2Y6JY/E06H7CoePdksb1pG9MDpotj5pxtmIpXtQIOAYeYSJa7iGpfQQg/NEm75uFQ bkuetKDopTuRDV/Edfdka0u2MbmT9acMF3pHUu0yfhqGZHO+5w9VAIf8bEahTLzW+I+3te xdcMr3jodJkpM0BQot7crqYk/6igKRGdkruZAU2OZHhX62tuHdrb+ms7hJ3xXclgkh8ovR 9w6ftZDvgRA0mncRqiyZ2MJDuf+SUm8d2KQC3ruCKOM+SQkFKfWsnT5+WNL/lhV0G+qWue mEGhmI8TFtV60DKqzbvODGQ/0EQ6DNlc6yRK9yjuX42KCIuYJF05A+HJDol50w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729625724; a=rsa-sha256; cv=none; b=evL/oIcUdOVZ8/iKahZ0ajtfu9nZcvnhwLUe4+liRsYPiyiGpHicQ8ORJYl7bJx9NAMGsk YF3s/rmsHwC+rRWk+LJW1gRBzlyXGatGe6czhcFIsktC2OKDtnXwCep3zgOFQr1Ac4LfQG CNAC2cNXAMpvmpYvo60JlePICIOGGYoiFC1u71H14vrHc3b2O4rf0USgkH0H/71COxzqw7 yj5BEj5/N7HLbHCMPFxZRmfU9SBMCnJ9a21sVivzABU4KF5oclV/7129cxggBIxEfci/7I iZ2qBtiGWDE8Y4pMSClYX67G4gPlGjJ0PjYlXGPVyGFJR/V3p5Sdy50y8qlIxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY2T836RBzRvh; Tue, 22 Oct 2024 19:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MJZOrF018324; Tue, 22 Oct 2024 19:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MJZOSv018321; Tue, 22 Oct 2024 19:35:24 GMT (envelope-from git) Date: Tue, 22 Oct 2024 19:35:24 GMT Message-Id: <202410221935.49MJZOSv018321@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: 5a6e19cac0c6 - main - acpidump: use acpica definitions for devscope types in DMAR decoding List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5a6e19cac0c69f55c3b7b56c4489a611f4339a0e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5a6e19cac0c69f55c3b7b56c4489a611f4339a0e commit 5a6e19cac0c69f55c3b7b56c4489a611f4339a0e Author: Konstantin Belousov AuthorDate: 2024-10-20 01:40:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-22 19:34:34 +0000 acpidump: use acpica definitions for devscope types in DMAR decoding and add missed acpi namespace device type entry decoding. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- usr.sbin/acpi/acpidump/acpi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 7ebd3e764005..119f74c196d5 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1414,14 +1414,16 @@ devscope_type2str(int type) static char typebuf[16]; switch (type) { - case 1: + case ACPI_DMAR_SCOPE_TYPE_ENDPOINT: return ("PCI Endpoint Device"); - case 2: + case ACPI_DMAR_SCOPE_TYPE_BRIDGE: return ("PCI Sub-Hierarchy"); - case 3: + case ACPI_DMAR_SCOPE_TYPE_IOAPIC: return ("IOAPIC"); - case 4: + case ACPI_DMAR_SCOPE_TYPE_HPET: return ("HPET"); + case ACPI_DMAR_SCOPE_TYPE_NAMESPACE: + return ("ACPI NS DEV"); default: snprintf(typebuf, sizeof(typebuf), "%d", type); return (typebuf); From nobody Tue Oct 22 21:58: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 4XY5fV2WySz5ZQsG; Tue, 22 Oct 2024 21:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY5fV23F2z4F3q; Tue, 22 Oct 2024 21:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729634322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AB+YYkolte0zfrxYXEDMpG3di8v9P5OxBlNYCWm33SY=; b=EEZTY6/kAJnxXb9rtV4/W+ybN64HaXDmyH30wU0O9Rdj22SEUhdB3PgTTo4VoqnDiwTgZP MPZG4RtUSN8xLy2QgMEHedQfEuSYMwX5EcN9ZuJAAmRLj0GNnb5JoktjfncBGmshRgixlW DKGsQ919uu/tAqNT8gBK7INbFHTCUV1sN0CGxxJAz5fZ+RgKP0dbZ121+ON86/Ewqg7Nc4 CvVqTkp2gSpd0Ft5cPJtA/BPWe1FMOPdtYUlE/hObPHZinMfKIx+XFxI+R/MNl/YIO5SI+ f2zAbfUqwHQO4RyHr7fF+hhU0iOEinu5YJGK6cuq+7C6z6OzoXpIFlOZXyDwAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729634322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AB+YYkolte0zfrxYXEDMpG3di8v9P5OxBlNYCWm33SY=; b=mxVAP/DMibw+7md+SH9iBYi08DqTQxLudxXFBiB9ZOOX+JR2uat7NkIS8dChctSSAZp/t9 vFBvvUjLkD2rlI3scK5jrlJJJWKmNXYdDCD+s++/39yoFKzFc4Kg5dj1hpEM9Vk7nUvarE v8pafftJMKjl3G8xjcXYlSDNjJ3AEYPrDMwFgRdyg7VfCoPgwfQEoukKDmlWbhcRRPXcsx lRqiKKPtYMlLa24Ox55OPBgJ+QdsHic2vYuHdlFP2g6r4ic1HnbjeMwkfqowuftXaPS9V5 jJ9oI/R5qAbmm8u1S8nIBvUNGneOtMjHuZlElO9d3VXygOs7dQotMChJ1UNn4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729634322; a=rsa-sha256; cv=none; b=rMax+p6a5JFkcnz/2L4G2tGx4C5L6fcnpIv0fmDjN/gz9ViU52IPOR/IMFU4F5+RIA/aUh lOqQ8BoEpbOCgXsC7oRTMC67BqcaSSzIMuLyC6D+hfkBlEUUX/Auol2h956fGilz0oeso+ Qj/arnbUlHKu4zSiFWl00R6W8SGfP03OlOgE4cKthU04FOyGxxtX+uIJmVEOYjV4FccZ4u FMbME0liA5Y9W+JYush3B249L+o0CYKiCMyj15iuk0LsxlLu0ZOXh1f4/WqxXtrcy2Ha6U tRH9SsklSNn6JKhsut0yhotqWHArt764TEef44hrUusP0foivJFHTBdRcIAM9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY5fV1fQbzXb1; Tue, 22 Oct 2024 21:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MLwg40077717; Tue, 22 Oct 2024 21:58:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MLwgjD077714; Tue, 22 Oct 2024 21:58:42 GMT (envelope-from git) Date: Tue, 22 Oct 2024 21:58:42 GMT Message-Id: <202410222158.49MLwgjD077714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: e2414d91d33f - main - vfs_subr: maintain sorted tailq List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2414d91d33f31d6f2c9f49eef7a1553b5798c9e Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e2414d91d33f31d6f2c9f49eef7a1553b5798c9e commit e2414d91d33f31d6f2c9f49eef7a1553b5798c9e Author: Doug Moore AuthorDate: 2024-10-22 21:54:34 +0000 Commit: Doug Moore CommitDate: 2024-10-22 21:54:34 +0000 vfs_subr: maintain sorted tailq Pctries are based on unsigned index values. Type daddr_t is signed. Using daddr_t as an index type for a pctrie works, except that the pctrie considers negative values greater than nonnegative ones. Building a sorted tailq of bufs, based on pctrie results, sorts negative daddr_ts larger than nonnegative ones, and makes code that depends on the tailq being actually sorted broken. Write wrappers for the functions that do pctrie operations that depend on index ordering that fix the order problem, and use them in place of direct pctrie operations. PR: 282134 Reported by: pho Reviewed by: kib, markj Tested by: pho Fixes: 2c8caa4b3925aa7335 vfs_subr: optimize inval_buf_range Differential Revision: https://reviews.freebsd.org/D47200 --- sys/kern/vfs_subr.c | 56 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index ff18c50546dd..3b00fdbe93b4 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -537,6 +537,42 @@ buf_trie_free(struct pctrie *ptree, void *node) PCTRIE_DEFINE_SMR(BUF, buf, b_lblkno, buf_trie_alloc, buf_trie_free, buf_trie_smr); +/* + * Lookup the next element greater than or equal to lblkno, accounting for the + * fact that, for pctries, negative values are greater than nonnegative ones. + */ +static struct buf * +buf_lookup_ge(struct bufv *bv, daddr_t lblkno) +{ + struct buf *bp; + + bp = BUF_PCTRIE_LOOKUP_GE(&bv->bv_root, lblkno); + if (bp == NULL && lblkno < 0) + bp = BUF_PCTRIE_LOOKUP_GE(&bv->bv_root, 0); + if (bp != NULL && bp->b_lblkno < lblkno) + bp = NULL; + return (bp); +} + +/* + * Insert bp, and find the next element smaller than bp, accounting for the fact + * that, for pctries, negative values are greater than nonnegative ones. + */ +static int +buf_insert_lookup_le(struct bufv *bv, struct buf *bp, struct buf **n) +{ + int error; + + error = BUF_PCTRIE_INSERT_LOOKUP_LE(&bv->bv_root, bp, n); + if (error != EEXIST) { + if (*n == NULL && bp->b_lblkno >= 0) + *n = BUF_PCTRIE_LOOKUP_LE(&bv->bv_root, ~0L); + if (*n != NULL && (*n)->b_lblkno >= bp->b_lblkno) + *n = NULL; + } + return (error); +} + /* * Initialize the vnode management data structures. * @@ -2489,9 +2525,8 @@ bnoreuselist(struct bufv *bufv, struct bufobj *bo, daddr_t startn, daddr_t endn) for (lblkno = startn;;) { again: - bp = BUF_PCTRIE_LOOKUP_GE(&bufv->bv_root, lblkno); - if (bp == NULL || bp->b_lblkno >= endn || - bp->b_lblkno < startn) + bp = buf_lookup_ge(bufv, lblkno); + if (bp == NULL || bp->b_lblkno >= endn) break; error = BUF_TIMELOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, BO_LOCKPTR(bo), "brlsfl", 0, 0); @@ -2628,9 +2663,8 @@ v_inval_buf_range_locked(struct vnode *vp, struct bufobj *bo, clean = true; do { bv = clean ? &bo->bo_clean : &bo->bo_dirty; - bp = BUF_PCTRIE_LOOKUP_GE(&bv->bv_root, startlbn); - if (bp == NULL || bp->b_lblkno >= endlbn || - bp->b_lblkno < startlbn) + bp = buf_lookup_ge(bv, startlbn); + if (bp == NULL) continue; TAILQ_FOREACH_FROM_SAFE(bp, &bv->bv_hd, b_bobufs, nbp) { if (bp->b_lblkno >= endlbn) @@ -2709,13 +2743,13 @@ buf_vlist_find_or_add(struct buf *bp, struct bufobj *bo, b_xflags_t xflags) else bv = &bo->bo_clean; - error = BUF_PCTRIE_INSERT_LOOKUP_LE(&bv->bv_root, bp, &n); + error = buf_insert_lookup_le(bv, bp, &n); if (n == NULL) { KASSERT(error != EEXIST, ("buf_vlist_add: EEXIST but no existing buf found: bp %p", bp)); } else { - KASSERT((uint64_t)n->b_lblkno <= (uint64_t)bp->b_lblkno, + KASSERT(n->b_lblkno <= bp->b_lblkno, ("buf_vlist_add: out of order insert/lookup: bp %p n %p", bp, n)); KASSERT((n->b_lblkno == bp->b_lblkno) == (error == EEXIST), @@ -2728,16 +2762,14 @@ buf_vlist_find_or_add(struct buf *bp, struct bufobj *bo, b_xflags_t xflags) /* Keep the list ordered. */ if (n == NULL) { KASSERT(TAILQ_EMPTY(&bv->bv_hd) || - (uint64_t)bp->b_lblkno < - (uint64_t)TAILQ_FIRST(&bv->bv_hd)->b_lblkno, + bp->b_lblkno < TAILQ_FIRST(&bv->bv_hd)->b_lblkno, ("buf_vlist_add: queue order: " "%p should be before first %p", bp, TAILQ_FIRST(&bv->bv_hd))); TAILQ_INSERT_HEAD(&bv->bv_hd, bp, b_bobufs); } else { KASSERT(TAILQ_NEXT(n, b_bobufs) == NULL || - (uint64_t)bp->b_lblkno < - (uint64_t)TAILQ_NEXT(n, b_bobufs)->b_lblkno, + bp->b_lblkno < TAILQ_NEXT(n, b_bobufs)->b_lblkno, ("buf_vlist_add: queue order: " "%p should be before next %p", bp, TAILQ_NEXT(n, b_bobufs))); From nobody Tue Oct 22 23:37: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 4XY7rj32zWz5ZXWL for ; Tue, 22 Oct 2024 23:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY7rj2B22z4V8V; Tue, 22 Oct 2024 23:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729640261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddQsNLJNhDDWTHMs10+4sgf1E44lJvCZq8Vqa6bsHkA=; b=iXPqZPZyVS9wC+9DTPVgPoGOLwzKJH6dVLe3I/NUEek06wLaFov7RqLxzZS3dfWh9rkII7 YbCn9r7rr0BwnAoFy7V4JGbDgSoKCSH8iN62nID53vRFxNQB+KuoDfXq34hNRkt9ixcACr stlXm+DRv3M+f4GjBE80UGmzfW5Hv5FrX7uo3lXdTV36W+Lh0WmkQ1F4t6cI/6uGk8x2OM gO4ifwRXxnNE1X32qvUHDnS1HsEjSHBZLm9DYo1UKJfkImT14yHr3mEQxhiwFRPTlbFfVc 7o+9tojtbgNzuAXR5b7UtNwaoetHmmf4Uh5zvatfOUVUX35jXjA8F+AOY90GKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729640261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddQsNLJNhDDWTHMs10+4sgf1E44lJvCZq8Vqa6bsHkA=; b=Dgy8X8QaqKUQ1Zw31mzTuVphQFeIOZpfFMXe/NB3srKN5d7UOjwkW7LNaZniLcpIidqIIc +0PpXNQOxwGY1CHPSUl9+qQ0gaVPeTfgbVodty+xw+skzUiMv8ugheelFsGBao4Uo+YeqV aevgqOC8HFOHiCzbQ5BfajvLxRxfMQA6S5XlxLmWSGtJVZoBxlDmyvetV6t4sbrCHGkEsE p+glw7DSSjC+xUIKvuGBZkGq71VFHxhdHDwoKahEQWfS3K5VgzM0tjFu/ehWqHraiul8Ji s20JSrWgDyH60jrPAMWHFXbnd4UN5TBB2DNO58Y8KxGGhM+yFy3VMoCJLp+RRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729640261; a=rsa-sha256; cv=none; b=addZ2EHzGOupWDUse9C1PYq3kLzj67SJMQ0FKVV+YjsHzvv1WGFNweKk23enSJlhXnAInr r+Ar+r/KbHvyQ+5pkuy49Ye2hXZ/nxEZNXMYWh+2TNWC8+vSvV/k+tnNm7Gl6zAcDvZOG+ tmOISgvFj26gdX57ptvh17JQYWcQ0CY0icqjp4ACwO0uCXFwosinX2WsyI4VBqq3pq7oz+ C+R10cTwuD2Lje77lLB8X2wxLN9KD7zYmz/+ffZ3dX2EB9FkS0aebYjxgIcTb3OCv+FsnD 1dIn30AEe34OOxPyj9wFpRSmviI2ODWcffQwObttSGPe5Rn1cVARXkv31qcCNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY7rj1KNNzb3K; Tue, 22 Oct 2024 23:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MNbf4a066131; Tue, 22 Oct 2024 23:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MNbfZ5066130; Tue, 22 Oct 2024 23:37:41 GMT (envelope-from git) Date: Tue, 22 Oct 2024 23:37:41 GMT Message-Id: <202410222337.49MNbfZ5066130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 156745f57594..5a07cb04925d - vendor/libcxxrt - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/vendor/libcxxrt X-Git-Reftype: branch X-Git-Commit: 5a07cb04925d79523b5cf1cb11edfbc74b828af7 X-Git-Oldrev: 156745f575946b366c430fc2bc7b9a90d5925b29 X-Git-Newrev: 5a07cb04925d79523b5cf1cb11edfbc74b828af7 Auto-Submitted: auto-generated The branch vendor/libcxxrt has been updated by emaste: URL: https://cgit.FreeBSD.org/src/log/?id=156745f57594..5a07cb04925d 5a07cb04925d Import libcxxrt master 698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 From nobody Tue Oct 22 23:37: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 4XY7ry5z5Tz5ZXDX for ; Tue, 22 Oct 2024 23:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY7ry5GQ9z4V9g; Tue, 22 Oct 2024 23:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729640274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ns25npWutx/VvsTrku/xkoPV6KZU6Tc/N2TcnHj2m1k=; b=NBi1QFTVUlgGaelnekHS8axVHfp4SSnaxaL4r/bgmvPBfOJCaWdtTcnZGw47PLxK1FI/NI cwFQFqM8FVVnSor5GSQrvztdR6iBy3JHQxtkGneJejgPaTo1i0JfOog0eXpUaJlr3zTxDJ jdD1pqfcca2JLPP4Pnf2Y6rlh4nzfwXDxriTT7UH8XePjQujIDQfsOXT18gGy2fH6qz+hW vn3R5hqu4OPl1HPaffqieAxs4nqemguf/wRPdz5ZuJoR2KyWZOpxTZP5lOlGXhwuCSzFYS vTNDFvj4XeE7GAW54BwMmPkQ+Voj5ffwALt8lCWORCR6+Zs1gaFRZFObOXdJXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729640274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ns25npWutx/VvsTrku/xkoPV6KZU6Tc/N2TcnHj2m1k=; b=M1JAypIGaw06r1RVwdeWHGmFI4xtTqiXt6S/QmC2aub2LEw9DlAUnrce+0X2hawGv6+X6Q uAfONdqTkXF5WdwTVmVzhg4lxabVMWJYt3+pC+RtGKqLeDsE/US6nvf9biIzsRKMAi0qS0 OUwl2/0ojR9PsA44PCGvxtiStEqp9hpNLjpuYx1KSHrpOgXUDcASB4nQqkVqPGdfvqX9lu SvTVREBPpQ37Gvf6qXSSmNuboimymZuIyBJR48TM9nBmCKdb7qQesJmQIH8sTYaNhOyTLG +9cXAchyNVsumBjXX+i/Jn+vNYcOohWQ6C3dRbvTTryLbiZgscg/atpY9d/m0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729640274; a=rsa-sha256; cv=none; b=yLXN0sui+Tba1mmXuQAltfQ9HmppeLOvZDjcRIQZL3JofRbITRqILZMol8ajBX4uY0tgCE GlRw5KtG3s6OEaleDtRuj6iYaVx/vexdefQvYGAqcQV1ybBH9QIaTYpRmUuPBhCwzEG85Y JkG0HEP3MVLP+EfmrOUVP6xz904p+APpkSE4ChAgk+/xveqvw+f4peKZpn81KaHby9zK3i dAbnuaSC6OTxVd46qQgbUePgIICuFy9oljg7zoov7XRGPLk34cjdOItdZuRHePktS14W7b b5NNn4IqSqKUotsCXfLFJvgUuPbJ9H0gEPxM/+hc3572MflzRhYKyeDZ6Mb4ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY7ry4ssGzbDm; Tue, 22 Oct 2024 23:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MNbsTH066281; Tue, 22 Oct 2024 23:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MNbsX9066280; Tue, 22 Oct 2024 23:37:54 GMT (envelope-from git) Date: Tue, 22 Oct 2024 23:37:54 GMT Message-Id: <202410222337.49MNbsX9066280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 9bc16e443504 - Create tag vendor/libcxxrt/2024-10-22-698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/tags/vendor/libcxxrt/2024-10-22-698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 X-Git-Reftype: annotated tag X-Git-Commit: 9bc16e443504c855e481f05aa0181219f1fdff5b Auto-Submitted: auto-generated The annotated tag vendor/libcxxrt/2024-10-22-698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 has been created by emaste: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/libcxxrt/2024-10-22-698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 tag vendor/libcxxrt/2024-10-22-698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 Tagger: Ed Maste TaggerDate: 2024-10-22 23:37:03 +0000 Tag libcxxrt 698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 commit 5a07cb04925d79523b5cf1cb11edfbc74b828af7 Author: Ed Maste AuthorDate: 2024-10-22 14:42:59 +0000 Commit: Ed Maste CommitDate: 2024-10-22 14:43:39 +0000 Import libcxxrt master 698997bfde1fc81b0bc0bfd1a1e5e3ad6f33b634 Interesting fixes: 045c52c Mark __cxa_allocate_exception, __cxa_free_exception and __cxa_init_primary_exception noexcept. 8a2f123 Define _LIBCXXRT_NOEXCEPT in cxxabi.h and use it instead of throw() 9529236 Fix memory corruption in cpp_demangle_read_sname() 8f5c74e Add test cases, fix more bugs, and improve perf 391a3dc Add a simple implementation of __cxa_call_terminate 40e4fa2 mark std::terminate as noreturn and noexcept 5eede09 Print diagnostics in default std::terminate handler From nobody Tue Oct 22 23:44: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 4XY8122Zrpz5ZXnf; Tue, 22 Oct 2024 23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY8121m1hz4VTp; Tue, 22 Oct 2024 23: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=1729640694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8LI+Uvxo02SV+bjYPDPTDKyEar53znBnb6fa7K2v5s=; b=BY674LYa8pAAL7YNPfvgZiF6eqGmr7bwo7ZYvKwvWEB2pd+prqvTOVp4hWKsADHoOxiWpO 8K2XwWg71fwvKdErTHrP3RyO/P1lNOns1vt3BlSsvTJBd9h/rKpjMymVN7IoSEG0B/upf5 RmEWsH+H8HABmk5fTuJE5E88Zg7Q+yVy/AzJPyQgkdbv3S6mMCViqNXeWsNKF0okOvcuKi HJvlAxxAsgFvEeJMJl9nKBk60H2znf9Ht+kIn0GbkW7G90egvp8pJqnirJKJNzFmU+/w20 PH8EK85j/y40r5poJeM0njLkI4Y+SjugeuEJ5SdePj15LCkoiNMV4XmRiikqBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729640694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8LI+Uvxo02SV+bjYPDPTDKyEar53znBnb6fa7K2v5s=; b=JYhvHProlGyuZJlL6P+uVh3rHHfT8jReqfPYyl68qhbdSWSCIE9tYsiyunFoJ7VHDipR2a 2DqIZvlK93br85RNiwKTAHkyMNwZUjvqpUTwajA9LhmTOm4zAUe1P2bZsNzQbrOppp0maI idGtQCCX2ZjzNRJguJdLIS5LtBnf1uGFC6mWw4xxtOZapHz/LpX/7Rc7qSOAnihh+qBH6O htR+Nwn9s9HXMrjN5/URVr36X5vz/bndu0N4vMpU1z3ZHCi42kiTUWdje4ZdziK23KLunb y8vzmKodyIzxZmPLbUcKFxTrlW22Sd8k6+IECggyNGDbfWwcqj0XubiNHocF7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729640694; a=rsa-sha256; cv=none; b=kl9n5XXRfOV6TbEESqxSVdBbnRn4ytMkMsqKwFSNo68erDzFGaOIoOTIoKpx9YDF2B4UpP 8422edSFG4Omqf8Rq/cgcRNja4z9FfA8jX0z1tbwZFd+SJnFqeK+ghm4tU6fhkR2nOVyl+ UhnKP1QK7hDczJbW/sMaCeQjxpFmX1FFg5Ed6MAbSKS62Ps//0gSCvFdMwmvzOKy8dpCVL XL2JuYkdgw6fLeAH2fGi6mW7iFdb3bi1/K63tBVlYGvk7FM/eX4SfYAG3nABS3RmtVMzIw 9Rdo8MZJe+fWGW3L1NAEPnWk5egChLZPJOfgB54+45MyTI0D3UTO2Fq3Oj4JZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY8121DzTzbWv; Tue, 22 Oct 2024 23:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MNis4Y083619; Tue, 22 Oct 2024 23:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MNioRX083610; Tue, 22 Oct 2024 23:44:50 GMT (envelope-from git) Date: Tue, 22 Oct 2024 23:44:50 GMT Message-Id: <202410222344.49MNioRX083610@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: 13da1af1cd67 - main - libcxxrt: Update to upstream 698997bfde1f List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 13da1af1cd677b7901d3bf4b9dbe3290b94130d5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=13da1af1cd677b7901d3bf4b9dbe3290b94130d5 commit 13da1af1cd677b7901d3bf4b9dbe3290b94130d5 Merge: e2414d91d33f 5a07cb04925d Author: Ed Maste AuthorDate: 2024-10-22 23:40:09 +0000 Commit: Ed Maste CommitDate: 2024-10-22 23:43:54 +0000 libcxxrt: Update to upstream 698997bfde1f Interesting fixes: 045c52c Mark __cxa_allocate_exception, __cxa_free_exception and __cxa_init_primary_exception noexcept. 8a2f123 Define _LIBCXXRT_NOEXCEPT in cxxabi.h and use it instead of throw() 9529236 Fix memory corruption in cpp_demangle_read_sname() 8f5c74e Add test cases, fix more bugs, and improve perf 391a3dc Add a simple implementation of __cxa_call_terminate 40e4fa2 mark std::terminate as noreturn and noexcept 5eede09 Print diagnostics in default std::terminate handler Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47238 contrib/libcxxrt/atomic.h | 2 +- contrib/libcxxrt/cxxabi.h | 17 +++- contrib/libcxxrt/exception.cc | 174 ++++++++++++++++++----------------- contrib/libcxxrt/libelftc_dem_gnu3.c | 92 +++++++++--------- contrib/libcxxrt/memory.cc | 14 ++- contrib/libcxxrt/noexception.cc | 4 +- contrib/libcxxrt/stdexcept.cc | 40 ++++---- contrib/libcxxrt/stdexcept.h | 42 +++++---- 8 files changed, 196 insertions(+), 189 deletions(-) From nobody Tue Oct 22 23:49: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 4XY85q0Rzmz5ZY3K; Tue, 22 Oct 2024 23:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XY85p66Sqz4Wq1; Tue, 22 Oct 2024 23:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729640942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U2nekiBC5YTGXrgH7m1+2KObiIzPVg97a059oHdNB/M=; b=Ec7c3rdDRGkrJ7SUUoDqffizzBb4cgcc3i0FJqo21+4hTcxAB+bTP21dOGgrA9trf3VFqf KGbUwMPAABTMxMfQyVqEyxEGnn8jA5c6/OWRw1IL0T8zMwKpGCzVA3mUyaKsr6bAh/CspI ECBnYkWiJa7X2Rimbrvo8KTwoPViG5V5bjUOx9P4nM/2fWKa+nqZLL6X3CDYuTNToas9BH hFRtMqeJAta/QohVS+DDpnvE4hlPCUR/EmyxePBWYt5OxZicrKTjHwpMKjCWbVUI9z5z2W 9pA7lDqbNHZwJY7tfo0v6IflnyRv9Sn/irc4C5X4sOJPXACjy1I6ivD3xeLTww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729640942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U2nekiBC5YTGXrgH7m1+2KObiIzPVg97a059oHdNB/M=; b=Wn9JzJug327bTAyukd17AHoiWgx2OKkObVsTSjMu7hE5xeKjovFDu6Eh6QFQQO9ex4MIu7 fF7yo6yMv6nM9sLTwUqtEcvVsauCVPOPm1iXY6RMy8lsF0bRzh9B6ASS4nPDFUkKHYee0U ctXZj5Ll66F+rdRyZN+aFpydkUNVZ4ZUPOsRZRmf1Lq+p/9KRHTSEiuJIyZFP37XkEU9jg unjlO6k8RrXd2ZsBfeuKnztR5EHUoMfMf2Y/4DGseRmzTu+FAAskMGoMX/qn96Iefn7o45 ObEcbKz95ItCxY7TZJxadDNwjysrY7Lr/m070I7fsZQh1IeQ6JmRTks9a8iCqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729640942; a=rsa-sha256; cv=none; b=YIJ6ffq3Fdw/JPLiLsbhD1D9aau5pRaX1nH0Nh5aL+tyPKmWIMFTDy4BkzYaMb53c/S5F9 6ZNZk0X3Y4T+IAunSLG4awcnt37dkktM9IpgPFezZDRXtNGZqJOU6J4VM69NXY8wiDHt2J ilaVJsAeQ7UezyU4ET0nnljQwaxR5tPlRsvo4V1DpcHFLxKFK72s6HV/MpbRKTUT46Lo3V TF8dgLPIkFaMT5McJmQpAWkiJR33FmK76MW/VNa7SbBgKSrZSF8CXp0dCXCfvdiwGbqCBI U2E8kM5jlXL35C8BwaveitvZTqwcYZmP3EC9Nq2rXhsPtRbRSoqIsYAWO65kbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XY85p3z2jzbFM; Tue, 22 Oct 2024 23:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49MNn2gN084950; Tue, 22 Oct 2024 23:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MNn2iw084947; Tue, 22 Oct 2024 23:49:02 GMT (envelope-from git) Date: Tue, 22 Oct 2024 23:49:02 GMT Message-Id: <202410222349.49MNn2iw084947@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: d55d5dd9f7ad - main - style.9: clarify FALLTHROUGH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d55d5dd9f7adcffa6a1f2a49956d7fd7d549aba1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d55d5dd9f7adcffa6a1f2a49956d7fd7d549aba1 commit d55d5dd9f7adcffa6a1f2a49956d7fd7d549aba1 Author: Ed Maste AuthorDate: 2024-10-22 16:13:55 +0000 Commit: Ed Maste CommitDate: 2024-10-22 23:48:25 +0000 style.9: clarify FALLTHROUGH FALLTHROUGH is intended for a block of code that cascades to the next case block. Multiple case statements sharing a single block of code do not need a FALLTHROUGH comment. Reviewed by: imp, markj, jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47242 --- share/man/man9/style.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 80099b67831c..69561e3e1e73 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -520,7 +520,7 @@ parts of the cascade. Elements in a .Ic switch -statement that cascade should have a +statement that execute some code and then cascade to the next case should have a .Li FALLTHROUGH comment. Numerical arguments should be checked for accuracy. From nobody Wed Oct 23 04:16: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 4XYG2M0VH5z5Zn11; Wed, 23 Oct 2024 04:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYG2L75g1z4nvB; Wed, 23 Oct 2024 04:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729656987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ySVaSB+i9vFoa2yWqGAoEu6qGlhYGIMfx/c7qx4MZ+g=; b=CDviB4WAbxw1plaYg+69xT2xYsNOyIhpeLSoCkYI1AWEWYVU2QhMnRnEUP+Kj3KCd7vT1t WYMoSJhYV6c+KOrre/+4xW3sEcC1BFR7EI8rBClXH0v352DergEn0Db9y80JkrrcAv/Iy0 Bwe+3bhvPscdd/FUyhXvfr6QqNQi783e9EK5GiJJbU1o+yTdFhPliU0Mg4H1r+JpIR1arR +aB+ffZplzKAeHm7CGNgRRS6Ax+vKcf6XSPPTfKKckF9g7t5WiYnh63SU2HvvLHG+x79Zb IFYL5aIiZBJjT5exol2tkOtabmTtDMmGuJCVUPflVzgtPHXHDPeGAYWo35FNWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729656987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ySVaSB+i9vFoa2yWqGAoEu6qGlhYGIMfx/c7qx4MZ+g=; b=EKfQGKHyvbah1ws9guaJyIECwRz2Ju5o4IMUiXEh5PH98jpIlpe7HTC+v+aXBgP21GfKnx EuK5mggZtS9OddCOCHB05yd2q7aRO8eF9Zh00ei//dGHpe4cu66OE48jFR5bW3HCTJOnja 9qj+QPNS5yUpIXAB9MWAmTJq+fNKLyeellByVOUsTZgKUjE2fBjw3pTzJAeTDmB6LKIJx4 DjAvJ3BPvb7QNC15NB5a708Tqx0/zobwyBiljGP0qEwTekrS3C3v89F2UZ0bh1tfLsW0YM mtPFIOUu0i3du1xtY259a1WYaWZsAnN0wC+n/ugvpiQ9A0zyD1e8iBCEvEGAhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729656987; a=rsa-sha256; cv=none; b=mnH1MZwsCzzmAXN7m1Bx0SsUfBtPk3czboHRnPNd/Vvc/PBCLs5xmqYzwS839yI+0t8yrj Y8Ie8iIA75OSNYb8d7riJ0jdGGlLYddgA9S2A6h6S+MkMVwtZs8gGL7NNZJGF/o8EZIz79 ohvrwe8rjBGyc/N64N57+MIuyPaSZUYTj7bcjvmVLb15M9p47qmXcddLAshlSFz3MeWIFt LnR1AtiPcnrrugPKuOWFzpfOGT8wQTttVNlWMcS8LX2QSbGnHXX+IqHwgj+SKTvujJ4CaF mJu22aQ7udP1O3x+RfFuvqcXErU7vNyaaXQZjDVYZblEcYB+Wps9Lk5d9zxM5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYG2L6hnDzjrt; Wed, 23 Oct 2024 04:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N4GQCp084943; Wed, 23 Oct 2024 04:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N4GQWZ084940; Wed, 23 Oct 2024 04:16:26 GMT (envelope-from git) Date: Wed, 23 Oct 2024 04:16:26 GMT Message-Id: <202410230416.49N4GQWZ084940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5c92f84bb607 - main - LinuxKPI: update rcu_dereference_*() and lockdep_is_held() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c92f84bb607c692ce4fa762a7a3c4b86a2fa281 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5c92f84bb607c692ce4fa762a7a3c4b86a2fa281 commit 5c92f84bb607c692ce4fa762a7a3c4b86a2fa281 Author: Bjoern A. Zeeb AuthorDate: 2024-09-29 00:35:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-10-23 01:43:09 +0000 LinuxKPI: update rcu_dereference_*() and lockdep_is_held() Update rcu_dereference_{check,protected}() to call the check and log once if it fails and if the RCU debug sysctl is turned on. Also add proper checks for conditions passed in to these functions. For that implement linux_rcu_read_lock_held() (lots of help from wulf). (While here also remove extraneous extern for function prototypes). Update lockdep_is_held() to always be an inline function with argument annotation so that we do no longer have unused variables in callers which only call lockdep_is_held(). Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D46842 --- sys/compat/linuxkpi/common/include/linux/lockdep.h | 28 ++++++----- .../linuxkpi/common/include/linux/rcupdate.h | 57 ++++++++++++++++++---- sys/compat/linuxkpi/common/src/linux_compat.c | 4 ++ sys/compat/linuxkpi/common/src/linux_rcu.c | 31 ++++++++++++ 4 files changed, 97 insertions(+), 23 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/lockdep.h b/sys/compat/linuxkpi/common/include/linux/lockdep.h index 5291be79218e..70a4e45867fe 100644 --- a/sys/compat/linuxkpi/common/include/linux/lockdep.h +++ b/sys/compat/linuxkpi/common/include/linux/lockdep.h @@ -70,17 +70,6 @@ struct pin_cookie { #define lockdep_assert_none_held_once() do { } while (0) -static __inline bool -lockdep_is_held(void *__m) -{ - struct lock_object *__lock; - struct thread *__td; - - __lock = __m; - return (LOCK_CLASS(__lock)->lc_owner(__lock, &__td) != 0); -} -#define lockdep_is_held_type(_m, _t) lockdep_is_held(_m) - #else #define lockdep_assert(cond) do { } while (0) #define lockdep_assert_once(cond) do { } while (0) @@ -91,10 +80,23 @@ lockdep_is_held(void *__m) #define lockdep_assert_held_once(m) do { (void)(m); } while (0) -#define lockdep_is_held(m) 1 -#define lockdep_is_held_type(_m, _t) 1 #endif +static __inline bool +lockdep_is_held(void *__m __diagused) +{ +#ifdef INVARIANTS + struct lock_object *__lock; + struct thread *__td; + + __lock = __m; + return (LOCK_CLASS(__lock)->lc_owner(__lock, &__td) != 0); +#else + return (true); +#endif +} +#define lockdep_is_held_type(_m, _t) lockdep_is_held(_m) + #define might_lock(m) do { } while (0) #define might_lock_read(m) do { } while (0) #define might_lock_nested(m, n) do { } while (0) diff --git a/sys/compat/linuxkpi/common/include/linux/rcupdate.h b/sys/compat/linuxkpi/common/include/linux/rcupdate.h index 95332217f8f5..85d766c8dbc9 100644 --- a/sys/compat/linuxkpi/common/include/linux/rcupdate.h +++ b/sys/compat/linuxkpi/common/include/linux/rcupdate.h @@ -1,6 +1,10 @@ /*- * Copyright (c) 2016-2017 Mellanox Technologies, Ltd. * All rights reserved. + * Copyright (c) 2024 The FreeBSD Foundation + * + * Portions of this software were developed by Björn Zeeb + * 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 @@ -26,11 +30,20 @@ #ifndef _LINUXKPI_LINUX_RCUPDATE_H_ #define _LINUXKPI_LINUX_RCUPDATE_H_ +#include + #include #include +#include #include +extern int linuxkpi_rcu_debug; +#define RCU_WARN_ONCE(c, ...) do { \ + if (unlikely(linuxkpi_rcu_debug > 0)) \ + WARN_ONCE((c), ##__VA_ARGS__); \ +} while(0) + #define LINUX_KFREE_RCU_OFFSET_MAX 4096 /* exclusive */ /* BSD specific defines */ @@ -61,6 +74,9 @@ linux_rcu_read_unlock(RCU_TYPE_REGULAR);\ } while (0) +#define rcu_read_lock_held(void) \ + linux_rcu_read_lock_held(RCU_TYPE_REGULAR) + #define synchronize_rcu(void) do { \ linux_synchronize_rcu(RCU_TYPE_REGULAR); \ } while (0) @@ -79,14 +95,34 @@ #define rcu_access_pointer(p) \ ((__typeof(*p) *)READ_ONCE(p)) -#define rcu_dereference_protected(p, c) \ +#define rcu_dereference(p) \ ((__typeof(*p) *)READ_ONCE(p)) -#define rcu_dereference(p) \ - rcu_dereference_protected(p, 0) +#define __rcu_var_name(n, f, l) \ + __CONCAT(__CONCAT(__CONCAT(rcu_, n), _), __COUNTER__) + +#define __rcu_dereference_protected(p, c, n) \ +({ \ + RCU_WARN_ONCE(!(c), "%s:%d: condition for %s failed\n", \ + __func__, __LINE__, __XSTRING(n)); \ + rcu_dereference(p); \ +}) + +#define rcu_dereference_protected(p, c) \ + __rcu_dereference_protected((p), (c), \ + __rcu_var_name(protected, __func__, __LINE__)) + +#define __rcu_dereference_check(p, c, n) \ +({ \ + __typeof(*p) *n = rcu_dereference(p); \ + RCU_WARN_ONCE(!(c), "%s:%d: condition for %s failed\n", \ + __func__, __LINE__, __XSTRING(n)); \ + n; \ +}) -#define rcu_dereference_check(p, c) \ - rcu_dereference_protected(p, c) +#define rcu_dereference_check(p, c) \ + __rcu_dereference_check((p), (c) || rcu_read_lock_held(), \ + __rcu_var_name(check, __func__, __LINE__)) #define rcu_dereference_raw(p) \ ((__typeof(*p) *)READ_ONCE(p)) @@ -113,11 +149,12 @@ /* prototypes */ -extern void linux_call_rcu(unsigned type, struct rcu_head *ptr, rcu_callback_t func); -extern void linux_rcu_barrier(unsigned type); -extern void linux_rcu_read_lock(unsigned type); -extern void linux_rcu_read_unlock(unsigned type); -extern void linux_synchronize_rcu(unsigned type); +void linux_call_rcu(unsigned type, struct rcu_head *ptr, rcu_callback_t func); +void linux_rcu_barrier(unsigned type); +void linux_rcu_read_lock(unsigned type); +void linux_rcu_read_unlock(unsigned type); +bool linux_rcu_read_lock_held(unsigned); +void linux_synchronize_rcu(unsigned type); /* Empty implementation for !DEBUG */ #define init_rcu_head(...) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index ebc1dbabd567..81d24603d1dd 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -117,6 +117,10 @@ int linuxkpi_debug; SYSCTL_INT(_compat_linuxkpi, OID_AUTO, debug, CTLFLAG_RWTUN, &linuxkpi_debug, 0, "Set to enable pr_debug() prints. Clear to disable."); +int linuxkpi_rcu_debug; +SYSCTL_INT(_compat_linuxkpi, OID_AUTO, rcu_debug, CTLFLAG_RWTUN, + &linuxkpi_rcu_debug, 0, "Set to enable RCU warning. Clear to disable."); + int linuxkpi_warn_dump_stack = 0; SYSCTL_INT(_compat_linuxkpi, OID_AUTO, warn_dump_stack, CTLFLAG_RWTUN, &linuxkpi_warn_dump_stack, 0, diff --git a/sys/compat/linuxkpi/common/src/linux_rcu.c b/sys/compat/linuxkpi/common/src/linux_rcu.c index 4879c30164e3..c0b864d269b3 100644 --- a/sys/compat/linuxkpi/common/src/linux_rcu.c +++ b/sys/compat/linuxkpi/common/src/linux_rcu.c @@ -2,6 +2,10 @@ * Copyright (c) 2016 Matthew Macy (mmacy@mattmacy.io) * Copyright (c) 2017-2021 Hans Petter Selasky (hselasky@freebsd.org) * All rights reserved. + * Copyright (c) 2024 The FreeBSD Foundation + * + * Portions of this software were developed by Björn Zeeb + * 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 @@ -245,6 +249,33 @@ linux_rcu_read_unlock(unsigned type) sched_unpin(); } +bool +linux_rcu_read_lock_held(unsigned type) +{ +#ifdef INVARINATS + struct linux_epoch_record *record __diagused; + struct task_struct *ts; + + MPASS(type < RCU_TYPE_MAX); + + if (RCU_SKIP()) + return (false); + + if (__current_unallocated(curthread)) + return (false); + + ts = current; + if (ts->rcu_recurse[type] == 0) + return (false); + + MPASS(curthread->td_pinned != 0); + MPASS((record = &DPCPU_GET(linux_epoch_record[type])) && + record->epoch_record.active != 0); +#endif + + return (true); +} + static void linux_synchronize_rcu_cb(ck_epoch_t *epoch __unused, ck_epoch_record_t *epoch_record, void *arg __unused) { From nobody Wed Oct 23 06:23: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 4XYJsN6XKPz5ZtHT; Wed, 23 Oct 2024 06:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYJsN5zT9z41TF; Wed, 23 Oct 2024 06:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729664632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YqWzwd+qfnXkp6gckWZRgc3zzT/9IkgJ3N/rCT/m538=; b=SuwODJsin4GUwsKi2BGbBuB2wTqJqsFWhDLui1xSRaQryUxjHmi7Ge0WdVvNMTHEXfM68z gjdKMA22c2JdNl1bWxx/EPvCCaRInLLX4zS7B+hgLjAS0FnWqX9d0YbW+SInkrxQ+ABfWd BzIlIgE0T51slfRKlQ0u1oBHr/gSfDuC+rUIOOWPFSmtSYhgdFrWrblVhXDNTUzZwLT6hQ A+zjHTXRPPnE4oRayf1dcgKhGRCEz4Xh+vdwSGzg7vWGmtM9AgxUQcrONcnq5ImwGFwnR9 jZ7aGhrI+hX4PF8kVL7hZMwRo4BbM4BTaGRLb9l+77q6RjGqE1vQvuDqiE8Elg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729664632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YqWzwd+qfnXkp6gckWZRgc3zzT/9IkgJ3N/rCT/m538=; b=PTTag6UsiyImWA5zmqUZYEtXqZutBjrzUDM9gDP9XIVba2HRQij2PBUGHre3NII3SrX5x7 BoD0tWrvMFGQQ5Ch6Kpb+9RYc/+42hd+BNMt8AtKwNjoQO4vMcPv4IP7t/E4DNb+eP4sFx rJ+HHOYv80l8d6wKCW1xRTxkZRJaMKkhlHtTUMS7PFR2m4nN+Rjr/FMDs3YdiOmzegBGrx TfPp5hPpe54xklxQWdepMDy5hJP6j7sbeLXNiZm27/+8Blh2/hCA89S8L8XseqwxF5kspP NLwhiuVPsEeLrG1ocaMvUbJNfE0ZnSsVnHxPtw3bZkUZ9WF+S+b153UVS6ylhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729664632; a=rsa-sha256; cv=none; b=cl7WrDYJmxER1oOKSxAYRJc+9wvKB81Y1gL7qs1taq0+63JV7gdFrQH1GCNmKqOgT92hxY cjzRT6+mBh42l7UWKg8LK3EevWhMGSnPD1Zmkp1tRGS4FGBHodMtIYn5L9/lRTkCF6bbG7 79+QGNQegToMLb5arZncdcrU8LxM362u+eiKGE7jP/o+cqi6BKn57HM7dIwJKeDZ5H6Dal WPOKJRdi7SIXSUz0oVlRxasn6Ic2LSJsEh0id/wZV/X87CnaFHwL/i/2B+51CPBzIQVbCa 4ftNZBnUY0NBdigOTLCtvcsP1+GPfKrtRMDMDSEEUw/F/dtEjd5RArSHwRz3tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYJsN5ZR5znDs; Wed, 23 Oct 2024 06:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N6NqsO025422; Wed, 23 Oct 2024 06:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N6Nq50025419; Wed, 23 Oct 2024 06:23:52 GMT (envelope-from git) Date: Wed, 23 Oct 2024 06:23:52 GMT Message-Id: <202410230623.49N6Nq50025419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 6fa91acca40d - main - conf/NOTES: Remove trailing whitespace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fa91acca40d80b39cbd768b30f99473c9dfd780 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=6fa91acca40d80b39cbd768b30f99473c9dfd780 commit 6fa91acca40d80b39cbd768b30f99473c9dfd780 Author: Li-Wen Hsu AuthorDate: 2024-10-23 06:21:25 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-23 06:21:25 +0000 conf/NOTES: Remove trailing whitespace Sponsored by: The FreeBSD Foundation --- sys/conf/NOTES | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 47d6bcb4e5da..181bd351b460 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -92,11 +92,11 @@ makeoptions DESTDIR=/tmp # The soft limits can be modified during normal system operation, but # the hard limits are set at boot time. Their default values are # in sys//include/vmparam.h. There are two ways to change them: -# +# # 1. Set the values at kernel build time. The options below are one # way to allow that limit to grow to 1GB. They can be increased # further by changing the parameters: -# +# # 2. In /boot/loader.conf, set the tunables kern.maxswzone, # kern.maxbcache, kern.maxtsiz, kern.dfldsiz, kern.maxdsiz, # kern.dflssiz, kern.maxssiz and kern.sgrowsiz. @@ -202,7 +202,7 @@ options ROOTDEVNAME=\"ufs:da0s2e\" # # SCHED_ULE provides significant performance advantages over 4BSD on many # workloads on SMP machines. It supports cpu-affinity, per-cpu runqueues -# and scheduler locks. It also has a stronger notion of interactivity +# and scheduler locks. It also has a stronger notion of interactivity # which leads to better responsiveness even on uniprocessor machines. This # is the default scheduler. # @@ -296,7 +296,7 @@ options SX_NOINLINE # frequency. # TURNSTILE_PROFILING enables rudimentary profiling of the hash table # used to hold active lock queues. -# UMTX_PROFILING enables rudimentary profiling of the hash table used +# UMTX_PROFILING enables rudimentary profiling of the hash table used # to hold active lock queues. # WITNESS enables the witness code which detects deadlocks and cycles # during locking operations. @@ -681,11 +681,11 @@ options TCP_RFC7413 # TCP Fast Open options TCPHPTS -# In order to enable IPSEC you MUST also add device crypto to +# In order to enable IPSEC you MUST also add device crypto to # your kernel configuration options IPSEC #IP security (requires device crypto) -# Option IPSEC_SUPPORT does not enable IPsec, but makes it possible to +# Option IPSEC_SUPPORT does not enable IPsec, but makes it possible to # load it as a kernel module. You still MUST add device crypto to your kernel # configuration. options IPSEC_SUPPORT @@ -723,7 +723,7 @@ options LIBALIAS # and is quite well tested. # # Note YOU MUST have both INET and INET6 defined. -# You don't have to enable V6, but SCTP is +# You don't have to enable V6, but SCTP is # dual stacked and so far we have not torn apart # the V6 and V4.. since an association can span # both a V6 and V4 address at the SAME time :-) @@ -751,9 +751,9 @@ options SCTP_DEBUG # All that options after that turn on specific types of # logging. You can monitor CWND growth, flight size # and all sorts of things. Go look at the code and -# see. I have used this to produce interesting +# see. I have used this to produce interesting # charts and graphs as well :-> -# +# # I have not yet committed the tools to get and print # the logs, I will do that eventually .. before then # if you want them send me an email rrs@freebsd.org @@ -2357,7 +2357,7 @@ device pwmc # userland control access to pwm outputs # # etherswitch The etherswitch(4) framework # miiproxy Proxy device for miibus(4) functionality -# +# # Switch hardware support: # arswitch Atheros switches # ip17x IC+ 17x family switches @@ -2592,7 +2592,7 @@ device zyd # Sierra USB wireless driver device usie -# +# # debugging options for the USB subsystem # options USB_DEBUG @@ -2840,7 +2840,7 @@ options ZSTDIO # BHND(4) drivers options BHND_LOGLEVEL # Logging threshold level -# evdev interface +# evdev interface device evdev # input event device support options EVDEV_SUPPORT # evdev support in legacy drivers options EVDEV_DEBUG # enable event debug msgs @@ -2853,9 +2853,9 @@ options EKCD # Serial Peripheral Interface (SPI) support. device spibus # Bus support. device at45d # DataFlash driver -device cqspi # +device cqspi # device mx25l # SPIFlash driver -device n25q # +device n25q # device spigen # Generic access to SPI devices from userland. # Enable legacy /dev/spigenN name aliases for /dev/spigenX.Y devices. options SPIGEN_LEGACY_CDEVNAME # legacy device names for spigen From nobody Wed Oct 23 06:23: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 4XYJsQ0Zgnz5ZtZB; Wed, 23 Oct 2024 06:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYJsP6t6Fz41X0; Wed, 23 Oct 2024 06:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729664634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0RIzmNaMIuUbfBMI311vHr4Pi9t9idJJmvrH6YU2yQ=; b=giEoNZ5f7N4TfLrWlo4Kyy+LL7jhksIeMl7lgAt1SLokST2cr8qXcOf9Jg6eIxHbCyBBeD khqo0zQkMIPQhWWWuknRq0I9rrEAP2LSZ11SWzgt/vtZ1T5T/H7CNUv77m5NvDsFkW7CB8 xhE0rSdZ5MIo3cC9KUPqLMzJkkNOaouBCjSyXmVrCefSujds6L2izxSZ86NxuvQXMTzFni Nx3agAG/49fsM4pBER6ZP8g5dWtWtyPspyqXtznIg+wmHkCh2k1/pidc1lnru7QpQ2PfjX sw1kJ1/ZbeY/zUxn5FHd0LOr9LJFJQskKFdbMdoecl5n699Y0T6rncPsV/fRQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729664634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0RIzmNaMIuUbfBMI311vHr4Pi9t9idJJmvrH6YU2yQ=; b=FIT1nOsUY4L7MEpd+Dr64DMxwT/GK7RJPeFy3Dt+JJAS7swGl4Mv+ff3SGxBg0G24e0ERo JgE2HOGCMVLuxouXBQV9KG1qOpa/Ze/jEDHbzF2c/e+jLvPZBflA8RVpBV41LmaciUMnYn U1RCW1u+acrUVEri6ntHhqe8MPtjtj04eQomSz8Q45Y/S5y+ym4Se1/76eLWIoeEjKacw1 sX0KeL2gYKkpfp8m0oNEKbmpE/ROPcby6CRr0HpLjcC8a37zdbKPK5RWZhGELXbspZfjzZ D2lI8ZCmmaoEf1z4dxdGyxphWNnELJXBfZ5ZgVY6VkV98U0KWwBaHec4Y2Swow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729664634; a=rsa-sha256; cv=none; b=GwzOmrfRSZNhxfTvTg2BobBJFAHfBab35o/V2o9qgYdL6hsarX2LLrMYW6mbceNsRYRQOl VxfVLHNuaGDd4C85IPWL7nLtT3du+iuUkt/NuxrfiL7Iu23yi/L7Z6R7Oa1yB1pSoBnkv+ RtN7zmkSLQy0JwB5pePmuQQXXRvhH73NH1CGxGaqW1vxPb/7hb6sMPXd7HZ2Ucqa6usg5w BcaG7759ETckISTAfVSQBKMtT5xyHDlsl42vYlViM5iJskubsGvPS9pPYhs3aYpL4h4mk3 oFND0dNXD5yzTp6tkhW3i5FR9yNHdDaMeuCK9hjQSYhGYmt9vx3wAWIMA8i+yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYJsP6TsHznDt; Wed, 23 Oct 2024 06:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N6NrQ9025468; Wed, 23 Oct 2024 06:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N6NrUv025465; Wed, 23 Oct 2024 06:23:53 GMT (envelope-from git) Date: Wed, 23 Oct 2024 06:23:53 GMT Message-Id: <202410230623.49N6NrUv025465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 91b7b225b2ce - main - LINT: Add mac_do List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91b7b225b2ce577381aae989c361b9b5b6dd1500 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=91b7b225b2ce577381aae989c361b9b5b6dd1500 commit 91b7b225b2ce577381aae989c361b9b5b6dd1500 Author: Li-Wen Hsu AuthorDate: 2024-10-23 06:21:55 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-23 06:21:55 +0000 LINT: Add mac_do Sponsored by: The FreeBSD Foundation --- sys/conf/NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 181bd351b460..c2deaadd6e64 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1253,6 +1253,7 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED options MAC_DDB +options MAC_DO options MAC_IFOFF options MAC_IPACL options MAC_LOMAC From nobody Wed Oct 23 07:24: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 4XYLCK1P5Gz5ZxC5; Wed, 23 Oct 2024 07:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLCK049dz477r; Wed, 23 Oct 2024 07:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yrzBSzjCoEBudgJwrxuqjybt/SzhedJI4C8f9Hu4vw8=; b=eUeJ2oS5enOfq0HN8NwgNiWwJwOFq5r9C7kY3SwKBBDyYOrkZxtrE90jbdQkv5xHvRDE+0 gjbWO9Hwo4ZWLa9hjrWcM+RiA0HSSulq9TBzyWMmGnoG/Tgr8UT81e9Rj8zw3+czyi333b ajmWLMRryjhl2OYz749I1KiZLd67iOYshOsiDkq0ABIYkCP4t+ls+pUqatyq5JMkr5pd59 vYZMMmfgDSb2q1br5Q7wNcXMv6N60BDNVuQkx5xpgpRTZYazQ/trQaUKkY6ufjf21aPB3k 0mdDB/OOmao7Z7RcTvuPwiZxtmSDOd+jxtLSMO5vfcR9+rL8YGLPv6lZ2N98qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yrzBSzjCoEBudgJwrxuqjybt/SzhedJI4C8f9Hu4vw8=; b=TnyxCkF5GViUJX6CCt5nmmt7HPLLdwNFkNoamUuF7GtiwwaaBMNkGFQ4AHf542ChNa/KKO kQ6aHAW6H+dwTTgliXW3KuouIbD4g3R3+wyLUVk5ayH3zTTFkTB4QGq4AN1/pRlkgddmBt YGW55blEsjldrv1v2MmwsJQcUbzj4ndTYsyfPdQddGuEwi6ahKI2vRcqskIuu+MvRgCIDE j9XtnBDusJLUX7Z/FH1anDT2YIN37MgNUN+13Plp1G2a49jsCG/OCQavUqc55lNZGJkTHA xkqI5PNPj1EkeMHUEFa8STgPW7S8utduemM4zCTFkYBDz1T8EQ0B9cG4APotyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668269; a=rsa-sha256; cv=none; b=SB6pC9DOuER9B1xtT/ubAhaGIcnjhpvK5x3UdKXn18LqVArvA5n6XK7tqEovY9RED6ZB/L tPi2F+8Gcfg+9HF19efaRCuvw564f7g8F9KkwZEH/JYo9JSlp5wCpSEIN7BsluCZrr9xN6 bPHMzXCeraVaWXx2MZGnPwU1YDnPdySHKOY0advbApwvpqguOBNCcXx6v2X6eOsouyHYSW 5SVVKnTgQ33vZI0KzOedB+bAh/kAMBjl7DM5wXG+MfkkUoRi6vdhTa8eVYRrVcUjye2x38 t/OGGRZrGIlnwR93Go6IFx/B752URBZnywFV1bnQHqqCOnThDVM2z9iDA9kYbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLCJ6n51zpt1; Wed, 23 Oct 2024 07:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7OSFm036269; Wed, 23 Oct 2024 07:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7OSu4036266; Wed, 23 Oct 2024 07:24:28 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:24:28 GMT Message-Id: <202410230724.49N7OSu4036266@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: eff7d958dda8 - stable/14 - genl: allow to monitor all know groups List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: eff7d958dda8542dc5be4ac6109d0da2055c0d02 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=eff7d958dda8542dc5be4ac6109d0da2055c0d02 commit eff7d958dda8542dc5be4ac6109d0da2055c0d02 Author: Baptiste Daroussin AuthorDate: 2024-10-07 09:45:21 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:24:09 +0000 genl: allow to monitor all know groups Add a special keyword "all" for the group name, which allows genl to monitor all groups in an existing family (cherry picked from commit 65e7a648693cc151990688f48c190df1c1fc858b) --- usr.bin/genl/genl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index e3acb872a39e..eaf20d20e890 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -197,6 +197,7 @@ monitor_mcast(int argc __unused, char **argv) struct _getfamily_attrs attrs; struct pollfd pfd; bool found = false; + bool all = false; void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); parser = parser_fallback; @@ -210,8 +211,10 @@ monitor_mcast(int argc __unused, char **argv) } if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); + if (strcmp(argv[1], "all") == 0) + all = true; for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { - if (strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, + if (all || strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, argv[1]) == 0) { found = true; if (setsockopt(ss.fd, SOL_NETLINK, @@ -221,7 +224,8 @@ monitor_mcast(int argc __unused, char **argv) == -1) err(EXIT_FAILURE, "Cannot subscribe to command " "notify"); - break; + if (!all) + break; } } if (!found) From nobody Wed Oct 23 07:24: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 4XYLCL1Gydz5Zwrh; Wed, 23 Oct 2024 07:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLCK6PH0z46qM; Wed, 23 Oct 2024 07:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68yMCiMWEevwY7yBR7ng0h6nBKSnslXEJ4gBXtiYCUw=; b=oVjlouJr1DxxVpWnLvmISPLQO3a5fM5ctEhfPymgPp6pCmrab9bjCzmu6Clrma4diac+2A 81el2dX0+6ZaVEYeHm/CVDo35w392V3K4t/nNIaG58070x8efr5Z/d99wA3c/KVa0Qao8Y 0WGtJ8jBK2uiiD94vCmxoPIzWWwo954ftsFemBy7HHJN7sqWhk6wvzKzkM63mHXzX4vA3+ /sz7IKT2gdSfNIwYLWNI5wgBr0e8nbHiR63bEbMfIwoT5OdTFsmkRdBuE7ZEyTpUWquIGD womQaPIf4bY4XZtXA+jcI4sjgyn7duTMgBRIcZm73BmTqBhg8eaWSo/04GFnSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68yMCiMWEevwY7yBR7ng0h6nBKSnslXEJ4gBXtiYCUw=; b=AE4g4UuLaB6yTvOU1phh2M/euZ8oDNFrODRKB5wr5F6Dxd94dDQ8wWa6NvU5Ub4GUTyHw0 7stxpv2V3TdYG8PGfjQler4ujfbZsFz3U2TyB/BOOWCcBhlvpJw/8EHs2JhIvxT+xBGf1I oNN/lwUrmNTzHxoRn0/vO/XEGKrEQr9j6L5pkMf631wHpCeKCw55M7n2AcDtIKrtg7AP2k Tk/311JnRrlRBq57Xoq8YdoZbbHDuJOAlSvGDPc1TI/jgGjFKO7oSLqlI9f/4sAI0R+U5u X2AvRFYN8+LM8vKdKHyn8B9emJpGUzjWYfoxwZTKbIxpXy/EmP5PUZFr274QpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668269; a=rsa-sha256; cv=none; b=Gb/l3mlaUphAAB7nOz48VoficoSfgG5dSTdRqRkcbZdy4gimMtF6dZWzztq4u3xAzjafBt KMprKEuCOGWNNfyEXvW5jlz1VnJimc8gLQb0nYqanRs5uXO4P3evepKq7ZDgI9lpSJuOw0 pHB8CqKJlyTpvJzfKtyFyF8kCzNEf0e14bvDWBYAW6lyraRnfYM2yfqiWw5zjiI7ArCSqA MxVy4Xu3l4ixtAJjRdom3yKAVb36a7HyKoAMtdptzNyy4+FuJ0fV0ZhSPl63ryYm4ZWfYt QeZDJnvIB1Sgri8p1WQm6+84EVnYTVZt5oReJHbhAgvag6mjy9IdkMOIqIJePQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLCK5hlczpgL; Wed, 23 Oct 2024 07:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7OTDI036341; Wed, 23 Oct 2024 07:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7OT9o036338; Wed, 23 Oct 2024 07:24:29 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:24:29 GMT Message-Id: <202410230724.49N7OT9o036338@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: c116dea0be45 - stable/14 - genl: subscribe to all if no group is provided List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c116dea0be45de2ebc7c7f519bdfc33c69571054 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c116dea0be45de2ebc7c7f519bdfc33c69571054 commit c116dea0be45de2ebc7c7f519bdfc33c69571054 Author: Baptiste Daroussin AuthorDate: 2024-10-07 10:07:07 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:24:09 +0000 genl: subscribe to all if no group is provided the monitor command now subscribes too all groups if no "multicast group" is provided, this avoid potential collision with a group that could be named "all" (cherry picked from commit f45132db215be4d811e0efa0d01bcab72e4d0a59) --- usr.bin/genl/genl.1 | 13 +++++++++---- usr.bin/genl/genl.c | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index b3d66298eb00..8aafd24dd6f3 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Oct 5, 2023 +.Dd Oct 5, 2024 .Dt GENL 1 .Os .Sh NAME @@ -35,7 +35,8 @@ .Pp .Nm Cm list .Pp -.Nm Cm monitor Ao family Ac Ao multicast group Ac +.Nm Cm monitor Ao family Ac +.Op multicast group .Sh DESCRIPTION The .Nm @@ -52,7 +53,7 @@ Id of the operation if any and associated capabilities .It multicast groups If of the available multicast group if any and it associated name .El -.It Cm monitor Ao family Ac Ao multicast group Ac +.It Cm monitor Ao family Ac Oo multicast group Oc Connect to the .Ar family protocol and subscribe to the @@ -60,7 +61,11 @@ protocol and subscribe to the then print the received messages in a readable format if the protocol is known. So far only .Qq nlctrl -is known. +and +.Qq nlsysevent +are known. If no +.Ar multicast group +are provided then all the groups are subsribed to. .El .Sh SEE ALSO .Xr genetlink 4 , diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index eaf20d20e890..88880c4bacbd 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -51,7 +51,7 @@ static struct commands { const char *usage; int (*cmd)(int argc, char **argv); } cmds[] = { - { "monitor", "monitor ", monitor_mcast }, + { "monitor", "monitor [multicast group]", monitor_mcast }, { "list", "list", list_families }, }; @@ -205,13 +205,13 @@ monitor_mcast(int argc __unused, char **argv) if (!snl_init(&ss, NETLINK_GENERIC)) err(EXIT_FAILURE, "snl_init()"); - if (argc != 2) { + if (argc < 1 || argc > 2) { usage(); return (EXIT_FAILURE); } if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); - if (strcmp(argv[1], "all") == 0) + if (argc == 1) all = true; for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { if (all || strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, From nobody Wed Oct 23 07:24: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 4XYLCM29Lmz5ZxCC; Wed, 23 Oct 2024 07:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLCL6kWCz479L; Wed, 23 Oct 2024 07:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQW8mS6G4/LOK49xLv0uRZ8yJWVXqlG5JVn3evMa+0Q=; b=jaNNyDiTmvQ6SKM/Q7aHQWdLI8yHGruGCuj9Y2Btd91LKNGSwwe9b6ESWP7J0NS0+XIPUK cHGXGOSFt7C3hlAyCRxL6PVyjEiNdN7pjX8mk3npyjzuStlZra01fjhtGqHaNa205yZORd 5VJrklt2KWLBf8wyzLYCSl6LqXN7zpuXAJEvZBniwutNVwuue5rl05D3vJVPe/D1oSRHth H0cvC98bck5BvJzNWkBUdlDsJC7HupH6O/tt+hTNtxcEwVuNSkTeW45ZmNmaGqs9Ed0ZWc rYpo8g/KHwwZdk6TQY+jk/0gDqEdILwmoYvPdXs5vHylJ4o9ML3yPzTTZ6VMfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cQW8mS6G4/LOK49xLv0uRZ8yJWVXqlG5JVn3evMa+0Q=; b=F4kHEkO8FGAVbVVbSnjQyHsc+aklCTpwu0FYCAENvAyTgPLub3E2jh2Id56f1F9WY3m+fc BuuU18xUfo9SxR5oQTjc0roCVodwSAeGq9R4xtVvxMkAWyxJZYaT4U5DI4Ezd9/uQNqWr1 judx3vjAL4Zc+ZdaPEtHXw/GlICY1UpMiHosEz4ILt8M/RzJ8tMZuuT4txh5y998d1R+Im mz6uxzjktwzEmYoDs37VFJXrzpD8/ys2UIVrxJyrXahV/VTVUuSPjtRfGffHJPqG1wwuw1 r/+GhljoUSUhdUpUudIb05mYOSaEFD/cP6v5OlHyykHd8CsrJ59I4CHh+VjCCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668270; a=rsa-sha256; cv=none; b=A66GqwMOmuAMZ8QK5MdZ6Q2qUNjjdCJ26MV+UlUrsjjsTkunQSJNyraTEwCwW78FapvNif oX/YKS5KOgN9jTZ6iOIayxfCdXJZB3WUlz0prEUZe6+RIeIaOkyUx5OTUu+sGeqhiNh2dY IJFi5P+3uT5Xj5sSUDHG7dEMGrHPQsqNhQHyYE6RCoHaA05E3I8sm/65u1OXLRLKbh/04I M67VZfgoasgy3XsaM3rB4D49oQZx+6PhRmOm2Q/1eUrZWHAJZzRwk0Scr1lo/DnVSlm/sl R/izUokNqCGGpCdrqpA8hInzygSZKVOHnmlFRE7jh3pcxpADLo29jG2v/ryjkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLCL6LPTzpkt; Wed, 23 Oct 2024 07:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7OUQ6036406; Wed, 23 Oct 2024 07:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7OUGM036403; Wed, 23 Oct 2024 07:24:30 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:24:30 GMT Message-Id: <202410230724.49N7OUGM036403@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: 58aca1634027 - stable/14 - genl(1): fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 58aca1634027fa469f8bcd4503803d8fee94393c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=58aca1634027fa469f8bcd4503803d8fee94393c commit 58aca1634027fa469f8bcd4503803d8fee94393c Author: Baptiste Daroussin AuthorDate: 2024-10-07 10:08:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:24:09 +0000 genl(1): fix typo (cherry picked from commit 33938d88e35b88c5f28ca10aac89d871fc9edc3f) --- usr.bin/genl/genl.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index 8aafd24dd6f3..9837744fa8e3 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -51,7 +51,7 @@ Lists all available generic netlink protocols, and presents its details: .It operations Id of the operation if any and associated capabilities .It multicast groups -If of the available multicast group if any and it associated name +Id of the available multicast group if any and it associated name .El .It Cm monitor Ao family Ac Oo multicast group Oc Connect to the From nobody Wed Oct 23 07:24: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 4XYLCN2Z10z5ZxS4; Wed, 23 Oct 2024 07:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLCN0Qpxz47JD; Wed, 23 Oct 2024 07:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwFx7m0g99/92ejXAqSzRcLZrP6g6RzkEq3lRd7ThDY=; b=aOyQ4Rjy7jafMda30PWjSEoJb6slrLLP0UO/m3+VpOV7TemIJNgcr+7BjPOMQuBY12SFWJ ggfAYjvaOguvg+ZfPXIknp+exUJIGZv/m7Ht5K5lrYZy+/e/sZMUEFLCCdivVtqTxIoqkd qnXmmCfjakvCwame755IhJSX9s6elDDBjReahxtFepw5zwMUIviIhDN0Bkgtmpvg0YjbSd BHI0UWN6G/Dko6XHBtXXYBpX4WbIltufMsux5SSQHheC/66OrAayblN0xwTD6jw8vhYiya 5xLfxXVX62KT99mW7/Y/LEw267UYc5yyG6Hp4bafMJycx5Gklyyt4svbR5VxPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwFx7m0g99/92ejXAqSzRcLZrP6g6RzkEq3lRd7ThDY=; b=C4lxXtEKg4bivlzMp5RtDAVzvKSu+6zMUGRDbGPSrOPmUO1kS7yoNiLfAid5Kl5iT21unU /z+yt+EascC2DWq6nEp4INi+V1HXWeDYT238cO3/aywvOOxKCRYJnOUlsDTdbbniXL48L7 7bkVBXQmGvUtLnG0gwSyIaNq67ddk+JyRGjXsJb7SOnT13HneIEL2xWJpke6Ni+vSZzcVd ISjQ8mgJNXJ+YrRhWTJG7aslAkB4NfWGUm0YSBxJFlMxoqAyDJMN8PtjWu0n+HefkxsrSR C+4cU4xjzS1uBzARaQX/0KSqKpxEcPhkEvQj3jCOF+IopX3PQ+UiLS8ASZjR1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668272; a=rsa-sha256; cv=none; b=Bt4luQsCnhOjfb1F4H3Gmw9jtD/y3I9HvYh9hvO2npnompHi6uphvmsWk8dUJhDKH/yHYu G4ADEX93UeMvYAUJPTH1xDGAMf4na+TgRi9T4V+xpAIVX60gZaW44nm5cEQ2HMYLlpyFL5 bSsvUQHaf2FqOllOaQQZXIShWLLSvKIWww8oPpSjaZjFREOa81PNFHooOQx1dBkTLNhu5S O96CKJih3aXAv1kn8PupFPgxiGDKaQL/2jpeZ/gv/nL+Btq821CigdR6DfE5lnDM+VbMaY kxvImZlkTeeub6HY38YoB+Sx4B4vhuDk5FiHiavBw+j8cRMnLcGGIDP5t/aINQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLCM6ld6zpXn; Wed, 23 Oct 2024 07:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7OVx6036449; Wed, 23 Oct 2024 07:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7OVId036446; Wed, 23 Oct 2024 07:24:31 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:24:31 GMT Message-Id: <202410230724.49N7OVId036446@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: 379b9c6e7c68 - stable/14 - genl: add parser for nlsysevent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 379b9c6e7c680d14fac511ad7d5f54ea95c35681 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=379b9c6e7c680d14fac511ad7d5f54ea95c35681 commit 379b9c6e7c680d14fac511ad7d5f54ea95c35681 Author: Baptiste Daroussin AuthorDate: 2024-10-07 09:43:50 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:24:09 +0000 genl: add parser for nlsysevent genl monitor nlsysevent is now able to print the messages received (cherry picked from commit 883722891aa92fc6033020c67ec7f2f0d9fedf95) --- usr.bin/genl/genl.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index 88880c4bacbd..48c74fa20c81 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -40,10 +40,12 @@ #include #include #include +#include static int monitor_mcast(int argc, char **argv); static int list_families(int argc, char **argv); static void parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr); +static void parser_nlsysevent(struct snl_state *ss, struct nlmsghdr *hdr); static void parser_fallback(struct snl_state *ss, struct nlmsghdr *hdr); static struct commands { @@ -60,8 +62,25 @@ static struct mcast_parsers { void (*parser)(struct snl_state *ss, struct nlmsghdr *hdr); } mcast_parsers [] = { { "nlctrl", parser_nlctrl_notify }, + { "nlsysevent", parser_nlsysevent }, }; +struct nlevent { + const char *name; + const char *subsystem; + const char *type; + const char *data; +}; +#define _OUT(_field) offsetof(struct nlevent, _field) +static struct snl_attr_parser ap_nlevent_get[] = { + { .type = NLSE_ATTR_SYSTEM, .off = _OUT(name), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_SUBSYSTEM, .off = _OUT(subsystem), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_TYPE, .off = _OUT(type), .cb = snl_attr_get_string }, + { .type = NLSE_ATTR_DATA, .off = _OUT(data), .cb = snl_attr_get_string }, +}; +#undef _OUT +SNL_DECLARE_GENL_PARSER(nlevent_get_parser, ap_nlevent_get); + struct genl_ctrl_op { uint32_t id; uint32_t flags; @@ -183,6 +202,20 @@ parser_nlctrl_notify(struct snl_state *ss, struct nlmsghdr *hdr) dump_family(&family); } +void +parser_nlsysevent(struct snl_state *ss, struct nlmsghdr *hdr) +{ + struct nlevent ne = {}; + if (snl_parse_nlmsg(ss, hdr, &nlevent_get_parser, &ne)) { + printf("system=%s subsystem=%s type=%s", ne.name, ne.subsystem, ne.type); + if (ne.data) { + printf(" %s", ne.data); + if (ne.data[strlen(ne.data) -1] != '\n') + printf("\n"); + } + } +} + void parser_fallback(struct snl_state *ss __unused, struct nlmsghdr *hdr __unused) { @@ -209,6 +242,7 @@ monitor_mcast(int argc __unused, char **argv) usage(); return (EXIT_FAILURE); } + if (!snl_get_genl_family_info(&ss, argv[0], &attrs)) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); if (argc == 1) From nobody Wed Oct 23 07:24: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 4XYLCP3HH7z5Zwrk; Wed, 23 Oct 2024 07:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLCP1S3tz47Cw; Wed, 23 Oct 2024 07:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kMVJHk4UdeyiiBm5CUIHtjWo8ovD1344KWKgE1+okJY=; b=fNKyukk/jMKrHopHjpu5maFWWbW8gR7XNPxBZVs8ytUL3x1c5WsFAkTDE4xmqsBfH+iRf+ W1nFo0M2h8jvO+2n0iSLb1zdqiVMHlllUUM+ZrcCQt5YZqNQ1vOlwuxei8DZkPvcl5C3PO E5lGioGhqNuQ6sV0Un5NuyCHLieMLss5Hzm+gjYSVycL6ZUQ1QtRT6A8geKPIBlxqg1jbT fZONMg08UdEjD+icTSZd3FbLfAk/pXR1ToSNXeb9F0j/Y2z2M+5znvwh5gi9zLno74/Rg4 KK6I9oOkl3j213NkQW6KzJh70bjKagQEFJsXJK9PKWE7/cxM7ZDtHpiAPfFokQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kMVJHk4UdeyiiBm5CUIHtjWo8ovD1344KWKgE1+okJY=; b=iyEhrrPdKZLyBvdKFrXmJuq8Q5/+36Bf5c6tl16x3OAzKp00GONonH5h4xgg9FlRz0B+zs xrnWWG3NMToKAxhQKulxbtaqgsDbe1qtzvxb99p0gms7hDqB83lnfBdd9qae3Bpb7Na+pD 6ZWZt6AIzDOyTGFOjjdVh0nqepWPVXyqoCTcv92dIRYooH7yKNADQumXfihyg9CuSwmg/9 As6ODEa2IysOvA6Zyn+KTcVqAQiRe3/q4YMuz3wiD6Tc2PRewy7IY4OJNsRIMiAiXUidYw k5ipTwXyjAYeUmPezqx/XfSHefOdwswvhUJsxASBQlttkpMw4JQ3hwQsQ6h2Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668273; a=rsa-sha256; cv=none; b=gHiP51EMdbpe0LDMqPhG5eOIJXCzMuhzi1iuYjQkYfGcqs3mPnpGf/bFxkU77CsDaKp5/N KCmLk+/DaVBtvW0M8gOJ/v+HVO85Uc11rZhr6pj/xufhV6Qa7RZCTkByX3rAjpe/gGhmjt 7GF+/+CFMgfHpYZrilSDv1LnJUusEmSuc8eLTW39b8A3hm8f0obR6ZgVGnhaoiOYg3dbRi hbe61ZPelMJ07Jsu5aRDuaM8fFV7ucnSKlEmgZpUkayLVQyrjpHz1QNcBkvOoG3DwIY3zt awy8iMFrKG8vylgOBKhXY5KYA4hQK/JjIip9eYibx04mcmka0VCBbS2c14Yudg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLCP0bGfzpkv; Wed, 23 Oct 2024 07:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7OXXP036486; Wed, 23 Oct 2024 07:24:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7OXBH036483; Wed, 23 Oct 2024 07:24:33 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:24:33 GMT Message-Id: <202410230724.49N7OXBH036483@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: 8610fcedb98b - stable/14 - genl: small cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8610fcedb98bf6960c1bfd80084125016e1f8709 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8610fcedb98bf6960c1bfd80084125016e1f8709 commit 8610fcedb98bf6960c1bfd80084125016e1f8709 Author: Baptiste Daroussin AuthorDate: 2024-10-07 13:28:54 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:24:09 +0000 genl: small cleanup Following up from another review using basically the same code: remove useless cast replace uint32_t with unsigned int. No functional changes expected (cherry picked from commit 782766a32d963587a6aac8521aedd132b68a9dab) --- usr.bin/genl/genl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index 48c74fa20c81..df2758c273f3 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -247,13 +247,13 @@ monitor_mcast(int argc __unused, char **argv) errx(EXIT_FAILURE, "Unknown family '%s'", argv[0]); if (argc == 1) all = true; - for (uint32_t i = 0; i < attrs.mcast_groups.num_groups; i++) { + for (unsigned int i = 0; i < attrs.mcast_groups.num_groups; i++) { if (all || strcmp(attrs.mcast_groups.groups[i]->mcast_grp_name, argv[1]) == 0) { found = true; if (setsockopt(ss.fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, - (void *)&attrs.mcast_groups.groups[i]->mcast_grp_id, + &attrs.mcast_groups.groups[i]->mcast_grp_id, sizeof(attrs.mcast_groups.groups[i]->mcast_grp_id)) == -1) err(EXIT_FAILURE, "Cannot subscribe to command " From nobody Wed Oct 23 07:25: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 4XYLDz2mncz5ZxfS; Wed, 23 Oct 2024 07:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLDz2G3Zz496D; Wed, 23 Oct 2024 07:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0uu/oBIeCni2pbKA/YbsVk6hoYLFhSkv00OiNRwpCU=; b=BhRj5512rMp5WwWsdRmfSXBAP00FTY1oerOwnTxwWfRW+sqY7AH9F5UiEIL8rW/L1RpQMp 44bI4EA2LQKjI/F7m/WGo/Posc+CywNU3Qvu6Utv18MUPoypV6bNlmllUEzPxfBwkYFgg8 tagcphrAAMFa8jtNfOUdhk0hdCEstAoweogQ5WgchS3cywxSj9jYHweLM1z42NspuSgSTH r6LoBi8pz9k0x+2T6J6RyStfYPd0OCoJj3GYN2Cys1j7jTZWKogua4gJxQMiHInWKAVsNg q23KnVLYkYmOjQd6Zqkpn4KqIbG+Z8jxLq9be34l8ZNeOE/TWEDJp6CCtFMVrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0uu/oBIeCni2pbKA/YbsVk6hoYLFhSkv00OiNRwpCU=; b=gBxhgp9xgHdG534v/4ObQwdWNYgRUMrBN3YrU9lbsuenMpuPUi4FDsSf7xMGgRPE3f2c9W 3BoHwtn7c8725MBzjqOemb/MNU9c+m5JsUdt8YX4cBSFLQdOTd/lyfhFIidzQp6PhFiD40 atxsweMfTA7G33mCKld8t8C1LrcIAE85qu1JNR/bb9U/1XMVXE4vvcjPBkoW0IFzBmrMHo y1UykXlyRsrQxltiVjz4R4SfxEISuYADWk+BHczVNDSwb5QKW2nWiflANf8avML5rW51/f gvJ6nRWDfOqA0xXghsoJfEAAbp2Q9luhndERxrkogWi3orsNMZ7d3hVYp7Q98g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668355; a=rsa-sha256; cv=none; b=NRXexGiU4cvhwpJgoi1/OHdMdjtJwk9q6OW3mjxPkvRYGxQZPSTxiaC+JlHa8mx4pz/Ygn 8X03iIDFeFx6FhW5RxVHZi+CPWC7rgfTXQYWAszGRcmjjk9r6zyInp+eTswWlmu+66KPyl 7Ak/Ao2g6W1R8CQDwlZaHPedkFrgGjXIRw/6iuNgMsUiB30GWLdKEzVRqiAcHy2XSYBA0+ sW9oMRcCswgVq51dEIu81N3kRAP/15OAV66UasPhIXK2c+oM9G+3dSmLzPBm7eNRIr2ZGf pkcaiBTWKdQS03EUVspCdVGaPeEd1n/25OAXSBk+7pWstxVqUdOCawnOQd5vLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLDz1rl2zpTq; Wed, 23 Oct 2024 07:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7PtTt037054; Wed, 23 Oct 2024 07:25:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7PtEM037051; Wed, 23 Oct 2024 07:25:55 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:25:55 GMT Message-Id: <202410230725.49N7PtEM037051@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: c1104a7d8e25 - stable/14 - pci_vendors: update to 2024-09-20 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c1104a7d8e254037336afff6c1d8cb9f885aa040 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c1104a7d8e254037336afff6c1d8cb9f885aa040 commit c1104a7d8e254037336afff6c1d8cb9f885aa040 Author: Baptiste Daroussin AuthorDate: 2024-10-08 07:06:13 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:25:50 +0000 pci_vendors: update to 2024-09-20 (cherry picked from commit 8bfd7d5f507a1ee3d2836bf0a0502b218cd788c1) --- share/misc/pci_vendors | 412 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 346 insertions(+), 66 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index f168678909c8..968338dd1099 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2024.06.23 -# Date: 2024-06-23 03:15:02 +# Version: 2024.09.20 +# Date: 2024-09-20 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -138,6 +138,10 @@ 1702 IS64PH ISDN Adapter 1703 ISDN Adapter (PCI Bus, DV, W) 1704 ISDN Adapter (PCI Bus, D, C) +0709 LJMicro Co., Ltd + 0101 GP101 + 0102 GP102 + 0201 GP201 0721 Sapphire, Inc. 0731 Jingjia Microelectronics Co Ltd 7200 JM7200 Series GPU @@ -183,6 +187,7 @@ 6666 MediaPress (MPEG2 encoder board) 07d1 D-Link System Inc 0824 T1042 [Freescale] +0911 Hantick 0925 VIA Technologies, Inc. (Wrong ID) 0a89 BREA Technologies Inc 0b0b Rhino Equipment Corp. @@ -1228,6 +1233,7 @@ 131b Kaveri [Radeon R4 Graphics] 131c Kaveri [Radeon R7 Graphics] 131d Kaveri [Radeon R6 Graphics] + 13c0 Granite Ridge [Radeon Graphics] 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] @@ -1237,6 +1243,7 @@ 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch 1506 Mendocino + 150e Strix [Radeon 880M / 890M] 154c Kryptos [Radeon RX 350] 1462 7c28 MS-7C28 Motherboard 154e Garfield @@ -3963,6 +3970,7 @@ 1458 231d Radeon RX 5600 XT/REV 2.0 [Windforce 6GB OC] 148c 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 1682 5701 RX 5700 XT RAW II + 1849 5102 RX5700 CLD 8GO [ASRock Challenger D RX 5700 OC] 1849 5120 Radeon RX 5600 XT 1da2 e409 Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 1da2 e410 Sapphire NITRO+ RX 5700 XT @@ -4022,6 +4030,8 @@ 73e4 Navi 23 USB 73ef Navi 23 [Radeon RX 6650 XT / 6700S / 6800S] 1458 2405 Navi 23 [Radeon RX 6650 XT] +# This is the refreshed MSI MECH series card equipped with the same Navi 23 GPU as ID 5021 + 1462 5027 RX 6650XT MECH 2X 1849 5236 RX 6650 XT Challenger D OC 73f0 Navi 33 [Radeon RX 7600M XT] 73ff Navi 23 [Radeon RX 6600/6600 XT/6600M] @@ -4041,8 +4051,9 @@ 1da2 e457 PULSE AMD Radeon RX 6500 XT 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] - 744c Navi 31 [Radeon RX 7900 XT/7900 XTX/7900M] - 1002 0e3b RX 7900 GRE [XFX] + 744a Navi 31 [Radeon Pro W7900 Dual Slot] + 744c Navi 31 [Radeon RX 7900 XT/7900 XTX/7900 GRE/7900M] + 1002 0e3b RX 7900 XTX / RX 7900 GRE [XFX] 1043 0506 TUF Gaming Radeon RX 7900 XTX OC 1849 5304 Radeon RX 7900 XTX 1da2 471e PULSE RX 7900 XTX @@ -4050,15 +4061,21 @@ 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] - 7460 7460 Navi32 GL-XL [AMD Radeon PRO V710] + 7460 Navi32 GL-XL [AMD Radeon PRO V710] + 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC + 7481 Navi 33 [Radeon Graphics] 7483 Navi 33 [Radeon RX 7600M/7600M XT] + 7487 Navi 33 [Radeon Graphics] 7489 Navi 33 [Radeon Pro W7500] + 748b Navi 33 [Radeon Graphics] + 7499 Navi 33 [Radeon RX 7400/7300/Pro W7400] 74a0 Aqua Vanjaram [Instinct MI300A] 74a1 Aqua Vanjaram [Instinct MI300X] + 74b5 Aqua Vanjaram [Instinct MI300X VF] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -5177,6 +5194,12 @@ 1537 Kabini/Mullins PSP-Platform Security Processor 1538 Family 16h Processor Function 0 1539 Kabini P2P Bridge for PCIe Ports[4:0] +# AMD EPYC Turin CPU + 153a Family 1Ah (Models 00h-0Fh) Root Complex +# AMD EPYC Turin CPU + 153b Family 1Ah (Models 00h-0Fh) IOMMU +# AMD EPYC Turin CPU + 153d Family 1Ah (Models 00h-0Fh) PCIe Dummy Host Bridge 1540 Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky HT Configuration 1541 Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Address Maps 1542 Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky DRAM Configuration @@ -5193,6 +5216,10 @@ 154f Anubis Audio Processor 1550 Garfield+/Arlene/Pooky/Anubis SPLL Configuration 1553 Arlene/Pooky P2P Bridge for PCIE (3:0) +# AMD EPYC Turin CPU + 1555 Family 1Ah (Models 00h-0Fh) Internal PCIe GPP Bridge +# AMD EPYC Turin CPU + 1556 Family 1Ah (Models 00h-0Fh) PCIe Dummy Function 155b Anubis Root Complex 155c Anubis IOMMU 155d Anubis UMI PCIe Dummy Bridge @@ -8597,6 +8624,7 @@ 1093 72f7 PXIe-6535 1093 72f8 PXIe-6536 1093 72f9 PXIe-6537 + 1093 730a PXIe-5142 1093 7326 PCIe-6509 1093 736c PXIe-4140 1093 738b PXIe-5622 @@ -8666,6 +8694,7 @@ 1093 762e PXIe-5606 1093 7644 PXIe-4841 1093 764a PCIe-8237R-S + 1093 7652 PXIe-4080 1093 7658 PXIe-5162 (4CH) 1093 76ab PXIe-4322 1093 76ad PXIe-4112 @@ -8682,6 +8711,8 @@ 1093 76ce CVS-1459 1093 76d0 PXIe-5160 (2CH) 1093 76d1 PXIe-5160 (4CH) + 1093 76d8 PXIe-4081 + 1093 76d9 PXIe-4082 1093 76dc PXIe-4610 1093 76ec PXIe-2524 1093 76ed PXIe-2525 @@ -8719,6 +8750,8 @@ 1093 7790 PXIe-5170R (4CH) 1093 7791 PXIe-5170R (8CH) 1093 7793 PXIe-5171R (8CH) + 1093 7794 PXIe-5172 (4CH - 325T) + 1093 7795 PXIe-5172 (8CH - 410T) 1093 77a5 PXIe-6345 1093 77a6 PXIe-6355 1093 77a7 PXIe-6365 @@ -8742,18 +8775,44 @@ 1093 7802 PXIe-4302 1093 7803 PXIe-4303 1093 7805 PXIe-4305 + 1093 781e PXIe-4135 + 1093 7820 PXIe-5164 + 1093 783d PXIe-6570 + 1093 7851 PXIe-5172 (8CH - 325T) 1093 786f PXIe-4163 + 1093 7881 PXIe-5163 1093 788e PXIe-4304 + 1093 78d5 PXIe-5413 (1CH) + 1093 78d6 PXIe-5413 (2CH) + 1093 78d7 PXIe-5423 (1CH) + 1093 78d8 PXIe-5423 (2CH) + 1093 78d9 PXIe-5433 (1CH) + 1093 78da NI PXIe-5433 (2CH) 1093 78f8 NI FlexRIO Module (KU035) 1093 78f9 NI FlexRIO Module (KU040) 1093 78fa NI FlexRIO Module (KU060) 1093 78ff PXIe-4162 + 1093 792f PXIe-4190 + 1093 7935 PXIe-5111 + 1093 7936 PXIe-5110 1093 7995 PXIe-7911R 1093 7996 PXIe-7912R 1093 7997 PXIe-7915R + 1093 79cd PXIe-5113 1093 79d3 NI FlexRIO PCIe Module (KU035) 1093 79d4 NI FlexRIO PCIe Module (KU040) 1093 79d5 NI FlexRIO PCIe Module (KU060) + 1093 79f8 PXIe-6571 + 1093 7a16 PXIe-4147 + 1093 7a9a PXIe-4137 (40W) + 1093 7aa4 PXIe-4135 (40W) + 1093 7aca PXIe-4051 + 1093 7acb PXIe-4150 + 1093 7acc PXIe-4151 + 1093 7ae0 PXIe-4163 (10 pA) + 1093 7ae1 PXIe-4162 (10 pA) + 1093 7aef PXIe-4190 (500 kHz) + 1093 7b1f PXIe-6571 (8CH) c801 PCI-GPIB c811 PCI-GPIB+ c821 PXI-GPIB @@ -12950,7 +13009,7 @@ 2182 TU116 [GeForce GTX 1660 Ti] 2183 TU116 2184 TU116 [GeForce GTX 1660] - 2187 TU116 [GeForce GTX 1650 SUPER] + 2187 TU116 [GeForce GTX 1660 SUPER] 2188 TU116 [GeForce GTX 1650] 2189 TU116 [CMP 30HX] 2191 TU116M [GeForce GTX 1660 Ti Mobile] @@ -12993,6 +13052,7 @@ 22ba AD102 High Definition Audio Controller 22bc AD104 High Definition Audio Controller 22bd AD106M High Definition Audio Controller + 22be AD107 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] 2321 GH100 [H100L 94GB] @@ -13007,6 +13067,7 @@ 2338 GH100 [H100 SXM5 96GB] 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] + 233b GH100 [H200 NVL] 233d GH100 [H100 96GB] 2342 GH100 [GH200 120GB / 480GB] 2343 GH100 @@ -13131,7 +13192,7 @@ 2709 AD103 [GeForce RTX 4070] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] - 2757 GN21-X11 + 2757 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] 2783 AD104 [GeForce RTX 4070 SUPER] @@ -13154,6 +13215,7 @@ 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2808 AD106 [GeForce RTX 4060] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2822 AD106M [GeForce RTX 3050 A Laptop GPU] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2878 AD106GLM [RTX 3000 Ada Generation Embedded GPU] @@ -13168,6 +13230,8 @@ 28e0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28e1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] + 2900 GB100 + 2940 GB100 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -13525,7 +13589,7 @@ 1043 16d5 U6V/U31J laptop 1043 81aa P5B 1043 82c6 M3A78 Series Motherboard - 1043 83a3 M4A785/P7P55 Motherboard + 1043 83a3 M4A785/P7P55/AT3IONT-I Motherboard 1043 8432 P8P67 and other motherboards 1043 8505 P8 series motherboard 1043 8554 H81M-C Motherboard @@ -13608,6 +13672,7 @@ 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter 8852 RTL8852AE 802.11ax PCIe Wireless Network Adapter a85a RTL8852AE WiFi 6 802.11ax PCIe Adapter + b520 RTL8852BE-VT PCIe 802.11ax Wireless Network Controller b723 RTL8723BE PCIe Wireless Network Adapter 10ec 8739 Dell Wireless 1801 17aa b736 Z50-75 @@ -13644,11 +13709,16 @@ 3fc5 RME Hammerfall DSP 3fc6 RME Hammerfall DSP MADI 5000 Alveo U200 XDMA Platform + 10ee 000e Alveo card 5004 Alveo U250 XDMA Platform + 10ee 000e Alveo card 5005 Alveo U250 500c Alveo U280 XDMA Platform + 10ee 000e Alveo card 5020 Alveo U50 XMDA Platform + 10ee 000e Alveo card 505c Alveo U55C + 10ee 000e Alveo card 5074 Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card 5084 Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter 6987 SmartSSD @@ -13664,9 +13734,13 @@ 9234 SmartSSD 9434 SmartSSD d000 Alveo U200 Golden Image + 10ee 000e Alveo card d004 Alveo U250 Golden Image + 10ee 000e Alveo card d00c Alveo U280 Golden Image + 10ee 000e Alveo card d020 Alveo U50 Golden Image + 10ee 000e Alveo card d154 Copley Controls CAN card (PCI-CAN-02) # SED is assigned Xilinx PCI device IDs ebf0 through ebff ebf0 SED Systems Modulator/Demodulator @@ -15208,6 +15282,21 @@ 1137 021a VIC 1487 MLOM Ethernet NIC 1137 024a VIC 1495 PCIe Ethernet NIC 1137 024b VIC 1497 MLOM Ethernet NIC + 1137 02af VIC 1467 MLOM Ethernet NIC + 1137 02b0 VIC 1477 MLOM Ethernet NIC + 1137 02cf VIC 14425 MLOM Ethernet NIC + 1137 02d0 VIC 14825 Mezzanine Ethernet NIC + 1137 02db VIC 15231 MLOM Ethernet NIC + 1137 02dc VIC 15411 MLOM Ethernet NIC + 1137 02dd VIC 15428 MLOM Ethernet NIC + 1137 02de VIC 15420 MLOM Ethernet NIC + 1137 02df VIC 15230 MLOM Ethernet NIC + 1137 02e0 VIC 15427 MLOM Ethernet NIC + 1137 02e1 VIC 15422 Mezzanine Ethernet NIC + 1137 02e4 VIC 15235 PCIe Ethernet NIC + 1137 02e8 VIC 15238 MLOM Ethernet NIC + 1137 02f2 VIC 15425 PCIe Ethernet NIC + 1137 02f3 VIC 15237 MLOM Ethernet NIC 0044 VIC Ethernet NIC Dynamic 1137 0047 VIC P81E PCIe Ethernet NIC Dynamic 1137 0048 VIC M81KR Mezzanine Ethernet NIC Dynamic @@ -15254,6 +15343,7 @@ 1137 012e VIC 1227 PCIe Userspace NIC 1137 0137 VIC 1380 Mezzanine Userspace NIC 023e 1GigE I350 LOM + 02b7 VIC SR-IOV Ethernet VF 1138 Ziatech Corporation 8905 8905 [STD 32 Bridge] 1139 Dynamic Pictures, Inc @@ -15630,6 +15720,8 @@ 1170 Inventec Corporation 1171 Loughborough Sound Images Plc 1172 Altera Corporation +# Unknown card with Altera ACE EP1K50TC144-2 as the PCI interface and has 4 BNC inputs connected to 4 TL3016 Comparators and one TRS output connected to two LTC1650 DACs + 0004 PF5102 board 00a7 Stratix V 0530 Stratix IV 646c KT-500/KT-521 board @@ -16579,6 +16671,12 @@ 11f2 Picture Tel Japan K.K. 11f3 Keithley Metrabyte 0011 KPCI-PIO24 + 4200 42x0-SMU + 4205 4205-VPU + 4215 4200-VPU + 4216 422x-PxU + 4220 4200-CVU + 4221 4210-CVU 11f4 Kinetic Systems Corporation 2915 CAMAC controller 11f5 Computing Devices International @@ -17053,6 +17151,8 @@ 125d 1999 Allegro-1 AudioDrive 1989 ESS Modem 125d 1989 ESS Modem + 1990 ES1990S Canyon3D 2LE + 1992 ES1992S Canyon3D 2 1998 ES1983S Maestro-3i PCI Audio Accelerator 1028 00b1 Latitude C600 1028 00e5 Latitude C810 @@ -18552,6 +18652,7 @@ 0254 XR17V254 Quad UART PCI controller 0258 XR17V258 Octal UART PCI controller 0352 XR17V3521 Dual PCIe UART + 4c52 9252 LRUS9252H 2-Port RS232 Serial Adapter 13a9 Siemens Medical Systems, Ultrasound Group 13aa Broadband Networks Inc 13ab Arcom Control Systems Ltd @@ -20084,6 +20185,8 @@ f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. [MSI] 3483 MSI USB 3.0 (VIA VL80x-based xHCI USB Controller) +# This is MSI refreshed variant of their MECH series Navi 23 GPU card (73EF) + 5027 RX 6650XT MECH 2X 7c56 Realtek Ethernet controller RTL8111H aaf0 Radeon RX 580 Gaming X 8G 1463 Fast Corporation @@ -20877,7 +20980,7 @@ 14e4 d124 NetXtreme-E P2100D BCM57508 2x100G QSFP PCIE 14e4 d324 NetXtreme-E N2100D BCM57508 2x100G QSFP OCP3.0 Ethernet 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet - 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet + 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet 1028 09d4 PowerEdge XR11/XR12 LOM 1028 0b1b PowerEdge XR5610 LOM 14e4 4250 NetXtreme-E Quad-port 25G SFP28 Ethernet PCIe4.0 x16 Adapter (BCM957504-P425G) @@ -21933,6 +22036,8 @@ 0223 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch Secure Flash Recovery-RMA] 0224 CX9 Family [ConnectX-9 Flash Recovery] 0225 CX9 Family [ConnectX-9 Secure Flash Recovery-RMA] + 0226 CX10 Family [ConnectX-10 Flash Recovery] + 0227 CX10 Family [ConnectX-10 Secure Flash Recovery-RMA] 024e MT53100 [Spectrum-2, Flash recovery mode] 024f MT53100 [Spectrum-2, Secure Flash recovery mode] 0250 Spectrum-3, Flash recovery mode @@ -21953,12 +22058,13 @@ 0263 MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN 0264 Innova-2 Flex Burn image 0270 Spectrum-5 in Flash Recovery Mode - 0271 Spectrum-4L, RMA + 0271 Spectrum-5 RMA 0274 Spectrum-6 in Flash Recovery Mode - 0275 Spectrum-4C RMA + 0275 Spectrum-6 RMA 0277 Spectrum-4TOR RMA 0278 Quantum-4 in Flash Recovery Mode 0279 Quantum-4 RMA + 027a Eros Chiplet 0281 NPS-600 Flash Recovery 0282 ArcusE Flash recovery 0283 ArcusE RMA @@ -22071,6 +22177,7 @@ 1023 CX8 Family [ConnectX-8] 1024 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch] 1025 CX9 Family [ConnectX-9] + 1027 CX10 Family [ConnectX-10] 1974 MT28800 Family [ConnectX-5 PCIe Bridge] 1975 MT416842 Family [BlueField SoC PCIe Bridge] 1976 MT28908 Family [ConnectX-6 PCIe Bridge] @@ -22082,6 +22189,7 @@ 197c ConnectX/BlueField Family mlx5Gen PCIe Bridge [PCIe Bridge] 197d CX8 Family [ConnectX-8 PCIe Bridge] 197e CX9 Family [ConnectX-9 PCIe Bridge] + 197f CX10 Family [ConnectX-10 PCIe Bridge] 2020 MT2892 Family [ConnectX-6 Dx Emulated PCIe Bridge] 2021 MT42822 Family [BlueField-2 SoC Emulated PCIe Bridge] 2023 MT2910 Family [ConnectX-7 Emulated PCIe Bridge] @@ -22172,8 +22280,8 @@ cf6c MT53100 [Spectrum-2] cf70 Spectrum-3 cf80 Spectrum-4 - cf82 Spectrum-4L - cf84 Spectrum-4C + cf82 Spectrum-5 + cf84 Spectrum-6 d2f0 Quantum HDR (200Gbps) switch d2f2 Quantum-2 NDR (400Gbps) switch d2f4 Quantum-3 @@ -23616,6 +23724,7 @@ 0404 DOMINO Melody 0407 DOMINO Symphony 0408 DOMINO Symphony PCIe + 0814 Coaxlink Quad CXP-12 1809 Lumanate, Inc. 180c IEI Integration Corp 1813 Ambient Technologies Inc @@ -23913,6 +24022,7 @@ 01e5 NT100A01 Network Adapter 0215 NT400D11 Network Adapter 0225 NT40A11 Network Adapter + 0295 NT400D13 Network Adapter 18f6 NextIO 1000 [Nexsis] Switch Virtual P2P PCIe Bridge 1001 [Texsis] Switch Virtual P2P PCIe Bridge @@ -23966,7 +24076,8 @@ 2031 SC92031 PCI Fast Ethernet Adapter 8139 RTL8139D [Realtek] PCI 10/100BaseTX ethernet adaptor 1905 Micronas USA, Inc. -1912 Renesas Technology Corp. +# since the merger with NEC Electronics in 2010 +1912 Renesas Electronics Corp. 0002 SH7780 PCI Controller (PCIC) 0011 SH7757 PCIe End-Point [PBI] 0012 SH7757 PCIe-PCI Bridge [PPB] @@ -24460,12 +24571,17 @@ 19e5 d148 Hi1822 SP527 (2*16G FC) 19e5 d301 Hi1822 SP520 (2*16G FC) 19e5 d305 Hi1822 SP525 (2*16G FC) + 0204 Hi1822 Family (4*10GE) 0205 Hi1822 Family (2*100GE) 19e5 df27 Hi1822 MZ731 MEZZ (2*100GE) 0206 Hi1822 Family (2*25GE) 19e5 d138 Hi1822 SP582 (2*25GE) 19e5 d13a Hi1822 SC381 (2*25GE) 19e5 d145 Hi1822 SP586 (2*25GE) + 0208 Hi1822 Family (2*100GE) + 020b Hi1822 Family (4*25GE) + 020c Hi1822 Family (4*32G FC) + 020d Hi1822 Family (2*40GE) 0210 Hi1822 Family (4*25GE) 19e5 df2e Hi1822 MZ532 MEZZ (4*25GE) 0211 Hi1822 Family (4*25GE) @@ -24499,10 +24615,21 @@ 19e5 6213 NVMe SSD ES3500P V6 3840GB 2.5" U.2 19e5 6214 NVMe SSD ES3500P V6 7680GB 2.5" U.2 19e5 6215 NVMe SSD ES3500P V6 15360GB 2.5" U.2 + 3758 SP686C RAID Controller Card + 19e5 0185 RAID SP686C-M-16i 2G + 19e5 01a1 RAID SP686C-M-40i 2G + 19e5 01a4 RAID SP686C-M-16i 4G + 19e5 01a8 RAID SP686C-MH-32i 4G + 19e5 01ad RAID SP686C-M-40i 4G 375e Hi1822 Family Virtual Function 375f Hi1822 Family Virtual Function 379e Hi1822 Family Virtual Function 379f Hi1822 Family Virtual Function + 3858 SP186 HBA Controller Card + 19e5 0120 HBA SP186-M-32i + 19e5 0125 HBA SP186-M-40i + 19e5 0180 HBA SP186-M-16i + 19e5 0188 HBA SP186-M-8i a120 HiSilicon PCIe Root Port with Gen4 a121 HiSilicon PCI-PCI Bridge a122 HiSilicon Embedded DMA Engine @@ -24596,6 +24723,7 @@ 1a32 Quanta Microsystems, Inc 1a3b AzureWave 1112 AR9285 Wireless Network Adapter (PCI-Express) +1a3e Micro-Research Finland Oy 1a41 Tilera Corp. 0001 TILE64 processor 0002 TILEPro processor @@ -24963,7 +25091,7 @@ 1028 2151 BOSS-N1 Modular ET 1028 2196 ROR-N1 1028 2286 BOSS-N1 DC-MHS - 1028 2287 BOSS-N1 Modular + 1028 2287 BOSS-N1 Modular DC-MHS 1b4b 2241 Santa Cruz NVMe Host Adapter 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit @@ -25202,7 +25330,7 @@ 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD - 5018 FireCuda 530 SSD + 5018 E18 PCIe SSD 5019 BarraCuda PCIe SSD (DRAM-less) # 2TB 5021 FireCuda 520 SSD @@ -25254,7 +25382,7 @@ 1201 NG3 Series ARINC 429 Interface 1202 NG3 Series Avionics Discrete & Serial Interface 1203 NG3 Series Avionics Discrete Interface -1bd4 Inspur Electronic Information Industry Co., Ltd. +1bd4 IEIT SYSTEMS Co., Ltd 0911 Arria10_PCIe_F10A1150 1000 NS8600G1U160 NVME SSD 1001 NS8600G1U320 NVME SSD @@ -25328,6 +25456,7 @@ 0021 FD722 0022 FD788 0023 FD722-M2 + 0024 FD722 with bypass 1c28 Lite-On IT Corp. / Plextor 0122 M6e PCI Express SSD [Marvell 88SS9183] # previously Fiberblaze @@ -25437,7 +25566,39 @@ 284a PE8110 Series NVMe Solid State Drive 2a49 PE9110 Series NVMe Solid State Drive 2a59 PE9010 Series NVMe Solid State Drives - 2b59 PS10x0 Series NVMe Solid State Drives + 2b59 Px10x0 Series NVMe Solid State Drives + 1028 2295 NVMe ISE PS1010 RI U.2 1.92TB + 1028 2296 NVMe ISE PS1010 RI U.2 3.84TB + 1028 2297 NVMe ISE PS1010 RI U.2 7.68TB + 1028 2298 NVMe ISE PS1010 RI U.2 15.36TB + 1028 2299 NVMe ISE PS1030 MU U.2 1.6TB + 1028 229a NVMe ISE PS1030 MU U.2 3.2TB + 1028 229b NVMe ISE PS1030 MU U.2 6.4TB + 1028 229c NVMe ISE PS1030 MU U.2 12.8TB + 1028 22a7 NVMe ISE PS1010 RI E3.S 1.92TB + 1028 22a8 NVMe ISE PS1010 RI E3.S 3.84TB + 1028 22a9 NVMe ISE PS1010 RI E3.S 7.68TB + 1028 22aa NVMe ISE PS1010 RI E3.S 15.36TB + 1028 22ab NVMe ISE PS1030 MU E3.S 1.6TB + 1028 22ac NVMe ISE PS1030 MU E3.S 3.2TB + 1028 22ad NVMe ISE PS1030 MU E3.S 6.4TB + 1028 22ae NVMe ISE PS1030 MU E3.S 12.8TB + 1028 22dc NVMe FIPS PS1010 RI E3.S 1.92TB + 1028 22dd NVMe FIPS PS1010 RI E3.S 3.84TB + 1028 22de NVMe FIPS PS1010 RI E3.S 7.68TB + 1028 22df NVMe FIPS PS1010 RI E3.S 15.36TB + 1028 22e0 NVMe FIPS PS1030 MU E3.S 1.6TB + 1028 22e1 NVMe FIPS PS1030 MU E3.S 3.2TB + 1028 22e2 NVMe FIPS PS1030 MU E3.S 6.4TB + 1028 22e3 NVMe FIPS PS1030 MU E3.S 12.8TB + 1028 22f8 NVMe ISE PE1010 RI E3.S 1.92TB + 1028 22f9 NVMe ISE PE1010 RI E3.S 3.84TB + 1028 22fa NVMe ISE PE1010 RI E3.S 7.68TB + 1028 22fb NVMe ISE PE1010 RI E3.S 15.36TB + 1028 22fc NVMe ISE PE1030 MU E3.S 1.6TB + 1028 22fd NVMe ISE PE1030 MU E3.S 3.2TB + 1028 22fe NVMe ISE PE1030 MU E3.S 6.4TB + 1028 22ff NVMe ISE PE1030 MU E3.S 12.8TB 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -25676,7 +25837,7 @@ 0250 RMS-250 U.2 NVMe SSD 1ccf Zoom Corporation 0001 TAC-2 Thunderbolt Audio Converter -1cd2 SesKion GmbH +1cd2 Seskion GmbH 0301 Simulyzer-RT CompactPCI Serial DIO-1 card 0302 Simulyzer-RT CompactPCI Serial PSI5-ECU-1 card 0303 Simulyzer-RT CompactPCI Serial PSI5-SIM-1 card @@ -25685,6 +25846,9 @@ # supports 8x CAN (-FD) interfaces 0306 Simulyzer-RT CompactPCI Serial CAN-2 card (CAN-FD) 0307 Simulyzer-RT CompactPCI Serial DIO-2 card [Xilinx Zynq UltraScale+] + 0308 Simulyzer-RT CompactPCI Serial SENT-DIO-2 card +# 8-Channel ADC + 0309 Simulyzer-RT CompactPCI Serial SN-ADC card 1cd7 Nanjing Magewell Electronics Co., Ltd. 0002 Pro Capture AIO 0010 Pro Capture Endpoint @@ -25715,7 +25879,9 @@ 1cfd Mangstor 6300 MX6300 series PCIe x8 NVMe SSD 1d00 Pure Storage -1d05 Tongfang Hongkong Limited +1d05 AIstone Global Limited + 6027 B760-N2D5 motherboard + 7001 H610-N2 motherboard 1d0f Amazon.com, Inc. 7064 NeuronDevice (Inferentia) 7164 NeuronDevice (Trainium) @@ -25861,13 +26027,17 @@ 1d62 Nebbiolo Technologies 1d65 Imagine Communications Corp. 04de Taurus/McKinley -1d69 Celeno Communications +# nee Celeno Communications +1d69 Renesas Electronics Corp. 2432 CL2432 2440 CL2440 + 8000 CL80x0 Wireless Network Adapter + 8046 CL8046 Wireless Network Adapter 1d6a Aquantia Corp. 0001 AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion] 4c52 6880 LREC6880BT Single-port 10Gb Ethernet Network Adapter 00b1 AQtion AQC100 NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G] + 1043 874a XG-C100F 10GbE SFP+ Ethernet Adapter 00c0 Antigua NBase-T/IEEE 802.3an Ethernet Controller - Engineering Sample 04c0 AQtion AQC113 NBase-T/IEEE 802.3an Ethernet Controller [Antigua 10G] 4c52 1053 LRES1053PT Quad-port 10Gb Ethernet Network Adapter @@ -25935,6 +26105,7 @@ 1027 AR-P2P-DBG [P2P Debug Function] 1028 AR-P2P-ATR [P2P Actor Function] 1029 AR-P2P-UTL [P2P Utility Function] + 102a AR-TK242-FX2 [4x100GbE Gen5 Packet Capture-Replay Device] 4200 A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument] 1d72 Xiaomi 1d78 DERA Storage @@ -25996,6 +26167,14 @@ 1d78 7108 D7436 U.2 15mm 7.68TB NVMe SSD 1d78 7109 D7456 U.2 15mm 12.8TB NVMe SSD 1d78 710a D7436 U.2 15mm 15.36TB NVMe SSD + 1d78 7143 D7556 U.2 15mm 1.6TB dual port NVMe SSD + 1d78 7144 D7536 U.2 15mm 1.92TB dual port NVMe SSD + 1d78 7145 D7556 U.2 15mm 3.2TB dual port NVMe SSD + 1d78 7146 D7536 U.2 15mm 3.84TB dual port NVMe SSD + 1d78 7147 D7556 U.2 15mm 6.4TB dual port NVMe SSD + 1d78 7148 D7536 U.2 15mm 7.68TB dual port NVMe SSD + 1d78 7149 D7556 U.2 15mm 12.8TB dual port NVMe SSD + 1d78 714a D7536 U.2 15mm 15.36TB dual port NVMe SSD 1d78 7202 Aliflash V2 U.2 15mm 1.92TB NVMe SSD 1d78 7204 Aliflash V2 U.2 15mm 3.84TB NVMe SSD 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD @@ -26023,7 +26202,7 @@ 3588 RK3588 1d89 YEESTOR Microelectronics Co., Ltd 0280 PCIe NVMe SSD -1d8f Enyx +1d8f Exegy 1d92 Abaco Systems Inc. 1d93 YADRO 1d94 Chengdu Haiguang IC Design Co., Ltd. @@ -26075,8 +26254,10 @@ 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine 0011 IO Bridge + 0013 Host Network Interface 1da1 Teko Telecom S.r.l. 1da2 Sapphire Technology Limited + 475d Radeon RX 7800 XT [PULSE] e26a Radeon R7 250 e445 Sapphire Radeon RX 6700 1da3 Habana Labs Ltd. @@ -26144,7 +26325,14 @@ 1dbe 3001 Donghu-Z2 DC ZNS SSD U.2 4000GB 1dbe 3002 Donghu-Z2 DC ZNS SSD U.2 8000GB 5666 NVMe SSD Controller IG5666 - 5668 NVMe SSD Controller IG5668 + 5668 NVMe PCIe 5.0 DC SSD + 1dbe 5003 Dongting-N3 DC SSD U.2 3200GB + 1dbe 5004 Dongting-N3 DC SSD U.2 3840GB + 1dbe 5005 Dongting-N3 DC SSD U.2 6400GB + 1dbe 5006 Dongting-N3 DC SSD U.2 7680GB + 1dbe 5007 Dongting-N3 DC SSD U.2 12800GB + 1dbe 5008 Dongting-N3 DC SSD U.2 15360GB + 1dbe 5009 Dongting-N3 DC SSD U.2 25600GB 5669 NVMe SSD Controller IG5669 [Tacoma] 1dbf Guizhou Huaxintong Semiconductor Technology Co., Ltd 0401 StarDragon4800 PCI Express Root Port @@ -26407,7 +26595,17 @@ 1dee Biwin Storage Technology Co., Ltd. 2262 HP EX950 NVMe SSD 2263 HP EX900 NVMe SSD (DRAM-less) + 4121 PCIe 4.0 SP406/416 NVMe SSD + 1dee 0000 NVMe SSD SP416 800G 2.5" U.2 + 1dee 0001 NVMe SSD SP416 1.6T 2.5" U.2 + 1dee 0002 NVMe SSD SP416 3.2T 2.5" U.2 + 1dee 0003 NVMe SSD SP416 6.4T 2.5" U.2 + 1dee 0010 NVMe SSD SP406 960G 2.5" U.2 + 1dee 0011 NVMe SSD SP406 1.92T 2.5" U.2 + 1dee 0012 NVMe SSD SP406 3.84T 2.5" U.2 + 1dee 0013 NVMe SSD SP406 7.68T 2.5" U.2 5216 KingSpec NX series NVMe SSD (DRAM-less) + 7700 BIWIN NVMe SSD SP50Y/SP51Y 1def Ampere Computing, LLC e005 eMAG PCI Express Root Port 0 e006 eMAG PCI Express Root Port 1 @@ -26649,7 +26847,7 @@ 2263 270PM6, 270PM7 series NVMe SSD 1e3b DapuStor Corporation 0600 NVMe SSD Controller DP600 - 1e3b 0006 Enterprise NVMe SSD U.2 ODP 7.68TB (J5001) + 1e3b 0006 Enterprise NVMe SSD U.2 7.68TB (J5000) 1e3b 0010 Enterprise NVMe SSD U.2 3.84TB (R5102) 1e3b 0013 Enterprise NVMe SSD U.2 3.20TB (R5302) 1e3b 0030 Enterprise NVMe SSD U.2 3.84TB (J5100) @@ -26684,32 +26882,32 @@ 1e3b 0069 Enterprise NVMe SSD U.2 3.20TB (R5301D) 1e3b 006c Enterprise NVMe SSD U.2 1.92TB (R5101) 1e3b 006d Enterprise NVMe SSD U.2 1.60TB (J5301) - 1e3b 00b9 Enterprise NVMe SSD U.2 ODP 25.60TB (R5301)/(J5301) - 1e3b 00be Enterprise NVMe SSD U.2 ODP 30.72TB (R5101)/(J5101) - 1e3b 00c1 Enterprise NVMe SSD U.2 ODP 25.60TB (R5301D)/(J5301D) - 1e3b 00c4 Enterprise NVMe SSD U.2 ODP 30.72TB (R5101D)/(J5101D) - 1e3b 00c7 Enterprise NVMe SSD U.2 ODP 25.60TB (J5300) - 1e3b 00c8 Enterprise NVMe SSD U.2 ODP 30.72TB (J5100) - 1e3b 00c9 Enterprise NVMe SSD U.2 ODP 15.36TB (J5001) - 1e3b 00ca Enterprise NVMe SSD U.2 ODP 3.84TB (J5102) - 1e3b 00cb Enterprise NVMe SSD U.2 ODP 7.68TB (J5102) - 1e3b 00cc Enterprise NVMe SSD U.2 QDP 3.84TB (J5101) - 1e3b 00cd Enterprise NVMe SSD U.2 ODP 7.68TB (J5101) - 1e3b 00ce Enterprise NVMe SSD U.2 QDP 3.84TB (J5101D) - 1e3b 00cf Enterprise NVMe SSD U.2 ODP 7.68TB (J5101D) - 1e3b 00dc Enterprise NVMe SSD U.2 ODP 30.72TB with SAMSUNG 32GB DRAM (J5001) - 1e3b 00dd Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(J5001) - 1e3b 00de Enterprise NVMe SSD U.2 ODP 15.36TB with SK 16GB DRAM(J5001D) - 1e3b 00df Enterprise NVMe SSD U.2 ODP 30.72TB with SAMSUNG 32GB DRAM(J5001) - 1e3b 00e7 Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(J5001D) - 1e3b 00e8 Enterprise NVMe SSD U.2 QDP 3.20TB (J5301) - 1e3b 00e9 Enterprise NVMe SSD U.2 ODP 6.40TB (J5301) - 1e3b 00ea Enterprise NVMe SSD U.2 QDP 3.20TB (J5301D) - 1e3b 00eb Enterprise NVMe SSD U.2 ODP 6.40TB (J5301D) - 1e3b 00ec Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(J5101) - 1e3b 00ed Enterprise NVMe SSD U.2 ODP 30.72TB with MT 32GB DRAM(R5101) - 1e3b 00ee Enterprise NVMe SSD U.2 ODP 15.36B with SK 16GB DRAM(J5101) - 1e3b 00ef Enterprise NVMe SSD U.2 ODP 12.80TB with SK 16GB DRAM(J5301) + 1e3b 00b9 Enterprise NVMe SSD U.2 25.60TB + 1e3b 00be Enterprise NVMe SSD U.2 30.72TB + 1e3b 00c1 Enterprise NVMe SSD U.2 25.60TB + 1e3b 00c4 Enterprise NVMe SSD U.2 30.72TB + 1e3b 00c7 Enterprise NVMe SSD U.2 25.60TB (J5301) + 1e3b 00c8 Enterprise NVMe SSD U.2 30.72TB (J5000) + 1e3b 00c9 Enterprise NVMe SSD U.2 15.36TB (J5000) + 1e3b 00ca Enterprise NVMe SSD U.2 3.84TB (J5102) + 1e3b 00cb Enterprise NVMe SSD U.2 7.68TB (J5102) + 1e3b 00cc Enterprise NVMe SSD U.2 3.84TB (J5101) + 1e3b 00cd Enterprise NVMe SSD U.2 7.68TB (J5101) + 1e3b 00ce Enterprise NVMe SSD U.2 3.84TB (J5101D) + 1e3b 00cf Enterprise NVMe SSD U.2 7.68TB (J5101D) + 1e3b 00dc Enterprise NVMe SSD U.2 30.72TB (J5000) + 1e3b 00dd Enterprise NVMe SSD U.2 30.72TB(J5000) + 1e3b 00de Enterprise NVMe SSD U.2 15.36TB (J5000D) + 1e3b 00df Enterprise NVMe SSD U.2 30.72TB (J5000) + 1e3b 00e7 Enterprise NVMe SSD U.2 30.72TB (J5000D) + 1e3b 00e8 Enterprise NVMe SSD U.2 3.20TB (J5301) + 1e3b 00e9 Enterprise NVMe SSD U.2 6.40TB (J5301) + 1e3b 00ea Enterprise NVMe SSD U.2 3.20TB (J5301D) + 1e3b 00eb Enterprise NVMe SSD U.2 6.40TB (J5301D) + 1e3b 00ec Enterprise NVMe SSD U.2 30.72TB (J5101) + 1e3b 00ed NVMe SSD U.2 30.72TB (R5101) + 1e3b 00ee Enterprise NVMe SSD U.2 15.36B (J5101) + 1e3b 00ef Enterprise NVMe SSD U.2 12.80TB (J5301) 1e3b 00f0 Enterprise NVMe SSD U.2 0.40TB (X2900) 1e3b 00f1 Enterprise NVMe SSD U.2 0.80TB (X2900) 1e3b 00f2 Enterprise NVMe SSD U.2 1.60TB (X2900) @@ -26717,16 +26915,17 @@ 1e3b 00f5 Enterprise NVMe SSD U.2 0.40TB (X2900P) 1e3b 00f6 Enterprise NVMe SSD U.2 0.80TB (X2900P) 0800 DP800 - 1e3b 0001 Enterprise NVMe SSD U.2 QDP 3.84TB(R6100) - 1e3b 0007 Enterprise NVMe SSD U.2 ODP 15.36TB (R6100) + 1e3b 0001 Enterprise NVMe SSD U.2 3.84TB(R6100) + 1e3b 0007 Enterprise NVMe SSD U.2 15.36TB (R6100) 1e3b 000a Enterprise NVMe SSD U.2 3.20TB (R6300) 1e3b 000d Enterprise NVMe SSD U.2 6.40TB (R6300) 1e3b 0010 Enterprise NVMe SSD U.2 12.80TB (R6300) - 1e3b 0018 Enterprise NVMe SSD U.2 QDP 3.84TB (R6100C) - 1e3b 0019 Enterprise NVMe SSD U.2 ODP 7.68TB (R6100C) + 1e3b 0018 Enterprise NVMe SSD U.2 3.84TB (R6100C) + 1e3b 0019 Enterprise NVMe SSD U.2 7.68TB (R6100C) 1e3b 001a Enterprise NVMe SSD U.2 3.20TB (R6300C) 1e3b 001b Enterprise NVMe SSD U.2 6.40TB (R6300C) - 1e3b 001c Enterprise NVMe SSD U.2 ODP 7.68TB (R6100) + 1e3b 001c Enterprise NVMe SSD U.2 7.68TB (R6100) + 1e3b 001d Enterprise NVMe SSD U.2 3.84TB (R6101) 1098 Haishen3 NVMe SSD 1e3b 0001 Enterprise NVMe SSD U.2 0.8TB (H2100) 1e3b 0002 Enterprise NVMe SSD U.2 0.96TB (H2200) @@ -26793,6 +26992,7 @@ 1e4c GSI Technology 0010 Associative Processing Unit [Leda] 1e4c 0120 SE120 + 0020 Associative Processing Unit [Leda-2] 1e50 IP3 Tech (HK) Limited 1e52 Tenstorrent Inc 401e Wormhole @@ -26815,6 +27015,7 @@ 2864 Hailo-8 AI Processor 1e67 Untether AI 0002 runAI200 AI Inference Accelerator + 0004 speedAI240 AI Inference Accelerator 1e68 Jiangsu Xinsheng Intelligent Technology Co., Ltd 8111 EP2000Pro PCIe 3 NVMe SSD (DRAM-less) 1e6b Axiado Corp. @@ -26867,6 +27068,7 @@ 2a18 Video Transcode Controller 2a20 Cloud Intelligent Inference and Training Controller 2a22 Cloud Intelligent Inference Controller + 2a30 Cloud Video Transcode Controller 1ea7 Intelliprop, Inc 223a Typhon+ PCIe to Gen-Z Bridge 224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx] @@ -26877,6 +27079,8 @@ 1001 EM120R-GL LTE Modem 1002 EM160R-GL LTE Modem 1eae XFX Limited +1eb0 Shenzhen Electrical Appliances CO. + 1901 NVMe SSD Controller (DRAM-less) 1eb1 VeriSilicon Inc 1001 Video Accelerator 1eb4 Quantum Nebula Microelectronics Technology Co.,Ltd. @@ -26928,10 +27132,7 @@ 2283 Patriot P300 NVMe SSD (DRAM-less) 1ed2 FuriosaAI, Inc. 0000 Warboy - 1111 RNGD - 0000 1111 RNGD-S - 0000 2222 RNGD VF - 0000 3333 RNGD-S VF + 0001 RNGD 2222 RNGD-S 1ed3 Yeston 1ed5 Moore Threads Technology Co.,Ltd @@ -26954,12 +27155,16 @@ 0222 MTT S3000 1ed5 0001 C3150 0223 G2S4 + 0225 MTT S3000E + 1ed5 0001 C3150 0251 G2N10 02ff MTT HDMI/DP Audio 0300 MTT S90 Engineering Sample 0301 MTT S90 + 0313 MTT X500 0323 MTT S4000 0327 MTT S4000 + 0328 MTT S4000 03ff MTT HDMI/DP Audio 1ed8 Digiteq Automotive 0101 FG4 PCIe Frame Grabber (T100) @@ -26972,7 +27177,26 @@ 1ee1 000b Airglow A430 NVMe SSD U.2 4.8TB 1ee1 0012 Airglow Z400 NVMe ZNS SSD U.2 5.76TB 1ee4 PETAIO INC - 1180 P8118 U.2 Single Port SSD + 1180 P8118 NVMe SSD Series + 1ee4 0015 NVMe SSD U.2 1.92TB (P8118E) + 1ee4 0016 NVMe SSD U.2 3.84TB (P8118E) + 1ee4 0017 NVMe SSD U.2 7.68TB (P8118E) + 1ee4 0025 NVMe SSD U.2 1.6TB (P8118E) + 1ee4 0026 NVMe SSD U.2 3.2TB (P8118E) + 1ee4 0027 NVMe SSD U.2 6.4TB (P8118E) + 1ee4 0115 NVMe SSD U.2 1.92TB (P8118Z) + 1ee4 0116 NVMe SSD U.2 3.84TB (P8118Z) + 1ee4 0117 NVMe SSD U.2 7.68TB (P8118Z) + 1ee4 0125 NVMe SSD U.2 1.6TB (P8118Z) + 1ee4 0126 NVMe SSD U.2 3.2TB (P8118Z) + 1ee4 0127 NVMe SSD U.2 6.4TB (P8118Z) + 1ee4 0215 NVMe SSD U.2 1.92TB (P8118X) + 1ee4 0216 NVMe SSD U.2 3.84TB (P8118X) + 1ee4 0217 NVMe SSD U.2 7.68TB (P8118X) + 1ee4 0225 NVMe SSD U.2 1.6TB (P8118X) + 1ee4 0226 NVMe SSD U.2 3.2TB (P8118X) + 1ee4 0227 NVMe SSD U.2 6.4TB (P8118X) + 1ee4 abcd NVMe SSD U.2 1ee9 SUSE LLC 1eec Viscore Technologies Ltd 0102 VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe @@ -27028,6 +27252,8 @@ 5636 IG5636-Based NVMe SSD 1f0a Motorcomm Microelectronics. 6801 YT6801 Gigabit Ethernet Controller +1f0d DeGirum Corp. + 0100 AI Accelerator [ORCA] 1f0f NebulaMatrix Technology 1041 D1055AS vDPA Ethernet Controller 1f0f 0001 D1055AS vDPA Ethernet Controller @@ -27068,6 +27294,8 @@ # XConn XC50256 CXL2.0/PCIe5.0 switch c500 XC50256 1f17 Zettastone Technology +1f1c Sophgo Technologies Inc. + 1686 BM1684X [Sophon Series Deep Learning Accelerator] 1f24 xFusion Digital Technologies Co., Ltd. 1058 EP500/EP600 NVMe SSD 1f24 1114 EP500 NVMe SSD(RI) @@ -27151,9 +27379,18 @@ 1112 metaScale SmartNIC Virtual Function 1151 metaVisor DPU Physical Function 1152 metaVisor DPU Virtual Function +1f73 Shenzhen Quanxing Tech Co., Ltd. +1f7a Efinix, Inc. + 0100 Default ID for Titanium FPGA PCIe Interface (AXI) +1f99 Shenzhen Techwinsemi Technology Co., Ltd. +1f9d Axelera AI + 1100 Metis AIPU (rev 02) + 11aa Metis AIPU (rev 01) 1faa Hexaflake (Shanghai) Information Technology Co., Ltd. 0c10 Compass C10 PF 0c11 Compass C10 VF + 0c80 Compass2 C80 PF + 0c81 Compass2 C80 VF 1fab Unifabrix Ltd. 0000 Nexus Alpha IVPU 0100 NoX Gamma @@ -27260,6 +27497,7 @@ 1010 AWM 1 2000 AWM 2 2010 AWM 2-M +1fe1 Beijing Eswin Computing Technology Co., Ltd. 1fe4 HippStor Technology 1600 HP600 Series NVMe SSD 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) @@ -27304,9 +27542,20 @@ 5818 A5818 2036 Netforward Microelectronics Co., Ltd. 1618 NF1618 PCI Express Ethernet Controller + 2036 0860 NF1618 Family NX860 (2*25GE) + 2036 0861 NF1618 Family NX861 (4*25GE) + 2036 0862 NF1618 Family NX862 (2*50GE) + 2036 0863 NF1618 Family NX863 (2*100GE) + 2036 0864 NF1618 Family NX864 (1*200GE) 1619 NF1618 Family Virtual Function 2046 GXMICRO Technology (Shanghai) Co., Ltd. 2048 Beijing SpaceControl Technology Co.Ltd +2061 Unis Flash Memory + 4000 E4000 controller + 4100 E4100 controller +2063 Hubei Yangtze Mason Semiconductor Technology Co., Ltd. + 1406 ME7000 NVMe SSD +206d GigaIO Networks, Inc. 20f4 TRENDnet 2116 ZyDAS Technology Corp. 21b4 Hunan Goke Microelectronics Co., Ltd @@ -27317,6 +27566,7 @@ 1200 NVMe Streamer EP ERD 2304 Colorgraphic Communications Corp. *** 190 LINES SKIPPED *** From nobody Wed Oct 23 07:25: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 4XYLF04BYBz5ZwjC; Wed, 23 Oct 2024 07:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLF03JsMz497T; Wed, 23 Oct 2024 07:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pco4ZCKRNZj4FAQ1d+r9NTavdKQr7jjvprvpksGK1Cw=; b=jM9ODePG4AQH6oEDLL4nIPOK7VfoI1S6ZUaNTWQhvgy21ItcytWLd4oSGrx3Dw/E2D12f1 FfHzvwTwey83kDHQVQ/oS9+7NBKriOZXKT3IWZ1yygDbyn8pISszAeebEZWiSuhLbDAVwK he3xPBax1tpnBMrhJMsojTmeg0EreXhwzOLbXqzcNjclmdalGSOQxoM3CI1Fhq43RUogQo Y/gtSzX2s6hD29qBgeRqhgazl6ubFr1D5MA+BDpJSneECfEr+Q5d4ofEADTKziY7pCbU/j 17Crf2QOXJLH1tRI5pszW6Qka+HXTW87MGaPs7z5rX0TTX2lJCh+O2OZN2AJaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pco4ZCKRNZj4FAQ1d+r9NTavdKQr7jjvprvpksGK1Cw=; b=ebg6fXAhqeis8+RCdiapiOd1i/0zhbAm0eTdMfmErHwOLjEOsrbN6AJa0JxjtUc78rZE+Y 25UPeeoDL3Lj0f9SyItm/yZATDlYdvyxys1KtPdIYgTJvZQgOHCmIzKidbPgSWfRqb7+a/ pj80NF2gNhL0R/VWifn+LQQZ84R5xt58OGGWjo+3D+odp7S/wjVs8eZsrWlPEz499fmGvX VCbc8RpyUdVXQBPNqFSLzqBuHeBaHovGpsgUsBJduUOyj5sQRaGr8X0SSb26Ng9O3Hg5hT suR9rfFoc4yvVPi1XacBLLueGGOth1AF6wyv61+CxDTGLbPjvVKkS2W/erdqSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668356; a=rsa-sha256; cv=none; b=jdFC0kFS4A2+who19oUK3DyhnPpXCgvRvw6rqI5lJjTvWybltCgVoGfkkR2yb0Y7UrlN/D eqZej5sCLkrbC0Ldetu1ykdXOFCQALBZ7BPN6Q+DIzrBvHNGRSLWL6vOWABomdPjavzkUv 82mxbfLImNmTbZRq9LKYCijEOsnX1NzaDBJZ+jTvZC3SygABStGgMcY518FgVL+PkQCbNN PvZFTNQXKZWCiH1zuE02hiD9wZPPNJ5kSNzjTESWEGRj5eOJAShnKxKBz+DJ5YxLOpXRgq bKnpWnPfPct7Hb0+01TsESxW4CAjBQUTm9hV7b4xK5kkqp/N/CO7En2IwKu+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 4XYLF02smCzpXq; Wed, 23 Oct 2024 07:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7Pu41037130; Wed, 23 Oct 2024 07:25:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7Pu4f037127; Wed, 23 Oct 2024 07:25:56 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:25:56 GMT Message-Id: <202410230725.49N7Pu4f037127@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: acd0487a7f1f - stable/14 - hier(7): fix manpage location in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: acd0487a7f1fdbb9c38e777e4b4653ecaf34231a Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=acd0487a7f1fdbb9c38e777e4b4653ecaf34231a commit acd0487a7f1fdbb9c38e777e4b4653ecaf34231a Author: Baptiste Daroussin AuthorDate: 2024-10-10 13:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:25:50 +0000 hier(7): fix manpage location in ports Since 2020-01-15 the ports manpage are locate in /usr/local/share/man (cherry picked from commit 0fbfb22a2d4d542e2f3d5d0eadd37e0d132a3884) --- share/man/man7/hier.7 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 7d164b5683d6..82600ad7b53e 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2024 +.Dd October 10, 2024 .Dt HIER 7 .Os .Sh NAME @@ -499,9 +499,6 @@ local 32-bit compatability libraries local utility data files .It Pa libexec/ utilities executed by local utilities -.It Pa man/ -local manual pages; see -.Xr man 1 .It Pa sbin/ local administration utilities .It Pa share/ @@ -512,6 +509,9 @@ local documentation articles, books, FAQ, and handbooks available from the .Fx project +.It Pa share/man/ +local manual pages; see +.Xr man 1 .El .Pp .It Pa obj/ From nobody Wed Oct 23 07:25: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 4XYLF16lSJz5ZxCP; Wed, 23 Oct 2024 07:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLF14FQyz49CG; Wed, 23 Oct 2024 07:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wYueOi4dTv7UF1B1HKy+xsSmInnuUaZn5swKPb0xW44=; b=KaTZ/fNqrXiBQVpRQ5+En9M3EX1D6Ewu2B7FqhKT9MjlMR1z5t5z9ZE58sJEybk1C6pZ9f 70459d+6xlAg1cwgLV6ie6KGNVA46oD0MCbdwmbUFR3jRbFr42N+FAZWHyTIl4e/wE08E3 KQHJeZxDfrMm4vmlJbRUahRhfZPstYN5f5FI1NmMBhpjKvRzX0xyV/39Yt3PFmxUKphAP1 hpX2aZIDo1ZRDBf3AjFypwyyhbUUilll/7M3i3O2gLYZQr8bMoRIiQ4FGYmUnlKqGoY54S IVVKlBUEvPe8p+EJze3xo3roYVBlRW5dmeeLeS3RGK6MD1wBJ1gwFR0gMhf22g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729668357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wYueOi4dTv7UF1B1HKy+xsSmInnuUaZn5swKPb0xW44=; b=h7LKM9MqYwpSLNZzjVs8GhjGQ984zTmHZkxhP/FRy9RSSOQYFhmHI5ofmT7TMMl8NoP66A 8qpjgZMg3kPlLCd7VJARsOheSeoi0wHFLD8KhWgKCFa7MrjjnI2eY/3Q5L2BRUZqJ4J2UF 5fEh8FUoiexKRbblTw2/DC+x0Nm32bTN97WZ9O1HMyBrIaBCVthc77g4NVU+sTKpT6pbmz KjzhoRdo+Hue0VIlad+R/KXs0Twz5baiCctgKHhQme1PdYgM8LfkNLtwS2icDhSz5aafmb CyA3SmN//r2Ktv3wwHV+5AKifI1XeMcw1GMwRL9Fz4nSUCO8l8Tv/6h/ZWwG/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729668357; a=rsa-sha256; cv=none; b=jvdvzc3SC0PVrG62KC22z5TE8HYlzWZuP4ZOsoBWMCj+pMxIV5XWM9aaEV+hbe4LuuMlux xPydELV9z9N0ucCBSZEO9lo35Tm7nYEwXkF+QNPT7V7nFPXI9uqEXUJfPn7/rPYHDF66hJ HGi8PoHusZDaN6iYaIw1MHh8VWt2ClU/CmMcg9SpACbbBge2QsZNOCkEPMXRubzPAtKBWF WVr5u9KWxTKLA+xIQrIG/DN71Me6/uPLSs2o0VAM3KZPCxTpbtMfeNn++yCa+KgHPxCXwm Rj2p11HWCaRLsbHCGPSb9gjgjLLAYzz1A9M0Gr23ITTSLzl8Ebd5Df5uplmkTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLF13sTCzpHQ; Wed, 23 Oct 2024 07:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7PvtJ037183; Wed, 23 Oct 2024 07:25:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7PvwJ037180; Wed, 23 Oct 2024 07:25:57 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:25:57 GMT Message-Id: <202410230725.49N7PvwJ037180@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: 6c1a174e4c0a - stable/14 - w(1): fix libxo output being locale dependant List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6c1a174e4c0a01a40aa1c06dfc07a37a31cabe33 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6c1a174e4c0a01a40aa1c06dfc07a37a31cabe33 commit 6c1a174e4c0a01a40aa1c06dfc07a37a31cabe33 Author: Baptiste Daroussin AuthorDate: 2024-10-14 07:37:46 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-23 07:25:50 +0000 w(1): fix libxo output being locale dependant by being locale dependant the json export is invalid in locales where the separator for float is a comma. The Json and the XML are invalid for login-time when days contains contains characters which are not unicode. Forcing locale to be C, makes this json and xml output valid and also identical accross locales, so reliable for parsers PR: 276304 Reported by: Vedran Miletic (cherry picked from commit bd490be57438a82c22d1274bc58d51142b63f4a0) --- usr.bin/w/w.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 93f17b0f4ae3..69ff8c33cbbf 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -144,14 +144,16 @@ main(int argc, char *argv[]) char buf[MAXHOSTNAMELEN], fn[MAXHOSTNAMELEN]; char *dot; - (void)setlocale(LC_ALL, ""); - use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0'); - use_comma = (*nl_langinfo(RADIXCHAR) != ','); argc = xo_parse_args(argc, argv); if (argc < 0) exit(1); + if (xo_get_style(NULL) == XO_STYLE_TEXT) { + setlocale(LC_ALL, ""); + } + use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0'); + use_comma = (*nl_langinfo(RADIXCHAR) != ','); /* Are we w(1) or uptime(1)? */ if (strcmp(basename(argv[0]), "uptime") == 0) { wcmd = 0; From nobody Wed Oct 23 07:40: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 4XYLZ11l7Fz5ZyLB; Wed, 23 Oct 2024 07:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLZ11Djsz4CXm; Wed, 23 Oct 2024 07:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729669241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KMRwH/YHxpKME5M5ZtAaV0OUHGyDi/BhxEjjou+S1FQ=; b=yXOb1gD/ZYIhiMfPsCtbaFlGxTc5kmvoWKm9S/F5LXVzzjxYlJdoHooIF4O9FZVWaTYPkn I3bPWYvekH91ncehP5QbyY6SXqJKSUtIpK09uWch8Lvq5u7v11ABOTvwSkbzWtSGJ+GWuM cQOSksBYrTwv/r/zXg+bN4ZKv34DdH8iiZB3/W3d6I+S9RVY4DRKf3GXn7mXzTSHl3ZgSi iTuX1iC4KvLAZppXwSckduSmzR74qa8UQGALFSIiK7NgjBRgVCmSkLXswOHSXeKF0O2200 OsWeMbxaT4jYf3MgljXUsE4b8Bxl0931Bcz1HlPjxNxTQBuuuTkZvf/UTBKoEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729669241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KMRwH/YHxpKME5M5ZtAaV0OUHGyDi/BhxEjjou+S1FQ=; b=LSE7QUHZplP4lIANLbLcdHsNWgWW2i6ogLr5xvAhNJmvTujVajEqh3atlrtA0/ZcnTiJO9 FN5NdqIIUg6Yy3fHvGD6POKXQp0BTfo5prchcr/RiuvW+v9BxN1P0qUKbVxGRfYKP6jYbr q6L5VdQ6ME8EQb+BrqzkK5+wK9vhElwcFXcTwoH/zaJcMqKZVj81lxSgk5DpYfOzf9sK1A 5c9sETzV++Y1fcAnmLG6flywLdweL16cutVJZLTxYvG3kAUbODXLrSdEMofrhglZ26f7dv bBXuk4BmopYTkhsX4ghE4Ifaohse2V03AdcwG0Fr5Uhn2/gxSRgcIE8EeLDHog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729669241; a=rsa-sha256; cv=none; b=QO39J0uoHLnwPyrqaaKNxmuDPFaxdcMYwVybUptDgRN5vZp1QzCGGoM/WykONcjJSgiRYf B2KZCo1fffGfL/z88XV/MB0id2e5bx6wp7K/+CV04IHVCZVLfvrqcb5Yj78vnsGkib+V45 gpH8rYFGvrkM0WqFOoiFOuZjdINUgT8xL+9JCQHrLxbuxDrACF6gCgNtyvXNmPWj+qBWMC s2nUlXJOnV6WcEhFdMrP3mCLNMOhoVVsztZ5r7b8t1WayXkcx6UqRE+6EZKA2VwMyB9U4B TVyGcu0IqtQROL0RIcOAOuiNBg+SiOFP71Dgxkx2l4sPZODkTVMFw81TeBSrYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYLZ10qyLzq6R; Wed, 23 Oct 2024 07:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49N7efkQ065897; Wed, 23 Oct 2024 07:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49N7efYQ065894; Wed, 23 Oct 2024 07:40:41 GMT (envelope-from git) Date: Wed, 23 Oct 2024 07:40:41 GMT Message-Id: <202410230740.49N7efYQ065894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 419249c1cacc - main - Revert "LINT: Add mac_do" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 419249c1cacca2cfdf5128ead2873a9fd57f112e Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=419249c1cacca2cfdf5128ead2873a9fd57f112e commit 419249c1cacca2cfdf5128ead2873a9fd57f112e Author: Li-Wen Hsu AuthorDate: 2024-10-23 07:40:14 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-23 07:40:14 +0000 Revert "LINT: Add mac_do" This reverts commit 91b7b225b2ce577381aae989c361b9b5b6dd1500. --- sys/conf/NOTES | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c2deaadd6e64..181bd351b460 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1253,7 +1253,6 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED options MAC_DDB -options MAC_DO options MAC_IFOFF options MAC_IPACL options MAC_LOMAC From nobody Wed Oct 23 07:47: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 4XYLjN2LVwz5Zy2X; Wed, 23 Oct 2024 07:47:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYLjN1qDxz4F3l; Wed, 23 Oct 2024 07:47:04 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729669624; 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=un6CxglJmy56Uzzzj769IfE/GdbYTZZfg6UimguKMto=; b=MrlPlYtvm8e+zYqx51QKpiJXVncu3a25lbtTK9WK4MUb/9zTubyVrLVBOU3lk7jBYO2SWP DgDMUphuvMrlmMQjRgaEeJg6ffUNy6ieNBKk9Oqto0pf4sw2he1IvIaiL9p+RPwXbY2va3 hzIZ6zc7x5F3eKR5EZVfPNphfZTs7K7XyRUQaCD5X7o1/dwItqE8N0joOd8+jbupViMWdw Ma5alT9bgYpXgJSyJIoHDgrhB5Y4JQPq5kG+QkXD8+nJ/MrOBJ/N8ThTrGdJ8FCQNcRE70 A4zdjylqKlA8q43tn503dNTUvwMnhzESyfA5V9oFrfBhfnlfdbVNj/x7QpKsjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729669624; 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=un6CxglJmy56Uzzzj769IfE/GdbYTZZfg6UimguKMto=; b=QPGfG8j2uKsX2G6OkInSGW8mMCQKPhiwpa3Ww6mSbYgXymLnyYnHGzS5kIAlJbSc2AtBzQ uFkGT0kXH5UxlFNeLsmssQiXOOjOgKVkDynUyJIBC+gagjxMtyPTM9kPosTI4ZTk7aTSKa dI+Don/DcGMO9owSoK6iVeHnqaB7vZsSiYVSdm1C9+11FaNhmDjg2W8Gr1qG/FOYbmY/UZ dJ6FcXCu7b3Nt5TYKrfw5sCzzuYiPriKYRPkJICmt89HKexGJp9m3jl0LAVQf8Kzoyxnfh 6EzHwGeTWYzkZypXzBRercbxojthvTuE2oK3+qUvIgWG31eh5vraoNcwNGJzjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729669624; a=rsa-sha256; cv=none; b=gqoekM3GiuURXh6rbnZSWH0b6Du8Yyu5mDO62hGPkub/aTMe23cPgtensdqOnnZe7A8oY0 fjGd+U40rEfFCSflYQy58posAWkW6EojHyNhz3evM0ePaaCy5YdBXT7f3pdwyaTMg9+Fpx b4yKV9jBP0IpmqD+AA5CkrWlf22UDMaNPkZ2S7Zi00jJy+bTUDcCkl7bhRj/JBpiLstRy3 zqISu03w7mKWqSunUtJ7veCIbcLahuc/AhWNSA64AGUjuuCXqXaYAiT1u+DZgB2Wo99LK+ WyKcT7j3kcQSigYflp38OBCQsNAoUFdpPxdWrAo2aC8WHiPzNka8BU1UIWiOxA== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XYLjN0llwzcgX; Wed, 23 Oct 2024 07:47:04 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 2A0AD202495; Wed, 23 Oct 2024 09:47:00 +0200 (CEST) Date: Wed, 23 Oct 2024 09:47:00 +0200 From: Baptiste Daroussin To: Li-Wen Hsu Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 419249c1cacc - main - Revert "LINT: Add mac_do" Message-ID: References: <202410230740.49N7efYQ065894@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202410230740.49N7efYQ065894@gitrepo.freebsd.org> On Wed 23 Oct 07:40, Li-Wen Hsu wrote: > The branch main has been updated by lwhsu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=419249c1cacca2cfdf5128ead2873a9fd57f112e > > commit 419249c1cacca2cfdf5128ead2873a9fd57f112e > Author: Li-Wen Hsu > AuthorDate: 2024-10-23 07:40:14 +0000 > Commit: Li-Wen Hsu > CommitDate: 2024-10-23 07:40:14 +0000 > > Revert "LINT: Add mac_do" > > This reverts commit 91b7b225b2ce577381aae989c361b9b5b6dd1500. It would be interesting to get the why in the commit log here, to understand what needs to be fixed. Bapt From nobody Wed Oct 23 13:49: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 4XYVlg3LK3z5bFgt; Wed, 23 Oct 2024 13:49:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYVlg2qkVz4jLG; Wed, 23 Oct 2024 13:49:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729691375; h=from:from:reply-to:subject: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=gXb4OHJJLcqYLwMK7HEYkXP73Bm2ibZDnhV6HztP35o=; b=ms6iorOMeZxx6+4Uj5i/e8beGqR1ZnJWjOWrA4M5gddPqJVqbXO65aybIqgqK0fbpduiQo mUauSICiuALFCKBGagxXjzRRTy3ZlXcpKtyGYP5FpbsT17otWtVE9CEqkyT7PfF11CriAk Rhs7E7bVAaab2ZXvohgD+491JSLsNWtrvGvpJS0sEtSH5Apfoli2fLDC8l0zpgJc0gKjvf jgo+6mlC5Tl3PTdn2tc+J7oXahgAMqZIq7aMS4lIfUgSRB0EPszo9CynG3eDYWwbD5seN1 toBMIhUSDsPzOQKKNfTUe4XgHfmzpeWz9cMfqsC4WIGLcqm+/ypI1wo7jkaqgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729691375; h=from:from:reply-to:subject: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=gXb4OHJJLcqYLwMK7HEYkXP73Bm2ibZDnhV6HztP35o=; b=s5tLEdxN7uAFoAE6DcIWm887GBSOjyMnlL4v75fOdAaC8/3jeMlVEsrTvgdwLKRTg6XydQ CQ/VZuGj+hOwgMOeXGewfMJOaDx00Kby9WsL25j/nZvemc0GiDykYKfGXdp2swFxBoYfJ4 KHmyuIFEzkcHkpPprjYv3VafK4iLOrKZttBdon/vSH4eR8hWnv2BWtlZmeeBmesXDJIGN1 wtukY8OqCC7y8L43IJe14ghJqBQWGf4UB2i9xVKipR9XITkzwPMIypOemDTQWdU7P6//QO 2sKLT6jLicoXKzHuNEHUy+6BSP8ickk7zkecpZLSMP6m1DqNi+HE5UBi9bNZ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729691375; a=rsa-sha256; cv=none; b=xoKyv3dYq9zLkNsI9E+O9DauIcNwVGIFHgIVmm4PC5DWXuMznx6Uv2bsRhO6r4vt1weT1+ 9sFaCEgn+bWaOTUnFJsu030Vxg+fi4S8FWjlhIl7KNv33xJo8RJznDEamMD082RijaqqZ9 WGdDIfRL+nTQmNefQu3U5lzJ3bBKvM3LSrC8YtKNBIUdyil+EgYgoHkml1JHdLN//wNyA2 tL+N9gl4QUYTZTAI3Wjwedg0SEgP9fmDWA2fq1LOZOociiCm7eWv2xi2X1ETAmQJY+xhxV GuSwBPHjVJT44+cH8/fAV5xatzoHOqpAOc/dnHHRBym97QKo5WeSj9VeN1byBQ== Received: from [IPV6:2601:5c0:4200:b830:9c12:c1f9:e640:dda4] (unknown [IPv6:2601:5c0:4200:b830:9c12:c1f9:e640:dda4]) (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 4XYVlg0pgWz10vX; Wed, 23 Oct 2024 13:49:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7a7c5efa-457f-43b3-b2e1-b5935317f63f@FreeBSD.org> Date: Wed, 23 Oct 2024 09:49:33 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 13da1af1cd67 - main - libcxxrt: Update to upstream 698997bfde1f Content-Language: en-US To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202410222344.49MNioRX083610@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202410222344.49MNioRX083610@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/22/24 19:44, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=13da1af1cd677b7901d3bf4b9dbe3290b94130d5 > > commit 13da1af1cd677b7901d3bf4b9dbe3290b94130d5 > Merge: e2414d91d33f 5a07cb04925d > Author: Ed Maste > AuthorDate: 2024-10-22 23:40:09 +0000 > Commit: Ed Maste > CommitDate: 2024-10-22 23:43:54 +0000 > > libcxxrt: Update to upstream 698997bfde1f > > Interesting fixes: > > 045c52c Mark __cxa_allocate_exception, __cxa_free_exception and > __cxa_init_primary_exception noexcept. > 8a2f123 Define _LIBCXXRT_NOEXCEPT in cxxabi.h and use it instead of > throw() > 9529236 Fix memory corruption in cpp_demangle_read_sname() > 8f5c74e Add test cases, fix more bugs, and improve perf > 391a3dc Add a simple implementation of __cxa_call_terminate > 40e4fa2 mark std::terminate as noreturn and noexcept > 5eede09 Print diagnostics in default std::terminate handler > > Reviewed by: dim > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D47238 Thanks! -- John Baldwin From nobody Wed Oct 23 13:51: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 4XYVnr0XpBz5bFdS; Wed, 23 Oct 2024 13:51:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYVnr04SSz4k6T; Wed, 23 Oct 2024 13:51:28 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729691488; 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=Nv+EivXlS4ykE2K3eCglbaGgdnkClCl/dfJyti8Ogas=; b=cmVowdXg5rCMuwai5IzjZbKf3Av6P2qKaaHiYzCB17jI/9UvsJOB09cgB9uWTnpc5rdfJw XExgalp4Bml5RSHK2lvGPYFqgAEhbcBUXyfvkSgl/rQVeuY6lcj0VsObeK/nz67zIKcegc Mza2w3lBIPbtxElnqcQHgNsYpFuHuN0/aRDp6bFyWoPQvC9H5GokCn6CDzYEA4c7P1qmEI 4iuq9vfYhKp1zGocfn3KOV4c57JtXYCiAL5D6SfVJGpmfIOdoIHa1oC+k8cUXCiQnh0DVe 1Zm5ufKjg4R/siVMhsRQW5p01ByZSoQuxAdwWPb8skHgeAE3PL5ZpekHt7sgeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729691488; 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=Nv+EivXlS4ykE2K3eCglbaGgdnkClCl/dfJyti8Ogas=; b=ab6lf0be7HSeWZscCUSIQJY+DH+KFB93y8DZL9PTucrN+K+0UctmweOC4t5qbiWmuJRYVU UsbK6QnEMh2WpFdLaKkZiE+Cw8HGC8OJsutqpNbusoyEayfjotgcmYiaTBI9o47oWvcWG1 q52MO+o9vKL8JvAMz4+I9BjDDz3DQUTpGEQzSuY8elQn7d9uuAckVk0i8xmJao5L8RppeQ OP71TDcGWPL7Vf/M5ChatwBKN6SzNRN8/E3J4FVzu1MUEeBw1AY6lvqiaByz1KpKr4VnAI 13UDeA/izJNWicm+iIBLxc9/xgz5GDpTTSUlbcOt77iYU/SdwMdNNnOpYC+wOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729691488; a=rsa-sha256; cv=none; b=NFa1FVwsShD28QVVThS7aFmiBo7QhoXtJXHHp04U9L6a+uUBa3AmTtgCxX8ZV0aeiRRNHD MTa053n2fstlrtsprzPn5oo73FMdwZ96p/pZQc0QVJ4lHafANPQMAdzKw3/1FOIY1EPWVC FMsxTlUpCuq/hyAv4hDKXkkx0lwQS7i28NIf5Vl9DHKmXQ1hmsOVmUMiF1ojNiMxwsLlRV yW7UoCs+7PxYdRaOJyEE82V3TZEhzoFCUDHTMwGMd9HLOls2p1p1c1R/Hx6A3p6GVXV2Ri qFp/xTR5Idx8NmCPuwonEYW0AU59ZB1jD+hHgiGjfHozPeoylCh/wDmDgEqyFw== Received: from [IPV6:2601:5c0:4200:b830:41c2:e465:68f5:36e1] (unknown [IPv6:2601:5c0:4200:b830:41c2:e465:68f5:36e1]) (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 4XYVnq5766zjlP; Wed, 23 Oct 2024 13:51:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <1b16aaec-e586-4e5c-a764-0e1eed7c9611@FreeBSD.org> Date: Wed, 23 Oct 2024 09:51:27 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 419249c1cacc - main - Revert "LINT: Add mac_do" Content-Language: en-US To: Baptiste Daroussin , Li-Wen Hsu Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202410230740.49N7efYQ065894@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/23/24 03:47, Baptiste Daroussin wrote: > On Wed 23 Oct 07:40, Li-Wen Hsu wrote: >> The branch main has been updated by lwhsu: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=419249c1cacca2cfdf5128ead2873a9fd57f112e >> >> commit 419249c1cacca2cfdf5128ead2873a9fd57f112e >> Author: Li-Wen Hsu >> AuthorDate: 2024-10-23 07:40:14 +0000 >> Commit: Li-Wen Hsu >> CommitDate: 2024-10-23 07:40:14 +0000 >> >> Revert "LINT: Add mac_do" >> >> This reverts commit 91b7b225b2ce577381aae989c361b9b5b6dd1500. > > It would be interesting to get the why in the commit log here, to understand > what needs to be fixed. I was about to reply with the same thought, that in general we should try to add the "why" when reverting a change and not just use the raw generated log from git revert. -- John Baldwin From nobody Wed Oct 23 17:11: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 4XYbDT4VdLz5ZS94; Wed, 23 Oct 2024 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYbDT3dryz52F0; Wed, 23 Oct 2024 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729703481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Maf2477hpFAskeArXUeJrNbik/ceLXuc1k//1TJydL8=; b=O2t1i7lMNyZyEFZYD2DkgebAnUD0Fywc65XnPt9/KGBLeoWQegWYTAt3POaxbBFGq8xBiB roVEoWvzEXGw2aRNIxfNaQa1PhmBZwgu3ja3c8C1MwA2o3zzgJPY+CzK2OxB5xR9djMHRL 02S/5H9ordC3kkGv8aDgjcYN/gUkdGQPlsHs4eOlLxOB1OtkI8/zWUe023EbHahYOOykG0 XmQulTu2C3GHUJfOlylIF9OJdi9eEFoypCsi09gVu9mAh0IQWjfZf/n58ja/ECMG/2ltwF nhSSxjwZA67fqFsXcVCWqyfQeRnhnDU7MgsITYLBEK5iEJDyemGRjrm3EYowWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729703481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Maf2477hpFAskeArXUeJrNbik/ceLXuc1k//1TJydL8=; b=yw0r9ymfR+1SgnnWklPoYgR9jwrAwKAJDI8alKsu6D5l/o26F8t1Q7ZgHGb24IeaaKrenf SEX13LdSg4DqZ4agDMeZCYD1CqnUtd3deUMau91+zz5/v0kK52Vmjh03B4fcOnJ6HaP70a zK+ywqYuTnIbM2iHu/li8rCTxjKojmHLlzywh/cQcMQGYsK1uSQcj+0JS/fv+VCnBKHtO9 D5BaPGr3AuMa9h+Mr09VqQ19gLNZZewA0Kg43iPxEB3d9a25HGNJTOduZLycepVB6jOcj3 T9rwClUfcMfEQxqvi6sOzCwbnSqiAkSXmyvEEVFq+RmfaiiS/x93tofHfulf6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729703481; a=rsa-sha256; cv=none; b=BhzZGFIy4Yu3ALMHHj5cAYjLW2B8n0g7kYWWf8Kfp/FuQ664viHVEEU8LhJCc/Acto31pB IrYEkN38vAmG+d6F6UijaJVFeQxnzYjoHIRvTfsVSgY648B1ndLeLUCl32eawFVtnR1OhC cE053++p1JblpMBXmuKmBDQ/jqfepLHqWKA0AEV+7eQuN9s0d3cUse1xihUz0TRZJt9zeF ZPWuq86CN5mVjfa+7CKrXUIo+9sJ43+Wgw/ksg7Ga/kCy4hdiGLrgNImpnNxtkWJ6mR7UE mX6J5E0Gs4+yvvJZ4uo0xrJ7579ePXgYRjvcKmxgFavebvzZk/MKYZaLEsP1mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYbDT3BF4z165c; Wed, 23 Oct 2024 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NHBLjb022288; Wed, 23 Oct 2024 17:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NHBLPG022285; Wed, 23 Oct 2024 17:11:21 GMT (envelope-from git) Date: Wed, 23 Oct 2024 17:11:21 GMT Message-Id: <202410231711.49NHBLPG022285@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: 0953460ce149 - main - libc: fix access mode tests in fmemopen(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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0953460ce149e6f384aafbcb1e6213dfbf8f6a16 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0953460ce149e6f384aafbcb1e6213dfbf8f6a16 commit 0953460ce149e6f384aafbcb1e6213dfbf8f6a16 Author: Ed Maste AuthorDate: 2024-10-23 13:41:51 +0000 Commit: Ed Maste CommitDate: 2024-10-23 17:11:14 +0000 libc: fix access mode tests in fmemopen(3) Previously a stream opened as read-only could be written to. Add a test case for the fix. Also correct another incorrect access mode check that worked by accident, and improve the tests for that. PR: 281953 Reported by: Erkki Moorits, fuz Reviewed by: fuz, khng (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47265 --- lib/libc/stdio/fmemopen.c | 10 +++++----- lib/libc/tests/stdio/fmemopen2_test.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/lib/libc/stdio/fmemopen.c b/lib/libc/stdio/fmemopen.c index 2f835a34951b..dc323921d93a 100644 --- a/lib/libc/stdio/fmemopen.c +++ b/lib/libc/stdio/fmemopen.c @@ -74,10 +74,9 @@ fmemopen(void * __restrict buf, size_t size, const char * __restrict mode) } /* - * There's no point in requiring an automatically allocated buffer - * in write-only mode. + * An automatically allocated buffer is only allowed in read-write mode. */ - if (!(flags & O_RDWR) && buf == NULL) { + if ((flags & O_ACCMODE) != O_RDWR && buf == NULL) { errno = EINVAL; return (NULL); } @@ -136,9 +135,10 @@ fmemopen(void * __restrict buf, size_t size, const char * __restrict mode) break; } + /* Disable read in O_WRONLY mode, and write in O_RDONLY mode. */ f = funopen(ck, - flags & O_WRONLY ? NULL : fmemopen_read, - flags & O_RDONLY ? NULL : fmemopen_write, + (flags & O_ACCMODE) == O_WRONLY ? NULL : fmemopen_read, + (flags & O_ACCMODE) == O_RDONLY ? NULL : fmemopen_write, fmemopen_seek, fmemopen_close); if (f == NULL) { diff --git a/lib/libc/tests/stdio/fmemopen2_test.c b/lib/libc/tests/stdio/fmemopen2_test.c index 2e1b9ea917a5..4a7242ee6b2f 100644 --- a/lib/libc/tests/stdio/fmemopen2_test.c +++ b/lib/libc/tests/stdio/fmemopen2_test.c @@ -132,9 +132,11 @@ ATF_TC_BODY(test_autoalloc, tc) /* Open a FILE * using a wrong mode */ fp = fmemopen(NULL, 512, "r"); ATF_REQUIRE(fp == NULL); + ATF_REQUIRE(errno == EINVAL); fp = fmemopen(NULL, 512, "w"); ATF_REQUIRE(fp == NULL); + ATF_REQUIRE(errno == EINVAL); } ATF_TC_WITHOUT_HEAD(test_data_length); @@ -271,6 +273,35 @@ ATF_TC_BODY(test_size_0, tc) ATF_REQUIRE(errno == EINVAL); } +/* + * PR281953 - ensure we cannot write in read-only only mode, and cannot read in + * write-only mode. + */ +ATF_TC_WITHOUT_HEAD(test_rdonly_wronly); +ATF_TC_BODY(test_rdonly_wronly, tc) +{ + FILE *fp; + char buf[16]; + char buf_orig[16] = "input data"; + char buf_write[16] = "write"; + size_t sz; + + memcpy(buf, buf_orig, sizeof(buf)); + fp = fmemopen(buf, sizeof(buf), "r"); + ATF_REQUIRE(fp != NULL); + sz = fwrite(buf_write, 1, strlen(buf_write), fp); + ATF_REQUIRE(sz == 0); + ATF_REQUIRE(errno == EBADF); + ATF_REQUIRE(memcmp(buf, buf_orig, sizeof(buf)) == 0); + fclose(fp); + + fp = fmemopen(buf_orig, sizeof(buf), "w"); + sz = fread(buf, sizeof(buf), 1, fp); + ATF_REQUIRE(sz == 0); + ATF_REQUIRE(errno == EBADF); + fclose(fp); +} + ATF_TP_ADD_TCS(tp) { @@ -280,6 +311,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, test_binary); ATF_TP_ADD_TC(tp, test_append_binary_pos); ATF_TP_ADD_TC(tp, test_size_0); + ATF_TP_ADD_TC(tp, test_rdonly_wronly); return (atf_no_error()); } From nobody Wed Oct 23 17:31: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 4XYbgS6zNFz5ZT4w; Wed, 23 Oct 2024 17:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYbgS68TSz54R3; Wed, 23 Oct 2024 17:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729704676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuS2Geq42/PBDWP4ATooRbzlnyiz485e+amp/einW1M=; b=PV8PzwBbF2i56ibJkkUg7DMHnCOlqCnHkedlW9Fmg7EvndqHhjwAm8OgV3vx16Qzye9fTI fC00sNtPwcsbJ0q7tpKL05oEQspaQpbg1QETTMFZ5gRDzhaUjpIM4sixVux2xDDikypaxK qFyNKztS9Q9bY9ghVNFgd0P//Tb2dEajSJ9nokW2j6+aU7UjPAY6p8o3/kmDYTITa25HI1 XhWfHwdsi4aN2Z/K4a8n4Hh+vPOZcn4surkq/OtcD49b9iyJZemHvHTMvtNYJhLftsknKY /snRumOof801BpvZJvU1skyoJuSqKEwEMPyQgbS/QXHJhRD0d4IAkt5rvtI5Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729704676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LuS2Geq42/PBDWP4ATooRbzlnyiz485e+amp/einW1M=; b=U+tGs+8CQVLylpLCqwSNJQkUQU6RzFY67P3QaFxN9i9EdjIElJA2cfo4y+XSGfF6JWKe71 emGFNtqsC6B0cQyFmY1wBjbVKhYTJIFYkbws/Gpua3G+djgZmkezIWgfkaH08NDTn3I71l sTRnbja9O4o52UHVblLE4Rj9kEFkqXys78CR+J/ZHk6cGObbvRtV9ASO1GrLQmNWvATVvR dDF5islgtIAwVZfyxL7yutbn7phDniJQR1xdWgTT61CHpDn39e5RzVFJ2Y0JLqfkU3VHt9 dSoX8p+nUZYWvzAHrozRXS4PT9b6lT4uPpuKvkxa9CbXM//TmHnVfHq2BIWoOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729704676; a=rsa-sha256; cv=none; b=XVWPPTPM7Ic4BFqn5UqV9iBxA1Hx00Ff3AK7igoiHzuuqGcjvUc1UY/ViQdSf8VYP2B/J2 MJYTdZxo3VqoQrO4OfYSr7bqkTjjea3Rf4n2xGO1vyD4geZ5XCjK6F2WQvNwhKZWkvsvwt ml5mNL5Gl8lyP4IXMVfm43IvMjdpkFhaGHuDwKnds8Uw9XI+rYAPPcUdJOsxxCp+NQyAKQ OJbNOwIUOMMvrreFTt4QSxfIjpI1ZhAu5NPzZfGN7cI4UCoiUciJaXomT8CItg9GGTqCAG E+NLWpn4tp+HpSrMy+gXgJiE83d9tNL6l3WB09LLJntIlqPuzh2PmdULeLBAbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYbgS5jv0z16xw; Wed, 23 Oct 2024 17:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NHVGie061061; Wed, 23 Oct 2024 17:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NHVGRJ061058; Wed, 23 Oct 2024 17:31:16 GMT (envelope-from git) Date: Wed, 23 Oct 2024 17:31:16 GMT Message-Id: <202410231731.49NHVGRJ061058@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: 6b9f7133aba4 - main - libc: Add one more check in new fmemopen 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6b9f7133aba44189d9625c352bc2c2a59baf18ef Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b9f7133aba44189d9625c352bc2c2a59baf18ef commit 6b9f7133aba44189d9625c352bc2c2a59baf18ef Author: Ed Maste AuthorDate: 2024-10-23 17:28:55 +0000 Commit: Ed Maste CommitDate: 2024-10-23 17:29:34 +0000 libc: Add one more check in new fmemopen test Reported by: jrtc27 Fixes: 0953460ce149 ("libc: fix access mode tests in fmemopen(3)") --- lib/libc/tests/stdio/fmemopen2_test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/tests/stdio/fmemopen2_test.c b/lib/libc/tests/stdio/fmemopen2_test.c index 4a7242ee6b2f..a558ff3515e9 100644 --- a/lib/libc/tests/stdio/fmemopen2_test.c +++ b/lib/libc/tests/stdio/fmemopen2_test.c @@ -296,6 +296,7 @@ ATF_TC_BODY(test_rdonly_wronly, tc) fclose(fp); fp = fmemopen(buf_orig, sizeof(buf), "w"); + ATF_REQUIRE(fp != NULL); sz = fread(buf, sizeof(buf), 1, fp); ATF_REQUIRE(sz == 0); ATF_REQUIRE(errno == EBADF); From nobody Wed Oct 23 18:05: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 4XYcQt4vlbz5ZW47; Wed, 23 Oct 2024 18:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYcQt4JyWz57KR; Wed, 23 Oct 2024 18:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729706726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=se4nY/tZ+YpQAmn0jbcDbWoW+9f9vhQfV/U2ThY5O5E=; b=j/zfKLy/2DLGvPvm5OwgLs1OvruEj2VZEfFqDuGpoPb5kJ/Sq4Cq8wh74KUETA6iH+6myB 0nt7TDMYJnjE6NXNryku+kfQ99yBF6HFDHMpD4mTORHEyYi4BWAKpvYduK+dQStKP0g25f l94n0R1McSTqS8IGkGOKo/3gzECKB1C0PfKYJnKwGcLn9NABBcXHhfqPjj/hvcgXeS2F9r 8/IMH2XWnMGVdo7bsuU8fgmvwls7dy7sDiywLymZptjwWsZklOyBqLVBqFxHHvDPVCYSs/ dEAlVZCiC3JK80R9wJHFXj78pzjJfQwrIdotuRp33kMU5egM2mNZhxrxPMWPDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729706726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=se4nY/tZ+YpQAmn0jbcDbWoW+9f9vhQfV/U2ThY5O5E=; b=Yc4SfP9Z8x7qoy7XBvHyLssNQ8ZnMfVWBAVYohvdDVQ4mZKPrTdqZcOufGuJoLkj5iwbLM mwtT5xPBiqs1dKcQOV0MEa7/dQBpnaa6NxZkpw3+p7T2vsBN+TBG8LdhxjxLghz7kgfDnB Xg2xbRcNv5SIgW0354KMHGg5y0MzHvxRuTDFZbmoz/OzwGeKCdM+3mvfQ+AIVV+6SehDyJ xjTfXSFN0vT5bJKVnfwtDw4cvrrC9fsUdH8csbXsz6HemF7oimI9g98e5nEsiclOgaWoIT IIJl9nYNYE21kgbflbeB182mptCDWc37f+Tm17qGIKJVYpH3X3ew0YS4bg5fwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729706726; a=rsa-sha256; cv=none; b=YluUaOrkH7HjTj7XEKLk9VnCqlDeZQTY3L7eaG5353U76uR/e9QGM03axZRWVLYAocS5vK NRXLEGYWmRugiHfbUv9BWBXMakxFJBYXox09EXT7WaFiOGC1gcq/U78M4SvdOLzChh6jD4 dC9oN1p+/e6IJvrONoiHwnh/Mm9HtINJ2iz0LQ0nP4wNqmRLFNoWm4tf4ntkR6kz42X8XU UjDGHYe9uAh2xvaqc+NVg/LgRCbUF/44twofImf4fJsq2vx6dwZI2J71xDiaqosV0C2ykT i6CVKDiM0oU35918kBPz1+Vllg07dA9dnFKzuNZNX+Xu8dkDV+Tg7+Pg7JZnIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYcQt3wHxz17ww; Wed, 23 Oct 2024 18:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NI5QbO022241; Wed, 23 Oct 2024 18:05:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NI5QLY022238; Wed, 23 Oct 2024 18:05:26 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:05:26 GMT Message-Id: <202410231805.49NI5QLY022238@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: 5ae76ff5138e - stable/14 - la57: explain how the trampoline works List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5ae76ff5138e2ecbd2d740d75337d930360a6c6b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae76ff5138e2ecbd2d740d75337d930360a6c6b commit 5ae76ff5138e2ecbd2d740d75337d930360a6c6b Author: Konstantin Belousov AuthorDate: 2024-10-20 15:47:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-23 18:04:58 +0000 la57: explain how the trampoline works (cherry picked from commit 6244b9dc4a03e87246bad1c94067dfe54ff4cdbc) --- sys/amd64/amd64/locore.S | 61 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 1ed9085e655c..d39503adadf0 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -89,15 +89,36 @@ ENTRY(btext) 0: hlt jmp 0b -/* la57_trampoline(%rdi pml5) */ +/* + * void la57_trampoline(%rdi pml5) + * + * Entered in 4-level paging long mode on AP, hopefully returns alive in + * 5-level paging mode. The parameter is a pointer to a 5-level page + * table root. The passed 5-level page table, and the current 4-level page + * table, both must map the trampoline code page 1:1 physical, below 4G. + * The trampoline must be PIC because it is copied from kernel text into + * this page. + * + * The current paging level cannot be changed while paging is enabled, and + * paging cannot be disabled while in long mode. As consequence, code + * switches into the compat mode, then disables paging to descend into + * protected mode. There, the paging level bit CR4.LA57 can be changed, + * and code directly jumps back into long mode. + * + * Falling into the protected mode requires single-purpose GDT entries, + * which are provided by the private GDT. It is the caller's responsibility + * to + * - restore the GDT and %gsbase after the call + * - reset IDT back to long mode. + */ ENTRY(la57_trampoline) - movq %rsp,lst(%rip) - movq %rbx,lst+8(%rip) - movq %rbp,lst+0x10(%rip) + movq %rsp,lst(%rip) /* save registers into memeory */ + movq %rbx,lst+8(%rip) /* upper halves are not saved .. */ + movq %rbp,lst+0x10(%rip) /* by 64->32->64 switch */ movq %cr4,%rax - orq $CR4_LA57,%rax + orq $CR4_LA57,%rax /* 5-lvl %cr4 */ movq %rax,lst+0x18(%rip) - leaq la57_trampoline_end(%rip),%rsp + leaq la57_trampoline_end(%rip),%rsp /* priv stack */ movq %cr0,%rbp lgdtq la57_trampoline_gdt_desc(%rip) @@ -111,45 +132,45 @@ ENTRY(la57_trampoline) .code32 l1: movl $(3<<3),%eax - movl %eax,%ss + movl %eax,%ss /* 32bit paged, priv gdt and stack */ movl %cr4,%eax - andl $~(CR4_PGE | CR4_PCIDE),%eax + andl $~(CR4_PGE | CR4_PCIDE),%eax /* clear sensitive paging ctrls */ movl %eax,%cr4 movl %ebp,%eax - andl $~CR0_PG,%eax + andl $~CR0_PG,%eax /* protected mode */ movl %eax,%cr0 - movl $MSR_EFER,%ecx - rdmsr + movl $MSR_EFER,%ecx /* disable long mode bit */ + rdmsr /* to safer tweaking LA57 */ andl $~EFER_LME,%eax wrmsr - movl %cr4,%eax + movl %cr4,%eax /* finally safe to switch bit */ orl $CR4_LA57,%eax movl %eax,%cr4 - movl %edi,%cr3 + movl %edi,%cr3 /* and load the 5-level pgtable root */ rdmsr orl $EFER_LME,%eax - wrmsr + wrmsr /* prepare for ... */ - movl %ebp,%cr0 - jmp 1f + movl %ebp,%cr0 /* and jump back directly into long */ + jmp 1f /* mode from protected by enabling pg */ -1: pushl $(1<<3) +1: pushl $(1<<3) /* reload %cs */ pushl %ebx lretl .code64 -l2: movq lst(%rip),%rsp +l2: movq lst(%rip),%rsp /* back on C stack */ movq lst+8(%rip),%rbx movq lst+0x10(%rip),%rbp movq lst+0x18(%rip),%rax - movq %rax,%cr4 - retq + movq %rax,%cr4 /* re-enable paging controls */ + retq /* back to C */ .p2align 4,0 lst: .quad 0,0,0,0 ENTRY(la57_trampoline_gdt_desc) From nobody Wed Oct 23 18: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 4XYczT5yPfz5ZX47; Wed, 23 Oct 2024 18:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczT5XLCz58yw; Wed, 23 Oct 2024 18:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whPHtkvP0TM3gxT7zA779Nz/mRQUbUPScvEgYU1yDaM=; b=H+GR3bdXbYVb3kKvTZ0NL0siCIkqkQV+GqcfJzopfY40pAXjpqbHpNXKnXq4XCQ/Bz9gHB 0z+MCu1nn3I2/dpJqia7341l4klWVwzyY6u7GWB2U1CEIIpjdcArAkN3k7C5Vs813/sJFj b32xd112HtrJVrHtaOyfF6AxjVvp/fLaGSSjyuzge/AYHR9NzHb5fmstyDPneWbOs5CLNU D1D+Kg8hZr3aFMC7P4fI/6RSsmlYLxWFqdndLY001BkeZ2/q8OLZEwfcUUZ006yH7/WV1Q yBx8qlvKJqsbl2or1y29Pz54WMSMM6LxZO0MKDUxGj+s2Akfxk8gqtxE75tUZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whPHtkvP0TM3gxT7zA779Nz/mRQUbUPScvEgYU1yDaM=; b=LKvH1U3nPAVhdHyiL2o9j4R6qm5aLCsEaqI6ZdCkmfJC5JxPwaBFeoWS0VEltFyexbAM4A HzwZC6HlBpZF41E/0fyWKC0UbO9hNZ2nCrnLZ4Sjqsiv8ZGk5lLNGZ4mg0hU83SsfqfzZI 7oj9cdLn7dQUElHM23AR4kJ//9n8oVW+HcKxK4NdEm4GwZ7YnHehURwNIpIqs3gVhq1pkB N/FATdzP54GJPJUbbFvKG8D83yQjhiYmUimtOK6Hkw2Pnzxwy48lNdnCb79oX+RjTj91s/ wQE/03ukfkpNDATJHb0wbFkYDiI+yfOS6/oYMxw71Kq/BLj9FSv3sog0PRcknw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708213; a=rsa-sha256; cv=none; b=Xyl82ONEFoRHaWo9KAhC4Bt85HrnDTzFM/hyT5i9TPJA8tOxQulL0sIuGjFkXegAJziNlE lqUaFbTR2IjkgKaRubCN9cjgoqQbqutDVS7e3KbLRP/dVNuzUOP3EwgLzhnMz2dJPXLpWy 2ss8RGn02IdvZhADHl8leNCc4o2l1N8ngrHuptHTBGNkjz6jOo/dp3Y1RkEu6wijPlIjd9 onYMUtrH/deVGoNOF0suy/Dj2tprU+TWZ0CRq3O+aSZAs2IjHjC1UvyOVpdzDZSgJUjTju Lja49vV1s2XzJOi5eDxkdUojXJnvhmu04foIm1QDmo8EOE7qranHDmjalQkO/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 4XYczT571Fz17yK; Wed, 23 Oct 2024 18:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUDCx066261; Wed, 23 Oct 2024 18:30:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIU2xS062239; Wed, 23 Oct 2024 18:30:02 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:02 GMT Message-Id: <202410231830.49NIU2xS062239@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: 0fca6ea1d4ee - main - Merge llvm-project main llvmorg-19-init-18630-gf2ccf80136a0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0fca6ea1d4eea4c934cfff25ac9ee8ad6fe95583 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0fca6ea1d4eea4c934cfff25ac9ee8ad6fe95583 commit 0fca6ea1d4eea4c934cfff25ac9ee8ad6fe95583 Merge: 6b9f7133aba4 ac9a064cb179 Author: Dimitry Andric AuthorDate: 2024-07-27 23:34:35 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:01 +0000 Merge llvm-project main llvmorg-19-init-18630-gf2ccf80136a0 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-19-init-18630-gf2ccf80136a0, the last commit before the upstream release/19.x branch was created. PR: 280562 MFC after: 1 month ObsoleteFiles.inc | 477 + contrib/llvm-project/FREEBSD-Xlist | 56 +- contrib/llvm-project/clang/include/clang-c/Index.h | 85 +- .../clang/include/clang/APINotes/APINotesManager.h | 2 +- .../clang/include/clang/APINotes/APINotesReader.h | 25 +- .../clang/include/clang/APINotes/APINotesWriter.h | 29 +- .../clang/include/clang/APINotes/Types.h | 77 +- .../clang/include/clang/AST/ASTConcept.h | 11 +- .../clang/include/clang/AST/ASTConsumer.h | 3 +- .../clang/include/clang/AST/ASTContext.h | 134 +- .../clang/include/clang/AST/ASTMutationListener.h | 27 + .../clang/include/clang/AST/ASTNodeTraverser.h | 130 +- .../clang/include/clang/AST/ASTUnresolvedSet.h | 9 +- .../clang/include/clang/AST/AbstractBasicReader.h | 13 +- .../clang/include/clang/AST/AbstractBasicWriter.h | 12 +- .../clang/include/clang/AST/Availability.h | 63 + .../clang/include/clang/AST/BuiltinTypes.def | 5 +- .../clang/include/clang/AST/CommentCommandTraits.h | 22 + .../clang/include/clang/AST/CommentCommands.td | 9 +- .../clang/include/clang/AST/CommentParser.h | 9 +- .../clang/include/clang/AST/ComparisonCategories.h | 2 +- .../clang/include/clang/AST/ComputeDependence.h | 6 +- .../llvm-project/clang/include/clang/AST/Decl.h | 286 +- .../clang/include/clang/AST/DeclAccessPair.h | 37 +- .../clang/include/clang/AST/DeclBase.h | 72 +- .../llvm-project/clang/include/clang/AST/DeclCXX.h | 63 +- .../clang/include/clang/AST/DeclContextInternals.h | 41 +- .../clang/include/clang/AST/DeclFriend.h | 2 +- .../llvm-project/clang/include/clang/AST/DeclID.h | 274 + .../clang/include/clang/AST/DeclObjC.h | 119 +- .../clang/include/clang/AST/DeclOpenMP.h | 19 +- .../clang/include/clang/AST/DeclTemplate.h | 395 +- .../llvm-project/clang/include/clang/AST/Expr.h | 577 +- .../llvm-project/clang/include/clang/AST/ExprCXX.h | 199 +- .../clang/include/clang/AST/ExprOpenMP.h | 124 - .../clang/include/clang/AST/ExternalASTSource.h | 8 +- .../clang/include/clang/AST/FormatString.h | 13 + .../clang/include/clang/AST/GlobalDecl.h | 4 + .../clang/include/clang/AST/JSONNodeDumper.h | 5 + .../llvm-project/clang/include/clang/AST/Mangle.h | 11 +- .../clang/include/clang/AST/NestedNameSpecifier.h | 8 +- .../clang/include/clang/AST/OpenACCClause.h | 917 + .../clang/include/clang/AST/OpenMPClause.h | 40 + .../clang/include/clang/AST/OperationKinds.def | 6 + .../clang/include/clang/AST/ParentMapContext.h | 2 +- .../clang/include/clang/AST/PrettyPrinter.h | 7 +- .../clang/include/clang/AST/PropertiesBase.td | 3 + .../clang/include/clang/AST/RawCommentList.h | 15 +- .../clang/include/clang/AST/RecursiveASTVisitor.h | 170 +- .../clang/include/clang/AST/Redeclarable.h | 4 +- .../llvm-project/clang/include/clang/AST/Stmt.h | 31 +- .../clang/include/clang/AST/StmtObjC.h | 3 +- .../clang/include/clang/AST/StmtOpenACC.h | 256 + .../clang/include/clang/AST/StmtOpenMP.h | 157 +- .../clang/include/clang/AST/StmtVisitor.h | 3 +- .../clang/include/clang/AST/TemplateBase.h | 2 +- .../clang/include/clang/AST/TemplateName.h | 37 +- .../clang/include/clang/AST/TextNodeDumper.h | 17 + .../llvm-project/clang/include/clang/AST/Type.h | 1137 +- .../llvm-project/clang/include/clang/AST/TypeLoc.h | 71 +- .../clang/include/clang/AST/TypeProperties.td | 51 + .../clang/include/clang/AST/UnresolvedSet.h | 1 + .../clang/include/clang/AST/VTTBuilder.h | 6 +- .../clang/include/clang/AST/VTableBuilder.h | 29 + .../clang/include/clang/ASTMatchers/ASTMatchers.h | 148 +- .../clang/ASTMatchers/ASTMatchersInternal.h | 50 +- .../clang/Analysis/Analyses/ExprMutationAnalyzer.h | 136 +- .../clang/Analysis/Analyses/PostOrderCFGView.h | 36 +- .../clang/Analysis/Analyses/ThreadSafetyCommon.h | 6 +- .../clang/Analysis/Analyses/UnsafeBufferUsage.h | 58 +- .../Analysis/Analyses/UnsafeBufferUsageGadgets.def | 12 +- .../clang/include/clang/Analysis/CFG.h | 3 + .../include/clang/Analysis/FlowSensitive/ASTOps.h | 156 + .../clang/Analysis/FlowSensitive/AdornedCFG.h | 96 + .../clang/Analysis/FlowSensitive/CNFFormula.h | 179 + .../Analysis/FlowSensitive/ControlFlowContext.h | 79 - .../Analysis/FlowSensitive/DataflowAnalysis.h | 200 +- .../FlowSensitive/DataflowAnalysisContext.h | 75 +- .../Analysis/FlowSensitive/DataflowEnvironment.h | 323 +- .../clang/Analysis/FlowSensitive/DataflowLattice.h | 8 +- .../clang/Analysis/FlowSensitive/DataflowValues.h | 12 +- .../include/clang/Analysis/FlowSensitive/Logger.h | 6 +- .../clang/Analysis/FlowSensitive/RecordOps.h | 6 +- .../include/clang/Analysis/FlowSensitive/Solver.h | 3 + .../clang/Analysis/FlowSensitive/Transfer.h | 9 +- .../FlowSensitive/TypeErasedDataflowAnalysis.h | 25 +- .../include/clang/Analysis/FlowSensitive/Value.h | 41 - .../Analysis/FlowSensitive/WatchedLiteralsSolver.h | 10 +- .../clang/include/clang/Analysis/PathDiagnostic.h | 8 +- .../clang/include/clang/Analysis/SelectorExtras.h | 4 +- .../clang/include/clang/Basic/AMDGPUTypes.def | 21 + .../include/clang/Basic/ASTSourceDescriptor.h | 52 + .../clang/include/clang/Basic/AllDiagnostics.h | 1 + .../llvm-project/clang/include/clang/Basic/Attr.td | 508 +- .../clang/include/clang/Basic/AttrDocs.td | 449 +- .../include/clang/Basic/AttributeCommonInfo.h | 6 +- .../clang/include/clang/Basic/Builtins.def | 1705 +- .../clang/include/clang/Basic/Builtins.h | 7 +- .../clang/include/clang/Basic/Builtins.td | 4770 ++++ .../clang/include/clang/Basic/BuiltinsAArch64.def | 15 +- .../clang/include/clang/Basic/BuiltinsAMDGPU.def | 82 +- .../clang/include/clang/Basic/BuiltinsBPF.def | 33 - .../clang/include/clang/Basic/BuiltinsBPF.td | 37 + .../clang/include/clang/Basic/BuiltinsBase.td | 127 + .../clang/include/clang/Basic/BuiltinsNVPTX.def | 20 +- .../clang/include/clang/Basic/BuiltinsRISCV.def | 93 - .../clang/include/clang/Basic/BuiltinsRISCV.td | 148 + .../include/clang/Basic/BuiltinsWebAssembly.def | 12 + .../clang/include/clang/Basic/BuiltinsX86.def | 66 +- .../clang/include/clang/Basic/CharInfo.h | 36 +- .../clang/include/clang/Basic/CodeGenOptions.def | 12 +- .../clang/include/clang/Basic/CodeGenOptions.h | 19 +- .../llvm-project/clang/include/clang/Basic/Cuda.h | 51 +- .../include/clang/Basic/CustomizableOptional.h | 8 - .../clang/include/clang/Basic/DarwinSDKInfo.h | 24 + .../clang/include/clang/Basic/DebugOptions.def | 5 + .../clang/include/clang/Basic/DeclNodes.td | 2 +- .../clang/include/clang/Basic/Diagnostic.td | 1 + .../include/clang/Basic/DiagnosticASTKinds.td | 2 + .../include/clang/Basic/DiagnosticCommonKinds.td | 25 +- .../include/clang/Basic/DiagnosticDriverKinds.td | 93 +- .../include/clang/Basic/DiagnosticFrontendKinds.td | 49 +- .../clang/include/clang/Basic/DiagnosticGroups.td | 131 +- .../clang/include/clang/Basic/DiagnosticIDs.h | 9 +- .../include/clang/Basic/DiagnosticInstallAPI.h | 26 + .../clang/Basic/DiagnosticInstallAPIKinds.td | 77 + .../include/clang/Basic/DiagnosticLexKinds.td | 45 +- .../clang/include/clang/Basic/DiagnosticOptions.h | 2 +- .../include/clang/Basic/DiagnosticParseKinds.td | 64 +- .../include/clang/Basic/DiagnosticSemaKinds.td | 669 +- .../clang/Basic/DiagnosticSerializationKinds.td | 5 + .../clang/include/clang/Basic/DirectoryEntry.h | 7 - .../clang/include/clang/Basic/Features.def | 18 +- .../clang/include/clang/Basic/FileEntry.h | 10 - .../clang/include/clang/Basic/FileManager.h | 29 +- .../clang/include/clang/Basic/IdentifierTable.h | 164 +- .../clang/include/clang/Basic/LangOptions.def | 36 +- .../clang/include/clang/Basic/LangOptions.h | 114 +- .../clang/include/clang/Basic/LangStandard.h | 41 +- .../clang/include/clang/Basic/LangStandards.def | 9 + .../clang/include/clang/Basic/MSP430Target.def | 583 +- .../clang/include/clang/Basic/Module.h | 50 +- .../clang/include/clang/Basic/OpenACCClauses.def | 58 + .../clang/include/clang/Basic/OpenACCKinds.h | 166 +- .../include/clang/Basic/OpenCLExtensionTypes.def | 2 +- .../clang/include/clang/Basic/OpenMPKinds.h | 14 + .../clang/include/clang/Basic/PointerAuthOptions.h | 193 + .../clang/include/clang/Basic/RISCVVTypes.def | 8 +- .../clang/include/clang/Basic/Sanitizers.def | 23 +- .../clang/include/clang/Basic/SourceLocation.h | 1 + .../clang/include/clang/Basic/SourceManager.h | 56 +- .../clang/include/clang/Basic/Specifiers.h | 54 +- .../clang/include/clang/Basic/StmtNodes.td | 13 +- .../clang/include/clang/Basic/SyncScope.h | 3 +- .../clang/include/clang/Basic/TargetBuiltins.h | 4 +- .../clang/include/clang/Basic/TargetCXXABI.h | 2 +- .../clang/include/clang/Basic/TargetInfo.h | 124 +- .../clang/include/clang/Basic/TargetOSMacros.def | 5 +- .../llvm-project/clang/include/clang/Basic/Thunk.h | 15 +- .../clang/include/clang/Basic/TokenKinds.def | 95 +- .../clang/include/clang/Basic/TokenKinds.h | 10 +- .../clang/include/clang/Basic/TypeNodes.td | 4 + .../clang/include/clang/Basic/Visibility.h | 3 + .../clang/include/clang/Basic/arm_fp16.td | 2 +- .../clang/include/clang/Basic/arm_neon.td | 125 +- .../clang/include/clang/Basic/arm_neon_incl.td | 4 +- .../clang/include/clang/Basic/arm_sme.td | 210 +- .../clang/include/clang/Basic/arm_sve.td | 1787 +- .../clang/include/clang/Basic/arm_sve_sme_incl.td | 7 +- .../include/clang/Basic/riscv_sifive_vector.td | 29 +- .../clang/include/clang/Basic/riscv_vector.td | 145 +- .../include/clang/CIR/Dialect/IR/CIRDialect.h | 16 + .../include/clang/CIR/Dialect/IR/CIRDialect.td | 44 + .../clang/include/clang/CIR/Dialect/IR/CIROps.td | 19 + .../clang/include/clang/CodeGen/CGFunctionInfo.h | 11 + .../clang/include/clang/CodeGen/CodeGenABITypes.h | 8 + .../clang/include/clang/CodeGen/CodeGenAction.h | 2 + .../include/clang/CodeGen/ConstantInitBuilder.h | 10 +- .../clang/include/clang/CodeGen/ModuleBuilder.h | 4 + .../clang/include/clang/Driver/ClangOptionDocs.td | 3 +- .../clang/include/clang/Driver/Distro.h | 3 +- .../clang/include/clang/Driver/Driver.h | 54 +- .../clang/include/clang/Driver/OffloadBundler.h | 23 +- .../clang/include/clang/Driver/Options.td | 671 +- .../clang/include/clang/Driver/SanitizerArgs.h | 3 + .../clang/include/clang/Driver/ToolChain.h | 20 +- .../clang/include/clang/Driver/Types.def | 1 + .../clang/Driver/aarch64-mlr-for-calls-only.c | 3 + .../clang/include/clang/ExtractAPI/API.h | 1629 +- .../clang/include/clang/ExtractAPI/APIRecords.inc | 115 + .../include/clang/ExtractAPI/AvailabilityInfo.h | 76 - .../clang/ExtractAPI/DeclarationFragments.h | 118 +- .../clang/ExtractAPI/ExtractAPIActionBase.h | 8 +- .../include/clang/ExtractAPI/ExtractAPIVisitor.h | 789 +- .../include/clang/ExtractAPI/FrontendActions.h | 6 - .../clang/ExtractAPI/Serialization/APISetVisitor.h | 172 + .../ExtractAPI/Serialization/SerializerBase.h | 314 - .../Serialization/SymbolGraphSerializer.h | 258 +- .../clang/include/clang/Format/Format.h | 415 +- .../clang/include/clang/Frontend/ASTUnit.h | 25 +- .../include/clang/Frontend/CompilerInstance.h | 42 + .../include/clang/Frontend/CompilerInvocation.h | 15 + .../clang/include/clang/Frontend/FrontendActions.h | 23 +- .../clang/include/clang/Frontend/FrontendOptions.h | 58 +- .../include/clang/Frontend/MultiplexConsumer.h | 6 +- .../include/clang/Frontend/PrecompiledPreamble.h | 4 +- .../clang/Frontend/PreprocessorOutputOptions.h | 3 + .../clang/Frontend/SerializedDiagnosticReader.h | 7 +- .../clang/include/clang/Frontend/TextDiagnostic.h | 18 +- .../clang/include/clang/InstallAPI/Context.h | 103 + .../include/clang/InstallAPI/DirectoryScanner.h | 81 + .../clang/include/clang/InstallAPI/DylibVerifier.h | 228 + .../clang/include/clang/InstallAPI/FileList.h | 43 + .../clang/include/clang/InstallAPI/Frontend.h | 50 + .../include/clang/InstallAPI/FrontendRecords.h | 113 + .../clang/include/clang/InstallAPI/HeaderFile.h | 167 + .../clang/InstallAPI/InstallAPIDiagnostic.h | 14 + .../clang/include/clang/InstallAPI/Library.h | 65 + .../clang/include/clang/InstallAPI/MachO.h | 54 + .../clang/include/clang/InstallAPI/Visitor.h | 89 + .../clang/include/clang/Interpreter/Interpreter.h | 53 +- .../clang/include/clang/Interpreter/Value.h | 1 + .../include/clang/Lex/ExternalPreprocessorSource.h | 59 +- .../clang/include/clang/Lex/HeaderSearch.h | 79 +- .../clang/include/clang/Lex/HeaderSearchOptions.h | 23 +- .../clang/include/clang/Lex/LiteralSupport.h | 13 +- .../clang/include/clang/Lex/MacroInfo.h | 8 +- .../clang/include/clang/Lex/ModuleMap.h | 15 +- .../clang/include/clang/Lex/PPCallbacks.h | 70 +- .../clang/include/clang/Lex/PPDirectiveParameter.h | 33 + .../clang/include/clang/Lex/PPEmbedParameters.h | 93 + .../clang/include/clang/Lex/PreprocessingRecord.h | 3 +- .../clang/include/clang/Lex/Preprocessor.h | 151 +- .../clang/include/clang/Lex/PreprocessorOptions.h | 30 +- .../llvm-project/clang/include/clang/Lex/Token.h | 5 +- .../clang/include/clang/Parse/Parser.h | 358 +- .../include/clang/Parse/RAIIObjectsForParser.h | 2 +- .../clang/include/clang/Rewrite/Core/HTMLRewrite.h | 15 +- .../include/clang/Sema/AnalysisBasedWarnings.h | 4 + .../llvm-project/clang/include/clang/Sema/Attr.h | 192 + .../include/clang/Sema/CodeCompleteConsumer.h | 10 +- .../clang/include/clang/Sema/CodeCompleteOptions.h | 9 + .../clang/include/clang/Sema/DeclSpec.h | 156 +- .../clang/include/clang/Sema/DelayedDiagnostic.h | 2 + .../include/clang/Sema/HLSLExternalSemaSource.h | 1 - .../clang/include/clang/Sema/Initialization.h | 4 +- .../llvm-project/clang/include/clang/Sema/Lookup.h | 47 +- .../clang/Sema/MultiplexExternalSemaSource.h | 2 +- .../clang/include/clang/Sema/Overload.h | 60 +- .../clang/include/clang/Sema/ParsedAttr.h | 66 +- .../clang/include/clang/Sema/ParsedTemplate.h | 7 +- .../clang/include/clang/Sema/Redeclaration.h | 31 + .../llvm-project/clang/include/clang/Sema/Scope.h | 59 + .../clang/include/clang/Sema/ScopeInfo.h | 37 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 25015 ++++++++++--------- .../clang/include/clang/Sema/SemaAMDGPU.h | 68 + .../clang/include/clang/Sema/SemaARM.h | 77 + .../clang/include/clang/Sema/SemaAVR.h | 32 + .../clang/include/clang/Sema/SemaBPF.h | 35 + .../clang/include/clang/Sema/SemaBase.h | 227 + .../clang/include/clang/Sema/SemaCUDA.h | 304 + .../clang/include/clang/Sema/SemaCodeCompletion.h | 237 + .../clang/include/clang/Sema/SemaConcept.h | 193 +- .../clang/include/clang/Sema/SemaHLSL.h | 68 + .../clang/include/clang/Sema/SemaHexagon.h | 29 + .../clang/include/clang/Sema/SemaInternal.h | 4 - .../clang/include/clang/Sema/SemaLoongArch.h | 30 + .../clang/include/clang/Sema/SemaM68k.h | 30 + .../clang/include/clang/Sema/SemaMIPS.h | 37 + .../clang/include/clang/Sema/SemaMSP430.h | 30 + .../clang/include/clang/Sema/SemaNVPTX.h | 30 + .../clang/include/clang/Sema/SemaObjC.h | 1085 + .../clang/include/clang/Sema/SemaOpenACC.h | 463 + .../clang/include/clang/Sema/SemaOpenCL.h | 107 + .../clang/include/clang/Sema/SemaOpenMP.h | 1457 ++ .../clang/include/clang/Sema/SemaPPC.h | 58 + .../clang/include/clang/Sema/SemaPseudoObject.h | 40 + .../clang/include/clang/Sema/SemaRISCV.h | 57 + .../clang/include/clang/Sema/SemaSYCL.h | 69 + .../clang/include/clang/Sema/SemaSwift.h | 59 + .../clang/include/clang/Sema/SemaSystemZ.h | 28 + .../clang/include/clang/Sema/SemaWasm.h | 52 + .../clang/include/clang/Sema/SemaX86.h | 44 + .../clang/include/clang/Sema/Template.h | 1 + .../clang/include/clang/Sema/TemplateDeduction.h | 5 + .../include/clang/Serialization/ASTBitCodes.h | 352 +- .../Serialization/ASTDeserializationListener.h | 4 +- .../clang/include/clang/Serialization/ASTReader.h | 300 +- .../include/clang/Serialization/ASTRecordReader.h | 31 +- .../include/clang/Serialization/ASTRecordWriter.h | 17 + .../clang/include/clang/Serialization/ASTWriter.h | 183 +- .../clang/include/clang/Serialization/ModuleFile.h | 45 +- .../clang/Serialization/ModuleFileExtension.h | 1 - .../include/clang/Serialization/ModuleManager.h | 3 +- .../clang/Serialization/PCHContainerOperations.h | 4 +- .../clang/Serialization/SourceLocationEncoding.h | 91 +- .../include/clang/Serialization/TypeBitCodes.def | 3 + .../clang/StaticAnalyzer/Checkers/Checkers.td | 129 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.def | 52 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.h | 9 +- .../StaticAnalyzer/Core/BugReporter/BugReporter.h | 12 + .../Core/BugReporter/BugReporterVisitors.h | 26 +- .../Core/BugReporter/BugSuppression.h | 5 + .../Core/BugReporter/Z3CrosscheckVisitor.h | 92 + .../clang/StaticAnalyzer/Core/CheckerManager.h | 2 +- .../StaticAnalyzer/Core/PathDiagnosticConsumers.h | 2 +- .../Core/PathSensitive/CallDescription.h | 84 +- .../StaticAnalyzer/Core/PathSensitive/CallEvent.h | 72 + .../Core/PathSensitive/CheckerContext.h | 24 +- .../Core/PathSensitive/CheckerHelpers.h | 4 + .../StaticAnalyzer/Core/PathSensitive/CoreEngine.h | 18 +- .../StaticAnalyzer/Core/PathSensitive/ExprEngine.h | 14 +- .../StaticAnalyzer/Core/PathSensitive/MemRegion.h | 9 +- .../Core/PathSensitive/ProgramState.h | 16 +- .../Core/PathSensitive/SMTConstraintManager.h | 5 +- .../Core/PathSensitive/SValBuilder.h | 12 +- .../StaticAnalyzer/Core/PathSensitive/SVals.h | 8 - .../StaticAnalyzer/Core/PathSensitive/Store.h | 14 +- .../include/clang/Support/RISCVVIntrinsicUtils.h | 9 +- .../clang/include/clang/Testing/CommandLineArgs.h | 1 + .../clang/include/clang/Testing/TestAST.h | 4 + .../clang/include/clang/Testing/TestClangConfig.h | 16 +- .../include/clang/Tooling/CommonOptionsParser.h | 15 +- .../DependencyScanningFilesystem.h | 105 +- .../DependencyScanning/DependencyScanningService.h | 14 +- .../DependencyScanning/ModuleDepCollector.h | 18 +- .../clang/Tooling/Inclusions/IncludeStyle.h | 23 + .../include/clang/Tooling/NodeIntrospection.h | 101 - .../clang/include/clang/Tooling/Syntax/Tokens.h | 4 +- .../clang/Tooling/Transformer/RangeSelector.h | 5 + .../llvm-project/clang/include/module.modulemap | 20 +- .../clang/lib/APINotes/APINotesFormat.h | 107 +- .../clang/lib/APINotes/APINotesManager.cpp | 8 +- .../clang/lib/APINotes/APINotesReader.cpp | 426 +- .../clang/lib/APINotes/APINotesTypes.cpp | 2 +- .../clang/lib/APINotes/APINotesWriter.cpp | 199 +- .../clang/lib/APINotes/APINotesYAMLCompiler.cpp | 173 +- .../llvm-project/clang/lib/ARCMigrate/ARCMT.cpp | 3 +- .../llvm-project/clang/lib/ARCMigrate/ObjCMT.cpp | 12 +- .../clang/lib/ARCMigrate/TransAPIUses.cpp | 2 +- .../clang/lib/ARCMigrate/TransGCAttrs.cpp | 2 +- .../clang/lib/ARCMigrate/TransUnbridgedCasts.cpp | 2 +- .../clang/lib/ARCMigrate/Transforms.cpp | 5 +- contrib/llvm-project/clang/lib/AST/APValue.cpp | 8 +- contrib/llvm-project/clang/lib/AST/ASTConcept.cpp | 36 +- contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 984 +- .../llvm-project/clang/lib/AST/ASTDiagnostic.cpp | 111 +- contrib/llvm-project/clang/lib/AST/ASTDumper.cpp | 51 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 398 +- .../clang/lib/AST/ASTStructuralEquivalence.cpp | 45 +- .../llvm-project/clang/lib/AST/ASTTypeTraits.cpp | 2 + .../llvm-project/clang/lib/AST/AttrDocTable.cpp | 2 +- .../AvailabilityInfo.cpp => AST/Availability.cpp} | 27 +- .../llvm-project/clang/lib/AST/CommentParser.cpp | 171 + .../clang/lib/AST/ComparisonCategories.cpp | 16 +- .../clang/lib/AST/ComputeDependence.cpp | 43 +- contrib/llvm-project/clang/lib/AST/Decl.cpp | 294 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 98 +- contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 215 +- contrib/llvm-project/clang/lib/AST/DeclFriend.cpp | 2 +- contrib/llvm-project/clang/lib/AST/DeclObjC.cpp | 123 +- contrib/llvm-project/clang/lib/AST/DeclOpenMP.cpp | 14 +- contrib/llvm-project/clang/lib/AST/DeclPrinter.cpp | 281 +- .../llvm-project/clang/lib/AST/DeclTemplate.cpp | 393 +- contrib/llvm-project/clang/lib/AST/Expr.cpp | 237 +- contrib/llvm-project/clang/lib/AST/ExprCXX.cpp | 118 +- .../clang/lib/AST/ExprClassification.cpp | 15 +- .../llvm-project/clang/lib/AST/ExprConstShared.h | 10 + .../llvm-project/clang/lib/AST/ExprConstant.cpp | 926 +- .../clang/lib/AST/ExternalASTSource.cpp | 6 +- .../llvm-project/clang/lib/AST/FormatString.cpp | 54 +- .../llvm-project/clang/lib/AST/Interp/Boolean.h | 15 +- .../clang/lib/AST/Interp/ByteCodeEmitter.cpp | 111 +- .../clang/lib/AST/Interp/ByteCodeEmitter.h | 9 +- .../clang/lib/AST/Interp/ByteCodeExprGen.cpp | 3088 --- .../clang/lib/AST/Interp/ByteCodeGenError.h | 46 - .../clang/lib/AST/Interp/ByteCodeStmtGen.cpp | 680 - .../clang/lib/AST/Interp/ByteCodeStmtGen.h | 91 - .../llvm-project/clang/lib/AST/Interp/Compiler.cpp | 5599 +++++ .../AST/Interp/{ByteCodeExprGen.h => Compiler.h} | 408 +- .../llvm-project/clang/lib/AST/Interp/Context.cpp | 169 +- .../llvm-project/clang/lib/AST/Interp/Context.h | 26 +- .../clang/lib/AST/Interp/Descriptor.cpp | 164 +- .../llvm-project/clang/lib/AST/Interp/Descriptor.h | 66 +- .../llvm-project/clang/lib/AST/Interp/Disasm.cpp | 315 +- .../clang/lib/AST/Interp/DynamicAllocator.cpp | 118 + .../clang/lib/AST/Interp/DynamicAllocator.h | 102 + .../clang/lib/AST/Interp/EvalEmitter.cpp | 126 +- .../clang/lib/AST/Interp/EvalEmitter.h | 31 +- .../clang/lib/AST/Interp/EvaluationResult.cpp | 152 +- .../clang/lib/AST/Interp/EvaluationResult.h | 22 +- .../llvm-project/clang/lib/AST/Interp/Floating.h | 2 +- .../llvm-project/clang/lib/AST/Interp/Function.cpp | 3 +- .../llvm-project/clang/lib/AST/Interp/Function.h | 21 +- .../clang/lib/AST/Interp/FunctionPointer.h | 36 +- .../llvm-project/clang/lib/AST/Interp/Integral.h | 10 +- .../llvm-project/clang/lib/AST/Interp/IntegralAP.h | 39 +- .../llvm-project/clang/lib/AST/Interp/Interp.cpp | 563 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 1279 +- .../clang/lib/AST/Interp/InterpBlock.cpp | 11 +- .../clang/lib/AST/Interp/InterpBlock.h | 50 +- .../clang/lib/AST/Interp/InterpBuiltin.cpp | 933 +- .../clang/lib/AST/Interp/InterpFrame.cpp | 62 +- .../clang/lib/AST/Interp/InterpFrame.h | 16 +- .../clang/lib/AST/Interp/InterpShared.cpp | 42 + .../clang/lib/AST/Interp/InterpShared.h | 26 + .../clang/lib/AST/Interp/InterpStack.cpp | 1 + .../clang/lib/AST/Interp/InterpStack.h | 4 +- .../clang/lib/AST/Interp/InterpState.cpp | 33 +- .../clang/lib/AST/Interp/InterpState.h | 29 +- .../clang/lib/AST/Interp/MemberPointer.cpp | 76 + .../clang/lib/AST/Interp/MemberPointer.h | 112 + .../llvm-project/clang/lib/AST/Interp/Opcodes.td | 216 +- .../llvm-project/clang/lib/AST/Interp/Pointer.cpp | 404 +- .../llvm-project/clang/lib/AST/Interp/Pointer.h | 456 +- .../llvm-project/clang/lib/AST/Interp/PrimType.cpp | 1 + .../llvm-project/clang/lib/AST/Interp/PrimType.h | 62 +- .../llvm-project/clang/lib/AST/Interp/Program.cpp | 165 +- .../llvm-project/clang/lib/AST/Interp/Program.h | 12 +- .../llvm-project/clang/lib/AST/Interp/Record.cpp | 21 +- contrib/llvm-project/clang/lib/AST/Interp/Record.h | 21 +- .../llvm-project/clang/lib/AST/Interp/Source.cpp | 2 +- .../llvm-project/clang/lib/AST/Interp/State.cpp | 5 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 144 +- .../llvm-project/clang/lib/AST/JSONNodeDumper.cpp | 71 +- contrib/llvm-project/clang/lib/AST/Linkage.h | 3 + contrib/llvm-project/clang/lib/AST/Mangle.cpp | 28 +- .../llvm-project/clang/lib/AST/MicrosoftMangle.cpp | 263 +- contrib/llvm-project/clang/lib/AST/NSAPI.cpp | 109 +- .../clang/lib/AST/NestedNameSpecifier.cpp | 18 +- .../llvm-project/clang/lib/AST/ODRDiagsEmitter.cpp | 19 +- contrib/llvm-project/clang/lib/AST/ODRHash.cpp | 25 +- .../llvm-project/clang/lib/AST/OpenACCClause.cpp | 552 + .../llvm-project/clang/lib/AST/OpenMPClause.cpp | 2 + contrib/llvm-project/clang/lib/AST/ParentMap.cpp | 7 +- .../clang/lib/AST/ParentMapContext.cpp | 25 +- .../clang/lib/AST/PrintfFormatString.cpp | 95 +- .../llvm-project/clang/lib/AST/QualTypeNames.cpp | 9 +- .../clang/lib/AST/RecordLayoutBuilder.cpp | 12 + .../clang/lib/AST/ScanfFormatString.cpp | 4 +- .../clang/lib/AST/SelectorLocationsKind.cpp | 4 +- contrib/llvm-project/clang/lib/AST/Stmt.cpp | 1 + contrib/llvm-project/clang/lib/AST/StmtOpenACC.cpp | 125 + contrib/llvm-project/clang/lib/AST/StmtOpenMP.cpp | 43 +- contrib/llvm-project/clang/lib/AST/StmtPrinter.cpp | 66 +- contrib/llvm-project/clang/lib/AST/StmtProfile.cpp | 210 +- .../llvm-project/clang/lib/AST/TemplateBase.cpp | 21 +- .../llvm-project/clang/lib/AST/TemplateName.cpp | 115 +- .../llvm-project/clang/lib/AST/TextNodeDumper.cpp | 321 +- contrib/llvm-project/clang/lib/AST/Type.cpp | 664 +- contrib/llvm-project/clang/lib/AST/TypeLoc.cpp | 18 +- contrib/llvm-project/clang/lib/AST/TypePrinter.cpp | 179 +- contrib/llvm-project/clang/lib/AST/VTTBuilder.cpp | 2 +- .../llvm-project/clang/lib/AST/VTableBuilder.cpp | 105 +- .../clang/lib/ASTMatchers/Dynamic/Marshallers.cpp | 4 +- .../clang/lib/ASTMatchers/Dynamic/Marshallers.h | 4 +- .../clang/lib/ASTMatchers/Dynamic/Registry.cpp | 1 + contrib/llvm-project/clang/lib/Analysis/CFG.cpp | 9 +- .../clang/lib/Analysis/CalledOnceCheck.cpp | 5 +- .../clang/lib/Analysis/ExprMutationAnalyzer.cpp | 168 +- .../clang/lib/Analysis/FlowSensitive/ASTOps.cpp | 287 + .../lib/Analysis/FlowSensitive/AdornedCFG.cpp | 183 + .../lib/Analysis/FlowSensitive/CNFFormula.cpp | 303 + .../Analysis/FlowSensitive/ControlFlowContext.cpp | 121 - .../FlowSensitive/DataflowAnalysisContext.cpp | 73 +- .../Analysis/FlowSensitive/DataflowEnvironment.cpp | 991 +- .../lib/Analysis/FlowSensitive/DebugSupport.cpp | 2 - .../lib/Analysis/FlowSensitive/HTMLLogger.cpp | 129 +- .../lib/Analysis/FlowSensitive/HTMLLogger.css | 10 + .../lib/Analysis/FlowSensitive/HTMLLogger.html | 1 + .../clang/lib/Analysis/FlowSensitive/Logger.cpp | 8 +- .../Models/UncheckedOptionalAccessModel.cpp | 279 +- .../clang/lib/Analysis/FlowSensitive/RecordOps.cpp | 97 +- .../clang/lib/Analysis/FlowSensitive/Transfer.cpp | 361 +- .../FlowSensitive/TypeErasedDataflowAnalysis.cpp | 261 +- .../clang/lib/Analysis/FlowSensitive/Value.cpp | 2 - .../FlowSensitive/WatchedLiteralsSolver.cpp | 482 +- .../clang/lib/Analysis/MacroExpansionContext.cpp | 2 +- .../clang/lib/Analysis/ObjCNoReturn.cpp | 5 +- .../clang/lib/Analysis/PathDiagnostic.cpp | 7 +- .../clang/lib/Analysis/ReachableCode.cpp | 51 +- .../clang/lib/Analysis/ThreadSafetyCommon.cpp | 8 +- .../clang/lib/Analysis/UninitializedValues.cpp | 2 +- .../clang/lib/Analysis/UnsafeBufferUsage.cpp | 1173 +- .../clang/lib/Basic/ASTSourceDescriptor.cpp | 33 + .../llvm-project/clang/lib/Basic/Attributes.cpp | 8 +- contrib/llvm-project/clang/lib/Basic/Builtins.cpp | 7 +- contrib/llvm-project/clang/lib/Basic/CharInfo.cpp | 20 +- contrib/llvm-project/clang/lib/Basic/Cuda.cpp | 111 +- .../llvm-project/clang/lib/Basic/Diagnostic.cpp | 8 +- .../llvm-project/clang/lib/Basic/DiagnosticIDs.cpp | 27 +- .../llvm-project/clang/lib/Basic/FileManager.cpp | 104 +- .../clang/lib/Basic/IdentifierTable.cpp | 39 +- .../llvm-project/clang/lib/Basic/LangOptions.cpp | 4 +- .../llvm-project/clang/lib/Basic/LangStandards.cpp | 13 + contrib/llvm-project/clang/lib/Basic/Module.cpp | 41 +- .../llvm-project/clang/lib/Basic/OpenMPKinds.cpp | 379 +- contrib/llvm-project/clang/lib/Basic/Sarif.cpp | 3 +- .../llvm-project/clang/lib/Basic/SourceManager.cpp | 45 +- .../llvm-project/clang/lib/Basic/TargetInfo.cpp | 15 + contrib/llvm-project/clang/lib/Basic/Targets.cpp | 7 +- .../clang/lib/Basic/Targets/AArch64.cpp | 262 +- .../llvm-project/clang/lib/Basic/Targets/AArch64.h | 21 +- .../clang/lib/Basic/Targets/AMDGPU.cpp | 75 +- .../llvm-project/clang/lib/Basic/Targets/AMDGPU.h | 14 +- .../llvm-project/clang/lib/Basic/Targets/ARM.cpp | 11 +- contrib/llvm-project/clang/lib/Basic/Targets/ARM.h | 21 +- contrib/llvm-project/clang/lib/Basic/Targets/AVR.h | 4 + .../llvm-project/clang/lib/Basic/Targets/BPF.cpp | 6 +- contrib/llvm-project/clang/lib/Basic/Targets/BPF.h | 4 + .../llvm-project/clang/lib/Basic/Targets/CSKY.cpp | 3 +- .../llvm-project/clang/lib/Basic/Targets/CSKY.h | 2 +- .../llvm-project/clang/lib/Basic/Targets/DirectX.h | 1 - .../clang/lib/Basic/Targets/Hexagon.cpp | 12 + .../llvm-project/clang/lib/Basic/Targets/Hexagon.h | 10 + .../clang/lib/Basic/Targets/LoongArch.cpp | 33 +- .../clang/lib/Basic/Targets/LoongArch.h | 5 +- .../llvm-project/clang/lib/Basic/Targets/M68k.cpp | 11 +- .../llvm-project/clang/lib/Basic/Targets/M68k.h | 5 + .../llvm-project/clang/lib/Basic/Targets/Mips.cpp | 28 + .../llvm-project/clang/lib/Basic/Targets/Mips.h | 42 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.cpp | 163 +- .../llvm-project/clang/lib/Basic/Targets/NVPTX.h | 25 +- .../clang/lib/Basic/Targets/OSTargets.h | 1 + .../llvm-project/clang/lib/Basic/Targets/PPC.cpp | 106 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 40 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.cpp | 23 +- .../llvm-project/clang/lib/Basic/Targets/RISCV.h | 10 +- .../llvm-project/clang/lib/Basic/Targets/SPIR.cpp | 75 + .../llvm-project/clang/lib/Basic/Targets/SPIR.h | 66 +- .../llvm-project/clang/lib/Basic/Targets/Sparc.h | 4 + .../clang/lib/Basic/Targets/SystemZ.cpp | 10 + .../llvm-project/clang/lib/Basic/Targets/SystemZ.h | 16 +- contrib/llvm-project/clang/lib/Basic/Targets/VE.h | 1 + .../clang/lib/Basic/Targets/WebAssembly.cpp | 197 +- .../clang/lib/Basic/Targets/WebAssembly.h | 21 +- .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 122 +- contrib/llvm-project/clang/lib/Basic/Targets/X86.h | 40 +- .../llvm-project/clang/lib/Basic/TypeTraits.cpp | 10 + .../clang/lib/CIR/Dialect/IR/CIRDialect.cpp | 13 + contrib/llvm-project/clang/lib/CodeGen/ABIInfo.cpp | 62 +- contrib/llvm-project/clang/lib/CodeGen/ABIInfo.h | 24 +- .../llvm-project/clang/lib/CodeGen/ABIInfoImpl.cpp | 76 +- .../llvm-project/clang/lib/CodeGen/ABIInfoImpl.h | 23 +- contrib/llvm-project/clang/lib/CodeGen/Address.h | 229 +- .../clang/lib/CodeGen/BackendConsumer.h | 17 +- .../llvm-project/clang/lib/CodeGen/BackendUtil.cpp | 113 +- .../llvm-project/clang/lib/CodeGen/CGAtomic.cpp | 499 +- .../llvm-project/clang/lib/CodeGen/CGBlocks.cpp | 78 +- contrib/llvm-project/clang/lib/CodeGen/CGBlocks.h | 3 +- contrib/llvm-project/clang/lib/CodeGen/CGBuilder.h | 247 +- .../llvm-project/clang/lib/CodeGen/CGBuiltin.cpp | 1575 +- .../llvm-project/clang/lib/CodeGen/CGCUDANV.cpp | 110 +- .../llvm-project/clang/lib/CodeGen/CGCUDARuntime.h | 5 + contrib/llvm-project/clang/lib/CodeGen/CGCXX.cpp | 11 +- .../llvm-project/clang/lib/CodeGen/CGCXXABI.cpp | 21 +- contrib/llvm-project/clang/lib/CodeGen/CGCXXABI.h | 31 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 671 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.h | 28 +- contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 135 +- .../llvm-project/clang/lib/CodeGen/CGCleanup.cpp | 186 +- contrib/llvm-project/clang/lib/CodeGen/CGCleanup.h | 72 +- .../llvm-project/clang/lib/CodeGen/CGCoroutine.cpp | 166 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.cpp | 371 +- .../llvm-project/clang/lib/CodeGen/CGDebugInfo.h | 39 +- contrib/llvm-project/clang/lib/CodeGen/CGDecl.cpp | 182 +- .../llvm-project/clang/lib/CodeGen/CGDeclCXX.cpp | 25 +- .../llvm-project/clang/lib/CodeGen/CGException.cpp | 23 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 691 +- .../llvm-project/clang/lib/CodeGen/CGExprAgg.cpp | 332 +- .../llvm-project/clang/lib/CodeGen/CGExprCXX.cpp | 228 +- .../clang/lib/CodeGen/CGExprComplex.cpp | 161 +- .../clang/lib/CodeGen/CGExprConstant.cpp | 492 +- .../clang/lib/CodeGen/CGExprScalar.cpp | 591 +- .../clang/lib/CodeGen/CGGPUBuiltin.cpp | 7 +- .../clang/lib/CodeGen/CGHLSLRuntime.cpp | 23 +- .../llvm-project/clang/lib/CodeGen/CGHLSLRuntime.h | 35 + .../llvm-project/clang/lib/CodeGen/CGLoopInfo.cpp | 15 +- .../llvm-project/clang/lib/CodeGen/CGLoopInfo.h | 7 +- .../clang/lib/CodeGen/CGNonTrivialStruct.cpp | 26 +- contrib/llvm-project/clang/lib/CodeGen/CGObjC.cpp | 92 +- .../llvm-project/clang/lib/CodeGen/CGObjCGNU.cpp | 55 +- .../llvm-project/clang/lib/CodeGen/CGObjCMac.cpp | 142 +- .../clang/lib/CodeGen/CGObjCRuntime.cpp | 6 +- .../clang/lib/CodeGen/CGOpenMPRuntime.cpp | 495 +- .../clang/lib/CodeGen/CGOpenMPRuntime.h | 25 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 1574 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.h | 3 - .../clang/lib/CodeGen/CGPointerAuth.cpp | 621 + .../clang/lib/CodeGen/CGPointerAuthInfo.h | 99 + .../clang/lib/CodeGen/CGRecordLayout.h | 5 + .../clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 513 +- contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 332 +- .../clang/lib/CodeGen/CGStmtOpenMP.cpp | 498 +- contrib/llvm-project/clang/lib/CodeGen/CGVTT.cpp | 35 +- .../llvm-project/clang/lib/CodeGen/CGVTables.cpp | 63 +- contrib/llvm-project/clang/lib/CodeGen/CGVTables.h | 6 +- contrib/llvm-project/clang/lib/CodeGen/CGValue.h | 272 +- .../clang/lib/CodeGen/CodeGenAction.cpp | 168 +- .../clang/lib/CodeGen/CodeGenFunction.cpp | 264 +- .../clang/lib/CodeGen/CodeGenFunction.h | 569 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 750 +- .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 105 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.cpp | 266 +- .../llvm-project/clang/lib/CodeGen/CodeGenPGO.h | 20 +- .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 142 +- .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 16 +- .../clang/lib/CodeGen/CodeGenTypeCache.h | 2 +- .../clang/lib/CodeGen/CodeGenTypes.cpp | 78 +- .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 25 +- .../clang/lib/CodeGen/ConstantEmitter.h | 12 +- .../clang/lib/CodeGen/ConstantInitBuilder.cpp | 18 + .../clang/lib/CodeGen/CoverageMappingGen.cpp | 626 +- .../clang/lib/CodeGen/CoverageMappingGen.h | 19 +- .../clang/lib/CodeGen/ItaniumCXXABI.cpp | 525 +- .../clang/lib/CodeGen/LinkInModulesPass.cpp | 16 +- .../clang/lib/CodeGen/LinkInModulesPass.h | 3 +- contrib/llvm-project/clang/lib/CodeGen/MCDCState.h | 49 + .../clang/lib/CodeGen/MacroPPCallbacks.cpp | 4 +- .../clang/lib/CodeGen/MacroPPCallbacks.h | 3 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 106 +- .../clang/lib/CodeGen/ModuleBuilder.cpp | 18 +- .../clang/lib/CodeGen/SwiftCallingConv.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 22 + .../llvm-project/clang/lib/CodeGen/TargetInfo.h | 26 +- .../clang/lib/CodeGen/Targets/AArch64.cpp | 295 +- .../clang/lib/CodeGen/Targets/AMDGPU.cpp | 56 +- .../llvm-project/clang/lib/CodeGen/Targets/ARC.cpp | 10 +- .../llvm-project/clang/lib/CodeGen/Targets/ARM.cpp | 40 +- .../clang/lib/CodeGen/Targets/CSKY.cpp | 16 +- .../clang/lib/CodeGen/Targets/Hexagon.cpp | 15 +- .../clang/lib/CodeGen/Targets/LoongArch.cpp | 15 +- .../clang/lib/CodeGen/Targets/MSP430.cpp | 9 +- .../clang/lib/CodeGen/Targets/Mips.cpp | 29 +- .../clang/lib/CodeGen/Targets/NVPTX.cpp | 40 +- .../clang/lib/CodeGen/Targets/PNaCl.cpp | 13 +- .../llvm-project/clang/lib/CodeGen/Targets/PPC.cpp | 115 +- .../clang/lib/CodeGen/Targets/RISCV.cpp | 42 +- .../clang/lib/CodeGen/Targets/Sparc.cpp | 21 +- .../clang/lib/CodeGen/Targets/SystemZ.cpp | 26 +- .../clang/lib/CodeGen/Targets/WebAssembly.cpp | 10 +- .../llvm-project/clang/lib/CodeGen/Targets/X86.cpp | 97 +- .../clang/lib/CodeGen/Targets/XCore.cpp | 12 +- .../linux/DirectoryWatcher-linux.cpp | 9 +- contrib/llvm-project/clang/lib/Driver/Distro.cpp | 1 + contrib/llvm-project/clang/lib/Driver/Driver.cpp | 406 +- .../clang/lib/Driver/OffloadBundler.cpp | 237 +- .../clang/lib/Driver/SanitizerArgs.cpp | 36 +- .../llvm-project/clang/lib/Driver/ToolChain.cpp | 129 +- .../clang/lib/Driver/ToolChains/AIX.cpp | 124 +- .../llvm-project/clang/lib/Driver/ToolChains/AIX.h | 2 + .../clang/lib/Driver/ToolChains/AMDGPU.cpp | 46 +- .../clang/lib/Driver/ToolChains/AMDGPU.h | 6 + .../clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp | 10 +- .../clang/lib/Driver/ToolChains/Arch/AArch64.cpp | 50 +- .../clang/lib/Driver/ToolChains/Arch/AArch64.h | 3 + .../clang/lib/Driver/ToolChains/Arch/ARM.cpp | 53 +- .../clang/lib/Driver/ToolChains/Arch/LoongArch.cpp | 68 +- .../clang/lib/Driver/ToolChains/Arch/Mips.cpp | 19 + .../clang/lib/Driver/ToolChains/Arch/Mips.h | 2 +- .../clang/lib/Driver/ToolChains/Arch/PPC.cpp | 20 + .../clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 77 +- .../clang/lib/Driver/ToolChains/Arch/RISCV.h | 4 +- .../clang/lib/Driver/ToolChains/Arch/Sparc.h | 2 +- .../clang/lib/Driver/ToolChains/Arch/SystemZ.cpp | 8 + .../clang/lib/Driver/ToolChains/Arch/X86.cpp | 26 +- .../clang/lib/Driver/ToolChains/BareMetal.cpp | 90 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 941 +- .../clang/lib/Driver/ToolChains/Clang.h | 15 + .../clang/lib/Driver/ToolChains/CommonArgs.cpp | 500 +- .../clang/lib/Driver/ToolChains/CommonArgs.h | 19 +- .../clang/lib/Driver/ToolChains/Cuda.cpp | 228 +- .../clang/lib/Driver/ToolChains/Cuda.h | 17 +- .../clang/lib/Driver/ToolChains/Darwin.cpp | 188 +- .../clang/lib/Driver/ToolChains/Darwin.h | 19 +- .../clang/lib/Driver/ToolChains/DragonFly.cpp | 9 +- .../clang/lib/Driver/ToolChains/Flang.cpp | 121 +- .../clang/lib/Driver/ToolChains/Flang.h | 7 + .../clang/lib/Driver/ToolChains/FreeBSD.cpp | 17 +- .../clang/lib/Driver/ToolChains/Fuchsia.cpp | 23 +- .../clang/lib/Driver/ToolChains/Gnu.cpp | 90 +- .../clang/lib/Driver/ToolChains/HIPAMD.cpp | 51 +- .../clang/lib/Driver/ToolChains/HIPAMD.h | 4 + .../clang/lib/Driver/ToolChains/HIPSPV.cpp | 2 +- .../clang/lib/Driver/ToolChains/HIPUtility.cpp | 265 +- .../clang/lib/Driver/ToolChains/HLSL.cpp | 66 +- .../clang/lib/Driver/ToolChains/HLSL.h | 3 + .../clang/lib/Driver/ToolChains/Haiku.cpp | 11 +- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 39 +- .../clang/lib/Driver/ToolChains/Linux.cpp | 57 +- .../clang/lib/Driver/ToolChains/Linux.h | 4 - .../clang/lib/Driver/ToolChains/MSVC.cpp | 25 +- .../clang/lib/Driver/ToolChains/MSVC.h | 5 +- .../clang/lib/Driver/ToolChains/MinGW.cpp | 38 +- .../clang/lib/Driver/ToolChains/MipsLinux.cpp | 7 +- .../clang/lib/Driver/ToolChains/NetBSD.cpp | 9 +- .../clang/lib/Driver/ToolChains/OHOS.cpp | 2 +- .../clang/lib/Driver/ToolChains/OpenBSD.cpp | 12 +- .../clang/lib/Driver/ToolChains/PS4CPU.cpp | 182 +- .../clang/lib/Driver/ToolChains/PS4CPU.h | 27 +- .../clang/lib/Driver/ToolChains/RISCVToolchain.cpp | 8 + .../clang/lib/Driver/ToolChains/RISCVToolchain.h | 2 + .../clang/lib/Driver/ToolChains/SPIRV.cpp | 12 +- .../clang/lib/Driver/ToolChains/Solaris.cpp | 6 +- .../clang/lib/Driver/ToolChains/WebAssembly.cpp | 108 +- .../clang/lib/Driver/ToolChains/ZOS.cpp | 9 +- .../clang/lib/Edit/RewriteObjCFoundationAPI.cpp | 11 +- contrib/llvm-project/clang/lib/ExtractAPI/API.cpp | 551 +- .../clang/lib/ExtractAPI/DeclarationFragments.cpp | 398 +- .../clang/lib/ExtractAPI/ExtractAPIConsumer.cpp | 119 +- .../Serialization/SymbolGraphSerializer.cpp | 988 +- .../ExtractAPI/TypedefUnderlyingTypeResolver.cpp | 6 +- .../clang/lib/Format/BreakableToken.cpp | 4 +- .../llvm-project/clang/lib/Format/BreakableToken.h | 3 - .../clang/lib/Format/ContinuationIndenter.cpp | 79 +- .../clang/lib/Format/ContinuationIndenter.h | 7 +- contrib/llvm-project/clang/lib/Format/Encoding.h | 1 - contrib/llvm-project/clang/lib/Format/Format.cpp | 317 +- .../llvm-project/clang/lib/Format/FormatInternal.h | 4 +- .../llvm-project/clang/lib/Format/FormatToken.cpp | 54 +- .../llvm-project/clang/lib/Format/FormatToken.h | 89 +- .../clang/lib/Format/FormatTokenLexer.cpp | 52 +- .../clang/lib/Format/FormatTokenLexer.h | 5 - .../clang/lib/Format/FormatTokenSource.h | 14 +- .../clang/lib/Format/MacroCallReconstructor.cpp | 68 +- .../clang/lib/Format/MacroExpander.cpp | 12 +- contrib/llvm-project/clang/lib/Format/Macros.h | 40 +- .../clang/lib/Format/QualifierAlignmentFixer.cpp | 29 +- .../clang/lib/Format/QualifierAlignmentFixer.h | 18 +- .../clang/lib/Format/SortJavaScriptImports.cpp | 18 +- .../clang/lib/Format/SortJavaScriptImports.h | 3 - .../clang/lib/Format/TokenAnalyzer.cpp | 4 +- .../llvm-project/clang/lib/Format/TokenAnalyzer.h | 12 +- .../clang/lib/Format/TokenAnnotator.cpp | 934 +- .../llvm-project/clang/lib/Format/TokenAnnotator.h | 13 +- .../clang/lib/Format/UnwrappedLineFormatter.cpp | 65 +- .../clang/lib/Format/UnwrappedLineFormatter.h | 2 - .../clang/lib/Format/UnwrappedLineParser.cpp | 365 +- .../clang/lib/Format/UnwrappedLineParser.h | 18 +- .../clang/lib/Format/WhitespaceManager.cpp | 136 +- .../clang/lib/Format/WhitespaceManager.h | 21 +- .../llvm-project/clang/lib/Frontend/ASTUnit.cpp | 31 +- .../clang/lib/Frontend/CompilerInstance.cpp | 148 +- .../clang/lib/Frontend/CompilerInvocation.cpp | 280 +- .../clang/lib/Frontend/DependencyFile.cpp | 28 +- .../clang/lib/Frontend/DependencyGraph.cpp | 31 +- .../clang/lib/Frontend/FrontendAction.cpp | 27 +- .../clang/lib/Frontend/FrontendActions.cpp | 62 +- .../clang/lib/Frontend/FrontendOptions.cpp | 1 + .../clang/lib/Frontend/InitPreprocessor.cpp | 268 +- .../Frontend/InterfaceStubFunctionsConsumer.cpp | 5 +- .../lib/Frontend/ModuleDependencyCollector.cpp | 5 +- .../clang/lib/Frontend/MultiplexConsumer.cpp | 37 +- .../clang/lib/Frontend/PrecompiledPreamble.cpp | 7 +- .../clang/lib/Frontend/PrintPreprocessedOutput.cpp | 133 +- .../lib/Frontend/Rewrite/InclusionRewriter.cpp | 10 +- .../lib/Frontend/Rewrite/RewriteModernObjC.cpp | 46 +- .../lib/Frontend/SerializedDiagnosticPrinter.cpp | 2 +- .../clang/lib/Frontend/TextDiagnostic.cpp | 213 +- .../clang/lib/Frontend/TextDiagnosticPrinter.cpp | 2 +- .../lib/Frontend/VerifyDiagnosticConsumer.cpp | 16 +- .../lib/FrontendTool/ExecuteCompilerInvocation.cpp | 14 +- .../clang/lib/Headers/__clang_cuda_intrinsics.h | 4 +- .../clang/lib/Headers/__stdarg_header_macro.h | 12 + .../clang/lib/Headers/__stddef_header_macro.h | 12 + contrib/llvm-project/clang/lib/Headers/arm_acle.h | 36 +- .../clang/lib/Headers/avx512erintrin.h | 271 - .../clang/lib/Headers/avx512fp16intrin.h | 76 +- .../clang/lib/Headers/avx512pfintrin.h | 92 - contrib/llvm-project/clang/lib/Headers/avxintrin.h | 102 +- contrib/llvm-project/clang/lib/Headers/bmiintrin.h | 6 +- contrib/llvm-project/clang/lib/Headers/builtins.h | 3 + contrib/llvm-project/clang/lib/Headers/cpuid.h | 26 +- .../clang/lib/Headers/cuda_wrappers/algorithm | 2 +- contrib/llvm-project/clang/lib/Headers/emmintrin.h | 469 +- contrib/llvm-project/clang/lib/Headers/float.h | 28 + contrib/llvm-project/clang/lib/Headers/fmaintrin.h | 48 +- .../clang/lib/Headers/hlsl/hlsl_basic_types.h | 13 +- .../clang/lib/Headers/hlsl/hlsl_intrinsics.h | 1341 +- .../llvm-project/clang/lib/Headers/ia32intrin.h | 72 +- contrib/llvm-project/clang/lib/Headers/immintrin.h | 244 +- contrib/llvm-project/clang/lib/Headers/intrin.h | 272 +- contrib/llvm-project/clang/lib/Headers/intrin0.h | 247 + contrib/llvm-project/clang/lib/Headers/inttypes.h | 4 + contrib/llvm-project/clang/lib/Headers/iso646.h | 4 + .../clang/lib/Headers/keylockerintrin.h | 13 +- contrib/llvm-project/clang/lib/Headers/limits.h | 5 + .../clang/lib/Headers/llvm_libc_wrappers/assert.h | 2 +- contrib/llvm-project/clang/lib/Headers/mm3dnow.h | 147 +- contrib/llvm-project/clang/lib/Headers/mmintrin.h | 160 +- .../clang/lib/Headers/module.modulemap | 15 +- .../llvm-project/clang/lib/Headers/opencl-c-base.h | 4 + contrib/llvm-project/clang/lib/Headers/opencl-c.h | 15 + .../llvm-project/clang/lib/Headers/prfchwintrin.h | 18 +- contrib/llvm-project/clang/lib/Headers/ptrauth.h | 305 + .../llvm-project/clang/lib/Headers/sifive_vector.h | 102 + contrib/llvm-project/clang/lib/Headers/smmintrin.h | 24 +- contrib/llvm-project/clang/lib/Headers/stdalign.h | 5 + contrib/llvm-project/clang/lib/Headers/stdarg.h | 34 +- contrib/llvm-project/clang/lib/Headers/stdatomic.h | 8 +- contrib/llvm-project/clang/lib/Headers/stdbool.h | 5 + contrib/llvm-project/clang/lib/Headers/stddef.h | 43 +- contrib/llvm-project/clang/lib/Headers/stdint.h | 5 + .../llvm-project/clang/lib/Headers/stdnoreturn.h | 6 + contrib/llvm-project/clang/lib/Headers/tmmintrin.h | 36 +- contrib/llvm-project/clang/lib/Headers/varargs.h | 6 +- .../llvm-project/clang/lib/Headers/x86gprintrin.h | 21 +- contrib/llvm-project/clang/lib/Headers/x86intrin.h | 32 +- contrib/llvm-project/clang/lib/Headers/xmmintrin.h | 382 +- .../llvm-project/clang/lib/Headers/yvals_core.h | 25 + .../clang/lib/Headers/zos_wrappers/builtins.h | 18 + .../llvm-project/clang/lib/Index/CommentToXML.cpp | 40 +- contrib/llvm-project/clang/lib/Index/IndexBody.cpp | 2 +- contrib/llvm-project/clang/lib/Index/IndexDecl.cpp | 15 +- .../llvm-project/clang/lib/Index/IndexSymbol.cpp | 3 +- .../clang/lib/Index/IndexingAction.cpp | 2 +- .../llvm-project/clang/lib/Index/USRGeneration.cpp | 32 +- .../lib/InstallAPI/DiagnosticBuilderWrappers.cpp | 110 + .../lib/InstallAPI/DiagnosticBuilderWrappers.h | 49 + .../clang/lib/InstallAPI/DirectoryScanner.cpp | 300 + .../clang/lib/InstallAPI/DylibVerifier.cpp | 1005 + .../llvm-project/clang/lib/InstallAPI/FileList.cpp | 192 + .../llvm-project/clang/lib/InstallAPI/Frontend.cpp | 220 + .../clang/lib/InstallAPI/HeaderFile.cpp | 88 + .../llvm-project/clang/lib/InstallAPI/Library.cpp | 40 + .../llvm-project/clang/lib/InstallAPI/Visitor.cpp | 728 + .../clang/lib/Interpreter/CodeCompletion.cpp | 3 +- .../clang/lib/Interpreter/DeviceOffload.cpp | 1 + .../clang/lib/Interpreter/IncrementalExecutor.cpp | 35 +- .../clang/lib/Interpreter/IncrementalExecutor.h | 20 +- .../clang/lib/Interpreter/IncrementalParser.cpp | 34 +- .../clang/lib/Interpreter/Interpreter.cpp | 522 +- .../clang/lib/Interpreter/InterpreterUtils.cpp | 2 +- .../llvm-project/clang/lib/Interpreter/Value.cpp | 10 +- .../llvm-project/clang/lib/Interpreter/Wasm.cpp | 114 + contrib/llvm-project/clang/lib/Interpreter/Wasm.h | 37 + .../clang/lib/Lex/DependencyDirectivesScanner.cpp | 31 +- .../llvm-project/clang/lib/Lex/HeaderSearch.cpp | 347 +- contrib/llvm-project/clang/lib/Lex/Lexer.cpp | 68 +- .../llvm-project/clang/lib/Lex/LiteralSupport.cpp | 68 +- contrib/llvm-project/clang/lib/Lex/MacroInfo.cpp | 2 +- contrib/llvm-project/clang/lib/Lex/ModuleMap.cpp | 66 +- .../llvm-project/clang/lib/Lex/PPDirectives.cpp | 552 +- .../llvm-project/clang/lib/Lex/PPExpressions.cpp | 57 +- .../llvm-project/clang/lib/Lex/PPLexerChange.cpp | 9 +- .../clang/lib/Lex/PPMacroExpansion.cpp | 140 +- contrib/llvm-project/clang/lib/Lex/Pragma.cpp | 3 +- .../clang/lib/Lex/PreprocessingRecord.cpp | 11 +- .../llvm-project/clang/lib/Lex/Preprocessor.cpp | 138 +- .../clang/lib/Lex/TokenConcatenation.cpp | 5 +- contrib/llvm-project/clang/lib/Parse/ParseAST.cpp | 10 +- .../clang/lib/Parse/ParseCXXInlineMethods.cpp | 86 +- contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp | 760 +- .../llvm-project/clang/lib/Parse/ParseDeclCXX.cpp | 490 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 339 +- .../llvm-project/clang/lib/Parse/ParseExprCXX.cpp | 193 +- contrib/llvm-project/clang/lib/Parse/ParseHLSL.cpp | 125 +- contrib/llvm-project/clang/lib/Parse/ParseInit.cpp | 49 +- contrib/llvm-project/clang/lib/Parse/ParseObjc.cpp | 438 +- .../llvm-project/clang/lib/Parse/ParseOpenACC.cpp | 742 +- .../llvm-project/clang/lib/Parse/ParseOpenMP.cpp | 932 +- .../llvm-project/clang/lib/Parse/ParsePragma.cpp | 56 +- contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp | 72 +- .../llvm-project/clang/lib/Parse/ParseTemplate.cpp | 244 +- .../clang/lib/Parse/ParseTentative.cpp | 35 +- contrib/llvm-project/clang/lib/Parse/Parser.cpp | 123 +- .../llvm-project/clang/lib/Rewrite/HTMLRewrite.cpp | 135 +- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 60 +- .../clang/lib/Sema/CheckExprLifetime.cpp | 1321 + .../clang/lib/Sema/CheckExprLifetime.h | 39 + .../clang/lib/Sema/CodeCompleteConsumer.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/DeclSpec.cpp | 60 +- .../clang/lib/Sema/HLSLExternalSemaSource.cpp | 84 +- .../clang/lib/Sema/JumpDiagnostics.cpp | 28 +- .../clang/lib/Sema/MultiplexExternalSemaSource.cpp | 2 +- .../llvm-project/clang/lib/Sema/OpenCLBuiltins.td | 26 +- contrib/llvm-project/clang/lib/Sema/ParsedAttr.cpp | 8 +- contrib/llvm-project/clang/lib/Sema/Scope.cpp | 9 + contrib/llvm-project/clang/lib/Sema/ScopeInfo.cpp | 1 + contrib/llvm-project/clang/lib/Sema/Sema.cpp | 503 +- contrib/llvm-project/clang/lib/Sema/SemaAMDGPU.cpp | 311 + .../llvm-project/clang/lib/Sema/SemaAPINotes.cpp | 1036 + contrib/llvm-project/clang/lib/Sema/SemaARM.cpp | 1340 + contrib/llvm-project/clang/lib/Sema/SemaAVR.cpp | 49 + contrib/llvm-project/clang/lib/Sema/SemaAccess.cpp | 83 +- contrib/llvm-project/clang/lib/Sema/SemaAttr.cpp | 44 +- .../clang/lib/Sema/SemaAvailability.cpp | 202 +- contrib/llvm-project/clang/lib/Sema/SemaBPF.cpp | 194 + contrib/llvm-project/clang/lib/Sema/SemaBase.cpp | 90 + .../clang/lib/Sema/SemaBoundsSafety.cpp | 193 + contrib/llvm-project/clang/lib/Sema/SemaCUDA.cpp | 439 +- .../clang/lib/Sema/SemaCXXScopeSpec.cpp | 115 +- contrib/llvm-project/clang/lib/Sema/SemaCast.cpp | 120 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 24572 +++++++----------- .../clang/lib/Sema/SemaCodeComplete.cpp | 1479 +- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 734 +- .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 103 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 2648 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 4156 +-- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 1920 +- .../llvm-project/clang/lib/Sema/SemaDeclObjC.cpp | 1463 +- .../clang/lib/Sema/SemaExceptionSpec.cpp | 69 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 2586 +- .../llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 924 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 383 +- .../llvm-project/clang/lib/Sema/SemaExprObjC.cpp | 1398 +- contrib/llvm-project/clang/lib/Sema/SemaHLSL.cpp | 1103 +- .../llvm-project/clang/lib/Sema/SemaHexagon.cpp | 290 + contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 1813 +- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 159 +- contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 503 +- .../llvm-project/clang/lib/Sema/SemaLoongArch.cpp | 515 + contrib/llvm-project/clang/lib/Sema/SemaM68k.cpp | 56 + contrib/llvm-project/clang/lib/Sema/SemaMIPS.cpp | 300 + contrib/llvm-project/clang/lib/Sema/SemaMSP430.cpp | 78 + contrib/llvm-project/clang/lib/Sema/SemaModule.cpp | 169 +- contrib/llvm-project/clang/lib/Sema/SemaNVPTX.cpp | 35 + contrib/llvm-project/clang/lib/Sema/SemaObjC.cpp | 2408 ++ .../clang/lib/Sema/SemaObjCProperty.cpp | 297 +- .../llvm-project/clang/lib/Sema/SemaOpenACC.cpp | 1710 ++ contrib/llvm-project/clang/lib/Sema/SemaOpenCL.cpp | 578 + contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 8531 +++---- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 1807 +- contrib/llvm-project/clang/lib/Sema/SemaPPC.cpp | 439 + .../clang/lib/Sema/SemaPseudoObject.cpp | 309 +- contrib/llvm-project/clang/lib/Sema/SemaRISCV.cpp | 1491 ++ .../clang/lib/Sema/SemaRISCVVectorLookup.cpp | 497 - contrib/llvm-project/clang/lib/Sema/SemaSYCL.cpp | 95 +- contrib/llvm-project/clang/lib/Sema/SemaStmt.cpp | 509 +- .../llvm-project/clang/lib/Sema/SemaStmtAsm.cpp | 2 +- .../llvm-project/clang/lib/Sema/SemaStmtAttr.cpp | 121 +- contrib/llvm-project/clang/lib/Sema/SemaSwift.cpp | 765 + .../llvm-project/clang/lib/Sema/SemaSystemZ.cpp | 94 + .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 1848 +- .../clang/lib/Sema/SemaTemplateDeduction.cpp | 1727 +- .../clang/lib/Sema/SemaTemplateDeductionGuide.cpp | 1435 ++ .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 542 +- .../clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 559 +- .../clang/lib/Sema/SemaTemplateVariadic.cpp | 106 +- contrib/llvm-project/clang/lib/Sema/SemaType.cpp | 1069 +- contrib/llvm-project/clang/lib/Sema/SemaWasm.cpp | 341 + contrib/llvm-project/clang/lib/Sema/SemaX86.cpp | 972 + .../llvm-project/clang/lib/Sema/TreeTransform.h | 2073 +- .../clang/lib/Serialization/ASTCommon.cpp | 18 +- .../clang/lib/Serialization/ASTCommon.h | 24 - .../clang/lib/Serialization/ASTReader.cpp | 1215 +- .../clang/lib/Serialization/ASTReaderDecl.cpp | 346 +- .../clang/lib/Serialization/ASTReaderInternals.h | 10 +- .../clang/lib/Serialization/ASTReaderStmt.cpp | 180 +- .../clang/lib/Serialization/ASTWriter.cpp | 1914 +- .../clang/lib/Serialization/ASTWriterDecl.cpp | 179 +- .../clang/lib/Serialization/ASTWriterStmt.cpp | 117 +- .../clang/lib/Serialization/GeneratePCH.cpp | 87 +- .../clang/lib/Serialization/GlobalModuleIndex.cpp | 14 +- .../clang/lib/Serialization/ModuleFile.cpp | 6 +- .../lib/Serialization/ModuleFileExtension.cpp | 2 +- .../clang/lib/Serialization/MultiOnDiskHashTable.h | 4 +- .../lib/Serialization/PCHContainerOperations.cpp | 2 - .../Checkers/ArrayBoundCheckerV2.cpp | 488 +- .../Checkers/BasicObjCFoundationChecks.cpp | 12 +- .../Checkers/BlockInCriticalSectionChecker.cpp | 383 +- .../Checkers/BoolAssignmentChecker.cpp | 55 +- .../Checkers/BuiltinFunctionChecker.cpp | 66 +- .../lib/StaticAnalyzer/Checkers/CStringChecker.cpp | 321 +- .../StaticAnalyzer/Checkers/CXXDeleteChecker.cpp | 4 +- .../StaticAnalyzer/Checkers/CastSizeChecker.cpp | 2 +- *** 137862 LINES SKIPPED *** From nobody Wed Oct 23 18:30: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 4XYczk5vgPz5ZX48; Wed, 23 Oct 2024 18:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczk4TPLz595P; Wed, 23 Oct 2024 18:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcrXa0fzFsZM+W1Z2PaEMQQUaXA2jUiO6uQ4iW4N3mI=; b=LWaEqPwlQnPBCBuSkc3KlI3qlIm+j5kx1sx1YsAMgTOz1M+UkuG22lAHsBnTd24JWFSwPL FiqukObI2sETcGsaggpWwehU9q9wwTUPYVA6OMY0gcCGZgPWKwNsICZYymb1KpUIsneV7X xEMfmeqF8+xHHyajlDA7mBdkijwDBiEG2q2lhT3WCt6oza1lMGNqj6ZwltaEHejdgvjDPX ogZXukg2LKyiR9JmxZzdURCgvrayspmMksFIsKOV0M3aZvf0ph9O5giTtIcDT6upLJ1Odq Jp+xlJ8WtBURT4Q8fjxwTIEh0dIx99unfQBGh3TbYwGUoZIcQXWpjRldDWSF+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcrXa0fzFsZM+W1Z2PaEMQQUaXA2jUiO6uQ4iW4N3mI=; b=cs3maYLh0bHJXlw/QhLmy/JQ2ux5k5eJbn7IypXYq1BMge8TWcR6tFTOFNCIZ0hNcc88r9 cYwQ6XC6qjuvUaiVTRsoA4U0TO3U8/+qqezSnEAjrfMLzI9+p9HebRc3Eg/C7a7xRg1jqq N2hZ3QtN/3SIdJe4EkRhifRb5Y6Ed7jrUG0rhG5PR6NrKGwJbZCYTP08JiuPpWBe3RSFVa BcaKL2KfhFZ8PIdfVAVWy2xCZyCRsFPP1zAUuPuaxzidv5i5mg+gTEkuQfd9eh8T/cwhN4 tHECTU7xSIv1UprVBSKE+nr16/0krYSP/5qlRE+0/QLqdn7ZgrLVl7jQ7/L4Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708226; a=rsa-sha256; cv=none; b=YJhN7nTKFA74FBhYkeo5JYkdCkHpSfi72V0C14+vAQnyeW1b/Pg7+Nh7H1E9PEFGur+qE5 20+vi0inq8fMQ38l5kOn143ustYgcaxvvsga+cDuim1P3ZJUFnH3pwSpXpI+CAYuTwdVCP zKPnJ+DwcFHgt5ghvXA0StyPyDYav3iWAAycwmIeEmnWdG5d8WFykf9nBrVEd7mjT/6xad kv4emZDqAgZUNyMGqM3z7IVWADPUl1YCALOWJwliKYju/JyTpwqKDzEqSAsAV/tW5W2wzh 2rvu6eLeEZcq1VEJBd/kWhPiByA32U+H5JeKt3Ju/Xkqzw4LxxCD9RXWSuPv5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczk4515z17w2; Wed, 23 Oct 2024 18:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUQ4L068756; Wed, 23 Oct 2024 18:30:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUM7u068730; Wed, 23 Oct 2024 18:30:22 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:22 GMT Message-Id: <202410231830.49NIUM7u068730@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: 36b606ae6aa4 - main - Merge llvm-project release/19.x llvmorg-19.1.0-rc1-0-ga4902a36d5c2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 36b606ae6aa4b24061096ba18582e0a08ccd5dba Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=36b606ae6aa4b24061096ba18582e0a08ccd5dba commit 36b606ae6aa4b24061096ba18582e0a08ccd5dba Merge: 0fca6ea1d4ee c76260f306a7 Author: Dimitry Andric AuthorDate: 2024-07-30 14:27:43 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:26 +0000 Merge llvm-project release/19.x llvmorg-19.1.0-rc1-0-ga4902a36d5c2 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.0-rc1-0-ga4902a36d5c2. PR: 280562 MFC after: 1 month ObsoleteFiles.inc | 1 - .../include/clang/Basic/DiagnosticSemaKinds.td | 3 + .../clang/include/clang/Basic/TokenKinds.def | 2 + .../clang/include/clang/Driver/Options.td | 10 +- .../clang/include/clang/Parse/Parser.h | 2 + .../clang/include/clang/Sema/Overload.h | 4 +- .../llvm-project/clang/include/clang/Sema/Sema.h | 2 + .../llvm-project/clang/lib/AST/ExprConstant.cpp | 32 +- contrib/llvm-project/clang/lib/AST/Interp/Interp.h | 22 +- .../llvm-project/clang/lib/AST/ItaniumMangle.cpp | 8 + .../llvm-project/clang/lib/Basic/Targets/PPC.cpp | 39 +- contrib/llvm-project/clang/lib/Basic/Targets/PPC.h | 19 +- .../clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp | 3 +- .../clang/lib/Driver/ToolChains/Arch/PPC.cpp | 3 + .../clang/lib/Driver/ToolChains/Clang.cpp | 4 + contrib/llvm-project/clang/lib/Headers/ptrauth.h | 19 + contrib/llvm-project/clang/lib/Headers/stdarg.h | 4 +- contrib/llvm-project/clang/lib/Headers/stdatomic.h | 4 + contrib/llvm-project/clang/lib/Headers/stddef.h | 21 +- contrib/llvm-project/clang/lib/Parse/ParseExpr.cpp | 27 +- .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 10 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 23 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 20 +- .../compiler-rt/lib/builtins/README.txt | 5 + .../compiler-rt/lib/builtins/aarch64/sme-abi-vg.c | 28 - .../compiler-rt/lib/builtins/aarch64/sme-abi.S | 44 + .../compiler-rt/lib/builtins/trampoline_setup.c | 42 + .../lib/sanitizer_common/sanitizer_ptrauth.h | 46 +- .../lib/ubsan/ubsan_type_hash_itanium.cpp | 2 +- .../llvm-project/libcxx/include/__bit_reference | 14 + contrib/llvm-project/libcxx/include/__config | 2 +- .../libcxx/include/__iterator/bounded_iter.h | 24 + .../libcxx/include/__iterator/wrap_iter.h | 23 + contrib/llvm-project/libcxx/include/__math/hypot.h | 89 + contrib/llvm-project/libcxx/include/cmath | 25 +- contrib/llvm-project/libcxx/include/deque | 29 +- contrib/llvm-project/libcxx/include/locale | 4 + contrib/llvm-project/libcxx/include/string | 17 +- .../llvm/include/llvm/Analysis/AliasAnalysis.h | 17 +- .../llvm/include/llvm/Analysis/SimplifyQuery.h | 6 + .../llvm/include/llvm/CodeGen/MachineFrameInfo.h | 14 +- .../include/llvm/CodeGen/TargetFrameLowering.h | 4 +- .../llvm/include/llvm/MC/MCAsmBackend.h | 2 +- .../llvm-project/llvm/include/llvm/MC/MCDwarf.h | 44 +- .../include/llvm/TargetParser/PPCTargetParser.def | 3 + .../llvm/lib/Analysis/BasicAliasAnalysis.cpp | 28 +- .../llvm/lib/Analysis/ValueTracking.cpp | 22 +- .../llvm/lib/CodeGen/CFIInstrInserter.cpp | 10 +- .../llvm/lib/CodeGen/MachineFrameInfo.cpp | 2 +- .../llvm/lib/CodeGen/PrologEpilogInserter.cpp | 4 +- contrib/llvm-project/llvm/lib/MC/MCDwarf.cpp | 6 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 58 + .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 2 + .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 7 +- .../Target/AArch64/AArch64MachineFunctionInfo.cpp | 4 + .../llvm/lib/Target/AArch64/AArch64PointerAuth.cpp | 3 +- .../llvm/lib/Target/AArch64/AArch64Subtarget.cpp | 9 +- .../llvm/lib/Target/AArch64/AArch64Subtarget.h | 3 +- .../AArch64/MCTargetDesc/AArch64AsmBackend.cpp | 8 +- .../llvm/lib/Target/ARM/ARMFrameLowering.cpp | 4 +- .../lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp | 2 +- .../Target/ARM/MCTargetDesc/ARMAsmBackendDarwin.h | 2 +- .../lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp | 8 +- .../lib/Target/Hexagon/HexagonFrameLowering.cpp | 4 +- .../lib/Target/LoongArch/LoongArchInstrInfo.td | 1 - .../llvm/lib/Target/MSP430/MSP430FrameLowering.cpp | 2 +- .../llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 5 +- .../llvm-project/llvm/lib/Target/PowerPC/PPC.td | 20 +- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 3 + .../llvm/lib/Target/PowerPC/PPCInstrInfo.cpp | 1 + .../llvm/lib/Target/PowerPC/PPCSubtarget.h | 1 + .../lib/Target/PowerPC/PPCTargetTransformInfo.cpp | 4 +- .../llvm/lib/Target/RISCV/RISCVInstrInfoC.td | 8 +- .../lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp | 12 +- .../llvm/lib/Target/X86/X86FrameLowering.cpp | 4 +- .../llvm-project/llvm/lib/TargetParser/Host.cpp | 7 + .../llvm/lib/Transforms/Scalar/LICM.cpp | 62 - .../lib/Transforms/Scalar/LoopStrengthReduce.cpp | 6 +- .../lib/Transforms/Vectorize/LoopVectorize.cpp | 2 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/clang/libclang/Makefile | 5 + lib/clang/libllvm/Makefile | 1 + lib/libc++/Makefile | 4 +- lib/libc++/module.modulemap | 2136 -------------------- 90 files changed, 790 insertions(+), 2476 deletions(-) diff --cc ObsoleteFiles.inc index 47643370ff72,000000000000..309f329a77bd mode 100644,000000..100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@@ -1,19439 -1,0 +1,19438 @@@ +# +# +# This file lists old files (OLD_FILES), libraries (OLD_LIBS, MOVED_LIBS) +# and directories (OLD_DIRS) which should get removed after an update. +# Recently removed entries should be listed first (with the date as a +# comment). OLD_LIBS and MOVED_LIBS should only list dynamic libraries. +# Static libraries, links to dynamic libraries (lib*.so), and linker scripts +# should be listed in OLD_FILES. OLD_LIBS and MOVED_LIBS are removed by the +# delete-old-libs target, whereas OLD_FILES and OLD_DIRS are removed by the +# delete-old target. This separation allows users to avoid deleting old +# dynamic libraries still required by existing binaries. +# +# MOVED_LIBS should be used instead of OLD_LIBS when a library is moved +# from usr/lib to lib or vice versa. This avoids removing libraries for +# alternate ABIs (such as lib32) which store all libraries in a single +# directory (e.g. usr/lib32). +# +# For files listed in OLD_FILES, OLD_LIBS, and MOVED_LIBS, the check-old* +# and delete-old* targets will also delete associated debug symbols from +# usr/lib/debug. +# +# In case of a complete directory hierarchy the sorting is in depth first +# order. +# +# Files that are installed or removed depending on some build option +# should be listed in /usr/src/tools/build/mk/OptionalObsoleteFiles.inc +# instead of in this file. +# +# Before you commit changes to this file please check if any entries in +# tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following +# command tells which files are listed more than once regardless of some +# architecture specific conditionals, so you can not blindly trust the +# output: +# ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \ +# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ +# sort | uniq -d +# +# To find regular duplicates not dependent on optional components, you can +# also use something that will not give you false positives, e.g.: +# for t in `make -V TARGETS universe`; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \ +# -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done +# +# For optional components, you can use the following to see if some entries +# in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc +# for o in tools/build/options/WITH*; do +# __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \ +# -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \ +# xargs -n1 | sort | uniq -d; +# done + +# 20241023: new clang import which bumps version from 18 to 19 +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_complex_builtins.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_device_functions.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_libdevice_declares.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_math.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_texture_intrinsics.h +OLD_FILES+=usr/lib/clang/18/include/__clang_hip_cmath.h +OLD_FILES+=usr/lib/clang/18/include/__clang_hip_libdevice_declares.h +OLD_FILES+=usr/lib/clang/18/include/__clang_hip_math.h +OLD_FILES+=usr/lib/clang/18/include/__clang_hip_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/18/include/__clang_hip_stdlib.h +OLD_FILES+=usr/lib/clang/18/include/__stdarg___gnuc_va_list.h +OLD_FILES+=usr/lib/clang/18/include/__stdarg___va_copy.h +OLD_FILES+=usr/lib/clang/18/include/__stdarg_va_arg.h +OLD_FILES+=usr/lib/clang/18/include/__stdarg_va_copy.h +OLD_FILES+=usr/lib/clang/18/include/__stdarg_va_list.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_null.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_nullptr_t.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_offsetof.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_ptrdiff_t.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_rsize_t.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_size_t.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_unreachable.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_wchar_t.h +OLD_FILES+=usr/lib/clang/18/include/__stddef_wint_t.h +OLD_FILES+=usr/lib/clang/18/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/18/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/18/include/adcintrin.h +OLD_FILES+=usr/lib/clang/18/include/adxintrin.h +OLD_FILES+=usr/lib/clang/18/include/altivec.h +OLD_FILES+=usr/lib/clang/18/include/ammintrin.h +OLD_FILES+=usr/lib/clang/18/include/amxcomplexintrin.h +OLD_FILES+=usr/lib/clang/18/include/amxfp16intrin.h +OLD_FILES+=usr/lib/clang/18/include/amxintrin.h +OLD_FILES+=usr/lib/clang/18/include/arm64intr.h +OLD_FILES+=usr/lib/clang/18/include/arm_acle.h +OLD_FILES+=usr/lib/clang/18/include/arm_bf16.h +OLD_FILES+=usr/lib/clang/18/include/arm_cde.h +OLD_FILES+=usr/lib/clang/18/include/arm_cmse.h +OLD_FILES+=usr/lib/clang/18/include/arm_fp16.h +OLD_FILES+=usr/lib/clang/18/include/arm_mve.h +OLD_FILES+=usr/lib/clang/18/include/arm_neon.h +OLD_FILES+=usr/lib/clang/18/include/arm_neon_sve_bridge.h +OLD_FILES+=usr/lib/clang/18/include/arm_sme_draft_spec_subject_to_change.h +OLD_FILES+=usr/lib/clang/18/include/arm_sve.h +OLD_FILES+=usr/lib/clang/18/include/arm_vector_types.h +OLD_FILES+=usr/lib/clang/18/include/armintr.h +OLD_FILES+=usr/lib/clang/18/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512bf16intrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512bitalgintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512fp16intrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512ifmaintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512ifmavlintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512pfintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vbmi2intrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vbmiintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vbmivlintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlbf16intrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlbitalgintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlcdintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlfp16intrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlvbmi2intrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlvnniintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vlvp2intersectintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vnniintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vp2intersectintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vpopcntdqintrin.h +OLD_FILES+=usr/lib/clang/18/include/avx512vpopcntdqvlintrin.h +OLD_FILES+=usr/lib/clang/18/include/avxifmaintrin.h +OLD_FILES+=usr/lib/clang/18/include/avxintrin.h +OLD_FILES+=usr/lib/clang/18/include/avxneconvertintrin.h +OLD_FILES+=usr/lib/clang/18/include/avxvnniint16intrin.h +OLD_FILES+=usr/lib/clang/18/include/avxvnniint8intrin.h +OLD_FILES+=usr/lib/clang/18/include/avxvnniintrin.h +OLD_FILES+=usr/lib/clang/18/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/18/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/18/include/builtins.h +OLD_FILES+=usr/lib/clang/18/include/cet.h +OLD_FILES+=usr/lib/clang/18/include/cetintrin.h +OLD_FILES+=usr/lib/clang/18/include/cldemoteintrin.h +OLD_FILES+=usr/lib/clang/18/include/clflushoptintrin.h +OLD_FILES+=usr/lib/clang/18/include/clwbintrin.h +OLD_FILES+=usr/lib/clang/18/include/clzerointrin.h +OLD_FILES+=usr/lib/clang/18/include/cmpccxaddintrin.h +OLD_FILES+=usr/lib/clang/18/include/cpuid.h +OLD_FILES+=usr/lib/clang/18/include/crc32intrin.h +OLD_FILES+=usr/lib/clang/18/include/cuda_wrappers/algorithm +OLD_FILES+=usr/lib/clang/18/include/cuda_wrappers/bits/basic_string.h +OLD_FILES+=usr/lib/clang/18/include/cuda_wrappers/bits/basic_string.tcc +OLD_FILES+=usr/lib/clang/18/include/cuda_wrappers/bits/shared_ptr_base.h +OLD_DIRS+=usr/lib/clang/18/include/cuda_wrappers/bits +OLD_FILES+=usr/lib/clang/18/include/cuda_wrappers/cmath +OLD_FILES+=usr/lib/clang/18/include/cuda_wrappers/complex +OLD_FILES+=usr/lib/clang/18/include/cuda_wrappers/new +OLD_DIRS+=usr/lib/clang/18/include/cuda_wrappers +OLD_FILES+=usr/lib/clang/18/include/emmintrin.h +OLD_FILES+=usr/lib/clang/18/include/enqcmdintrin.h +OLD_FILES+=usr/lib/clang/18/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/18/include/float.h +OLD_FILES+=usr/lib/clang/18/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/18/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/18/include/fuzzer/FuzzedDataProvider.h +OLD_DIRS+=usr/lib/clang/18/include/fuzzer +OLD_FILES+=usr/lib/clang/18/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/18/include/gfniintrin.h +OLD_FILES+=usr/lib/clang/18/include/hexagon_circ_brev_intrinsics.h +OLD_FILES+=usr/lib/clang/18/include/hexagon_protos.h +OLD_FILES+=usr/lib/clang/18/include/hexagon_types.h +OLD_FILES+=usr/lib/clang/18/include/hlsl/hlsl_basic_types.h +OLD_FILES+=usr/lib/clang/18/include/hlsl/hlsl_intrinsics.h +OLD_DIRS+=usr/lib/clang/18/include/hlsl +OLD_FILES+=usr/lib/clang/18/include/hlsl.h +OLD_FILES+=usr/lib/clang/18/include/hresetintrin.h +OLD_FILES+=usr/lib/clang/18/include/htmintrin.h +OLD_FILES+=usr/lib/clang/18/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/18/include/hvx_hexagon_protos.h +OLD_FILES+=usr/lib/clang/18/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/18/include/immintrin.h +OLD_FILES+=usr/lib/clang/18/include/intrin.h +OLD_FILES+=usr/lib/clang/18/include/inttypes.h +OLD_FILES+=usr/lib/clang/18/include/invpcidintrin.h +OLD_FILES+=usr/lib/clang/18/include/iso646.h +OLD_FILES+=usr/lib/clang/18/include/keylockerintrin.h +OLD_FILES+=usr/lib/clang/18/include/larchintrin.h +OLD_FILES+=usr/lib/clang/18/include/lasxintrin.h +OLD_FILES+=usr/lib/clang/18/include/limits.h +OLD_FILES+=usr/lib/clang/18/include/lsxintrin.h +OLD_FILES+=usr/lib/clang/18/include/lwpintrin.h +OLD_FILES+=usr/lib/clang/18/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/18/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/18/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/18/include/mmintrin.h +OLD_FILES+=usr/lib/clang/18/include/module.modulemap +OLD_FILES+=usr/lib/clang/18/include/movdirintrin.h +OLD_FILES+=usr/lib/clang/18/include/msa.h +OLD_FILES+=usr/lib/clang/18/include/mwaitxintrin.h +OLD_FILES+=usr/lib/clang/18/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/omp-tools.h +OLD_FILES+=usr/lib/clang/18/include/omp.h +OLD_FILES+=usr/lib/clang/18/include/ompt.h +OLD_FILES+=usr/lib/clang/18/include/opencl-c-base.h +OLD_FILES+=usr/lib/clang/18/include/opencl-c.h +OLD_FILES+=usr/lib/clang/18/include/openmp_wrappers/__clang_openmp_device_functions.h +OLD_FILES+=usr/lib/clang/18/include/openmp_wrappers/cmath +OLD_FILES+=usr/lib/clang/18/include/openmp_wrappers/complex +OLD_FILES+=usr/lib/clang/18/include/openmp_wrappers/complex.h +OLD_FILES+=usr/lib/clang/18/include/openmp_wrappers/complex_cmath.h +OLD_FILES+=usr/lib/clang/18/include/openmp_wrappers/math.h +OLD_FILES+=usr/lib/clang/18/include/openmp_wrappers/new +OLD_DIRS+=usr/lib/clang/18/include/openmp_wrappers +OLD_FILES+=usr/lib/clang/18/include/orc_rt/c_api.h +OLD_DIRS+=usr/lib/clang/18/include/orc_rt +OLD_FILES+=usr/lib/clang/18/include/pconfigintrin.h +OLD_FILES+=usr/lib/clang/18/include/pkuintrin.h +OLD_FILES+=usr/lib/clang/18/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/bmi2intrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/bmiintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/emmintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/immintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/mm_malloc.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/mmintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/nmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/pmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/smmintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/tmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/x86gprintrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/x86intrin.h +OLD_FILES+=usr/lib/clang/18/include/ppc_wrappers/xmmintrin.h +OLD_DIRS+=usr/lib/clang/18/include/ppc_wrappers +OLD_FILES+=usr/lib/clang/18/include/prfchiintrin.h +OLD_FILES+=usr/lib/clang/18/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/18/include/profile/InstrProfData.inc +OLD_FILES+=usr/lib/clang/18/include/profile/MemProfData.inc +OLD_DIRS+=usr/lib/clang/18/include/profile +OLD_FILES+=usr/lib/clang/18/include/ptwriteintrin.h +OLD_FILES+=usr/lib/clang/18/include/raointintrin.h +OLD_FILES+=usr/lib/clang/18/include/rdpruintrin.h +OLD_FILES+=usr/lib/clang/18/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/18/include/riscv_bitmanip.h +OLD_FILES+=usr/lib/clang/18/include/riscv_crypto.h +OLD_FILES+=usr/lib/clang/18/include/riscv_ntlh.h +OLD_FILES+=usr/lib/clang/18/include/riscv_vector.h +OLD_FILES+=usr/lib/clang/18/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/18/include/s390intrin.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/hwasan_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/memprof_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/netbsd_syscall_hooks.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/scudo_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/tsan_interface.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/tsan_interface_atomic.h +OLD_FILES+=usr/lib/clang/18/include/sanitizer/ubsan_interface.h +OLD_DIRS+=usr/lib/clang/18/include/sanitizer +OLD_FILES+=usr/lib/clang/18/include/serializeintrin.h +OLD_FILES+=usr/lib/clang/18/include/sgxintrin.h +OLD_FILES+=usr/lib/clang/18/include/sha512intrin.h +OLD_FILES+=usr/lib/clang/18/include/shaintrin.h +OLD_FILES+=usr/lib/clang/18/include/sifive_vector.h +OLD_FILES+=usr/lib/clang/18/include/sm3intrin.h +OLD_FILES+=usr/lib/clang/18/include/sm4intrin.h +OLD_FILES+=usr/lib/clang/18/include/smmintrin.h +OLD_FILES+=usr/lib/clang/18/include/stdalign.h +OLD_FILES+=usr/lib/clang/18/include/stdarg.h +OLD_FILES+=usr/lib/clang/18/include/stdatomic.h +OLD_FILES+=usr/lib/clang/18/include/stdbool.h +OLD_FILES+=usr/lib/clang/18/include/stdckdint.h +OLD_FILES+=usr/lib/clang/18/include/stddef.h +OLD_FILES+=usr/lib/clang/18/include/stdint.h +OLD_FILES+=usr/lib/clang/18/include/stdnoreturn.h +OLD_FILES+=usr/lib/clang/18/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/18/include/tgmath.h +OLD_FILES+=usr/lib/clang/18/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/tsxldtrkintrin.h +OLD_FILES+=usr/lib/clang/18/include/uintrintrin.h +OLD_FILES+=usr/lib/clang/18/include/unwind.h +OLD_FILES+=usr/lib/clang/18/include/usermsrintrin.h +OLD_FILES+=usr/lib/clang/18/include/vadefs.h +OLD_FILES+=usr/lib/clang/18/include/vaesintrin.h +OLD_FILES+=usr/lib/clang/18/include/varargs.h +OLD_FILES+=usr/lib/clang/18/include/vecintrin.h +OLD_FILES+=usr/lib/clang/18/include/velintrin.h +OLD_FILES+=usr/lib/clang/18/include/velintrin_approx.h +OLD_FILES+=usr/lib/clang/18/include/velintrin_gen.h +OLD_FILES+=usr/lib/clang/18/include/vpclmulqdqintrin.h +OLD_FILES+=usr/lib/clang/18/include/waitpkgintrin.h +OLD_FILES+=usr/lib/clang/18/include/wasm_simd128.h +OLD_FILES+=usr/lib/clang/18/include/wbnoinvdintrin.h +OLD_FILES+=usr/lib/clang/18/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/x86gprintrin.h +OLD_FILES+=usr/lib/clang/18/include/x86intrin.h +OLD_FILES+=usr/lib/clang/18/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/18/include/xopintrin.h +OLD_FILES+=usr/lib/clang/18/include/xray/xray_interface.h +OLD_FILES+=usr/lib/clang/18/include/xray/xray_log_interface.h +OLD_FILES+=usr/lib/clang/18/include/xray/xray_records.h +OLD_DIRS+=usr/lib/clang/18/include/xray +OLD_FILES+=usr/lib/clang/18/include/xsavecintrin.h +OLD_FILES+=usr/lib/clang/18/include/xsaveintrin.h +OLD_FILES+=usr/lib/clang/18/include/xsaveoptintrin.h +OLD_FILES+=usr/lib/clang/18/include/xsavesintrin.h +OLD_FILES+=usr/lib/clang/18/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/18/include +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-aarch64.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-arm.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-armhf.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-i386.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-powerpc64.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-powerpc64le.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-riscv64.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan-x86_64.so +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.asan_static-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi_diag-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi_diag-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi_diag-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi_diag-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.cfi_diag-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.dd-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.msan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-powerpc.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.safestack-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.stats_client-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-basic-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-basic-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-basic-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-basic-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-fdr-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-fdr-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-fdr-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-fdr-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-profiling-aarch64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-profiling-arm.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-profiling-armhf.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-profiling-x86_64.a +OLD_FILES+=usr/lib/clang/18/lib/freebsd/libclang_rt.xray-x86_64.a +OLD_DIRS+=usr/lib/clang/18/lib/freebsd +OLD_DIRS+=usr/lib/clang/18/lib +OLD_FILES+=usr/lib/clang/18/share/asan_ignorelist.txt +OLD_FILES+=usr/lib/clang/18/share/cfi_ignorelist.txt +OLD_FILES+=usr/lib/clang/18/share/msan_ignorelist.txt +OLD_DIRS+=usr/lib/clang/18/share +OLD_DIRS+=usr/lib/clang/18 + +# 20241023: new libc++ import which bumps version from 18 to 19 +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_any_all_none_of.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backend.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backend.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/any_of.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/backend.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/fill.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/find_if.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/for_each.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/libdispatch.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/merge.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/serial.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/stable_sort.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/thread.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/transform.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends/transform_reduce.h +OLD_DIRS+=usr/include/c++/v1/__algorithm/pstl_backends/cpu_backends +OLD_DIRS+=usr/include/c++/v1/__algorithm/pstl_backends +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_copy.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_count.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_equal.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_fill.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_find.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_for_each.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_frontend_dispatch.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_generate.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_is_partitioned.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_merge.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_move.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_replace.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_rotate_copy.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_sort.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_stable_sort.h +OLD_FILES+=usr/include/c++/v1/__algorithm/pstl_transform.h +OLD_FILES+=usr/include/c++/v1/__availability +OLD_FILES+=usr/include/c++/v1/__format/format_fwd.h +OLD_FILES+=usr/include/c++/v1/__fwd/get.h +OLD_FILES+=usr/include/c++/v1/__fwd/hash.h +OLD_FILES+=usr/include/c++/v1/__numeric/pstl_reduce.h +OLD_FILES+=usr/include/c++/v1/__numeric/pstl_transform_reduce.h +OLD_FILES+=usr/include/c++/v1/__threading_support +OLD_FILES+=usr/include/c++/v1/__tuple/pair_like.h +OLD_FILES+=usr/include/c++/v1/__type_traits/apply_cv.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_copy_assignable.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_copy_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_default_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_member_function_pointer.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_member_object_pointer.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_move_assignable.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_move_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_copy_assignable.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_copy_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_default_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_move_assignable.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_move_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_scoped_enum.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_copy_assignable.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_copy_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_default_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_move_assignable.h +OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_move_constructible.h +OLD_FILES+=usr/include/c++/v1/__type_traits/operation_traits.h +OLD_FILES+=usr/include/c++/v1/experimental/__memory + +# 20241014: move divapp to netpfil/common/ +OLD_FILES+=usr/tests/sys/netpfil/pf/divapp + +# 20240930: libmd bumped to version 7 +OLD_LIBS+=lib/libmd.so.6 + +# 20240914 libpcap upgrade from 1.10.4 to 1.10.5 +OLD_FILES+=contrib/libpcap/pcap-haiku.cpp +OLD_FILES+=contrib/libpcap/pcap-rpcap-int.h +OLD_FILES+=contrib/libpcap/pcap-usb-linux-common.c + +# 20240827: retire fips.so +OLD_LIBS+=usr/lib/ossl-modules/fips.so + +# 20240824: sound examples: midi.c moved out of oss/ +OLD_FILES+=usr/share/examples/sound/oss/midi.c + +# 20240824: sound examples: Remove ossinit.h and rename basic.c to audio.c +OLD_FILES+=usr/share/examples/sound/oss/ossinit.h +OLD_FILES+=usr/share/examples/sound/oss/basic.c + +# 20240824: sound examples: Remove ossmidi.h +OLD_FILES+=usr/share/examples/sound/oss/ossmidi.h + +# 20240729: rename quick_exit_test to libc_exit_test +OLD_FILES+=usr/tests/lib/libc/stdlib/quick_exit_test + +# 20240729: retire ifaddr_byindex +OLD_FILES+=usr/share/man/man9/ifaddr_byindex.9.gz + +# 20240729: remove MD5(9) +OLD_FILES+=usr/share/man/man9/MD5.9.gz +OLD_FILES+=usr/share/man/man9/MD5Init.9.gz +OLD_FILES+=usr/share/man/man9/MD5Transform.9.gz + +# 20240726: deprecate contigfree(9) +OLD_FILES+=usr/share/man/man9/contigfree.9.gz + +# 20240721: retire vm_page_alloc_freelist +OLD_FILES+=usr/share/man/man9/vm_page_alloc_freelist.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_alloc_freelist_domain.9.gz + +# 20240716: retire mergemaster +OLD_FILES+=usr/sbin/mergemaster +OLD_FILES+=usr/share/man/man8/mergemaster.8.gz + +# 20240527: csh: Remove hardlink /.cshrc +OLD_FILES+=.cshrc + +# 20240511: move file system driver manuals to section four +OLD_FILES+=usr/share/man/man5/autofs.5.gz +OLD_FILES+=usr/share/man/man5/cd9660.5.gz +OLD_FILES+=usr/share/man/man5/devfs.5.gz +OLD_FILES+=usr/share/man/man5/ext2fs.5.gz +OLD_FILES+=usr/share/man/man5/ext4fs.5.gz +OLD_FILES+=usr/share/man/man5/fdescfs.5.gz +OLD_FILES+=usr/share/man/man5/fusefs.5.gz +OLD_FILES+=usr/share/man/man5/lindebugfs.5.gz +OLD_FILES+=usr/share/man/man5/linprocfs.5.gz +OLD_FILES+=usr/share/man/man5/linsysfs.5.gz +OLD_FILES+=usr/share/man/man5/mqueuefs.5.gz +OLD_FILES+=usr/share/man/man5/msdosfs.5.gz +OLD_FILES+=usr/share/man/man5/msdos.5.gz +OLD_FILES+=usr/share/man/man5/nullfs.5.gz +OLD_FILES+=usr/share/man/man5/procfs.5.gz +OLD_FILES+=usr/share/man/man5/smbfs.5.gz +OLD_FILES+=usr/share/man/man5/tarfs.5.gz +OLD_FILES+=usr/share/man/man5/tmpfs.5.gz +OLD_FILES+=usr/share/man/man5/unionfs.5.gz +OLD_FILES+=usr/share/man/man7/ffs.7.gz + +# 20240508: Remove remnants of portsnap(8) +OLD_DIRS+=var/db/portsnap + +# 20240507: remove gbde +OLD_FILES+=boot/kernel/geom_bde.ko +OLD_FILES+=etc/rc.d/gbde +OLD_FILES+=rescue/gbde +OLD_FILES+=sbin/gbde +OLD_FILES+=usr/share/man/man4/gbde.4.gz +OLD_FILES+=usr/share/man/man8/gbde.8.gz + +# 20240422: remove improperly installed libcxxrt.so.1 +MOVED_LIBS+=usr/lib/libcxxrt.so.1 + +# 20240414: unix_socketpair_test renamed +OLD_FILES+=usr/tests/sys/kern/unix_socketpair_test + +# 20240406: new clang import which bumps version from 17 to 18 +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_complex_builtins.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_device_functions.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_libdevice_declares.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_math.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_texture_intrinsics.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_cmath.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_libdevice_declares.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_math.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/17/include/__clang_hip_stdlib.h +OLD_FILES+=usr/lib/clang/17/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/17/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/17/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/17/include/adxintrin.h +OLD_FILES+=usr/lib/clang/17/include/altivec.h +OLD_FILES+=usr/lib/clang/17/include/ammintrin.h +OLD_FILES+=usr/lib/clang/17/include/amxcomplexintrin.h +OLD_FILES+=usr/lib/clang/17/include/amxfp16intrin.h +OLD_FILES+=usr/lib/clang/17/include/amxintrin.h +OLD_FILES+=usr/lib/clang/17/include/arm64intr.h +OLD_FILES+=usr/lib/clang/17/include/arm_acle.h +OLD_FILES+=usr/lib/clang/17/include/arm_bf16.h +OLD_FILES+=usr/lib/clang/17/include/arm_cde.h +OLD_FILES+=usr/lib/clang/17/include/arm_cmse.h +OLD_FILES+=usr/lib/clang/17/include/arm_fp16.h +OLD_FILES+=usr/lib/clang/17/include/arm_mve.h +OLD_FILES+=usr/lib/clang/17/include/arm_neon.h +OLD_FILES+=usr/lib/clang/17/include/arm_neon_sve_bridge.h +OLD_FILES+=usr/lib/clang/17/include/arm_sme_draft_spec_subject_to_change.h +OLD_FILES+=usr/lib/clang/17/include/arm_sve.h +OLD_FILES+=usr/lib/clang/17/include/armintr.h +OLD_FILES+=usr/lib/clang/17/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512bf16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512bitalgintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512fp16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512ifmaintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512ifmavlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512pfintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vbmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vbmiintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vbmivlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlbf16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlbitalgintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlcdintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlfp16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlvbmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlvnniintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vlvp2intersectintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vnniintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vp2intersectintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vpopcntdqintrin.h +OLD_FILES+=usr/lib/clang/17/include/avx512vpopcntdqvlintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxifmaintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxneconvertintrin.h +OLD_FILES+=usr/lib/clang/17/include/avxvnniint16intrin.h +OLD_FILES+=usr/lib/clang/17/include/avxvnniint8intrin.h +OLD_FILES+=usr/lib/clang/17/include/avxvnniintrin.h +OLD_FILES+=usr/lib/clang/17/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/17/include/builtins.h +OLD_FILES+=usr/lib/clang/17/include/cet.h +OLD_FILES+=usr/lib/clang/17/include/cetintrin.h +OLD_FILES+=usr/lib/clang/17/include/cldemoteintrin.h +OLD_FILES+=usr/lib/clang/17/include/clflushoptintrin.h +OLD_FILES+=usr/lib/clang/17/include/clwbintrin.h +OLD_FILES+=usr/lib/clang/17/include/clzerointrin.h +OLD_FILES+=usr/lib/clang/17/include/cmpccxaddintrin.h +OLD_FILES+=usr/lib/clang/17/include/cpuid.h +OLD_FILES+=usr/lib/clang/17/include/crc32intrin.h +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/algorithm +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.h +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.tcc +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/shared_ptr_base.h +OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers/bits +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/cmath +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/complex +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/new +OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/shared_ptr_base.h +OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers +OLD_FILES+=usr/lib/clang/17/include/emmintrin.h +OLD_FILES+=usr/lib/clang/17/include/enqcmdintrin.h +OLD_FILES+=usr/lib/clang/17/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/17/include/float.h +OLD_FILES+=usr/lib/clang/17/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/17/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/17/include/fuzzer/FuzzedDataProvider.h +OLD_DIRS+=usr/lib/clang/17/include/fuzzer +OLD_FILES+=usr/lib/clang/17/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/17/include/gfniintrin.h +OLD_FILES+=usr/lib/clang/17/include/hexagon_circ_brev_intrinsics.h +OLD_FILES+=usr/lib/clang/17/include/hexagon_protos.h +OLD_FILES+=usr/lib/clang/17/include/hexagon_types.h +OLD_FILES+=usr/lib/clang/17/include/hlsl/hlsl_basic_types.h +OLD_FILES+=usr/lib/clang/17/include/hlsl/hlsl_intrinsics.h +OLD_DIRS+=usr/lib/clang/17/include/hlsl +OLD_FILES+=usr/lib/clang/17/include/hlsl.h +OLD_FILES+=usr/lib/clang/17/include/hresetintrin.h +OLD_FILES+=usr/lib/clang/17/include/htmintrin.h +OLD_FILES+=usr/lib/clang/17/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/17/include/hvx_hexagon_protos.h +OLD_FILES+=usr/lib/clang/17/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/17/include/immintrin.h +OLD_FILES+=usr/lib/clang/17/include/intrin.h +OLD_FILES+=usr/lib/clang/17/include/inttypes.h +OLD_FILES+=usr/lib/clang/17/include/invpcidintrin.h +OLD_FILES+=usr/lib/clang/17/include/iso646.h +OLD_FILES+=usr/lib/clang/17/include/keylockerintrin.h +OLD_FILES+=usr/lib/clang/17/include/larchintrin.h +OLD_FILES+=usr/lib/clang/17/include/limits.h +OLD_FILES+=usr/lib/clang/17/include/lwpintrin.h +OLD_FILES+=usr/lib/clang/17/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/17/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/17/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/17/include/mmintrin.h +OLD_FILES+=usr/lib/clang/17/include/module.modulemap +OLD_FILES+=usr/lib/clang/17/include/movdirintrin.h +OLD_FILES+=usr/lib/clang/17/include/msa.h +OLD_FILES+=usr/lib/clang/17/include/mwaitxintrin.h +OLD_FILES+=usr/lib/clang/17/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/omp-tools.h +OLD_FILES+=usr/lib/clang/17/include/omp.h +OLD_FILES+=usr/lib/clang/17/include/ompt.h +OLD_FILES+=usr/lib/clang/17/include/opencl-c-base.h +OLD_FILES+=usr/lib/clang/17/include/opencl-c.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/__clang_openmp_device_functions.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/cmath +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex_cmath.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/math.h +OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/new +OLD_DIRS+=usr/lib/clang/17/include/openmp_wrappers +OLD_FILES+=usr/lib/clang/17/include/orc_rt/c_api.h +OLD_DIRS+=usr/lib/clang/17/include/orc_rt +OLD_FILES+=usr/lib/clang/17/include/pconfigintrin.h +OLD_FILES+=usr/lib/clang/17/include/pkuintrin.h +OLD_FILES+=usr/lib/clang/17/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/bmi2intrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/bmiintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/emmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/immintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/mm_malloc.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/mmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/pmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/smmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/tmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/x86gprintrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/x86intrin.h +OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/xmmintrin.h +OLD_DIRS+=usr/lib/clang/17/include/ppc_wrappers +OLD_FILES+=usr/lib/clang/17/include/prfchiintrin.h +OLD_FILES+=usr/lib/clang/17/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/17/include/profile/InstrProfData.inc +OLD_FILES+=usr/lib/clang/17/include/profile/MemProfData.inc +OLD_DIRS+=usr/lib/clang/17/include/profile +OLD_FILES+=usr/lib/clang/17/include/ptwriteintrin.h +OLD_FILES+=usr/lib/clang/17/include/raointintrin.h +OLD_FILES+=usr/lib/clang/17/include/rdpruintrin.h +OLD_FILES+=usr/lib/clang/17/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/17/include/riscv_ntlh.h +OLD_FILES+=usr/lib/clang/17/include/riscv_vector.h +OLD_FILES+=usr/lib/clang/17/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/17/include/s390intrin.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/hwasan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/memprof_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/netbsd_syscall_hooks.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/scudo_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/tsan_interface.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/tsan_interface_atomic.h +OLD_FILES+=usr/lib/clang/17/include/sanitizer/ubsan_interface.h +OLD_DIRS+=usr/lib/clang/17/include/sanitizer +OLD_FILES+=usr/lib/clang/17/include/serializeintrin.h +OLD_FILES+=usr/lib/clang/17/include/sgxintrin.h +OLD_FILES+=usr/lib/clang/17/include/sha512intrin.h +OLD_FILES+=usr/lib/clang/17/include/shaintrin.h +OLD_FILES+=usr/lib/clang/17/include/sifive_vector.h +OLD_FILES+=usr/lib/clang/17/include/sm3intrin.h +OLD_FILES+=usr/lib/clang/17/include/sm4intrin.h +OLD_FILES+=usr/lib/clang/17/include/smmintrin.h +OLD_FILES+=usr/lib/clang/17/include/stdalign.h +OLD_FILES+=usr/lib/clang/17/include/stdarg.h +OLD_FILES+=usr/lib/clang/17/include/stdatomic.h +OLD_FILES+=usr/lib/clang/17/include/stdbool.h +OLD_FILES+=usr/lib/clang/17/include/stddef.h +OLD_FILES+=usr/lib/clang/17/include/stdint.h +OLD_FILES+=usr/lib/clang/17/include/stdnoreturn.h +OLD_FILES+=usr/lib/clang/17/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/17/include/tgmath.h +OLD_FILES+=usr/lib/clang/17/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/tsxldtrkintrin.h +OLD_FILES+=usr/lib/clang/17/include/uintrintrin.h +OLD_FILES+=usr/lib/clang/17/include/unwind.h +OLD_FILES+=usr/lib/clang/17/include/vadefs.h +OLD_FILES+=usr/lib/clang/17/include/vaesintrin.h +OLD_FILES+=usr/lib/clang/17/include/varargs.h +OLD_FILES+=usr/lib/clang/17/include/vecintrin.h +OLD_FILES+=usr/lib/clang/17/include/velintrin.h +OLD_FILES+=usr/lib/clang/17/include/velintrin_approx.h +OLD_FILES+=usr/lib/clang/17/include/velintrin_gen.h +OLD_FILES+=usr/lib/clang/17/include/vpclmulqdqintrin.h +OLD_FILES+=usr/lib/clang/17/include/waitpkgintrin.h +OLD_FILES+=usr/lib/clang/17/include/wasm_simd128.h +OLD_FILES+=usr/lib/clang/17/include/wbnoinvdintrin.h +OLD_FILES+=usr/lib/clang/17/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/x86gprintrin.h +OLD_FILES+=usr/lib/clang/17/include/x86intrin.h +OLD_FILES+=usr/lib/clang/17/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/17/include/xopintrin.h +OLD_FILES+=usr/lib/clang/17/include/xray/xray_interface.h +OLD_FILES+=usr/lib/clang/17/include/xray/xray_log_interface.h +OLD_FILES+=usr/lib/clang/17/include/xray/xray_records.h +OLD_DIRS+=usr/lib/clang/17/include/xray +OLD_FILES+=usr/lib/clang/17/include/xsavecintrin.h +OLD_FILES+=usr/lib/clang/17/include/xsaveintrin.h +OLD_FILES+=usr/lib/clang/17/include/xsaveoptintrin.h +OLD_FILES+=usr/lib/clang/17/include/xsavesintrin.h +OLD_FILES+=usr/lib/clang/17/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/17/include +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-aarch64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-aarch64.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-arm.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-arm.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-armhf.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-armhf.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-i386.so +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64.a *** 24293 LINES SKIPPED *** From nobody Wed Oct 23 18:30: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 4XYczl6WGLz5ZX2q; Wed, 23 Oct 2024 18:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczl5JNNz595Q; Wed, 23 Oct 2024 18:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EtYLyopdqKo2ETRp98lF5Q4EmlA0fH1IEEwUiPgib3A=; b=QNC+xpSbfE/+F0rp1h4xNRZjxlUEY1ZPqQMDQ1wwkdTzGfWLF5zdroboXxrJ+ntLEWsXLu gYgBYyTZhVTuHmv+ouq2JfSuZFAd5dI/zKLcsQcAuSMw8cB1+NpPhz7CTbTHCWCdLHjHPB n2WhBlHqBfcNGS4QO1hk3k89C9o0sxD2Wqm8rj5/xIc2RFjyGJaxHFNENHvR3nnqaUMMl3 /cKQCDn1LFKD4niSRFlT3FfK7Z0o5BFl6vc4i7Yc+1nwhNJFOVhbkQpm66kwXhu5jlLexg 12pAx7JELgQ1VQblZa1hAJ43mU2hpJkKdJ781vvE3CtGggq1KgQ2KITg40z7gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EtYLyopdqKo2ETRp98lF5Q4EmlA0fH1IEEwUiPgib3A=; b=aVpp3xDCmVQHFoMRcsqpSTA4EyUppC+X/c9b0cIMmD6ph3XIuZhbFpAJGazy2s+sSRw3zX Ai2/7sTJe5PpiZX1gvjbLJ+RMdU6QVh4X8uJ7bofZJszCMZm9ybG9NniTwHJKJrhse3zM/ yYC6/pM8xobavql1PH/2ZfvDgikgjWKEVMULJ0uDvUWhdmg27PDPWzwJThdqQExyY0SFXr hUCdSBfR8J/sPCFW2ltncjHyGoPxkmjdjurlCAE2ZdCxBHUarM1NkwxMOwHq2L9kcqabJf /xwlHUVfGYG5rzVcf/YJZaFoFQm/cjF8fiQkHQPwBxZSnLRsztfWsTJN6kYvRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708227; a=rsa-sha256; cv=none; b=kt5KxFhUh0yzRM36wblm3Ghn5ZYRDJpImqDlHrojjviyFJn9z9HvD5eSLP+bVhueHIfRU0 HZuQVGVt/sHylgByONyVOxVKxEjjN/Hy4eM84CtiuWPACM7OpZkQeHN+vNzJkFxdesQhGk 8wakT86zYxL/teG2lI92tt507z5Pm66aTAfT+kZPv/Fy96KOGIFYGuL7o7Kyc+tNRrPbdM NTtG9TmOBfhMIxMRXY8TslwpMN4gr3zwC3XZ1J2Xrg5glP/pLWwUOZT6wPwxHzsYSSBQRk 67SmpiFreZLrc2ylDFQyCCwuE/NIin3Tf6B3eqylx/nOVkmHmi56HejlD/vRLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczl4vVhz18Tc; Wed, 23 Oct 2024 18:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIURL8068807; Wed, 23 Oct 2024 18:30:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIURvH068804; Wed, 23 Oct 2024 18:30:27 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:27 GMT Message-Id: <202410231830.49NIURvH068804@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: 3f157662c0ef - main - Tentatively apply https://github.com/llvm/llvm-project/pull/101403 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3f157662c0ef9298725340be1f40cbf307bd154e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3f157662c0ef9298725340be1f40cbf307bd154e commit 3f157662c0ef9298725340be1f40cbf307bd154e Author: Dimitry Andric AuthorDate: 2024-07-31 20:16:45 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:33 +0000 Tentatively apply https://github.com/llvm/llvm-project/pull/101403 PR: 280562 MFC after: 1 month --- .../source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm.h | 2 +- .../Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_mips64.h | 2 +- .../Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_powerpc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm.h b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm.h index 89ffa617294a..b9537e6952f6 100644 --- a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm.h +++ b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm.h @@ -30,7 +30,7 @@ class NativeProcessFreeBSD; class NativeRegisterContextFreeBSD_arm : public NativeRegisterContextFreeBSD { public: NativeRegisterContextFreeBSD_arm(const ArchSpec &target_arch, - NativeThreadProtocol &native_thread); + NativeThreadFreeBSD &native_thread); uint32_t GetRegisterSetCount() const override; diff --git a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_mips64.h b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_mips64.h index 0b4a508a7d5d..286b4fd8d8b9 100644 --- a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_mips64.h +++ b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_mips64.h @@ -31,7 +31,7 @@ class NativeRegisterContextFreeBSD_mips64 : public NativeRegisterContextFreeBSD { public: NativeRegisterContextFreeBSD_mips64(const ArchSpec &target_arch, - NativeThreadProtocol &native_thread); + NativeThreadFreeBSD &native_thread); uint32_t GetRegisterSetCount() const override; diff --git a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_powerpc.h b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_powerpc.h index 3df371036f91..420db822acc0 100644 --- a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_powerpc.h +++ b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_powerpc.h @@ -31,7 +31,7 @@ class NativeRegisterContextFreeBSD_powerpc : public NativeRegisterContextFreeBSD { public: NativeRegisterContextFreeBSD_powerpc(const ArchSpec &target_arch, - NativeThreadProtocol &native_thread); + NativeThreadFreeBSD &native_thread); uint32_t GetRegisterSetCount() const override; From nobody Wed Oct 23 18:30: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 4XYczn1VGYz5ZWwd; Wed, 23 Oct 2024 18:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczn052rz59K3; Wed, 23 Oct 2024 18:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=swZeJI+4VHNaofQsEUkVL5GT8mfxheIuO8W6CWsyR0Y=; b=l//QQMkfSt02ZtHnkCq2xoFizhPzmN+O0xSkcSOwwmCrUWLdDnFNCqFq8jbGYJxgafLweZ FaieI/WpXGm+W1Mb7Ck8xxdztbzc5iJQXPp+gzbmtkhIwfxiQphzg7n4sgFtgUPO/M+0QW Pk3uLWKQ5Epa6bOMHczVDhDGsITlX22urffRFX9guQU3hNORe46ANrdH+VxxB+iMZ7YwvF 33sNKvincqfB6OO+TfxA8ydhTsl7cdwcpY9ii81QXZVpz/EKipyvQjTF+IogI26V8Aw+Qg KwcabAcZJnVLlxtAk3+25nC761D3kggQmlCaskQjX0N3hxT3pshuPg5N0011RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=swZeJI+4VHNaofQsEUkVL5GT8mfxheIuO8W6CWsyR0Y=; b=d4JcUPDXHxrZA1hrQIZh9H/9kKeampkTi7qHqZsxQDsc0h0N9/ikb4ZCaMinX4knnUvzQ7 bjq/y07tVbdAL0YERHFcU+Z6DH7t1NHDN4bRdrX17X4nQx4QRNfO8p6KlyWSWxI71pAs6u nm9TOiDQkByEA7BV/aI0AHr52YHQir0jnMSC3J0nSUpMBDhnnvEJZ/LgfskIHI/FR3IyQ1 +XgpT4OZL55Gk3N0wKeNum9o77/XiW7BmHct3nX/YWnRof6uDr+kfgxV6OLTfPlwHS4vbf wfU0xuaeqE6g73iRXby3drTkIcGBVFllkwEo8KPTILCgQ9C/hSRZSEsdfv9zMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708229; a=rsa-sha256; cv=none; b=gCRQxmct+Ng5ToHbvzH2XvqPF9JITRn/qT4ieL+3S2rSxWwb3XvnDa36Pkgp3A4YMlPTvy Gm//vx3OCyuJvHYhhaBgHPOLnkDq2f7Hfbj+ArMBeqal+kYnIhs8+LhrSksx14ioCjdbCM dMcNOLbxO5W5AzhGyYll+kmGWnxP2TNxYTvYwZBE2WaoBkbJkTfaLBHuu+oOjVW/4skGXf +TU6NqVEI3mT/AEQNS0vwgwwbOifMQFqp5wxVJTbP/LJ1TrHs83Sq9helt0Sffi0cixU9X sG7Elfq6+LEeW/a9bJJU8niJCGHbzGNoY0jj6/N40WHjGLLzwJUQzHH8zD6COQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczm5sS1z18RS; Wed, 23 Oct 2024 18:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUSLt068879; Wed, 23 Oct 2024 18:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUSkY068876; Wed, 23 Oct 2024 18:30:28 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:28 GMT Message-Id: <202410231830.49NIUSkY068876@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: d575077527d4 - main - bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d575077527d448ee45b923fa8c6b0cb7216ca5c5 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d575077527d448ee45b923fa8c6b0cb7216ca5c5 commit d575077527d448ee45b923fa8c6b0cb7216ca5c5 Author: Dimitry Andric AuthorDate: 2024-07-30 18:28:51 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:34 +0000 bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. PR: 280562 MFC after: 1 month --- share/mk/bsd.sys.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 52c3d07746c7..1934a79a5427 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -88,6 +88,10 @@ CWARNFLAGS.clang+= -Wno-unused-const-variable .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000 +# Similar to gcc >= 8.1 -Wno-error=cast-function-type below +CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Wed Oct 23 18:30: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 4XYczp1S6Cz5ZWX6; Wed, 23 Oct 2024 18:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczp0CTQz597g; Wed, 23 Oct 2024 18:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eM5e6sM6H0tHnKvD0zEQpwg7/Ot/jDfM6oL7/ZWqyc=; b=x8ASglNphFznC8DoAt/MVkoP0zhD+McRFZo/a8jy7Rv30YA/KHx2LgI1le3J/4F0cu3jri +bqNzPur0V/s8Py5rgLEot3E5w43mwrQmMoweF94bv4muij5n2WPAPsJHuh3RNhbUIj+Tp mXl1D9N2DAz/Y1qON6gB1kti64H/rGi5uNjf89KQNZ3oUFzutxw8V9vtDjUTVtch6J6NQU SCGXU23wdqFo8ZFaj49ZGKvehaq66s9gIIqz5e29rDUomihZ1r/IabzwgTCZ8j7iJj+yO5 oud+WOu8PCjTE8rTUUeEtnJTT1gusOUNxFD6jpyp7i4f/5IKk2SHGATcVTtyjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eM5e6sM6H0tHnKvD0zEQpwg7/Ot/jDfM6oL7/ZWqyc=; b=pHei2DplGpQxExYK3ZkDOzEoMAfZzpc8ojmxYk/xHKmz5NmK8+M2Ik4i+ydn/mbIdZ4CTJ Jy9L47gf8rCoj2jZaso6vQJ3xJG8NfKFSoMC+sEVV4unos23h94Mosh/nfRiWybZAJaZlC lNMkdrg4cIlkDs2CYYAEWSN24uIplRGg1/cRxV+V4s2kv+cpejFgY+i6ul5EDRyYQ8q2bO 5T8MpZKYacuG2zI8qMNDt/vc+4Br9MYlRJqG0oOEXdJR5rrXGbvwYdgTW/8yvkjfo5Cfug 1wO4yxV08Illwx0OI8xaeI2H3bn4kH3izuJmU68J15/DOFy0zxVTQ4/8f65weQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708230; a=rsa-sha256; cv=none; b=QXm+H5ebR2T0UWjECPs3NfctUvAOfzswP4aWFVDw2miLWAuZAwbk46Q7nCFHm+tryEjktS X6hTqEqyQdpZxkhSJr4mJ4mLsuzjIhP/waSJv2C3yuBQvnqb1ccfk3kmsSN1Gw99Q0paQg p0n8HOGCRdA2jUSBxy5j0iFWi6VEYso+KOkoMkIAueIrHDO1OIdzMB9tZn7MoplRC6gt7O fkKQa0+lFRPa02aA1oF5r/bea+Hk6zN3GiduioyuN4UD3DdDhFdL7gGs4GggR6jf6uxMIl qDpN2r9+EMQPkrUt+w8sPxDNaArbevWKajMm53GgYSyu2iIqbJfhbF8qpV/Ynw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczn6qV4z18RT; Wed, 23 Oct 2024 18:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUTWW068924; Wed, 23 Oct 2024 18:30:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUTII068921; Wed, 23 Oct 2024 18:30:29 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:29 GMT Message-Id: <202410231830.49NIUTII068921@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: 36d486cc2ecd - main - Fix enum warning in ath_hal's ar9002 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 36d486cc2ecdb9c290dba65bd5668b7e50d0d822 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=36d486cc2ecdb9c290dba65bd5668b7e50d0d822 commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822 Author: Dimitry Andric AuthorDate: 2024-07-31 09:43:50 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:35 +0000 Fix enum warning in ath_hal's ar9002 This fixes a clang 19 warning: sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare] 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is set to `AH_TRUE` whenever the related field `ah_antControl` is set to `HAL_ANT_VARIABLE`. It is not entirely clear to me what the intended statement is here: the test as it is written now compares the enum value 0 to `ah_diversity`, so in effect it enables the following block whenever `ah_diversity` is `AH_TRUE`. Write it like that, to avoid the compiler warning. MFC after: 3 days --- sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c index 01a224cbbfe9..fb2700771ffa 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c @@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || - (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { + (AH5212(ah)->ah_diversity == AH_TRUE)) { if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { /* Enable antenna diversity */ From nobody Wed Oct 23 18:30: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 4XYczq3M1Gz5ZWwh; Wed, 23 Oct 2024 18:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczq0kpBz59BX; Wed, 23 Oct 2024 18:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/aUARsqVDXXGbjuMknIsSKO2cguJ0+vMlHIJCc6U/g=; b=TWnRr/N/+y0uIZkbUU1ZxjOImojNWlViPJKOhUrubn5oKdY8vvrOGjvhZqFiDohXtH2tUb h+dAegqC1ZIAp2W0g6spad3oRlMWa9FunVhjfW2FiwLBJAkgDXqGSsas0mzu+2m6jgRmB4 RPMqDLrCIuI3KeoigXO5sscDdhDLSGhqcvQiecLaIIBPsddNfww8KlODb00IdDntEg+U4j CuBg2TKFIR58x5xJQ1dzf8HCyAsp3O1jdHwkKH1XlaOlz9feFKn07AHZDibjj+WoDGVfCh VU0ApcVbySXhncNUAOjMe8baVNTKDAhy7qj5VdsrIoITTNQINug0SMjUyGHcrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/aUARsqVDXXGbjuMknIsSKO2cguJ0+vMlHIJCc6U/g=; b=A5Wom6sq+v2+olFhO0QdeHG46NtS7fqoyQj13L6caOhiP4jZ56Pz0tCC/CGdYjn3HBdBR8 lUIOVG+W7VpOJctkKRuUFETJanqCz1ODHFPdC9mQ+Aa0KqZHywdfM/rWy0tWZWGel8lUg1 WW82avd3NE7rt8/JPRH0Qcrbmeqk2JIdpgyb/n94RaFsy3T6c6c1rpOr3TlGzuYjdnRDtq j4jObC5lmwZjvIgUNLIkt8e0JGKwf+hh3BT/4NW+EzrfijX9k+1cg9vMNCAG1mlRTyxjxl G/Zd7C+rP9bD/rGZ6B2M7E108UFD3+87yT70MSpeU3D4g5+NpfUTpwPOP6n6gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708231; a=rsa-sha256; cv=none; b=TMZpzTrFsmQ/rVWpaD7QyECKRafVM8mqiWVHnKwINYnUeMatxqOS5isap3hL8FhWwW2Xpf 9E+JyLmdD+vGNjnOicHwtPjFdyULKxLDdK/Cjy5XV31XZ/k5wjhnaY9pqQOhmR/3EKE7c2 bMFh4KTzaHlfDzc+7bGd6yVexTPvn/C864E2PCo3GX7PG54N1qxce3+1jbVkJfp8jc73a/ mYACDSH/7hX0jyf0vTGlw0083bgfBEMq1UVnPxz18IljiOZ3am1P1h11iDRat1QFOpHqUH WoxbmauMjzX2+efAa5KUqKmhm+6tPgeGa6iChBWNpY0XqGqQjXdIDZUfEKfz0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczq0LsQz18Td; Wed, 23 Oct 2024 18:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUU6I069014; Wed, 23 Oct 2024 18:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUULQ069012; Wed, 23 Oct 2024 18:30:30 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:30 GMT Message-Id: <202410231830.49NIUULQ069012@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: 6846ab2fb663 - main - libcxx simd_utils.h: only enable _LIBCPP_HAS_ALGORITHM_VECTOR_UTILS for clang >= 15, since older versions do not support the required builtins. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6846ab2fb6630ca91ab0a71350d77358e521c1c7 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6846ab2fb6630ca91ab0a71350d77358e521c1c7 commit 6846ab2fb6630ca91ab0a71350d77358e521c1c7 Author: Dimitry Andric AuthorDate: 2024-08-05 20:05:46 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:36 +0000 libcxx simd_utils.h: only enable _LIBCPP_HAS_ALGORITHM_VECTOR_UTILS for clang >= 15, since older versions do not support the required builtins. PR: 280562 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__algorithm/simd_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__algorithm/simd_utils.h b/contrib/llvm-project/libcxx/include/__algorithm/simd_utils.h index 549197be8018..cb5c93675cad 100644 --- a/contrib/llvm-project/libcxx/include/__algorithm/simd_utils.h +++ b/contrib/llvm-project/libcxx/include/__algorithm/simd_utils.h @@ -28,7 +28,7 @@ _LIBCPP_PUSH_MACROS #include <__undef_macros> // TODO: Find out how altivec changes things and allow vectorizations there too. -#if _LIBCPP_STD_VER >= 14 && defined(_LIBCPP_CLANG_VER) && !defined(__ALTIVEC__) +#if _LIBCPP_STD_VER >= 14 && (defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 1500) && !defined(__ALTIVEC__) # define _LIBCPP_HAS_ALGORITHM_VECTOR_UTILS 1 #else # define _LIBCPP_HAS_ALGORITHM_VECTOR_UTILS 0 From nobody Wed Oct 23 18:30: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 4XYczr3nV3z5ZWtN; Wed, 23 Oct 2024 18:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczr1rMGz59H2; Wed, 23 Oct 2024 18:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aglESRAtRicFuUeJ1ZjqwnhHkqklLOXE3kfx9gQVC2Y=; b=dn/VpWX0tvASNp4swhDc+mLR5z/N7iLsQQzwbw8OboAA6/eTZng1+WFnYRfiocWNohOMqK gdpMYX/eU5VeC+elP6JC1BRA1TsD5phtqaqt0kXAKc00XXX3muXYtmFgb+gNVDu0n/aq4T XgeJERDtieANIIJjQO9UchGbpWswE98piR2nRtiTX1pHBu4Thj4eNes3LA3wgbZX1JVwHo 6fykTvbW7Uc96G4aApG2i3Qw07r8QwhJs61mJ6l9gyrZAEiH4Hht9U3Ea+tVU+gHABp4Oc UR4IwLzu1Ac44YghW32C+UnXazEgjT3Tg1Se12Kl760Dop1u0FTB7BBjex9B2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aglESRAtRicFuUeJ1ZjqwnhHkqklLOXE3kfx9gQVC2Y=; b=kvhLci2sHIGSY1lbsYxXjWRpOmUin+rbLKxTwKqMYd7ecIgjv7mKLaRocJ6ZvXhmgNbcsD o6ppbT+dWk/6Fmsap2GfCQ88CYNu61JvIh0+6dqfsbskY0q7OKIrIwzBfcyjKKQKrXJp/i c5Pytqmx0cpR6XSUyseXLqBCXLTnTM9nPl5mubpz6w3V+ce1lRPxGF8qu1C6TPTfMcQuE8 LqI8f5WqZq/rsbzQ/vu/OGET9qw7oQwkVeAzTRER6ZqQLXosFwFFVE1TAod4+isVvIt4Mv Z/tl7COwmQ2nJVTnTjo7W26O3t4YrJrFA7u1zBJe5KkLij+kKM9zhGHijqtQaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708232; a=rsa-sha256; cv=none; b=hIBszRireua1DPSiVoWRv3DX3optf/uuxo2GvMiqnKfgPiOlHAmaydAULN3yJGVfGO8YiK RcsiESa9PhYJlaMUFmDSWwgBjr7Qhj+bUNp0xgHTBP0cjAkVIi0KGHOViz53Ge3XSPcTOW ompTjPJzD9i8KYlldjoPhnuBXTaxDqxrkNxNZr1Fuie3XS1mYUx7UjG9p1I027jh2H4ajz F+TsaOYlcR5SJm7mi7KPPFRcmk5Wsd1YrVC1Ut8q4Vn6VqQF6X3hs9nGuu/AJTHvL9XofM TslTIrR2L9WpNPWR46sBAiPADHD2tdpkxUVpDaqIPD/URyqUdoL14BrXCtb5gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczr1RGVz17X3; Wed, 23 Oct 2024 18:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUWwV069089; Wed, 23 Oct 2024 18:30:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUWYn069086; Wed, 23 Oct 2024 18:30:32 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:32 GMT Message-Id: <202410231830.49NIUWYn069086@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: 81e300df5e65 - main - libcxx atomic_ref.h: add typename keyword for difference_type declarations, otherwise older clang versions cannot compile this header. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 81e300df5e654eee3835ec2c6a2ae34cf317df72 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=81e300df5e654eee3835ec2c6a2ae34cf317df72 commit 81e300df5e654eee3835ec2c6a2ae34cf317df72 Author: Dimitry Andric AuthorDate: 2024-08-05 20:07:28 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:37 +0000 libcxx atomic_ref.h: add typename keyword for difference_type declarations, otherwise older clang versions cannot compile this header. PR: 280562 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__atomic/atomic_ref.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__atomic/atomic_ref.h b/contrib/llvm-project/libcxx/include/__atomic/atomic_ref.h index 156f1961151c..f5ab6ffc9e77 100644 --- a/contrib/llvm-project/libcxx/include/__atomic/atomic_ref.h +++ b/contrib/llvm-project/libcxx/include/__atomic/atomic_ref.h @@ -241,7 +241,7 @@ template struct atomic_ref<_Tp> : public __atomic_ref_base<_Tp> { using __base = __atomic_ref_base<_Tp>; - using difference_type = __base::value_type; + using difference_type = typename __base::value_type; _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp& __obj) : __base(__obj) { _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN( @@ -287,7 +287,7 @@ template struct atomic_ref<_Tp> : public __atomic_ref_base<_Tp> { using __base = __atomic_ref_base<_Tp>; - using difference_type = __base::value_type; + using difference_type = typename __base::value_type; _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp& __obj) : __base(__obj) { _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN( From nobody Wed Oct 23 18:30: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 4XYczs6FF1z5ZX8s; Wed, 23 Oct 2024 18:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczs3xvBz59C1; Wed, 23 Oct 2024 18:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Xeez4lQSIFqmduMk6VWHNS7QyqwmH3UiT69b1EBm2U=; b=MXY0avOwj+64gPI3GFflv13dJ4sUdZHr3X8dP6o7UvFWL++G0g/BjIcdPa1wUBj1GoKHji P9o77HYWHirSN7eMN8Ssy0tUZIk3Aidc7TwX7KdEIibc9JrMV2Qn2oGmyPtK2Z6gZPtbUV PDeytmdBzIwYOVeZKyifegZ6PAQ0j/lKgHNWsgFgFi9XLRQmaxsIPm89H0C6Wq1reh5eBo k16kuuk0p4L6PuMo+61+7M9F/ZHL3xHdQ6V6nTMLjy9Oop9P8Nkc4ZnrSDkSKMO1s/Uzy2 NO0BEkuSKj4hc4XIE9h0k7ArfaVCjUgQ5L6XX3X7ceyZIfAPPfKQ01hC5bPs7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Xeez4lQSIFqmduMk6VWHNS7QyqwmH3UiT69b1EBm2U=; b=Nx4AkS94/LxNwhJzmbDmmpkANS8f9CzqZIRO2oK8yEDo9baB2WOZ84yxkCpSg0J66A6aff 7eb3wVsqPe2xYo49/T5oyV8YZ4o0S/kUN/hu2i2lQ3SA39MmGeILCxiN0VLWE8ukDrjNRS yQPPjm8I5RNWzZcH5zdW7x6etbAhw/9nRky/JBS6yspyOf3+8dVBPVg8riK/oay38RsLta lVN/sgfLxECu/8rfw0ADgWG2nHMWQaTrujM7Ba0KtPXm5FYn6LoDXhs/1I3SSaZpKgmfiQ e2b0WmdzPFVX8ko1Qf5P1LGNA9bRM6Ic8Mua4Ogc5elk/hwKGFK3IVrN0BEFbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708233; a=rsa-sha256; cv=none; b=LXn3uaNuYPJl6YuUFQ3UwSvDG7XbRp4v3TDqF7jLZDG9IFHEn9uhJ67s+A2fbUTRShSRYy cdQmnC0MpQGLhImOS5DFPAgqrm909g2YedzZZbiDKm/Rp7Lf6VBjKfU5mEpGYPowAj24iL xhPhHhsYnlsSZa6rjoBCCTD0ME9346VE2UwzU+ur7OnTQRtfS8PDyl8lQ8tTB68mKjAhWH jxJGoxtKP15sIZb0Cs9UlmSViwytiyUoiSCjzsH+iio8bgHbuTisQ1cV1siUiuY43Rbh+I UXYjEULAqAO4TDFoTfHl631GCI1s3h+APvckqkxac4MR7gaZGRHPrrYo7FYnTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczs2cBtz18RV; Wed, 23 Oct 2024 18:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUXhT069192; Wed, 23 Oct 2024 18:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUXxq069189; Wed, 23 Oct 2024 18:30:33 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:33 GMT Message-Id: <202410231830.49NIUXxq069189@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: 6b4981df6008 - main - libcxx cstdlib, cwchar: avoid using long long functions if not supported, even for older compilers that do not support the using_if_exists attribute. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6b4981df6008fb59a5b4c1f0b79f0a0b21ac232e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6b4981df6008fb59a5b4c1f0b79f0a0b21ac232e commit 6b4981df6008fb59a5b4c1f0b79f0a0b21ac232e Author: Dimitry Andric AuthorDate: 2024-08-05 20:08:49 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:38 +0000 libcxx cstdlib, cwchar: avoid using long long functions if not supported, even for older compilers that do not support the using_if_exists attribute. PR: 280562 MFC after: 1 month --- contrib/llvm-project/libcxx/include/cstdlib | 12 ++++++++++++ contrib/llvm-project/libcxx/include/cwchar | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/contrib/llvm-project/libcxx/include/cstdlib b/contrib/llvm-project/libcxx/include/cstdlib index c817fd8f4acc..d9e17ee65c56 100644 --- a/contrib/llvm-project/libcxx/include/cstdlib +++ b/contrib/llvm-project/libcxx/include/cstdlib @@ -102,18 +102,26 @@ _LIBCPP_BEGIN_NAMESPACE_STD using ::size_t _LIBCPP_USING_IF_EXISTS; using ::div_t _LIBCPP_USING_IF_EXISTS; using ::ldiv_t _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::lldiv_t _LIBCPP_USING_IF_EXISTS; +#endif using ::atof _LIBCPP_USING_IF_EXISTS; using ::atoi _LIBCPP_USING_IF_EXISTS; using ::atol _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::atoll _LIBCPP_USING_IF_EXISTS; +#endif using ::strtod _LIBCPP_USING_IF_EXISTS; using ::strtof _LIBCPP_USING_IF_EXISTS; using ::strtold _LIBCPP_USING_IF_EXISTS; using ::strtol _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::strtoll _LIBCPP_USING_IF_EXISTS; +#endif using ::strtoul _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::strtoull _LIBCPP_USING_IF_EXISTS; +#endif using ::rand _LIBCPP_USING_IF_EXISTS; using ::srand _LIBCPP_USING_IF_EXISTS; using ::calloc _LIBCPP_USING_IF_EXISTS; @@ -130,10 +138,14 @@ using ::bsearch _LIBCPP_USING_IF_EXISTS; using ::qsort _LIBCPP_USING_IF_EXISTS; using ::abs _LIBCPP_USING_IF_EXISTS; using ::labs _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::llabs _LIBCPP_USING_IF_EXISTS; +#endif using ::div _LIBCPP_USING_IF_EXISTS; using ::ldiv _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::lldiv _LIBCPP_USING_IF_EXISTS; +#endif using ::mblen _LIBCPP_USING_IF_EXISTS; #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS using ::mbtowc _LIBCPP_USING_IF_EXISTS; diff --git a/contrib/llvm-project/libcxx/include/cwchar b/contrib/llvm-project/libcxx/include/cwchar index 08cfac58c846..dd16eaeaa07f 100644 --- a/contrib/llvm-project/libcxx/include/cwchar +++ b/contrib/llvm-project/libcxx/include/cwchar @@ -151,9 +151,13 @@ using ::wcstod _LIBCPP_USING_IF_EXISTS; using ::wcstof _LIBCPP_USING_IF_EXISTS; using ::wcstold _LIBCPP_USING_IF_EXISTS; using ::wcstol _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::wcstoll _LIBCPP_USING_IF_EXISTS; +#endif using ::wcstoul _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::wcstoull _LIBCPP_USING_IF_EXISTS; +#endif using ::wcscpy _LIBCPP_USING_IF_EXISTS; using ::wcsncpy _LIBCPP_USING_IF_EXISTS; using ::wcscat _LIBCPP_USING_IF_EXISTS; From nobody Wed Oct 23 18:30: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 4XYczt5QsKz5ZWXD; Wed, 23 Oct 2024 18:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczt45Clz59Mk; Wed, 23 Oct 2024 18:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dq0ZypfvHEompJ/unQmPK3fT+m1lilK44UR2eoRlqFw=; b=awPgozflgkJHqFardfDEvyf5QHYn6fhnSIRMIh3a3egnAqduUp88+9XBOY7cFGv4vSDF2z aMTfa/W4oZtdcMJ/A5e9OFmYPfZEbNgmWxx80aIiWg2CMM6392w9XxlqyPLq41Ty8lS2z/ /XJV2nrxM5gaBcU0UaomirpyrSH41vZiHkSOc76bqfpI3u/+onm3sapnbiOFR74ay77nlI SqqzolMLmj3cM/drzPL3ZcTS9ToldIJVoalOBnE4zS45u+MnwaESUyYKA5gcOcYUQyxjc0 EdJV+IVo+f9iIMtQJFSar+OJcIIo7WG9UoTyrkzO7P6uslj4sb0Mfj+rPvS0VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dq0ZypfvHEompJ/unQmPK3fT+m1lilK44UR2eoRlqFw=; b=BJKhfNW8XHsqknxazygMbKNpuR7hfwyf9a6ESaCNxOgxA3dDa9akIjWiKVvMgLt76BpJ3e c1xN4a6Wo/YqJVD88fc3UoYd6xij3MCn1YnuhTkaZlV2q0tgKJZMo6gYN4P13ylB2ojk15 aulIEcrHabtVaOfBTsUbGuiVrb5RWd/MS+zRGUXKHprpENUj3z6qdaDp5aEyi9iIthhNQQ 3lJr88Mg/r1vsJEquC6J7luIUuE88akXyc21oVZKy+TxcAT4CjluazEKZ0/402stfjclsz OJqPOYAea2zcY7rG8MFeoqAmnT+tKPaxoHbFldOvBSdFzTMG0rUcBr6zlp+zMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708234; a=rsa-sha256; cv=none; b=IjDX5IxcdghSL1+0KikHB7T7e8j6wIMkvAGxR0huvUdJj2heMPuAyzaRPJjgY8TEDDzrsp l5m+Knk4OGatVH1wLX+HfOZs9CbGHhFfVhl7WDU9i7SbiGBBVI+zBmo7COSfb5ZvxBfRe4 TA/AWdgJjO6QI+cpEPsEZ0GIke87ZNHwk/dH/jgtHXTVNc2QUYMSHmhHECx31GMmLBkXXH enIwm3t2yzMuBLO1Sis4LNXXAcavHkg8/nNSgPxhhZi1xoWW+W5OGVh1bTpFYEP1eE2nup GCQmwKeVEb9ECRmoWT7l63uTNuwvLpu4AsF42j2w9+CUqGTUzEAqD2sXLUc4Nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczt3W8wz17w6; Wed, 23 Oct 2024 18:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUYic069230; Wed, 23 Oct 2024 18:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUYpa069227; Wed, 23 Oct 2024 18:30:34 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:34 GMT Message-Id: <202410231830.49NIUYpa069227@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: 2f6d6eaf2d51 - main - libcxx-compat: revert llvmorg-19-init-18063-g561246e90282: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2f6d6eaf2d511b212eab8ed002f3152c96deca3c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2f6d6eaf2d511b212eab8ed002f3152c96deca3c commit 2f6d6eaf2d511b212eab8ed002f3152c96deca3c Author: Dimitry Andric AuthorDate: 2024-08-05 20:13:12 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:39 +0000 libcxx-compat: revert llvmorg-19-init-18063-g561246e90282: [libc++][NFC] Remove wrong #endif comment PR: 280562 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h index 50e9f3e8aa78..2c4e9e419a1b 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -28,7 +28,7 @@ using __remove_cv_t = typename remove_cv<_Tp>::type; #else template using __remove_cv_t = __remove_cv(_Tp); -#endif +#endif // __has_builtin(__remove_cv) #if _LIBCPP_STD_VER >= 14 template From nobody Wed Oct 23 18:30: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 4XYczw20Pkz5ZWtV; Wed, 23 Oct 2024 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczw0Rg1z59HW; Wed, 23 Oct 2024 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YKPsBawOPjAl1hpEGb4iiQprQvFZNGGyCKioVSsaOJo=; b=oeeP7/aeRd8HKNLI1m+uSOXGYfxnczKoDDK7yV8Z8hWKcuo4sbhrujosnWTLlPOfXRi2J0 aMQNYk6vxUT/s+ycID0C3Hv/7+dHm9B9eahvx5zSTC1WCrSvQ9nVfoAQOyTA1YJAKku+zq GcFwOMAHlULYBxhBTse7nbzwYdPomx+CV6coB2tOtvro/vrlVX49+AGW+v3grvsx/I1Ciu gF5P4BfktIZ3j0T5N7rw6spOkDJmvzorJ3SR4dTKu5tFRLGPYQJGPEkrh2hyjJljyfe7lP yrquYVpA+6y5toCo4vxoO4E3iShmpdoHP8tamT7QwlFYbfCxJWAHr24/QDBeuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YKPsBawOPjAl1hpEGb4iiQprQvFZNGGyCKioVSsaOJo=; b=IuFsbKfQbkYPssRhmTGHTMJI4CJMVJf3QAzPxD0AJIrYPh4eaYSEd3ftQrulwRrKWl9rA/ RUojFN63LvZwg5bJMaME0SILSqgeG6nZ68Cacz+mnIh9TCEaQTTOZuaXoeQxkaQ6NDHAPL oBrCZbNAeeaxctVG4yKjxrfhrqFwsiyoMH5rNGne64ogcx4DI6cA1r1r8OsyigrWhZtben ZOUVeV6Q+QVy/Zi5JsbCioiWWsVv1GL6kJ8IwXx5ue7Wk9mm6QWkNKQtbqtPnHaKgjt+8N FC5MDtNzzt84topVzBgIq5KvzHpL2FlO4K8EVriHbKy9ltd0OjxU9p1bwiwHEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708236; a=rsa-sha256; cv=none; b=wABD9Pzn9giA1g00rush/6kgZ7eUbfAZH2qNkbkugRzEwr4RuvMPyH2Pydw7t7KZhltOu+ XoVOG9qHMiyXrmvIO1Ox1ZuXgiiaIM+DbYYWreYRRlJYgunZ6+WyvefQHRWTlUND9ECfLX jh3DYR81BozY7zBzxC5mnB2yu8p0/blCYEjgEZjU/BEgb8h3dygkW1fO9GYQF4ValTNUfT eIeSILdMfsELljkQKYt+AlfalaSVpNjiSKDS3gXw8iWwELMZmbrRTnqiu3Dhm+jsZ5O9gp iCD0gBXoqYS+WrqvkRKcz14lJMdj6PPSZ/GLQ7VPfrq7U2o1dhYj4TjcWFk1Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczv4VLkz17yN; Wed, 23 Oct 2024 18:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUZbV069270; Wed, 23 Oct 2024 18:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUZnr069267; Wed, 23 Oct 2024 18:30:35 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:35 GMT Message-Id: <202410231830.49NIUZnr069267@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: 04f5b79cfa49 - main - libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 04f5b79cfa4972b371e7751dee5bbfaa91f2f2fc Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=04f5b79cfa4972b371e7751dee5bbfaa91f2f2fc commit 04f5b79cfa4972b371e7751dee5bbfaa91f2f2fc Author: Dimitry Andric AuthorDate: 2024-08-05 20:16:04 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:40 +0000 libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5: [libc++] Merge is_scoped_enum.h into is_enum.h (#99458) PR: 280562 MFC after: 1 month --- .../libcxx/include/__type_traits/is_enum.h | 10 ------- .../libcxx/include/__type_traits/is_scoped_enum.h | 33 ++++++++++++++++++++++ .../llvm-project/libcxx/include/module.modulemap | 1 + contrib/llvm-project/libcxx/include/type_traits | 4 +++ 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h b/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h index 2fab6db2c8d5..77ca3ea10874 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h @@ -26,16 +26,6 @@ template inline constexpr bool is_enum_v = __is_enum(_Tp); #endif -#if _LIBCPP_STD_VER >= 23 - -template -struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : bool_constant<__is_scoped_enum(_Tp)> {}; - -template -inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp); - -#endif // _LIBCPP_STD_VER >= 23 - _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_ENUM_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h new file mode 100644 index 000000000000..cb3e25cf5733 --- /dev/null +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h @@ -0,0 +1,33 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H +#define _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H + +#include <__config> +#include <__type_traits/integral_constant.h> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +#if _LIBCPP_STD_VER >= 23 + +template +struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : bool_constant<__is_scoped_enum(_Tp)> {}; + +template +inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp); + +#endif // _LIBCPP_STD_VER >= 23 + +_LIBCPP_END_NAMESPACE_STD + +#endif // _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H diff --git a/contrib/llvm-project/libcxx/include/module.modulemap b/contrib/llvm-project/libcxx/include/module.modulemap index 13d0dce34d97..d76659664f75 100644 --- a/contrib/llvm-project/libcxx/include/module.modulemap +++ b/contrib/llvm-project/libcxx/include/module.modulemap @@ -2013,6 +2013,7 @@ module std_private_type_traits_is_scalar [system header "__type_traits/is_scalar.h" export std_private_type_traits_is_null_pointer } +module std_private_type_traits_is_scoped_enum [system] { header "__type_traits/is_scoped_enum.h" } module std_private_type_traits_is_signed [system] { header "__type_traits/is_signed.h" } module std_private_type_traits_is_signed_integer [system] { header "__type_traits/is_signed_integer.h" } module std_private_type_traits_is_specialization [system] { header "__type_traits/is_specialization.h" } diff --git a/contrib/llvm-project/libcxx/include/type_traits b/contrib/llvm-project/libcxx/include/type_traits index 7f231cd09df5..ffa137338b6a 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -514,6 +514,10 @@ namespace std # include <__type_traits/unwrap_ref.h> #endif +#if _LIBCPP_STD_VER >= 23 +# include <__type_traits/is_scoped_enum.h> +#endif + #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) From nobody Wed Oct 23 18:30: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 4XYczx08zlz5ZWXH; Wed, 23 Oct 2024 18:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczw68cfz59F2; Wed, 23 Oct 2024 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGbN48ooqCVM2epeuKEN5H0wzEFgAhhi0Nnx990MqoE=; b=p4WuvdGo4noObfmXhxj+NBreX27D+oSKUsbpjWJpJX7pnCvs02SdZ4/FoCAClJZ+sbuo+W vc0P+6bah4V1lHtnZilli0JvTnG/vZh8x72607eK6kEUjwJMYPKe/h1DpD2TgYsJArqi0m 8iUCfTG6mOf9QZ3f51IZUDTlTyW0WbgJQ7JJXsM98cWa3C7qRfRCQXEfiaBuR/wX6aKNvw 7Rj2kdlp6er5GsDMPICpL62qd+gdVGj0l0zptaEmHIrstffaLBtzWGdpA8KzXv2XkZJA+j 18g8Hi+c0mchAJSJJp6/uKQn/l6oM6jadx5VOWULXLKsURf2VjS+z0g68YXAnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGbN48ooqCVM2epeuKEN5H0wzEFgAhhi0Nnx990MqoE=; b=nNniA6lFTHTmu556TiuLACvKSBP2/pmqVo0/mLXs3KU2ep6YYA7lapFqjSZbBVM9darmeJ DmmUlUzqikC6aMXjOJx8nWujQoAuVrJN3he7eJqFx91GzBSlhKPLKARQ/mz3PVmBKlXFKE mE5JdediRKea7cPV6860A3fnIFSreOblnTXBfYII+P558hwYQ/6R8d4B88/OWwqFufQ5c/ hKKzqWDSmF6eE2ooaKW4dHvL+qh/2lRQQSe7TaV0+24sb4mEJban7y4qgNVuStI4YnvSv6 zaSVaHMZHRW//1VTHjS1+0JTRCLS5CFB6tEeibmvzhjMoiw+uPgybebWHlSg+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708236; a=rsa-sha256; cv=none; b=B9NY7+mLa4s0t98COy4/B0/nMP0pz+5W7fDjumFO39I2SQTWBZe8DAUn/hXQuJCsIP5P8V yhVIgt4C8UZNQu8ewdmDLJhzqgXslHrfzxUEVc89K403KdrBecjNB31KJw9F5l+NCTJeUE pmN1WoG4iliDJlvHE97+JKypm7ASI4EmtP9Ds2OVcJJ9MEMpUj5tjvJm8kX4XsvkJ3dxEE oLHjme4+FRrn9EGD7KiRgs0veX8xlJzPMQsVbat0TjYniezXXTmhxmzyPfBWLfUOwgPnSp XCq4bUlmHzCwDXw269T+MHxynhtBgVcankn+CCjrSxc0zGEuvZ9fNQYF4QO9Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczw5RdPz17yP; Wed, 23 Oct 2024 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUaBx069315; Wed, 23 Oct 2024 18:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUail069312; Wed, 23 Oct 2024 18:30:36 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:36 GMT Message-Id: <202410231830.49NIUail069312@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: e8054e44f4ca - main - libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e8054e44f4caf9c3968dcbf2d16bba37e987237b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e8054e44f4caf9c3968dcbf2d16bba37e987237b commit e8054e44f4caf9c3968dcbf2d16bba37e987237b Author: Dimitry Andric AuthorDate: 2024-08-05 20:17:17 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:41 +0000 libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7: [libc++] Simplify std::is_void (#99033) PR: 280562 MFC after: 1 month --- .../libcxx/include/__type_traits/is_void.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_void.h b/contrib/llvm-project/libcxx/include/__type_traits/is_void.h index 46316b0d3a53..4c27060530c8 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_void.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_void.h @@ -11,6 +11,8 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_same.h> +#include <__type_traits/remove_cv.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -18,14 +20,28 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__is_void) + template -struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_same(__remove_cv(_Tp), void)> {}; +struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_void(_Tp)> {}; # if _LIBCPP_STD_VER >= 17 template -inline constexpr bool is_void_v = __is_same(__remove_cv(_Tp), void); +inline constexpr bool is_void_v = __is_void(_Tp); # endif +#else + +template +struct _LIBCPP_TEMPLATE_VIS is_void : public is_same<__remove_cv_t<_Tp>, void> {}; + +# if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_void_v = is_void<_Tp>::value; +# endif + +#endif // __has_builtin(__is_void) + _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_VOID_H From nobody Wed Oct 23 18:30: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 4XYczy1yVpz5ZWXK; Wed, 23 Oct 2024 18:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczx74w1z3wYC; Wed, 23 Oct 2024 18:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c08ShXYA2TOWuGETrT5HFkpcAIgr9xYpqgpHtHxMZm0=; b=fqy+tRqmBfvqyvoVbNKigCWsZM9f45UM+4Gxz5lvLFyezETG4I+vsm56DBAHxIAlGoWXnd K8SqssNnuygKXYM7Eco7UHxszA0yHxEPxLmfYAnicEbYqtmD0M3OlANe3gNrA1YhkjLBYg M/R3Z+tI8nD+6UhDgaGmYBqC4ZC3FyU1O+9wsXiOas0bi8kYdynrCfkQ0RmH4x8W8DdB/s FdVW4hi7xs8BGWTC/sNtsO0JOEvpUncH+k84LSxbb9Yuty03/8J+xi/gXLlaJ7u8CfuEWO iwJ0hNC2QZKzOhueurZ6L9Af6dz6u9xsvwaLX8xouf6tlvxwRTPLqubl8CHoCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c08ShXYA2TOWuGETrT5HFkpcAIgr9xYpqgpHtHxMZm0=; b=qEgFwwlf5Zf4NLmwqAUReblZ8J4Whc/kSHYUP7vkxv4ESizFVsg+XKVUgQGQGncq3rBMyo nlGqqTjcjVCb9mP43455MJ67XlpsDDl/AP+ndsoOooviMhRdQcnpQxaVcEZ/POXSZDP0vS bbO69TO+K00HF5/F8Ma5i+EC3D00uWQxdeqEj2aUdpyeF3ke85HMHq+xwczp77i2+Rrlwm 25I3I5yCLGcXdABU7/Ye05Q8LIXoDh6iAfy98S9M68KY/vUEq6jJOw+w+gL51DEdEQMGET /1BI9N/YDYTetz9ftYTyMrVwX/bRM4Xi9US2E4Tt4Cuscsqo017umYXz5KYAIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708238; a=rsa-sha256; cv=none; b=N5SkpG0M7reJ7KVaIDlL3A+xxRgjXSLX2sPPC1OsJbljnVgtVtcux+XcncYVpcC2dHAJJC jLKN/ZRQpboYnagqhoDIH+Q0I0lkmy/xY/yHRdMvJoSTAC0sULgRCrOoIt2ccrGslHlEvJ LGiSLh7/3imJQvSnAYMQRL4qZX/uC8OrAhKlIhs1JvNjQwPYjFRaHFsuQtHWHXU3Lo5bhw td5nMVsUMmWaR69QspsD+CQHW0o8OP8RflH/cy5HQP6Bb3F37Jmhyz+bKRMe1PjO1wOkEW takROySAzzwBEtMZIHTfBhiPvQoWW/ynTdzhYIFyJeS4NHu4b3JPI8794e2JRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczx5vmJz17yQ; Wed, 23 Oct 2024 18:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUb8U069351; Wed, 23 Oct 2024 18:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUbj2069348; Wed, 23 Oct 2024 18:30:37 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:37 GMT Message-Id: <202410231830.49NIUbj2069348@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: 0bec0529b1d7 - main - libcxx-compat: revert llvmorg-19-init-17728-g30cc12cd818d: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0bec0529b1d704f391ec499c39744f521e646a6d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0bec0529b1d704f391ec499c39744f521e646a6d commit 0bec0529b1d704f391ec499c39744f521e646a6d Author: Dimitry Andric AuthorDate: 2024-08-05 20:17:59 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:42 +0000 libcxx-compat: revert llvmorg-19-init-17728-g30cc12cd818d: [libc++] Simplify the implementation of is_null_pointer a bit (#98728) PR: 280562 MFC after: 1 month --- .../libcxx/include/__type_traits/is_fundamental.h | 2 +- .../libcxx/include/__type_traits/is_null_pointer.h | 12 +++++++++--- .../llvm-project/libcxx/include/__type_traits/is_scalar.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h b/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h index 55f8e41f75f4..57206e0d9deb 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h @@ -34,7 +34,7 @@ inline constexpr bool is_fundamental_v = __is_fundamental(_Tp); template struct _LIBCPP_TEMPLATE_VIS is_fundamental - : public integral_constant::value || __is_null_pointer_v<_Tp> || is_arithmetic<_Tp>::value> {}; + : public integral_constant::value || __is_nullptr_t<_Tp>::value || is_arithmetic<_Tp>::value> {}; # if _LIBCPP_STD_VER >= 17 template diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h index 9f5697e23268..c666f5f24759 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h @@ -11,6 +11,7 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/remove_cv.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -20,15 +21,20 @@ _LIBCPP_BEGIN_NAMESPACE_STD template -inline const bool __is_null_pointer_v = __is_same(__remove_cv(_Tp), nullptr_t); +struct __is_nullptr_t_impl : public false_type {}; +template <> +struct __is_nullptr_t_impl : public true_type {}; + +template +struct _LIBCPP_TEMPLATE_VIS __is_nullptr_t : public __is_nullptr_t_impl<__remove_cv_t<_Tp> > {}; #if _LIBCPP_STD_VER >= 14 template -struct _LIBCPP_TEMPLATE_VIS is_null_pointer : integral_constant> {}; +struct _LIBCPP_TEMPLATE_VIS is_null_pointer : public __is_nullptr_t_impl<__remove_cv_t<_Tp> > {}; # if _LIBCPP_STD_VER >= 17 template -inline constexpr bool is_null_pointer_v = __is_null_pointer_v<_Tp>; +inline constexpr bool is_null_pointer_v = is_null_pointer<_Tp>::value; # endif #endif // _LIBCPP_STD_VER >= 14 diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h b/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h index 455200de4720..15f1c71554f2 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h @@ -49,7 +49,7 @@ struct _LIBCPP_TEMPLATE_VIS is_scalar bool, is_arithmetic<_Tp>::value || is_member_pointer<_Tp>::value || is_pointer<_Tp>::value || - __is_null_pointer_v<_Tp> || + __is_nullptr_t<_Tp>::value || __is_block<_Tp>::value || is_enum<_Tp>::value> {}; // clang-format on From nobody Wed Oct 23 18:30: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 4XYczz4drPz5ZWyZ; Wed, 23 Oct 2024 18:30:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczz07wgz3wYM; Wed, 23 Oct 2024 18:30:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=776LMe2HK8XtMEOGA87KLXMWIeg3Bar00UKQAOqbZ1k=; b=AaQ+EXnZwjRpSAhhdPOtamWcqn5fhieqrhY9FRsYorU8pM8iwYPKAX+/Qt77RkToatRP/O Y+dz81RBLhwjfiPhfooQSn5kUNG3LrxsyfJdmpYvydP4hgapOoCctjZjOZBBMnWIXYoVhL LtE69FwGR+kWX8VqYGrHvi7iZ9G4yqcPOVtXIQyPGARIgQvigYqR381fICCm7oP5KPU3tI Pi6Y1C2oRJtWJLtlLh8znjNtDWT71muFg8sDCQ86FbZ1hWcIg7sYFSIFEE4qnz2sWCWa0H 5wbuZG+UU6qDKWj3FaFoIk6Q2bYWxAqVUCkcaZTMzuEeZvAudQcM6Tx9h/sCcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=776LMe2HK8XtMEOGA87KLXMWIeg3Bar00UKQAOqbZ1k=; b=Z+t4n3qGl9Wpm/JUL611eyteHjzPedDWjjtkm7vVwLqwJsNtV5vIRTSxY8FH4k9jZGc/ZT dNFfhhZBzEi3DbQikpskhHvC+gmXn7CEPFN1VcQmLZU/IBxAD/L0/fbILGCLepHT6eCvVA mM0rphUbxZK4gU4IdAgcRQnTrDpuz16mPmG+TYtO2tiHgdB8WsLYQ0IAeMDxFjgNGEVOqF S0/Wt22UoH4dkk8WZp49x/vDc1wg/Mq3r+XeOE4wvR5YXkX0E+rybeJLSuePtPkXsVv49C rjMNBTLA9ZfXvoY7EoXjVYuwiGiW7tHo3piFjMEalVSEIUGcSEdymzFOcuOHyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708239; a=rsa-sha256; cv=none; b=UD+zwBsA2OkmT1Zes5woi+NBWJ2jSLTT6BKuYnoedFudiAni2/6aaj06TFDiXcHqQWjTJI koRXYPhoxrC1SYGLcJBaWc0mQy3dVgGoNGa5vZQDqP7aPEzUdPbQJt8KyZOdiTBKbNZCra huDIqccATTGlMyt6AFD7b2wCqrHJQ+cuiKAbai1JGmOEaBgTX4SikPf4UT8ZoeKmd/QQsA /rGaYkuYFdjieNGQ0LGRn4Tx6QCWttxPqIpAzo22/6Cao7FaV8T2mWmIUYeLr/5g5XlpVJ 7QbGUxWODcR3GQDi2RtMlrQcVvfd5NBHLhNxhJ7weRESpqX2qkFggWOg2fmsRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczy6t6Bz18Nx; Wed, 23 Oct 2024 18:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUc90069391; Wed, 23 Oct 2024 18:30:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUcTY069388; Wed, 23 Oct 2024 18:30:38 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:38 GMT Message-Id: <202410231830.49NIUcTY069388@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: e8847079df1b - main - libcxx-compat: revert llvmorg-19-init-17727-g0eebb48fcfbc: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: e8847079df1b7998ce84fd87c845d9eeef0567fb Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e8847079df1b7998ce84fd87c845d9eeef0567fb commit e8847079df1b7998ce84fd87c845d9eeef0567fb Author: Dimitry Andric AuthorDate: 2024-08-05 20:25:18 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:43 +0000 libcxx-compat: revert llvmorg-19-init-17727-g0eebb48fcfbc: [libc++] Merge is_member{,_object,_function}_pointer.h (#98727) The implementations for these traits have been simplified quite a bit, since we have builtins available for them now. PR: 280562 MFC after: 1 month --- .../libcxx/include/__type_traits/invoke.h | 3 ++- .../__type_traits/is_member_function_pointer.h | 31 ++++++++++++++++++++++ .../__type_traits/is_member_object_pointer.h | 31 ++++++++++++++++++++++ .../include/__type_traits/is_member_pointer.h | 12 --------- .../llvm-project/libcxx/include/module.modulemap | 2 ++ contrib/llvm-project/libcxx/include/type_traits | 2 ++ 6 files changed, 68 insertions(+), 13 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/invoke.h b/contrib/llvm-project/libcxx/include/__type_traits/invoke.h index 71db32ae6a3c..a0281f5b2006 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/invoke.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/invoke.h @@ -17,7 +17,8 @@ #include <__type_traits/integral_constant.h> #include <__type_traits/is_base_of.h> #include <__type_traits/is_core_convertible.h> -#include <__type_traits/is_member_pointer.h> +#include <__type_traits/is_member_function_pointer.h> +#include <__type_traits/is_member_object_pointer.h> #include <__type_traits/is_reference_wrapper.h> #include <__type_traits/is_same.h> #include <__type_traits/is_void.h> diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h new file mode 100644 index 000000000000..037d5ca04ab0 --- /dev/null +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h @@ -0,0 +1,31 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H +#define _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H + +#include <__config> +#include <__type_traits/integral_constant.h> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +template +struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer : _BoolConstant<__is_member_function_pointer(_Tp)> {}; + +# if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_member_function_pointer_v = __is_member_function_pointer(_Tp); +# endif + +_LIBCPP_END_NAMESPACE_STD + +#endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h new file mode 100644 index 000000000000..555794bfe038 --- /dev/null +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h @@ -0,0 +1,31 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_OBJECT_POINTER_H +#define _LIBCPP___TYPE_TRAITS_IS_MEMBER_OBJECT_POINTER_H + +#include <__config> +#include <__type_traits/integral_constant.h> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +template +struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer : _BoolConstant<__is_member_object_pointer(_Tp)> {}; + +# if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_member_object_pointer_v = __is_member_object_pointer(_Tp); +# endif + +_LIBCPP_END_NAMESPACE_STD + +#endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h index cc125e318cf9..149634fde758 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h @@ -21,21 +21,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD template struct _LIBCPP_TEMPLATE_VIS is_member_pointer : _BoolConstant<__is_member_pointer(_Tp)> {}; -template -struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer : _BoolConstant<__is_member_object_pointer(_Tp)> {}; - -template -struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer : _BoolConstant<__is_member_function_pointer(_Tp)> {}; - # if _LIBCPP_STD_VER >= 17 template inline constexpr bool is_member_pointer_v = __is_member_pointer(_Tp); - -template -inline constexpr bool is_member_object_pointer_v = __is_member_object_pointer(_Tp); - -template -inline constexpr bool is_member_function_pointer_v = __is_member_function_pointer(_Tp); # endif _LIBCPP_END_NAMESPACE_STD diff --git a/contrib/llvm-project/libcxx/include/module.modulemap b/contrib/llvm-project/libcxx/include/module.modulemap index d76659664f75..8e0ba6eebac4 100644 --- a/contrib/llvm-project/libcxx/include/module.modulemap +++ b/contrib/llvm-project/libcxx/include/module.modulemap @@ -1976,6 +1976,8 @@ module std_private_type_traits_is_implicitly_default_constructible [system } module std_private_type_traits_is_integral [system] { header "__type_traits/is_integral.h" } module std_private_type_traits_is_literal_type [system] { header "__type_traits/is_literal_type.h" } +module std_private_type_traits_is_member_function_pointer [system] { header "__type_traits/is_member_function_pointer.h" } +module std_private_type_traits_is_member_object_pointer [system] { header "__type_traits/is_member_object_pointer.h" } module std_private_type_traits_is_member_pointer [system] { header "__type_traits/is_member_pointer.h" } module std_private_type_traits_is_nothrow_assignable [system] { header "__type_traits/is_nothrow_assignable.h" } module std_private_type_traits_is_nothrow_constructible [system] { diff --git a/contrib/llvm-project/libcxx/include/type_traits b/contrib/llvm-project/libcxx/include/type_traits index ffa137338b6a..08badb6aa06e 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -453,6 +453,8 @@ namespace std #include <__type_traits/is_fundamental.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_literal_type.h> +#include <__type_traits/is_member_function_pointer.h> +#include <__type_traits/is_member_object_pointer.h> #include <__type_traits/is_member_pointer.h> #include <__type_traits/is_nothrow_assignable.h> #include <__type_traits/is_nothrow_constructible.h> From nobody Wed Oct 23 18:30: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 4XYd001hc3z5ZXBn; Wed, 23 Oct 2024 18:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd001M0Mz59SW; Wed, 23 Oct 2024 18:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhE3/3tg70Tg2jBbqTeb1M3vjWmItm6ONXMhsJ2UVvI=; b=LwP4Zd7yRCYs6nKIQgiXEXwLpC0k4dwfbODC9UpP0QhCiQXbMmEc3EdirFKg8rH2id5Yvl SFjeAoRMDzLY4THXsC4SUux0sRBbonZyUcSNcu9rZAy912IMzmLhP0sZyZANjPhAUb5x/t FiXgx2e+L5JG1P0MH1/uV5KnzSVUNDS2AobSfmYuSb+ZhQjjXMuVGMLXHfAKz9/9PFHxVe pe8bVojmlCHnMzHRNx79+8EfRAPv+1i0+7+WOoMzU3tr91w4b6nw15chsAqBmVs+Ayo+8t 9vCM7GGN3iDsHC3KQHVW5fab1/BrIkxPrZy5tpw5FGErg/Qq1gelcSP+XxJ5uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhE3/3tg70Tg2jBbqTeb1M3vjWmItm6ONXMhsJ2UVvI=; b=LF2cezF3Ky/8z9xEeqTWcZ255izQ6bVA/MUnHGbVwGKjsD111EuY+AkcVpnR1m6a73uBAP 8sBIE1W0NNmiMNVTPi78l9krcnikL4OpVcRa+r8C7fq8hZJpuEPYfm5VS/NeKk4vvj9U+K BxoOSB9H7WNHOmS+NBTR9pLOG76UuPsBvle3N9HjVuwSs6CaBy8GW8NAXbuUEfikYZbt45 6/PutniV2YFuAr3pykXSz0yVwH1muAJ1geGtN5fPV4FbzLiENxtBhxpnZNOHH2v4Qdy5Fr v169zRO9HIeUI6uJ1GN5uscP664uAtC1/n0da7Gk91qyukfVpKdmQt+FmDoZZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708240; a=rsa-sha256; cv=none; b=AiU8iYZy5fC8QKP7EqY/3XdMluotdb7tQIbbzXYmsjbbvRccAyIyYGCEA1b4N4lQyMpeSa dqbxDw+BPycc0EBhGRmJM0cUgx7W9rEPSp76nyFo9p6CfNXVVWiTCl9CO3OAXzvhNhUheV nSulz53wAzysgjm8SR8S3m85yunnOnvue8X8Gs/r7M3HCbhHKa05mFpW1Po5J3PvVGP2Fw t2DAXuejoKhMXpImBSzmH4sPsLQ/T3oTSoAS4I6MYsIyPHrOgieWJgUt6ZBojnFsuUjPxl M+VLwhynqAnf7rp7VRzRo8HRAFzffLo5YEI6u/fop1gbwTZpnAZtiHmqnv3uLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd000Kkjz18MH; Wed, 23 Oct 2024 18:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUetD069432; Wed, 23 Oct 2024 18:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUeL8069429; Wed, 23 Oct 2024 18:30:40 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:40 GMT Message-Id: <202410231830.49NIUeL8069429@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: 2f2ebe758bea - main - libcxx-compat: revert llvmorg-19-init-17473-g69fecaa1a455: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2f2ebe758bea201830bd021525424813f7fc6c6b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2f2ebe758bea201830bd021525424813f7fc6c6b commit 2f2ebe758bea201830bd021525424813f7fc6c6b Author: Dimitry Andric AuthorDate: 2024-08-05 20:26:02 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:44 +0000 libcxx-compat: revert llvmorg-19-init-17473-g69fecaa1a455: [libc++] Clean up some now dead code with the upgrade to GCC 14 (#97746) PR: 280562 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__config | 58 ++++++++++++++------ .../libcxx/include/__tuple/tuple_element.h | 26 +++++++++ .../libcxx/include/__type_traits/is_function.h | 14 ++++- .../__type_traits/is_member_function_pointer.h | 31 +++++++++++ .../__type_traits/is_member_object_pointer.h | 15 ++++++ .../include/__type_traits/is_member_pointer.h | 16 ++++++ .../__type_traits/is_nothrow_constructible.h | 61 ++++++++++++++++++++++ .../libcxx/include/__type_traits/is_object.h | 25 ++++++++- .../libcxx/include/__type_traits/is_reference.h | 29 ++++++---- .../libcxx/include/__type_traits/is_scoped_enum.h | 22 ++++++++ 10 files changed, 266 insertions(+), 31 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 2010e45ba13c..f44f18d52099 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -162,6 +162,16 @@ _LIBCPP_HARDENING_MODE_DEBUG # define _LIBCPP_CXX03_LANG # endif +// TODO: Remove once we switch to GCC 14 +# ifndef __has_extension +# define __has_extension(__x) 0 +# endif + +// TODO: Remove once we switch to GCC 14 +# ifndef __has_feature +# define __has_feature(__x) 0 +# endif + # ifndef __has_constexpr_builtin # define __has_constexpr_builtin(x) 0 # endif @@ -338,30 +348,44 @@ typedef __char32_t char32_t; # define _LIBCPP_PREFERRED_ALIGNOF(_Tp) __alignof(_Tp) +# if defined(_LIBCPP_COMPILER_CLANG_BASED) + // Objective-C++ features (opt-in) -# if __has_feature(objc_arc) -# define _LIBCPP_HAS_OBJC_ARC -# endif +# if __has_feature(objc_arc) +# define _LIBCPP_HAS_OBJC_ARC +# endif -# if __has_feature(objc_arc_weak) -# define _LIBCPP_HAS_OBJC_ARC_WEAK -# endif +# if __has_feature(objc_arc_weak) +# define _LIBCPP_HAS_OBJC_ARC_WEAK +# endif -# if __has_extension(blocks) -# define _LIBCPP_HAS_EXTENSION_BLOCKS -# endif +# if __has_extension(blocks) +# define _LIBCPP_HAS_EXTENSION_BLOCKS +# endif -# if defined(_LIBCPP_HAS_EXTENSION_BLOCKS) && defined(__APPLE__) -# define _LIBCPP_HAS_BLOCKS_RUNTIME -# endif +# if defined(_LIBCPP_HAS_EXTENSION_BLOCKS) && defined(__APPLE__) +# define _LIBCPP_HAS_BLOCKS_RUNTIME +# endif -# if !__has_feature(address_sanitizer) -# define _LIBCPP_HAS_NO_ASAN -# endif +# if !__has_feature(address_sanitizer) +# define _LIBCPP_HAS_NO_ASAN +# endif + +# define _LIBCPP_ALWAYS_INLINE __attribute__((__always_inline__)) + +# define _LIBCPP_DISABLE_EXTENSION_WARNING __extension__ + +# elif defined(_LIBCPP_COMPILER_GCC) + +# if !defined(__SANITIZE_ADDRESS__) +# define _LIBCPP_HAS_NO_ASAN +# endif + +# define _LIBCPP_ALWAYS_INLINE __attribute__((__always_inline__)) -# define _LIBCPP_ALWAYS_INLINE __attribute__((__always_inline__)) +# define _LIBCPP_DISABLE_EXTENSION_WARNING __extension__ -# define _LIBCPP_DISABLE_EXTENSION_WARNING __extension__ +# endif // _LIBCPP_COMPILER_[CLANG|GCC] # if defined(_LIBCPP_OBJECT_FORMAT_COFF) diff --git a/contrib/llvm-project/libcxx/include/__tuple/tuple_element.h b/contrib/llvm-project/libcxx/include/__tuple/tuple_element.h index 9127c47dc8f1..55b3b47619f6 100644 --- a/contrib/llvm-project/libcxx/include/__tuple/tuple_element.h +++ b/contrib/llvm-project/libcxx/include/__tuple/tuple_element.h @@ -40,6 +40,32 @@ struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const volatile _Tp> { #ifndef _LIBCPP_CXX03_LANG +# if !__has_builtin(__type_pack_element) + +namespace __indexer_detail { + +template +struct __indexed { + using type _LIBCPP_NODEBUG = _Tp; +}; + +template +struct __indexer; + +template +struct __indexer<__tuple_types<_Types...>, __tuple_indices<_Idx...>> : __indexed<_Idx, _Types>... {}; + +template +__indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&); + +} // namespace __indexer_detail + +template +using __type_pack_element _LIBCPP_NODEBUG = typename decltype(__indexer_detail::__at_index<_Idx>( + __indexer_detail::__indexer< __tuple_types<_Types...>, + typename __make_tuple_indices::type >{}))::type; +# endif + template struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...> > { static_assert(_Ip < sizeof...(_Types), "tuple_element index out of range"); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_function.h b/contrib/llvm-project/libcxx/include/__type_traits/is_function.h index 98fedd0ad96d..f09f19adf4aa 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_function.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_function.h @@ -11,6 +11,8 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_const.h> +#include <__type_traits/is_reference.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -18,12 +20,22 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__is_function) + template struct _LIBCPP_TEMPLATE_VIS is_function : integral_constant {}; +#else + +template +struct _LIBCPP_TEMPLATE_VIS is_function + : public integral_constant::value || is_const::value)> {}; + +#endif // __has_builtin(__is_function) + #if _LIBCPP_STD_VER >= 17 template -inline constexpr bool is_function_v = __is_function(_Tp); +inline constexpr bool is_function_v = is_function<_Tp>::value; #endif _LIBCPP_END_NAMESPACE_STD diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h index 037d5ca04ab0..11c8a00c9975 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h @@ -11,6 +11,9 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_function.h> +#include <__type_traits/remove_cv.h> +#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -18,6 +21,21 @@ _LIBCPP_BEGIN_NAMESPACE_STD +template +struct __libcpp_is_member_pointer { + enum { __is_member = false, __is_func = false, __is_obj = false }; +}; +template +struct __libcpp_is_member_pointer<_Tp _Up::*> { + enum { + __is_member = true, + __is_func = is_function<_Tp>::value, + __is_obj = !__is_func, + }; +}; + +#if __has_builtin(__is_member_function_pointer) + template struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer : _BoolConstant<__is_member_function_pointer(_Tp)> {}; @@ -26,6 +44,19 @@ template inline constexpr bool is_member_function_pointer_v = __is_member_function_pointer(_Tp); # endif +#else // __has_builtin(__is_member_function_pointer) + +template +struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer + : public _BoolConstant<__libcpp_is_member_pointer<__remove_cv_t<_Tp> >::__is_func> {}; + +# if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_member_function_pointer_v = is_member_function_pointer<_Tp>::value; +# endif + +#endif // __has_builtin(__is_member_function_pointer) + _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h index 555794bfe038..9141f9da530f 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h @@ -18,6 +18,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__is_member_object_pointer) + template struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer : _BoolConstant<__is_member_object_pointer(_Tp)> {}; @@ -26,6 +28,19 @@ template inline constexpr bool is_member_object_pointer_v = __is_member_object_pointer(_Tp); # endif +#else // __has_builtin(__is_member_object_pointer) + +template +struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer + : public _BoolConstant<__libcpp_is_member_pointer<__remove_cv_t<_Tp> >::__is_obj> {}; + +# if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_member_object_pointer_v = is_member_object_pointer<_Tp>::value; +# endif + +#endif // __has_builtin(__is_member_object_pointer) + _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h index 149634fde758..4ca01d1c2fc8 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h @@ -11,6 +11,7 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_member_function_pointer.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -18,6 +19,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__is_member_pointer) + template struct _LIBCPP_TEMPLATE_VIS is_member_pointer : _BoolConstant<__is_member_pointer(_Tp)> {}; @@ -26,6 +29,19 @@ template inline constexpr bool is_member_pointer_v = __is_member_pointer(_Tp); # endif +#else // __has_builtin(__is_member_pointer) + +template +struct _LIBCPP_TEMPLATE_VIS is_member_pointer + : public _BoolConstant<__libcpp_is_member_pointer<__remove_cv_t<_Tp> >::__is_member> {}; + +# if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_member_pointer_v = is_member_pointer<_Tp>::value; +# endif + +#endif // __has_builtin(__is_member_pointer) + _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_POINTER_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_nothrow_constructible.h b/contrib/llvm-project/libcxx/include/__type_traits/is_nothrow_constructible.h index 58d2b2475140..2f7ed8487e76 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_nothrow_constructible.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_nothrow_constructible.h @@ -13,6 +13,10 @@ #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_constructible.h> +#include <__type_traits/is_reference.h> +#include <__utility/declval.h> +#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -20,28 +24,85 @@ _LIBCPP_BEGIN_NAMESPACE_STD +// GCC is disabled due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106611 +#if __has_builtin(__is_nothrow_constructible) && !defined(_LIBCPP_COMPILER_GCC) + template < class _Tp, class... _Args> struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible : public integral_constant {}; +#else + +template +struct __libcpp_is_nothrow_constructible; + +template +struct __libcpp_is_nothrow_constructible + : public integral_constant()...))> {}; + +template +void __implicit_conversion_to(_Tp) noexcept {} + +template +struct __libcpp_is_nothrow_constructible + : public integral_constant(std::declval<_Arg>()))> {}; + +template +struct __libcpp_is_nothrow_constructible : public false_type { +}; + +template +struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible + : __libcpp_is_nothrow_constructible::value, + is_reference<_Tp>::value, + _Tp, + _Args...> {}; + +template +struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp[_Ns]> + : __libcpp_is_nothrow_constructible::value, is_reference<_Tp>::value, _Tp> {}; + +#endif // __has_builtin(__is_nothrow_constructible) #if _LIBCPP_STD_VER >= 17 template inline constexpr bool is_nothrow_constructible_v = is_nothrow_constructible<_Tp, _Args...>::value; #endif +// TODO: remove this implementation once https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106611 is fixed +#ifdef _LIBCPP_COMPILER_GCC + +template +struct _LIBCPP_TEMPLATE_VIS is_nothrow_copy_constructible + : public is_nothrow_constructible<_Tp, __add_lvalue_reference_t > {}; + +#else // _LIBCPP_COMPILER_GCC + template struct _LIBCPP_TEMPLATE_VIS is_nothrow_copy_constructible : public integral_constant< bool, __is_nothrow_constructible(_Tp, __add_lvalue_reference_t)> {}; +#endif // _LIBCPP_COMPILER_GCC + #if _LIBCPP_STD_VER >= 17 template inline constexpr bool is_nothrow_copy_constructible_v = is_nothrow_copy_constructible<_Tp>::value; #endif +// TODO: remove this implementation once https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106611 is fixed +#ifndef _LIBCPP_COMPILER_GCC + template struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_constructible : public integral_constant)> {}; +#else // _LIBCPP_COMPILER_GCC + +template +struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_constructible + : public is_nothrow_constructible<_Tp, __add_rvalue_reference_t<_Tp> > {}; + +#endif // _LIBCPP_COMPILER_GCC + #if _LIBCPP_STD_VER >= 17 template inline constexpr bool is_nothrow_move_constructible_v = is_nothrow_move_constructible<_Tp>::value; diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_object.h b/contrib/llvm-project/libcxx/include/__type_traits/is_object.h index ec04508402ce..5ac1d854a695 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_object.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_object.h @@ -11,6 +11,10 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_array.h> +#include <__type_traits/is_class.h> +#include <__type_traits/is_scalar.h> +#include <__type_traits/is_union.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -18,13 +22,30 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__is_object) + template struct _LIBCPP_TEMPLATE_VIS is_object : _BoolConstant<__is_object(_Tp)> {}; -#if _LIBCPP_STD_VER >= 17 +# if _LIBCPP_STD_VER >= 17 template inline constexpr bool is_object_v = __is_object(_Tp); -#endif +# endif + +#else // __has_builtin(__is_object) + +template +struct _LIBCPP_TEMPLATE_VIS is_object + : public integral_constant::value || is_array<_Tp>::value || is_union<_Tp>::value || + is_class<_Tp>::value > {}; + +# if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_object_v = is_object<_Tp>::value; +# endif + +#endif // __has_builtin(__is_object) _LIBCPP_END_NAMESPACE_STD diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/is_reference.h index cc157a438e49..42853d479039 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_reference.h @@ -18,15 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template -struct _LIBCPP_TEMPLATE_VIS is_reference : _BoolConstant<__is_reference(_Tp)> {}; - -#if _LIBCPP_STD_VER >= 17 -template -inline constexpr bool is_reference_v = __is_reference(_Tp); -#endif - -#if __has_builtin(__is_lvalue_reference) && __has_builtin(__is_rvalue_reference) +#if __has_builtin(__is_lvalue_reference) && __has_builtin(__is_rvalue_reference) && __has_builtin(__is_reference) template struct _LIBCPP_TEMPLATE_VIS is_lvalue_reference : _BoolConstant<__is_lvalue_reference(_Tp)> {}; @@ -34,14 +26,19 @@ struct _LIBCPP_TEMPLATE_VIS is_lvalue_reference : _BoolConstant<__is_lvalue_refe template struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference : _BoolConstant<__is_rvalue_reference(_Tp)> {}; +template +struct _LIBCPP_TEMPLATE_VIS is_reference : _BoolConstant<__is_reference(_Tp)> {}; + # if _LIBCPP_STD_VER >= 17 template +inline constexpr bool is_reference_v = __is_reference(_Tp); +template inline constexpr bool is_lvalue_reference_v = __is_lvalue_reference(_Tp); template inline constexpr bool is_rvalue_reference_v = __is_rvalue_reference(_Tp); # endif -#else // __has_builtin(__is_lvalue_reference) +#else // __has_builtin(__is_lvalue_reference) && etc... template struct _LIBCPP_TEMPLATE_VIS is_lvalue_reference : public false_type {}; @@ -53,7 +50,17 @@ struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference : public false_type {}; template struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference<_Tp&&> : public true_type {}; +template +struct _LIBCPP_TEMPLATE_VIS is_reference : public false_type {}; +template +struct _LIBCPP_TEMPLATE_VIS is_reference<_Tp&> : public true_type {}; +template +struct _LIBCPP_TEMPLATE_VIS is_reference<_Tp&&> : public true_type {}; + # if _LIBCPP_STD_VER >= 17 +template +inline constexpr bool is_reference_v = is_reference<_Tp>::value; + template inline constexpr bool is_lvalue_reference_v = is_lvalue_reference<_Tp>::value; @@ -61,7 +68,7 @@ template inline constexpr bool is_rvalue_reference_v = is_rvalue_reference<_Tp>::value; # endif -#endif // __has_builtin(__is_lvalue_reference) +#endif // __has_builtin(__is_lvalue_reference) && etc... _LIBCPP_END_NAMESPACE_STD diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h index cb3e25cf5733..1db88e13356e 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h @@ -11,6 +11,9 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_convertible.h> +#include <__type_traits/is_enum.h> +#include <__type_traits/underlying_type.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -20,12 +23,31 @@ _LIBCPP_BEGIN_NAMESPACE_STD #if _LIBCPP_STD_VER >= 23 +// TODO: GCC and Clang both have this builtin. Remove the false case once we've updated to GCC 14. +# if __has_builtin(__is_scoped_enum) + template struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : bool_constant<__is_scoped_enum(_Tp)> {}; template inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp); +# else + +template > +struct __is_scoped_enum_helper : false_type {}; + +template +struct __is_scoped_enum_helper<_Tp, true> : public bool_constant > > {}; + +template +struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : public __is_scoped_enum_helper<_Tp> {}; + +template +inline constexpr bool is_scoped_enum_v = is_scoped_enum<_Tp>::value; + +# endif // __has_builtin(__is_scoped_enum) + #endif // _LIBCPP_STD_VER >= 23 _LIBCPP_END_NAMESPACE_STD From nobody Wed Oct 23 18:30: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 4XYd015fbtz5ZXBq; Wed, 23 Oct 2024 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd011rNZz59Vw; Wed, 23 Oct 2024 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PK8/zBG2fHsE1vyrp83gkFs12DmDElSIvMYKuxOH9Hw=; b=FP974gqsCBCdez6xDRE8notiH6lO9qGRf7QeOTTQ+Hn8SgtMxFtMUnEiCAy55ry2ZGKheB v2wawyDCBBBqEkAsPKQaGHvWs+WoTiDuBZVGMS4Zqgi1XXPw9QOA1VeCKiIz68ITrKWMiB A3mK+FaMm2GScqSTcAsFLYWzU8i4zvcJ8uIAv/IEpKotDshygCTr/PkvtVgnjiU8lwCniq mcJ0CsnOcmwuh7gi0hwyEik6nnPfCf0j2RyKGc8iOfMk2N2voe8dwLcwc7MK/7GhKOo+D6 7x/JXSVUtPn8rctmJHuziTema62QE/pCsrK7i5IlCGViUeGshxxLDDAk/lVg3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PK8/zBG2fHsE1vyrp83gkFs12DmDElSIvMYKuxOH9Hw=; b=KDXcJolbGfVgfQ7BDtzlOLSMto2iHAuKaSoaCuN/W4E2V8THQ2MHmCFnXXgEDx24YVUpIH m1tnIdvh3Cg1VCzPD1zQBhDzm5gC1+kRqtUMhyr1jae6jleRbn9UckHrWJINDnOMhm7mH9 1/FLp1D1Vw5IA0KiANqr0QnjY0awJsoPtE0pUDHybzIyMFfoUkkGuBJn6lse3gs6L0fhKL wfpM2QeeqEDT/GxY84J2XOCtrldecOPQWQbmQ84zOzifJzz51cA4/1Fws8jk7pGm63xGce hBAF3I/jHPelrOAzm4R/DOMsiPtJt4jY6DKnM0VC/ly7DjjrYcre8stS9hpNWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708241; a=rsa-sha256; cv=none; b=U/DUt4QPumoQEUNGBmyOhe+uhXdAmTWy5H/WH2XGz3GHEY51ZfubHiNqYK1JyKQYpP+z60 beGDJgyGLy4TWrSWpMfCXsSd1mo64rmRRmCaoFxx7z3gtcEHFuVy9MNwggOAJC3EkifgcC fZQjObhCFxqyEuhAZyVyz9rH9Rz/m2uWFf9wYIegotSKdboVQ7EdZ88lOn1x4w+cMfbanf a7kvBlnHs8t7AEA3NncEWFYFGr3BsWukF8nppR5PUiuYtdighj+X12h/th80g9EMxk2FfU 1JafP1GoPHuXdsR3P5YRj4txVLr4ge3YSv2mbp2QYVp58lfST/Hm84POYZcQ0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd011H4qz18MJ; Wed, 23 Oct 2024 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUfLP069469; Wed, 23 Oct 2024 18:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUfEX069466; Wed, 23 Oct 2024 18:30:41 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:41 GMT Message-Id: <202410231830.49NIUfEX069466@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: 1199d38d8ec7 - main - libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1199d38d8ec764ce8545888b4c091d00441842bf Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1199d38d8ec764ce8545888b4c091d00441842bf commit 1199d38d8ec764ce8545888b4c091d00441842bf Author: Dimitry Andric AuthorDate: 2024-08-05 20:26:27 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:45 +0000 libcxx-compat: revert llvmorg-19-init-8667-g472b612ccbed: [libc++][NFC] Remove unused includes from <__type_traits/remove_cv.h> (#88752) PR: 280562 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__format/format_arg.h | 1 - contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__format/format_arg.h b/contrib/llvm-project/libcxx/include/__format/format_arg.h index aa02f81dc40e..4924e5fb3253 100644 --- a/contrib/llvm-project/libcxx/include/__format/format_arg.h +++ b/contrib/llvm-project/libcxx/include/__format/format_arg.h @@ -19,7 +19,6 @@ #include <__fwd/format.h> #include <__memory/addressof.h> #include <__type_traits/conditional.h> -#include <__type_traits/remove_const.h> #include <__utility/forward.h> #include <__utility/move.h> #include <__utility/unreachable.h> diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h index 2c4e9e419a1b..8e1c04336432 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -10,6 +10,8 @@ #define _LIBCPP___TYPE_TRAITS_REMOVE_CV_H #include <__config> +#include <__type_traits/remove_const.h> +#include <__type_traits/remove_volatile.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header From nobody Wed Oct 23 18:30: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 4XYd023rHMz5ZWx6; Wed, 23 Oct 2024 18:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd021vbNz59Sj; Wed, 23 Oct 2024 18:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxeAZboXZd+eqj3zdCf6ZUP+isYT1ghj4/fAtfpbmpo=; b=SvMpqGDvanxbUsur33AucWvpVz/jqzXicd6eH7I/AUEzSbfifkaNdzO/msSgezS4PxlPMY WeKIzt3CKRAthrrEgM5OzFy62WswUaZcqmtXgrelNUz26SuLR/EKWm6MHEEFa56u0IZd1g 63vaNBseLPpc7n82sTMBg9WPlWGwb8sU5WcvFcgsMMUCj925BTpZ5J6fMS9yjpwv7DDx6Y XeeCekNZJr6XuKUGbl9S/rQacxnB2k4QxB3JKYPbTrjC6JW7wT8Gdhc0ClOh2Yigo5+AX+ r/R3hidq/pb8zb+h+4eNIXV/8ng0c8JrY5TPEAbsX1EKXnb1Mv+mhpH30h+91g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxeAZboXZd+eqj3zdCf6ZUP+isYT1ghj4/fAtfpbmpo=; b=vMz9B0ELyM6d5lNcXGDiD6/OqJgIML/a3t8nWF7oqwW8kKfayBgF3uQJ+AeToN5masMyz1 wTo5MRUkc2rX40cvLwNsdy0CdrEkeXaZCmZSAQ99WGYq9cH6QAt3W2mgGEIaW1oBh8orB5 tHZT8QcZkOH6ywo74Wzj/L4aSmoFttPmpnk9coOIti2fMW+Gra0fhMo4Sy0Y89OjbBURPH DjR8539+Cz53HP8p2IUodNvt7b7KCeLTixGUoVnKtq9gXOjF5UcDUtoz7zdPnxuM1SQFTj 70OoZNhzHpRLz2UEeuIhXeImjfInWIx0hQCrSqWI84nmlOH8DVPgqhUXN6FfWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708242; a=rsa-sha256; cv=none; b=ohwXFVseq0YX5ww1RuZjMOfGDNPXB75u4evogUxfXECBTkMtaQbpI98tOHdQ5EkO9FOhP+ tDL91PGhmSzZ8w7Bhz5Nn2mz71KCG8R0BBYaUlw2GynHdmxtk4e9iaBbfyHBw1Dlv81lOX XDBnpGBAHJ7GQ5USG5hSXXUut02TUDNbX+Xymvw5uPJRPsekgkfEZkyUBlgMN6x/DWfN1d 04JP5WMkI/L8Q63bq9iHEVZVJgf0rdgiUDzWX3OmXp8njJNLxf0XbEORoobL+n2GlJtU0L wnETqsd2XIqGcgGihSZibJ5TcOowSj28B5EUwBcvhCf7vHg8W0T3gsSQeA7Y8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd021StLz17w8; Wed, 23 Oct 2024 18:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUgV2070473; Wed, 23 Oct 2024 18:30:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUgpl070461; Wed, 23 Oct 2024 18:30:42 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:42 GMT Message-Id: <202410231830.49NIUgpl070461@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: a7b2d7f261b8 - main - libcxx-compat: revert llvmorg-19-init-5639-ga10aa4485e83: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a7b2d7f261b81d141195c4204fdc4a0dc97a146e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b2d7f261b81d141195c4204fdc4a0dc97a146e commit a7b2d7f261b81d141195c4204fdc4a0dc97a146e Author: Dimitry Andric AuthorDate: 2024-08-05 20:26:58 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:45 +0000 libcxx-compat: revert llvmorg-19-init-5639-ga10aa4485e83: [libc++] Simplify the implementation of remove_reference (#85207) GCC 13 introduced the type trait `__remove_reference`. We can simplify the implementation of `remove_reference` a bit by using it. PR: 280562 MFC after: 1 month --- .../libcxx/include/__type_traits/remove_reference.h | 14 +++++++------- contrib/llvm-project/libcxx/include/cwchar | 4 ---- contrib/llvm-project/libcxx/include/execution | 4 ---- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h index ba67891758ad..fd66417bd84f 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h @@ -10,6 +10,7 @@ #define _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H #include <__config> +#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -25,16 +26,15 @@ struct remove_reference { template using __libcpp_remove_reference_t = __remove_reference_t(_Tp); -#elif __has_builtin(__remove_reference) -template -struct remove_reference { - using type _LIBCPP_NODEBUG = __remove_reference(_Tp); -}; +#else +// clang-format off +template struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _LIBCPP_NODEBUG _Tp type;}; +template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _LIBCPP_NODEBUG _Tp type;}; +template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _LIBCPP_NODEBUG _Tp type;}; +// clang-format on template using __libcpp_remove_reference_t = typename remove_reference<_Tp>::type; -#else -# error "remove_reference not implemented!" #endif // __has_builtin(__remove_reference_t) #if _LIBCPP_STD_VER >= 14 diff --git a/contrib/llvm-project/libcxx/include/cwchar b/contrib/llvm-project/libcxx/include/cwchar index dd16eaeaa07f..7abcc3440947 100644 --- a/contrib/llvm-project/libcxx/include/cwchar +++ b/contrib/llvm-project/libcxx/include/cwchar @@ -258,8 +258,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __constexpr_wmemchr(_Tp _LIBCPP_END_NAMESPACE_STD -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include -#endif - #endif // _LIBCPP_CWCHAR diff --git a/contrib/llvm-project/libcxx/include/execution b/contrib/llvm-project/libcxx/include/execution index 94d434b2e460..822ffa1fd3eb 100644 --- a/contrib/llvm-project/libcxx/include/execution +++ b/contrib/llvm-project/libcxx/include/execution @@ -142,8 +142,4 @@ _LIBCPP_END_NAMESPACE_STD #endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_PSTL) && _LIBCPP_STD_VER >= 17 -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include -#endif - #endif // _LIBCPP_EXECUTION From nobody Wed Oct 23 18:30: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 4XYd036tVFz5ZX58; Wed, 23 Oct 2024 18:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd033pQPz3wfc; Wed, 23 Oct 2024 18:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kNU93YJePTS/vBaq9Mky052qhKIAGpb77yPJjFUZBek=; b=VtJigJ3W+Gzcz9eRl3vX6n1GYyYQ1n5LuNuKgSWNeXhsDPt0grY5b7xeVhyRIFaDMRXBPL DJsxpOFsGAqQKgt7OovzYkToY7xIxVgePC0wyf7bA6OgEBD/o3y6qnzSMCXL8ManB3nFJs sIp/Z1Mx5nlIrOPdoIeIFDiSvNXeFrMrdwUmltYCOw9/jexyWg5bnTW53B0FGl9XijdBpz EDdLJkCIt75petUVXweHOmHSjSMT5m2KDb2qbZqmIgwIU8D6xoQIbXDcUc+Du/izgCLUiP NJrSvE5OrwTprXtAgV/VW/nPPF/VXsICl7xAsmiSCX4xCq5F9GjyhjJt6hii3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kNU93YJePTS/vBaq9Mky052qhKIAGpb77yPJjFUZBek=; b=AdUSDD9eEkpBMKW4lhhlCEXsFw6wcWHY2DkmwWi+o378KTL/bTlPVnYvTlTQjkh3bXUCpE vRENclXBmTjI54EuyZVJibs71q+KiZU78OG5WDtOWZVr1FpwYakCpza4Z4/IazwJ6LkCil BJStXEkDLnLHDbsv/+9fifulz9+WSLk50TmATFlJxei0+IqGKReJEx9c4C33SJOUqMLJXR WA6ObU+5KjuIkdAeG+tcYloPbzdOyDwpBm0nEItBOPV+CHARV9B44uOGZBDVu7n2mjRLlX SZ8pI9y92MN736b+sQTe/rlViM3qFLC2NbGkkQhzGRxXvA2vkB32WpiE4qyRQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708243; a=rsa-sha256; cv=none; b=KkcCVFCjpIGuNeUPAOIgTziinvw/vH9Z5yf1R2D23ETJ85ugtYZ+vdcPpgKHr43Ym5iQmu AIyx1KiTaEMt/3l1MTNExUxe43ngcQ1RS3D1aDQG6HHuYNfyJ4VaIQRyohKpXJBeOnOnyM C2+vs6Yk6M1Yh0ZcUmPQoMdPQrsrHMzMRIZyJp38SK/xRv8s7BGPEmes6ouWY9Z1h28YnE Prx5qCvDtUmYwt3QAdgEhg9J2AxZJeHTBP2jZGJ/2VdPjleqFRXhZJayxxDPmfGd7l0QUk KqBoKfasH8J4L2uyRGMe7gNiC50MfQ9LgEVhMtkBQntNObKEE185DXmSvZ4JhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd032QYYz17X6; Wed, 23 Oct 2024 18:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUh5l070814; Wed, 23 Oct 2024 18:30:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUh1M070811; Wed, 23 Oct 2024 18:30:43 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:43 GMT Message-Id: <202410231830.49NIUh1M070811@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: f3859a1a13a1 - main - libcxx-compat: revert llvmorg-19-init-4504-g937a5396cf3e: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f3859a1a13a119548fd80ccdc85e35b4e5d61f62 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f3859a1a13a119548fd80ccdc85e35b4e5d61f62 commit f3859a1a13a119548fd80ccdc85e35b4e5d61f62 Author: Dimitry Andric AuthorDate: 2024-08-05 20:27:22 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:46 +0000 libcxx-compat: revert llvmorg-19-init-4504-g937a5396cf3e: [libc++] Remove unused includes from __type_traits/is_convertible.h (#83747) PR: 280562 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h index baa6df94714f..b378a20cedeb 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h @@ -11,6 +11,12 @@ #include <__config> #include <__type_traits/integral_constant.h> +#include <__type_traits/is_array.h> +#include <__type_traits/is_function.h> +#include <__type_traits/is_void.h> +#include <__type_traits/remove_reference.h> +#include <__utility/declval.h> +#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header From nobody Wed Oct 23 18:30: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 4XYd045KmJz5ZX9P; Wed, 23 Oct 2024 18:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd043pjmz59R1; Wed, 23 Oct 2024 18:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9dCqA/CVEg0CAo4I9lW9iptkPZUsAEIAd1XVJiiqYHg=; b=xJpgmJe/1yijCFxNG5qGHKVS6NXytDiWVjz78R0x4kZGDu6usLGZ2vf9GRvL74mUBLtAO9 o4sN+6JbwNICMZOmdthzRhEoZJbpOfRgt2nBx2xwHNZlcvJ3ZoxorDMnJInM+8Um5a2FwK aIhDw8WlDDXDouSgDzNegFoY06gFztL44Zp5Pv1esBSCeHb/+GvNjAfCcX9RATnYBBcq88 XX1Z5FABJCqprJkg1hzwvpZL0znNDhgFdL/Mo6O4gWjIShop6IaHkK27XWP5YaRiWh+Ag8 2TwjOlNIH/ElMawQ1HUWd2CcmZ8cr16pO7qpEiREcVKQt5GIKUbHgUdTFl9ttA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9dCqA/CVEg0CAo4I9lW9iptkPZUsAEIAd1XVJiiqYHg=; b=o678ZE/7KRFTiy1pPQgG+dFxyFCSTklG85VNR/6XcAtVBV/S1+ahn13WT6FydbGRhK7jz1 qruvpJ07QFaK8id9EmUIN8Ea0rF/VeLiu1WKqPAZGkSoSsvSYlNlwUJcgubwtFn7zKbYxU /+nCL0eIleUEzZ0Jub9JySagf9z/bf696vHNaxq9xAalMQ7ruDxh24AFp2h/z4Mxie6ct/ 7lqdle3YrigYwSYtlvJ9cINinpED+F54BonFJbO72cWxsVFBIMxPkM0xOXgzGet6Sdfywk lgaBPM3PiUrVUovn7CMU1rKttVcrO+4JyBQM+192t+b3DNJmnXHsOsvFU81vkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708244; a=rsa-sha256; cv=none; b=oh0Z6JJwRlP48v4bpwsOH0V8f5Ss2+SwRMxlLeaUF0CLebLeDal69Mz3DIGgGc2Z8S52fl sugERay5RAIPT2oHvYFYDG+kxVk575H1d6ubr19FRSWIIqvNyorYwyV35RX5HQSTjHFKoy JaugNEwTWhPMD/NQGwfg/0cSed2eCuRQt9d3ND9SA//+F8ROVqqK85WmFbuOsskf5EsqBc wNmomlJ0PLt2a0PjN225F0BPkm4tdaoFS9OnFXqhZTQW683BsAf1U9X2lOlGMC7m/BXRAR eRkx8j3gKVH7P5qnQYFS0x8yxqWS4Ir4rHFOcFofFg96rHbBE/fJ7Tkco8N6YA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd043PRHz18RY; Wed, 23 Oct 2024 18:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUipw070867; Wed, 23 Oct 2024 18:30:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUiGg070864; Wed, 23 Oct 2024 18:30:44 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:44 GMT Message-Id: <202410231830.49NIUiGg070864@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: 072b5fb698ab - main - libcxx-compat: revert llvmorg-19-init-4003-g55357160d0e1: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 072b5fb698abd61ab30bea70135758336b0de999 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=072b5fb698abd61ab30bea70135758336b0de999 commit 072b5fb698abd61ab30bea70135758336b0de999 Author: Dimitry Andric AuthorDate: 2024-08-05 20:27:51 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:47 +0000 libcxx-compat: revert llvmorg-19-init-4003-g55357160d0e1: [libc++] Use GCC type traits builtins for remove_cv and remove_cvref (#81386) They have been added recently to GCC without support for mangling. This patch uses them in structs and adds aliases to these structs instead of the builtins directly. PR: 280562 MFC after: 1 month --- .../llvm-project/libcxx/include/__type_traits/remove_cv.h | 11 ++++++++--- .../libcxx/include/__type_traits/remove_cvref.h | 15 +++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h index 8e1c04336432..c4bf612794bd 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -19,17 +19,22 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_cv) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_cv { using type _LIBCPP_NODEBUG = __remove_cv(_Tp); }; -#if defined(_LIBCPP_COMPILER_GCC) template -using __remove_cv_t = typename remove_cv<_Tp>::type; +using __remove_cv_t = __remove_cv(_Tp); #else template -using __remove_cv_t = __remove_cv(_Tp); +struct _LIBCPP_TEMPLATE_VIS remove_cv { + typedef __remove_volatile_t<__remove_const_t<_Tp> > type; +}; + +template +using __remove_cv_t = __remove_volatile_t<__remove_const_t<_Tp> >; #endif // __has_builtin(__remove_cv) #if _LIBCPP_STD_VER >= 14 diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h index 55f894dbd1d8..e8e8745ab096 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h @@ -20,26 +20,21 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if defined(_LIBCPP_COMPILER_GCC) +#if __has_builtin(__remove_cvref) && !defined(_LIBCPP_COMPILER_GCC) template -struct __remove_cvref_gcc { - using type = __remove_cvref(_Tp); -}; - -template -using __remove_cvref_t _LIBCPP_NODEBUG = typename __remove_cvref_gcc<_Tp>::type; +using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); #else template -using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); +using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cv_t<__libcpp_remove_reference_t<_Tp> >; #endif // __has_builtin(__remove_cvref) template -using __is_same_uncvref = _IsSame<__remove_cvref_t<_Tp>, __remove_cvref_t<_Up> >; +struct __is_same_uncvref : _IsSame<__remove_cvref_t<_Tp>, __remove_cvref_t<_Up> > {}; #if _LIBCPP_STD_VER >= 20 template struct remove_cvref { - using type _LIBCPP_NODEBUG = __remove_cvref(_Tp); + using type _LIBCPP_NODEBUG = __remove_cvref_t<_Tp>; }; template From nobody Wed Oct 23 18:30: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 4XYd055q9wz5ZX5L; Wed, 23 Oct 2024 18:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd054Yypz59Nv; Wed, 23 Oct 2024 18:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szmbIusKQKizxIaui0pF3g/tuHgbBdq33L3axjWCUT4=; b=MKuPE+57oJ0a4rRgtUzxNLBrsNarx3ubVEfxKWxwnr41HiyWC2a82z+dewRwDuR0Yipg2U m9k0WGQiMBqtVCaLnxa8Lf3QE4ym33rS/Mw0eDAn668HBPib6D0DH6L1RINGbIeCaV+4k4 jHF+1O4hvKuswjcI+4WuG0Wc4VQejX3FUrChOZgq5VAsDNBLAKoRsNrVftOEfhj9ntinTL RdNN75hTEF8ITcECRK6irZERnLSCCM3tntVLwupi1wJ0zuvKJn09sCE5hLfZ97go9Vir5P vInJ8q3WxhWTY0LNSFz8xrk6V1FBM6gwd3P7AgcnGMGFnnrN2H6i5D9vz/FviA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szmbIusKQKizxIaui0pF3g/tuHgbBdq33L3axjWCUT4=; b=rQA/mjiNkli/yXubSPgfHZw4tQP0CBA+wdZXaDpdZEIzgs1S4TGtUmR4y3bGhK+j8XQx6D 4TLHj3VbWOSatyexZO5Z/hTcbUWNpKxxqGzpZ3cI8IZfAf3/4DavSBvv02PHE8z9/dUHcd tYCuzgqGnHg7cMS3+2/3CzVw3QA66UYdxY55WvjdEK6GuVkr9XoHJcWZKWJ6cVV1+vkiWU flmK65/r5kU6a+uDpvaNmnb0ILwFR4M/3fX2Oc1xI5qd7HoaSve8ZTEAPhd4Ru0kqfLvE/ zLpePYyISLD4OCOGc45DpDy/h/BacnhTzQ2JJUH6uIKf7zTANdXqlWXBrch9yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708245; a=rsa-sha256; cv=none; b=XnzkGcmers38SuVEcia8JON1lmBpkLF72rxPOXBY88lnTUuF1/cJ/r5W+ov8W5R+UKZouc CC9Od9P7c1U7kzTs2W8c8UdqzE3CQfAsuj2I6vQ8KG6SsV9F3w5EaHawcEUuEb9/UuuYRI FQbUx5Qna/CMGC0vZyIAr97oekcAcoGmlEtivem7CVtX1VHV7zhGJY27cU7Pae3gdyLiO4 QgFhOXXp1rpSpA6Uu+/w4AG+zakX29BJL75FLNtMjKPmVW7jalOTLzyLpcb6wpTKUgPzD5 kE7e8eeTyTeIkTjxdnaL9D/gZaliFemcKmezkj9KjOKyDvM7o59awyxU2djj4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd0549X8z17wB; Wed, 23 Oct 2024 18:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUjqU070926; Wed, 23 Oct 2024 18:30:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUjwR070923; Wed, 23 Oct 2024 18:30:45 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:45 GMT Message-Id: <202410231830.49NIUjwR070923@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: b60301d8b594 - main - libcxx-compat: don't remove headers that were reintroduced by reverts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b60301d8b5949438150f7b8ff89cfc45acab34cf Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b60301d8b5949438150f7b8ff89cfc45acab34cf commit b60301d8b5949438150f7b8ff89cfc45acab34cf Author: Dimitry Andric AuthorDate: 2024-08-05 20:36:02 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:48 +0000 libcxx-compat: don't remove headers that were reintroduced by reverts PR: 280562 MFC after: 1 month --- ObsoleteFiles.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 309f329a77bd..d9a8467443da 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -510,8 +510,6 @@ OLD_FILES+=usr/include/c++/v1/__type_traits/apply_cv.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_copy_assignable.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_copy_constructible.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_default_constructible.h -OLD_FILES+=usr/include/c++/v1/__type_traits/is_member_function_pointer.h -OLD_FILES+=usr/include/c++/v1/__type_traits/is_member_object_pointer.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_move_assignable.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_move_constructible.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_copy_assignable.h @@ -519,7 +517,6 @@ OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_copy_constructible.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_default_constructible.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_move_assignable.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_nothrow_move_constructible.h -OLD_FILES+=usr/include/c++/v1/__type_traits/is_scoped_enum.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_copy_assignable.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_copy_constructible.h OLD_FILES+=usr/include/c++/v1/__type_traits/is_trivially_default_constructible.h From nobody Wed Oct 23 18:30: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 4XYd070FZQz5ZXHr; Wed, 23 Oct 2024 18:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd065sznz3wZT; Wed, 23 Oct 2024 18:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12CIJe/tHicMv9ZJp9QTkfrcK1HhY8xqc4kloIa/3NM=; b=jcOynmiFvPDZ4O98WaN8EzoXMApw6tHsdTMyeLdGUmkpJxjfXlWJE0w7R/MQoNy9kMtgHF nHFXEMKpnrFivIKLAR6EOBIQ4FOqWBCQI9qdtfHngaOnC2/jws7Ui9vH2gvseJGrlKcxr8 nfkj2VOwWqklQOehfeU6VSJO4sowLvNmorM9cZcwdZlj4O3tJyemvA9ytlrtADPOPgxXIE Fj7ALs0agRHRebaU/WkE7QEwKM0GcX6GcjpzHfEV9Na/cnM5S4Q7VkCvPxCTuWWW2jPHA5 MYlBJaOJN2p6oVn0X1cjgA8+GviQFXZxHLns1gO56k9lXe8v4py+jgKEU0V2lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=12CIJe/tHicMv9ZJp9QTkfrcK1HhY8xqc4kloIa/3NM=; b=VoCAL5p7JjmZb4llfEmTZh9UxWwpcxwMT4cmBonWO0FCgxv7woUWi8NwgpsHncN6cz78nZ pvjz1Nzx2baoj1pI+siz75MBIiPrflgUV7J/YOuLwCv4I37etiB+B4LL/ju/641cMa5EFO GSCg2IKn5/coTKflvS3u7gusfcQWRzw5HiOs8bOmeU72GLvey1asd6JeUWTP1dLh9FeiQp Wkgy1ptz7fljfk2oOmHSzihEsmi2ftXzGZy8xprrHqPDzZjzQLaZDF5AFQa8ixLlRP7x22 B2MtnaUc411IDqz91aVtfyqeGKBzVtg0RNyUTjiWrNcxEFfq46URHTuMF3smig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708246; a=rsa-sha256; cv=none; b=mfjfDIexOjZNdxfeVObnEF01Oa1lotwEDAGwcR/0Bx4JW8B+LutlHZ+2+LrVSGvf/TIuvp aGIJWNcWbEsJQLyzHSpiuubpKUPzp0DefcKtTjILgKWW/rClK5zDN7QhDZ+ZewdVj3g1rJ J7idaIlhoNHPc+UvwMzv9rkWoPxUS3lF5VTmft3wOiFolENE4ehqP4vu7xxbhhXJtO8v1v xGJE9k2hcZFwBvvupJbedxkY73E6E1f/0dkZCcMlbzt4YlEgvaPNEJS0+dtrR0KHx3FtXz MRGIG3sFjWtMS2S7CsjgHsR3odMKGt578aRM1o6f/3giJI1XU1PhIw/EveTxtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd065RGxz18RZ; Wed, 23 Oct 2024 18:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUkW4070978; Wed, 23 Oct 2024 18:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUklr070975; Wed, 23 Oct 2024 18:30:46 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:46 GMT Message-Id: <202410231830.49NIUklr070975@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: 2e861daab905 - main - libcxx-compat: install headers that were reintroduced by reverts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2e861daab905dcc0c2056e5712de5e1c0d1f865b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2e861daab905dcc0c2056e5712de5e1c0d1f865b commit 2e861daab905dcc0c2056e5712de5e1c0d1f865b Author: Dimitry Andric AuthorDate: 2024-08-05 20:41:08 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:49 +0000 libcxx-compat: install headers that were reintroduced by reverts PR: 280562 MFC after: 1 month --- lib/libc++/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index c7f408cbf575..b30eefd6e2f7 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -1260,6 +1260,8 @@ TTR_HEADERS+= is_fundamental.h TTR_HEADERS+= is_implicitly_default_constructible.h TTR_HEADERS+= is_integral.h TTR_HEADERS+= is_literal_type.h +TTR_HEADERS+= is_member_function_pointer.h +TTR_HEADERS+= is_member_object_pointer.h TTR_HEADERS+= is_member_pointer.h TTR_HEADERS+= is_nothrow_assignable.h TTR_HEADERS+= is_nothrow_constructible.h @@ -1276,6 +1278,7 @@ TTR_HEADERS+= is_reference_wrapper.h TTR_HEADERS+= is_referenceable.h TTR_HEADERS+= is_same.h TTR_HEADERS+= is_scalar.h +TTR_HEADERS+= is_scoped_enum.h TTR_HEADERS+= is_signed.h TTR_HEADERS+= is_signed_integer.h TTR_HEADERS+= is_specialization.h From nobody Wed Oct 23 18:30: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 4XYd083f6Vz5ZWyn; Wed, 23 Oct 2024 18:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd076rTwz3wcf; Wed, 23 Oct 2024 18:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IRfAmjZdhF5puIMGAfcjA0m1Td4rHTFqAuRal5I/vHw=; b=tlFWa+z24raEfhD9bGA24nw6/Tw1oCkYJqnC0twBFwul0r04gPpsDTGavDuo5NcG0tIQRI onlu2FOc3ZKTXtTxJcJCW5Bl6be1pXHWs29dKflp9AkT5dNw90BTmlmv+3dYJf0jWliaPv 1nDa9bi+xrvyg61i1KtAjsNiB96eYDaTsld2zcJSstaIwJPQ2X8vCImFjbizmQWxgNZJ5a qXXBHby8RD6ramPbeHJDZevop78qiQPpFOCHmIF82sg9lcRZmgR2cgE66bnDD+0dryHPEw l7i/OeD3k5yMP65wFhtC8L2jzIGchRL9F49BQZ5QY8dkFHBBftemWPCBO8uz4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IRfAmjZdhF5puIMGAfcjA0m1Td4rHTFqAuRal5I/vHw=; b=gil2+yF0P+1izAPxhSTw5RZgibubiU7L9ilPxjFjh34g8yxxMp/YNPxKl8H6dY2hSGB/CT DcWo/UvfiKGF5496OIue1HJHAzjUxWBPHmy6wrZz79yHjmBl8SpnisaxVkidstQvj7qx8z AQCnT0P6Uw6kVRmmnkvALrMRreE27KUBwnEO//+mQKMYKhVe9sBCcji8cZ89NwZUvHfhnj JJqAi01hJJHnRrFAuc0cLn1wLxKhsqq8VjzdzNfQ7i3DrxUhxz70iJzaDD6M8bEyJ+fnH9 jwRWOhnIdRbF1XxZr3YjOG13uDmSFp/pFcP171YIGdYv/mBwYeebX1z5XbWE0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708248; a=rsa-sha256; cv=none; b=BZJXgQY6y9UUGWmqWcJGh91zqcpbsBrMYPd2v2GjMp+hcG56x0a1Pz7yzGgcy7wO8eLx9b mJZBqXZnyVtw0iwtM2UnEEOv8+JI3TMgMAOa8JXgg+4IJDW49Y7Kh9xnMZv5CGlBnNAUnu utxP82cQLQXhWpx4fhFXL4wINObxVPFU3bzYxX+4iq9+Acdv2kx0xwV5U9o+42fgMwIH6F WnsYY5D/aIil+OHrjIbbZHgmg6aa1Ekq6aaj+c8/Y5BuIp6H0gVMhQCi2ix70/b/STUQn+ DeXGBMAsXcDGbucRehlxp7IEpjmQpSyUyzxhKSNF+kWscjO4SWxzf02WWWHLJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd076SXTz18P3; Wed, 23 Oct 2024 18:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUlIP071041; Wed, 23 Oct 2024 18:30:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUlme071037; Wed, 23 Oct 2024 18:30:47 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:47 GMT Message-Id: <202410231830.49NIUlme071037@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: ff6c8447844b - main - libcxx-compat: update libcxx.imp for headers that were reintroduced by reverts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ff6c8447844b0f48bf507b2af4a0b8870e34e09e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ff6c8447844b0f48bf507b2af4a0b8870e34e09e commit ff6c8447844b0f48bf507b2af4a0b8870e34e09e Author: Dimitry Andric AuthorDate: 2024-08-06 08:47:32 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:50 +0000 libcxx-compat: update libcxx.imp for headers that were reintroduced by reverts PR: 280562 MFC after: 1 month --- lib/libc++/libcxx.imp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libc++/libcxx.imp b/lib/libc++/libcxx.imp index 214c12cd40ed..73c9d62df329 100644 --- a/lib/libc++/libcxx.imp +++ b/lib/libc++/libcxx.imp @@ -774,6 +774,8 @@ { include: [ "<__type_traits/is_implicitly_default_constructible.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_integral.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_literal_type.h>", "private", "", "public" ] }, + { include: [ "<__type_traits/is_member_function_pointer.h>", "private", "", "public" ] }, + { include: [ "<__type_traits/is_member_object_pointer.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_member_pointer.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_nothrow_assignable.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_nothrow_constructible.h>", "private", "", "public" ] }, @@ -790,6 +792,7 @@ { include: [ "<__type_traits/is_referenceable.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_same.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_scalar.h>", "private", "", "public" ] }, + { include: [ "<__type_traits/is_scoped_enum.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_signed.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_signed_integer.h>", "private", "", "public" ] }, { include: [ "<__type_traits/is_specialization.h>", "private", "", "public" ] }, From nobody Wed Oct 23 18:31: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 4XYd0W20JRz5ZXFk; Wed, 23 Oct 2024 18:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd0W12qJz3xkw; Wed, 23 Oct 2024 18:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzqzdUfUjxJsAFY8yF+2PoDlViiIpLsrzav76OXXIM4=; b=so2PpDQLQ8KtMw5AL5j8ec2mcHI7wbK7ajiHLZFIVT1xCuUYsQn78HlovVYbwG9JFTALiS mLTiwOsOtb1t2ImDv5a72iFicGrrnoCF36I59gXBOHBJFPS7h2/u/nvE0eUHto3ZMx6gQl 8DwlfiSdaBJX1HP3T/o7rpQCBFZiM3eVu/ZHp2xeJQMWZH1PxvLAzd6MPpXCWLe12MNS7X y5B01QC1JKLqp7Gy9KwJe3cepAK3XANoUY0ytqxA/ZVSxNj/tGViPVv9UtNk4dNKDV7TRJ 2jbx/EvjINZZFpnAGqZYMW6GfXOQBVvI2DohdfAWAlXQ7I1HcLweQtTWujRKyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzqzdUfUjxJsAFY8yF+2PoDlViiIpLsrzav76OXXIM4=; b=guUiCt7dzEse0pFTSrclzDbfjoQMsdKAQG4y1cI/ymXOqAtct0PzU9zyfaKBF9oBuSlEuK 0dkKPJ8WSG58X67AeJRA8/0zAhRQQZ7K4kvjwa6GISxBzdZTlYBtlpLNzjkglEORasEYsZ gcW5Iu8Q8sVo+7k+OlWzYuggve4kYrnVOgK7Djnr9qC9MN5P7aHmODPlGlNkMGFUtqWXsS xz65mhlYjvWQ5yxg8GlKFubwKAFSp2X/vAX07RyK44Y2WvezsGtULJNmP1GZxKP3GFwzQW WsczdAg/aRS3JAayprJAOHULGjrvRY6oHo7oN7eR+XorY5faGm7EA8HEOQOPpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708267; a=rsa-sha256; cv=none; b=VKXA5KEnNhigqkXG+29hUFlkhYAsNl5JCUQrDGqnu2V8IIMXlk/gbSdqHt978aEczmwOae jkHg4TJq8M+KQE+UOtLzEc+FP5n62XghYzOTEDxSshHE5w6bRBEqoYaLqqkunwOtafOe1h 8KEyCF05IiC2hfdBXfjFCTMiINuTuRaHQBa5yF+OFGvAh9yCZ8k/bfOhl/Ne0Q56cdjOUy z+3eInSmH709B0moUR0JkXztSvgvA+3rmp/PejrEaTdwOONJUZc/V9kuzircrQqbzi77il tMTqdkwtrssX5ixLcYQmPhNm7tUIB1E7DlTnDjLKYVOrk9MySUMFTfqMkVk9Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd0W0PwSz17X9; Wed, 23 Oct 2024 18:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIV6A9072195; Wed, 23 Oct 2024 18:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIV0c9071116; Wed, 23 Oct 2024 18:31:00 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:31:00 GMT Message-Id: <202410231831.49NIV0c9071116@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: 52418fc2be8e - main - Merge llvm-project release/19.x llvmorg-19.1.0-rc2-0-gd033ae172d1c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 52418fc2be8efa5172b90a3a9e617017173612c4 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=52418fc2be8efa5172b90a3a9e617017173612c4 commit 52418fc2be8efa5172b90a3a9e617017173612c4 Merge: ff6c8447844b 9b9503334fa8 Author: Dimitry Andric AuthorDate: 2024-08-06 13:37:26 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:53 +0000 Merge llvm-project release/19.x llvmorg-19.1.0-rc2-0-gd033ae172d1c This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.0-rc2-0-gd033ae172d1c. PR: 280562 MFC after: 1 month .../llvm-project/clang/include/clang/AST/DeclCXX.h | 7 + .../llvm-project/clang/include/clang/Basic/Attr.td | 9 + .../clang/include/clang/Basic/AttrDocs.td | 10 + .../include/clang/Basic/DiagnosticFrontendKinds.td | 3 + .../include/clang/Basic/DiagnosticSemaKinds.td | 5 +- contrib/llvm-project/clang/lib/AST/DeclCXX.cpp | 36 +++ .../clang/lib/CodeGen/CodeGenFunction.cpp | 3 + .../clang/lib/CodeGen/Targets/AArch64.cpp | 6 +- .../clang/lib/Driver/ToolChains/Clang.cpp | 3 + .../clang/lib/Format/TokenAnnotator.cpp | 61 ++--- .../clang/lib/Sema/CheckExprLifetime.cpp | 9 + .../llvm-project/clang/lib/Sema/SemaChecking.cpp | 74 ++--- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 29 +- .../llvm-project/clang/lib/Sema/SemaDeclAttr.cpp | 10 +- .../Checkers/BlockInCriticalSectionChecker.cpp | 16 +- .../clang/lib/StaticAnalyzer/Core/Store.cpp | 12 +- .../compiler-rt/lib/builtins/riscv/feature_bits.c | 298 --------------------- .../lib/interception/interception_linux.h | 16 +- .../compiler-rt/lib/nsan/nsan_interceptors.cpp | 10 - .../compiler-rt/lib/rtsan/rtsan_interceptors.cpp | 12 + .../lib/sanitizer_common/sanitizer_linux.cpp | 2 +- .../sanitizer_stacktrace_sparc.cpp | 11 +- .../libcxx/include/__atomic/atomic_ref.h | 32 ++- contrib/llvm-project/libcxx/include/typeinfo | 9 +- contrib/llvm-project/libcxx/include/version | 4 +- .../libcxx/src/include/overridable_function.h | 6 +- .../llvm-project/libunwind/src/UnwindCursor.hpp | 3 +- contrib/llvm-project/lld/ELF/Arch/LoongArch.cpp | 10 + contrib/llvm-project/lld/ELF/DWARF.cpp | 3 +- contrib/llvm-project/lld/ELF/ICF.cpp | 26 +- contrib/llvm-project/lld/ELF/InputFiles.cpp | 1 + contrib/llvm-project/lld/ELF/InputFiles.h | 1 + contrib/llvm-project/lld/ELF/InputSection.cpp | 75 ++++-- contrib/llvm-project/lld/ELF/InputSection.h | 27 +- contrib/llvm-project/lld/ELF/LinkerScript.cpp | 2 + contrib/llvm-project/lld/ELF/MarkLive.cpp | 12 +- contrib/llvm-project/lld/ELF/OutputSections.cpp | 132 ++++++++- contrib/llvm-project/lld/ELF/OutputSections.h | 6 + contrib/llvm-project/lld/ELF/Relocations.cpp | 57 ++-- contrib/llvm-project/lld/ELF/Relocations.h | 102 ++++++- contrib/llvm-project/lld/ELF/ScriptLexer.cpp | 5 - contrib/llvm-project/lld/ELF/SyntheticSections.cpp | 18 +- contrib/llvm-project/lld/ELF/SyntheticSections.h | 5 +- contrib/llvm-project/lld/ELF/Writer.cpp | 13 +- contrib/llvm-project/lld/docs/ReleaseNotes.rst | 8 +- .../llvm-project/llvm/include/llvm/ADT/STLExtras.h | 6 + .../include/llvm/CodeGen/TargetFrameLowering.h | 7 + .../llvm/include/llvm/IR/IntrinsicInst.h | 4 + .../llvm/include/llvm/IR/VectorBuilder.h | 5 +- .../llvm/include/llvm/MC/MCAsmBackend.h | 5 +- .../llvm/include/llvm/MC/MCAssembler.h | 4 +- .../llvm-project/llvm/include/llvm/MC/MCSection.h | 5 + .../llvm/include/llvm/Transforms/Utils/LoopUtils.h | 4 + .../llvm/lib/CodeGen/RegisterCoalescer.cpp | 7 + .../lib/CodeGen/StackFrameLayoutAnalysisPass.cpp | 72 +++-- .../llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp | 14 + contrib/llvm-project/llvm/lib/IR/IntrinsicInst.cpp | 19 ++ contrib/llvm-project/llvm/lib/IR/Metadata.cpp | 5 +- contrib/llvm-project/llvm/lib/IR/VectorBuilder.cpp | 57 +--- contrib/llvm-project/llvm/lib/MC/MCAssembler.cpp | 77 +++--- contrib/llvm-project/llvm/lib/MC/MCSection.cpp | 4 +- .../llvm/lib/Support/Windows/Process.inc | 3 +- .../llvm/lib/Support/Windows/Signals.inc | 38 +-- .../Target/AArch64/AArch64Arm64ECCallLowering.cpp | 5 + .../lib/Target/AArch64/AArch64FrameLowering.cpp | 35 +++ .../llvm/lib/Target/AArch64/AArch64FrameLowering.h | 2 + .../AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + .../llvm/lib/Target/ARM/ARMAsmPrinter.cpp | 6 +- .../Hexagon/MCTargetDesc/HexagonAsmBackend.cpp | 4 +- .../LoongArch/AsmParser/LoongArchAsmParser.cpp | 24 ++ .../lib/Target/LoongArch/LoongArchInstrInfo.td | 6 +- .../LoongArch/MCTargetDesc/LoongArchFixupKinds.h | 8 + .../MCTargetDesc/LoongArchMCCodeEmitter.cpp | 12 + .../LoongArch/MCTargetDesc/LoongArchMCExpr.cpp | 15 ++ .../LoongArch/MCTargetDesc/LoongArchMCExpr.h | 4 + .../llvm/lib/Target/NVPTX/NVPTXFrameLowering.cpp | 5 +- .../llvm/lib/Target/PowerPC/PPCRegisterInfo.td | 35 ++- .../llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp | 4 + .../llvm/lib/Target/RISCV/RISCVMergeBaseOffset.cpp | 10 +- .../lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp | 26 +- .../lib/Transforms/Scalar/InferAddressSpaces.cpp | 2 +- .../llvm/lib/Transforms/Utils/LoopUtils.cpp | 44 ++- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 4 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 4 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 89 files changed, 1106 insertions(+), 701 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 0ddee61ce532,000000000000..93ca585ac5b5 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc1-0-ga4902a36d5c2" ++#define LLVM_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-19.1.0-rc1-0-ga4902a36d5c2" ++#define CLANG_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-19.1.0-rc1-0-ga4902a36d5c2" ++#define LLDB_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 986051bde176,000000000000..e33bf4a26acf mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 19.1.0-rc1 - #define CLANG_VERSION_STRING "19.1.0-rc1" ++#define CLANG_VERSION 19.1.0-rc2 ++#define CLANG_VERSION_STRING "19.1.0-rc2" +#define CLANG_VERSION_MAJOR 19 +#define CLANG_VERSION_MAJOR_STRING "19" +#define CLANG_VERSION_MINOR 1 +#define CLANG_VERSION_PATCHLEVEL 0 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index ee8a017a3631,000000000000..7f5da14ec5e8 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500001 + - #define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-rc1-0-ga4902a36d5c2-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-rc2-0-gd033ae172d1c-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 266135b79e65,000000000000..947ab7b28590 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 19.1.0-rc1 - #define LLDB_VERSION_STRING "19.1.0-rc1" ++#define LLDB_VERSION 19.1.0-rc2 ++#define LLDB_VERSION_STRING "19.1.0-rc2" +#define LLDB_VERSION_MAJOR 19 +#define LLDB_VERSION_MINOR 1 +#define LLDB_VERSION_PATCH 0 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 24dd3bd53546,000000000000..a4fbe2afa470 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,372 -1,0 +1,372 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Whether tools show optional build config flags when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_BUILD_CONFIG 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 19.1.0-rc1" ++#define PACKAGE_STRING "LLVM 19.1.0-rc2" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "19.1.0-rc1" ++#define PACKAGE_VERSION "19.1.0-rc2" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 757fe014d662,000000000000..1aed03c7d4e6 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,232 -1,0 +1,232 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#define LLVM_HAS_SPARC_TARGET 0 + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 19 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ +#define LLVM_VERSION_PATCH 0 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "19.1.0-rc1" ++#define LLVM_VERSION_STRING "19.1.0-rc2" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +/* Define if logf128 is available */ +/* #undef LLVM_HAS_LOGF128 */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 6c7c4afdae9f,000000000000..b3b50ebcd180 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc1-0-ga4902a36d5c2" ++#define LLVM_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Wed Oct 23 18: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 4XYd0t3Cglz5ZX9Z; Wed, 23 Oct 2024 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd0t21nGz40QT; Wed, 23 Oct 2024 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3l45fm9Bm/QkGKlvU/zV9VrGL17A2c91B1SsdeJuGoA=; b=VEacqq+ixtWkUz2yqLuO3BxUC/Op9sPCLb91N/zOI2HlmMr8S3POjVIU3UFoZgRcxoAJuz dUPS8SOf21ZNru9IifvqZVmdwqcHyJkyt86QAr5vQ26tHgSSgUTZF4GvC9yuh+EeCo3/gy YmzOzlk7iLxC3RP+eAaeT1z+S6uaYhgjH4qYK6UQj8IJ7cGlgfmeGwWTKQywOSbApIeXCI VjeUa5wZGXgE2Y2mJ8gKdakH5vD9RT80hwh+kttURXXmwznx1SIRfGhoQ6vCS62dhMBOHM g5TFq0GKk7dReXQ4ZwtHuriX5ORsl1cJXMUwGLlP452TWFX+J/k/1qKCtsRPzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3l45fm9Bm/QkGKlvU/zV9VrGL17A2c91B1SsdeJuGoA=; b=PIs+PQsU9YHLz4RZxfprmTH/iFrtQ0yfOLfiCqLB5hcybEUJ1dLmqqPiXB8OVYrMZyyKMn NHglnUk3AjilU1oAmPe4UFy8S4Zi5jzVpI4eXAr06Xug5I1xLU31a4km6bap+RZ4iaWd5Z pHTplliBlENkCw4ol/lXj+akikmLgU0xI8DVz7CJLTuszUp2a48yr71usFpbB/mxSVBcJA 6/wmleZJmltdjy8avFlXDwF9ac0Saf8eW7C1GTbSANUKmClK1uPUzIoepnAR5/l8JWwhqN iMQFvJc6xlVkzMfdrNhmB0mwc25g6m8JjaVj3E16AlbKYYfjVOytQ/zQwFBS2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708286; a=rsa-sha256; cv=none; b=SISsbHvWgnhOQwMWBEQNDoT1gxUNYiw32iZkrCToqad9BvPXtG8m5/BcE5k92t4uBW96AQ TF/spYbU1rQEHWfyxhUqHUPg4w7EoQF1SxVSYvDDsCVDxGWPcZI6rATWhVTS2FlJNtadFZ YCIeiipcQgNkEm7befdzwcPlo6l9Nfrw/q63aEn+zbCEKEj8GwMPfrwhWcvbgCfU3QcLoL 1LM5vQm18gUZqwPrvWcYjz3/nxlS2UpNbMvkMP/xDMvSW0rcIIRtNhHsAhL26j61GdOcMP B6KLsBvJlN/vO24sU0vBAHoUL1CYFpF9TeaEdKdJu2F8dUxyL+lnCCFniWF36Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd0t1QNdz18jt; Wed, 23 Oct 2024 18:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIVQOb072343; Wed, 23 Oct 2024 18:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIVJl6072303; Wed, 23 Oct 2024 18:31:19 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:31:19 GMT Message-Id: <202410231831.49NIVJl6072303@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: 62987288060f - main - Merge llvm-project release/19.x llvmorg-19.1.0-rc3-0-g437434df21d8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 62987288060ff68c817b7056815aa9fb8ba8ecd7 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=62987288060ff68c817b7056815aa9fb8ba8ecd7 commit 62987288060ff68c817b7056815aa9fb8ba8ecd7 Merge: 52418fc2be8e adf62863f35c Author: Dimitry Andric AuthorDate: 2024-08-25 11:12:58 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:27:07 +0000 Merge llvm-project release/19.x llvmorg-19.1.0-rc3-0-g437434df21d8 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.0-rc3-0-g437434df21d8. PR: 280562 MFC after: 1 month .../clang/include/clang/AST/DeclBase.h | 7 + .../llvm-project/clang/include/clang/AST/ExprCXX.h | 7 +- .../include/clang/Basic/DiagnosticParseKinds.td | 3 - .../clang/include/clang/Basic/PointerAuthOptions.h | 6 + .../clang/include/clang/Basic/arm_sve.td | 26 ++- .../clang/include/clang/Driver/Options.td | 21 +-- .../clang/include/clang/Lex/PreprocessorOptions.h | 5 - .../clang/include/clang/Parse/Parser.h | 1 - .../include/clang/Serialization/ASTBitCodes.h | 3 + .../clang/include/clang/Serialization/ASTReader.h | 6 + .../clang/include/clang/Serialization/ASTWriter.h | 7 + contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 3 +- contrib/llvm-project/clang/lib/AST/ASTImporter.cpp | 6 +- contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 34 +++- contrib/llvm-project/clang/lib/AST/ExprCXX.cpp | 19 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 2 +- .../llvm-project/clang/lib/CodeGen/CGVTables.cpp | 56 +++--- .../clang/lib/CodeGen/CodeGenFunction.cpp | 4 + .../clang/lib/CodeGen/ItaniumCXXABI.cpp | 3 + .../llvm-project/clang/lib/CodeGen/TargetInfo.cpp | 32 +++- .../llvm-project/clang/lib/CodeGen/TargetInfo.h | 7 +- .../clang/lib/CodeGen/Targets/AArch64.cpp | 14 +- .../clang/lib/Driver/ToolChains/AIX.cpp | 6 - .../clang/lib/Driver/ToolChains/Cuda.cpp | 4 + .../clang/lib/Driver/ToolChains/Darwin.cpp | 37 +++- .../clang/lib/Driver/ToolChains/Gnu.cpp | 3 +- contrib/llvm-project/clang/lib/Driver/Types.cpp | 4 +- .../clang/lib/Format/TokenAnnotator.cpp | 11 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 3 + .../clang/lib/Frontend/CompilerInvocation.cpp | 5 +- .../clang/lib/Frontend/InitPreprocessor.cpp | 1 + contrib/llvm-project/clang/lib/Headers/ptrauth.h | 6 + .../llvm-project/clang/lib/Parse/ParsePragma.cpp | 25 --- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 4 + .../llvm-project/clang/lib/Sema/SemaCoroutine.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 11 +- .../llvm-project/clang/lib/Sema/SemaDeclCXX.cpp | 50 ++++- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 2 +- .../llvm-project/clang/lib/Sema/SemaExprMember.cpp | 3 +- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 4 +- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 6 +- .../llvm-project/clang/lib/Sema/SemaOverload.cpp | 6 +- .../llvm-project/clang/lib/Sema/SemaTemplate.cpp | 3 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 8 +- .../clang/lib/Serialization/ASTReader.cpp | 11 ++ .../clang/lib/Serialization/ASTReaderDecl.cpp | 72 ++++++-- .../clang/lib/Serialization/ASTWriter.cpp | 33 +++- .../clang/lib/Serialization/ASTWriterDecl.cpp | 6 + .../clang/tools/clang-format/ClangFormat.cpp | 12 +- .../lib/builtins/aarch64/sme-libc-mem-routines.S | 10 +- .../lib/sanitizer_common/sanitizer_linux.cpp | 47 ++++- contrib/llvm-project/libcxx/include/__bit/rotate.h | 37 ++-- contrib/llvm-project/libcxx/include/__math/hypot.h | 66 ++----- .../libcxx/include/__memory/inout_ptr.h | 10 +- .../llvm-project/libcxx/include/__memory/out_ptr.h | 8 +- contrib/llvm-project/libcxx/include/complex | 9 +- contrib/llvm-project/libcxx/include/optional | 9 +- contrib/llvm-project/libcxx/include/span | 2 +- contrib/llvm-project/libunwind/src/Registers.hpp | 7 + .../llvm-project/libunwind/src/UnwindCursor.hpp | 6 +- contrib/llvm-project/libunwind/src/UnwindLevel1.c | 31 +++- .../libunwind/src/UnwindRegistersRestore.S | 14 ++ contrib/llvm-project/libunwind/src/assembly.h | 25 ++- contrib/llvm-project/libunwind/src/cet_unwind.h | 22 +++ contrib/llvm-project/lld/ELF/Arch/ARM.cpp | 21 ++- contrib/llvm-project/lld/ELF/Config.h | 3 +- contrib/llvm-project/lld/ELF/Driver.cpp | 9 + contrib/llvm-project/lld/ELF/InputFiles.cpp | 6 +- contrib/llvm-project/lld/ELF/Relocations.cpp | 8 +- .../lldb/include/lldb/API/SBSaveCoreOptions.h | 2 +- .../lldb/include/lldb/Utility/AddressableBits.h | 2 + .../lldb/source/API/SBSaveCoreOptions.cpp | 2 + .../SymbolFile/DWARF/DWARFASTParserClang.cpp | 11 +- .../llvm/include/llvm/ADT/SmallVector.h | 1 + .../include/llvm/Analysis/LoopAccessAnalysis.h | 23 +-- .../include/llvm/CodeGen/TargetFrameLowering.h | 6 + .../llvm/include/llvm/CodeGenData/CodeGenData.h | 204 --------------------- .../llvm/include/llvm/CodeGenData/CodeGenData.inc | 46 ----- .../include/llvm/CodeGenData/CodeGenDataReader.h | 154 ---------------- .../include/llvm/CodeGenData/CodeGenDataWriter.h | 68 ------- .../llvm-project/llvm/include/llvm/IR/Metadata.h | 6 +- .../llvm/lib/Analysis/LoopAccessAnalysis.cpp | 121 ++++++------ .../llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp | 8 +- .../llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp | 1 + .../llvm/lib/CodeGen/PrologEpilogInserter.cpp | 3 + .../llvm/lib/CodeGenData/CodeGenData.cpp | 196 -------------------- .../llvm/lib/CodeGenData/CodeGenDataReader.cpp | 175 ------------------ .../llvm/lib/CodeGenData/CodeGenDataWriter.cpp | 162 ---------------- .../llvm-project/llvm/lib/IR/LegacyPassManager.cpp | 4 +- .../llvm/lib/Passes/StandardInstrumentations.cpp | 9 +- contrib/llvm-project/llvm/lib/Support/regcomp.c | 8 +- .../llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp | 7 + .../AArch64/AArch64DeadRegisterDefinitionsPass.cpp | 4 + .../llvm/lib/Target/AArch64/AArch64Features.td | 28 ++- .../lib/Target/AArch64/AArch64FrameLowering.cpp | 204 ++++++++++++++++++++- .../llvm/lib/Target/AArch64/AArch64FrameLowering.h | 6 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 3 + .../llvm/lib/Target/AArch64/AArch64Processors.td | 46 ++++- .../Target/AArch64/AArch64TargetTransformInfo.cpp | 40 +++- .../Target/AArch64/AArch64TargetTransformInfo.h | 2 +- .../llvm/lib/Target/AMDGPU/SIFoldOperands.cpp | 13 +- .../llvm/lib/Target/ARM/ARMCallLowering.cpp | 9 + .../llvm/lib/Target/ARM/ARMCallLowering.h | 2 + .../lib/Target/Hexagon/HexagonConstExtenders.cpp | 4 + .../llvm/lib/Target/Mips/MipsFastISel.cpp | 4 +- .../llvm/lib/Target/PowerPC/PPCFrameLowering.cpp | 14 +- .../llvm/lib/Target/RISCV/RISCVCodeGenPrepare.cpp | 19 +- .../Transforms/InstCombine/InstCombineCalls.cpp | 2 +- .../llvm/utils/TableGen/ARMTargetDefEmitter.cpp | 32 +++- .../llvm-project/openmp/runtime/src/z_Linux_asm.S | 53 ++++++ lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 4 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 4 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 117 files changed, 1235 insertions(+), 1454 deletions(-) diff --cc contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp index 9e16b67284be,c34d32002b5a..c34d32002b5a mode 100755,100644..100755 --- a/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp diff --cc lib/clang/include/VCSVersion.inc index 93ca585ac5b5,000000000000..f1318a5368ed mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" ++#define LLVM_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" ++#define CLANG_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" ++#define LLDB_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index e33bf4a26acf,000000000000..e8c05f487100 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 19.1.0-rc2 - #define CLANG_VERSION_STRING "19.1.0-rc2" ++#define CLANG_VERSION 19.1.0-rc3 ++#define CLANG_VERSION_STRING "19.1.0-rc3" +#define CLANG_VERSION_MAJOR 19 +#define CLANG_VERSION_MAJOR_STRING "19" +#define CLANG_VERSION_MINOR 1 +#define CLANG_VERSION_PATCHLEVEL 0 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 7f5da14ec5e8,000000000000..c6f196bf0935 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500001 + - #define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-rc2-0-gd033ae172d1c-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-rc3-0-g437434df21d8-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 947ab7b28590,000000000000..258cb68ca495 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 19.1.0-rc2 - #define LLDB_VERSION_STRING "19.1.0-rc2" ++#define LLDB_VERSION 19.1.0-rc3 ++#define LLDB_VERSION_STRING "19.1.0-rc3" +#define LLDB_VERSION_MAJOR 19 +#define LLDB_VERSION_MINOR 1 +#define LLDB_VERSION_PATCH 0 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index a4fbe2afa470,000000000000..5bf13c36aff5 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,372 -1,0 +1,372 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Whether tools show optional build config flags when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_BUILD_CONFIG 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 19.1.0-rc2" ++#define PACKAGE_STRING "LLVM 19.1.0-rc3" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "19.1.0-rc2" ++#define PACKAGE_VERSION "19.1.0-rc3" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 1aed03c7d4e6,000000000000..f2c424b507ad mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,232 -1,0 +1,232 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#define LLVM_HAS_SPARC_TARGET 0 + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 19 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ +#define LLVM_VERSION_PATCH 0 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "19.1.0-rc2" ++#define LLVM_VERSION_STRING "19.1.0-rc3" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +/* Define if logf128 is available */ +/* #undef LLVM_HAS_LOGF128 */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index b3b50ebcd180,000000000000..7c5e906d5370 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc2-0-gd033ae172d1c" ++#define LLVM_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Wed Oct 23 18:31: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 4XYd1H1b2hz5ZXLf; Wed, 23 Oct 2024 18:31: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd1G4x4Rz416F; Wed, 23 Oct 2024 18:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uB8MMAqY9S6yscULFlM7x6r75RAhcXuoBrJf9OMeTjE=; b=AWOR6dK0NzaraxtE2ptmBEpw7klhlHLV/sAzdmOPtWG8uyxwgAvGMD6qnTCN23pVGkRDuZ CMrpccMeJsTwOa4yQrde8QUpTm4YdIwRvmZnomP/fYi1NxpDu/otHOteDn8bBDj8YN4GTj EVLi5fd1PnUb8lc743FDbHzUQz0yamNSeEOUNZPeQRKsxzxq+09pollGAZKOJBO+QkqXyg p69de/haIRRiVwmuabjrQSw8kC7JZL1X1mKTlN4bNJ4E6jFWLywZJ6athS/EcMUa6x7SAk N0waLh4E47z++/Zu7x2i+7UDGbhdD8XYXwYjSI8XZ5v+oG5hlUTWTQz33SONDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uB8MMAqY9S6yscULFlM7x6r75RAhcXuoBrJf9OMeTjE=; b=C6KNjXxNEL1vmPlIPRk3LzgKPwX5mlDC/lmrCrlCzOkPI4d8x3urfJ2p2Knt4G6rw9fDPs QJhvZJVN7cW2GKWw6ysU/A28ikte3rMWkIHWRCaOEo1zsQkfZ9X1ZXR2gDDKWuyr9yLH7b Ym5RTRsRVbtnKfBM4Seri/6XsUOPO6RJU3TOV1IjwZ5120H31nOYBJHDKkNQnsebOY6mBL PhVgKiHeRdlxhc8M3+X92/T6KxZShoq+kLgFPZsrHl32Njd+1DclQ5SCMsoP5RzbGp506K CDzl+hEWTfE//iF+Yh9ROJAgKCotwpPkYoXfvM+GdgYHLGSsj2LFBNx3dhHAGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708306; a=rsa-sha256; cv=none; b=E7kzjlRfNpNQC8y9qqrOojBqACNXSO+FmJFb2G3ALJgwpr3hMMW/ZZMLDfotOfnWfkRqgY ULTh6WM3ihxjrDWqAWyvRyXWheC+4VUaZK4pjanSnnMhgnnSkyOjPGRZHFXsF5/uOUCauN B09jQgqhNnM4jeObyM33ZokMQg+ztVy9/nTBW8KMcxLcWOW84jrlrtZqJvoNrAkjZFt1cE YYPtZIFlOIKshiycVyg/V9JAXO3P3r2CvUF67V0fGtrZgqP09otmAH+NvrNL1QZa6yKbqS 4qoWfvOdAw6xNbgAqkserjesz38i3mHsQu4z/cqyCISTx4yMp7twwV05FSRJ3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd1G43Zqz18hD; Wed, 23 Oct 2024 18:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIVkM5073420; Wed, 23 Oct 2024 18:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIVdKm073377; Wed, 23 Oct 2024 18:31:39 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:31:39 GMT Message-Id: <202410231831.49NIVdKm073377@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: 6c4b055cfb6b - main - Merge llvm-project release/19.x llvmorg-19.1.0-rc4-0-g0c641568515a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6c4b055cfb6bf549e9145dde6454cc6b178c35e4 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6c4b055cfb6bf549e9145dde6454cc6b178c35e4 commit 6c4b055cfb6bf549e9145dde6454cc6b178c35e4 Merge: 62987288060f 7432c96084d7 Author: Dimitry Andric AuthorDate: 2024-09-04 14:31:28 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:27:14 +0000 Merge llvm-project release/19.x llvmorg-19.1.0-rc4-0-g0c641568515a This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.0-rc4-0-g0c641568515a. PR: 280562 MFC after: 1 month .../clang/include/clang/AST/ASTContext.h | 7 - .../clang/include/clang/AST/TemplateName.h | 4 +- .../llvm-project/clang/include/clang/AST/Type.h | 11 +- .../clang/include/clang/Serialization/ASTWriter.h | 4 +- .../clang/StaticAnalyzer/Core/AnalyzerOptions.def | 5 + contrib/llvm-project/clang/lib/AST/ASTContext.cpp | 25 +- .../llvm-project/clang/lib/AST/TemplateName.cpp | 9 + .../clang/lib/Basic/Targets/AArch64.cpp | 40 +- .../llvm-project/clang/lib/Basic/Targets/AArch64.h | 3 + .../clang/lib/Driver/ToolChains/Darwin.cpp | 10 +- .../clang/lib/Format/ContinuationIndenter.cpp | 10 +- .../llvm-project/clang/lib/Format/FormatToken.h | 3 +- .../clang/lib/Format/TokenAnnotator.cpp | 53 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 15 +- .../clang/lib/Format/WhitespaceManager.cpp | 4 +- contrib/llvm-project/clang/lib/Headers/emmintrin.h | 2 +- contrib/llvm-project/clang/lib/Headers/xmmintrin.h | 2 +- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 73 +- .../clang/lib/Serialization/ASTWriter.cpp | 3 + .../clang/lib/StaticAnalyzer/Checkers/Taint.cpp | 7 + .../lib/sanitizer_common/sanitizer_internal_defs.h | 9 + .../lib/sanitizer_common/sanitizer_linux.cpp | 2 +- .../lib/sanitizer_common/sanitizer_unwind_win.cpp | 7 + .../lib/sanitizer_common/sanitizer_win.cpp | 5 + .../include/__algorithm/three_way_comp_ref_type.h | 1 + contrib/llvm-project/libcxx/include/format | 12 +- .../mach-o/compact_unwind_encoding.modulemap | 4 - contrib/llvm-project/lld/MachO/ObjC.cpp | 10 +- .../llvm/include/llvm/IR/IntrinsicsBPF.td | 6 +- .../llvm/lib/CodeGen/DwarfEHPrepare.cpp | 7 + .../llvm/lib/CodeGen/MachinePipeliner.cpp | 12 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 22 +- .../llvm/lib/CodeGen/WindowScheduler.cpp | 29 +- contrib/llvm-project/llvm/lib/IR/BasicBlock.cpp | 24 +- .../llvm/lib/IR/DebugProgramInstruction.cpp | 5 +- contrib/llvm-project/llvm/lib/IR/TypeFinder.cpp | 14 + contrib/llvm-project/llvm/lib/Support/Z3Solver.cpp | 1 + .../llvm/lib/Target/AArch64/AArch64Processors.td | 7 +- .../llvm-project/llvm/lib/Target/AMDGPU/AMDGPU.td | 23 +- .../llvm/lib/Target/AMDGPU/GCNSubtarget.h | 9 + .../llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 9 +- .../llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 4 + .../llvm/lib/Target/AMDGPU/SIInstrInfo.h | 8 + .../llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp | 15 +- .../lib/Target/AVR/MCTargetDesc/AVRAsmBackend.cpp | 12 +- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 14 +- .../llvm/lib/Target/PowerPC/PPCInstr64Bit.td | 4 +- .../llvm/lib/Target/PowerPC/PPCInstrInfo.td | 12 +- .../llvm/lib/Target/Sparc/SparcAsmPrinter.cpp | 51 - .../llvm/lib/Target/X86/X86SchedIceLake.td | 2 + .../llvm/lib/Target/X86/X86SchedSkylakeServer.td | 2 + .../Instrumentation/PGOInstrumentation.cpp | 14 +- .../Transforms/Scalar/ConstraintElimination.cpp | 2 +- .../llvm/lib/Transforms/Utils/SimplifyIndVar.cpp | 28 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 4 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 4 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- lib/clang/liblldb/LLDBWrapLua.cpp | 1904 ++++++++++---------- 62 files changed, 1392 insertions(+), 1212 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index f1318a5368ed,000000000000..5c86affe3309 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" ++#define LLVM_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" ++#define CLANG_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" ++#define LLDB_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index e8c05f487100,000000000000..834f0b9f93fb mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 19.1.0-rc3 - #define CLANG_VERSION_STRING "19.1.0-rc3" ++#define CLANG_VERSION 19.1.0-rc4 ++#define CLANG_VERSION_STRING "19.1.0-rc4" +#define CLANG_VERSION_MAJOR 19 +#define CLANG_VERSION_MAJOR_STRING "19" +#define CLANG_VERSION_MINOR 1 +#define CLANG_VERSION_PATCHLEVEL 0 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index c6f196bf0935,000000000000..1d00a072c541 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500001 + - #define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-rc3-0-g437434df21d8-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-rc4-0-g0c641568515a-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 258cb68ca495,000000000000..bd8cfa6fea9a mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 19.1.0-rc3 - #define LLDB_VERSION_STRING "19.1.0-rc3" ++#define LLDB_VERSION 19.1.0-rc4 ++#define LLDB_VERSION_STRING "19.1.0-rc4" +#define LLDB_VERSION_MAJOR 19 +#define LLDB_VERSION_MINOR 1 +#define LLDB_VERSION_PATCH 0 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 5bf13c36aff5,000000000000..4135d560630c mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,372 -1,0 +1,372 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Whether tools show optional build config flags when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_BUILD_CONFIG 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 19.1.0-rc3" ++#define PACKAGE_STRING "LLVM 19.1.0-rc4" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "19.1.0-rc3" ++#define PACKAGE_VERSION "19.1.0-rc4" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index f2c424b507ad,000000000000..0d4ff6133d95 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,232 -1,0 +1,232 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#define LLVM_HAS_SPARC_TARGET 0 + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 19 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ +#define LLVM_VERSION_PATCH 0 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "19.1.0-rc3" ++#define LLVM_VERSION_STRING "19.1.0-rc4" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +/* Define if logf128 is available */ +/* #undef LLVM_HAS_LOGF128 */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 7c5e906d5370,000000000000..94081b2dd066 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc3-0-g437434df21d8" ++#define LLVM_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/liblldb/LLDBWrapLua.cpp index abcc2fff5660,000000000000..823354827790 mode 100644,000000..100644 --- a/lib/clang/liblldb/LLDBWrapLua.cpp +++ b/lib/clang/liblldb/LLDBWrapLua.cpp @@@ -1,83465 -1,0 +1,83511 @@@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (https://www.swig.org). - * Version 4.1.1 ++ * Version 4.2.1 + * + * Do not make changes to this file unless you know what you are doing - modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + + - #define SWIG_VERSION 0x040101 ++#define SWIG_VERSION 0x040201 +#define SWIGLUA +#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_LUA +#define SWIG_LUA_MODULE_GLOBAL + +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ + +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# elif defined(__HP_aCC) +/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */ +/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */ +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif + +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif + +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif + +#ifndef SWIG_MSC_UNSUPPRESS_4505 +# if defined(_MSC_VER) +# pragma warning(disable : 4505) /* unreferenced local function has been removed */ +# endif +#endif + +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif + +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if defined(__GNUC__) +# if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif +# endif +#endif + +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ +#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) +# define _SCL_SECURE_NO_DEPRECATE +#endif + +/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */ +#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES) +# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 +#endif + +/* Intel's compiler complains if a variable which was never initialised is + * cast to void, which is a common idiom which we use to indicate that we + * are aware a variable isn't used. So we just silence that warning. + * See: https://github.com/swig/swig/issues/192 for more discussion. + */ +#ifdef __INTEL_COMPILER +# pragma warning disable 592 +#endif + ++#if defined(__cplusplus) && __cplusplus >=201103L ++# define SWIG_NULLPTR nullptr ++#else ++# define SWIG_NULLPTR NULL ++#endif ++ ++/* ----------------------------------------------------------------------------- ++ * swigcompat.swg ++ * ++ * Macros to provide support compatibility with older C and C++ standards. ++ * ----------------------------------------------------------------------------- */ ++ ++/* C99 and C++11 should provide snprintf, but define SWIG_NO_SNPRINTF ++ * if you're missing it. ++ */ ++#if ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || \ ++ (defined __cplusplus && __cplusplus >= 201103L) || \ ++ defined SWIG_HAVE_SNPRINTF) && \ ++ !defined SWIG_NO_SNPRINTF ++# define SWIG_snprintf(O,S,F,A) snprintf(O,S,F,A) ++# define SWIG_snprintf2(O,S,F,A,B) snprintf(O,S,F,A,B) ++#else ++/* Fallback versions ignore the buffer size, but most of our uses either have a ++ * fixed maximum possible size or dynamically allocate a buffer that's large ++ * enough. ++ */ ++# define SWIG_snprintf(O,S,F,A) sprintf(O,F,A) ++# define SWIG_snprintf2(O,S,F,A,B) sprintf(O,F,A,B) ++#endif ++ +/* ----------------------------------------------------------------------------- + * swigrun.swg + * + * This file contains generic C API SWIG runtime support for pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "4" + +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) +#else +# define SWIG_TYPE_TABLE_NAME +#endif + +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the SWIG runtime code. + In 99.9% of the cases, SWIG just needs to declare them as 'static'. + + But only do this if strictly necessary, ie, if you have problems + with your compiler or suchlike. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN +#endif + +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +/* Generic buffer size */ +#ifndef SWIG_BUFFER_SIZE +# define SWIG_BUFFER_SIZE 1024 +#endif *** 84229 LINES SKIPPED *** From nobody Wed Oct 23 18:31: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 4XYd1H64CYz5ZX7q; Wed, 23 Oct 2024 18:31: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd1H5Z82z418r; Wed, 23 Oct 2024 18:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuOzHmeF5SHm19pvgfeJuqWqnxWCioHLGgWQFPjkpCM=; b=UyIYYE9GpdDQc/VIAGKVqVvNxm5yOGtUpwn2e9aCxxbhSAQDbn9x1vG1xBEP5EL+H8w9ng tKJw4UdXFnTTwyLBFbuLPPvbS+QOnMGkK51EdnMBrDvIB02z6PbqWJutlwIdcpV2WHNEuy /TpzP3RDhYX/h9V9Yhu4uMQZVQ1QZdBQ+PxdcREIKkUcSOATfu4VxqIetMVtGPwXGBNLmP xeOk7oWPnGUQAQ7qoZdheyDJOEaCntEhOX48QB8KsLgZE2zxRS7k5S7ZNbkbtQitf4eXMe pcLvvzi3gHmmegKDUD17qGZHNWYWowo8aYxG1CKKOCef9hgAr79xTSSf1T7olQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yuOzHmeF5SHm19pvgfeJuqWqnxWCioHLGgWQFPjkpCM=; b=GRs+RRouGGR/Re5w/ULY7X8KyUKixVOuvvsvEUMZ+hz7USz8FmaPl30KOHID4o042jhMih Dh6US8EqcKU6qGl5Fm4Z1TUnXU7GxzeR7MJbX+vuDpkY4XQL9Ha+8RhchcP4uBts3OIVHM 1l/MnxwYdLVffdiMRoOsA/pWdZKxfaC6OgLo2WF5qTLUXxVbBUySvAK8NrfTk8J59DOzRv oOl2dNQBwvaSx99sARC2XxX+5tX4xd50Cg6vEiiTBTmVgWMRhQr+5kqe3YzfSrJDvPGcwc 9c2zLenVD9IFXIw5PH66je926UwsnAoEX8c2XdGyDgVwbfVv2c/f7vug2qK9JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708307; a=rsa-sha256; cv=none; b=X/v9KnGJJ94LB4ZI0fYf7s5VIYnJxTUh1WiAQwou7SP2LG/ZOb1Oq9HN6MZms2PrmNEF70 OgvZLCITuYllENNw2jzsAa0CnHters+xLCss3LZxAwBl9Cu2UMHZIqGXVNL5lfrr+xedAk u3KRY3XcKZhoB/J+Iidwe9ojPhsBKQFDbPz6/eLnnYqCfiOqUHeivMKxrXtQB7GqwR2t94 Kiv8WkjF+WaRK6aok12UU7NyGRy7HVaNOmoFGIx/yysbNGaLL216hYs2MhkzQb2//msC2h cP7kQrSaUPugnSzRi12ogGfClxYR++3ZQqKp2UBwdBKSpJVc5109l/rSjPrp7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd1H55Dxz181Y; Wed, 23 Oct 2024 18:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIVltx073486; Wed, 23 Oct 2024 18:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIVlNQ073483; Wed, 23 Oct 2024 18:31:47 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:31:47 GMT Message-Id: <202410231831.49NIVlNQ073483@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: 835c3a3e69af - main - Merge commit 6dbdb8430b49 from llvm git (by Nikolas Klauser): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 835c3a3e69af562ec6d4ec3639938c96dad1697e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=835c3a3e69af562ec6d4ec3639938c96dad1697e commit 835c3a3e69af562ec6d4ec3639938c96dad1697e Author: Dimitry Andric AuthorDate: 2024-09-11 10:17:00 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:27:19 +0000 Merge commit 6dbdb8430b49 from llvm git (by Nikolas Klauser): [Clang] Fix crash due to invalid source location in __is_trivially_equality_comparable (#107815) Fixes #107777 This fixes an assertion failure building www/qt5-webengine: Assertion failed: (Loc.isValid() && "point of instantiation must be valid!"), function setPointOfInstantiation, file contrib/llvm-project/clang/include/clang/AST/DeclTemplate.h, line 1938. PR: 280562 MFC after: 1 month --- contrib/llvm-project/clang/lib/Sema/SemaExprCXX.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaExprCXX.cpp b/contrib/llvm-project/clang/lib/Sema/SemaExprCXX.cpp index 14d1f395af90..de50786f4d6c 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaExprCXX.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaExprCXX.cpp @@ -5140,7 +5140,8 @@ static bool HasNonDeletedDefaultedEqualityComparison(Sema &S, // const ClassT& obj; OpaqueValueExpr Operand( - {}, Decl->getTypeForDecl()->getCanonicalTypeUnqualified().withConst(), + KeyLoc, + Decl->getTypeForDecl()->getCanonicalTypeUnqualified().withConst(), ExprValueKind::VK_LValue); UnresolvedSet<16> Functions; // obj == obj; From nobody Wed Oct 23 18:32: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 4XYd1g2Djcz5ZXK8; Wed, 23 Oct 2024 18:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd1f6wY0z41pX; Wed, 23 Oct 2024 18:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9aXG+Run9xwN6RieLZiA1XNg8j5FivSRpKxLqXD7Vpg=; b=f5MLUXEFcimaegmUulTxlI0Kzg9rYolGaBdNX03R/YrNV/6scFxs1Xr/Xrt4qwSO7USGMl vdyXOKpBFFxY52n4B3QSZRjxjNdZG6Hxe6hYnzwIbrRYqLKk14vMwdwP2Xx4ol5pMXRRTK Z2/eiczEhuFXcezvQxIKJRMr6nkDcV0BP04+M7ChF9RouSRQd+OlWulAsyJBjXx3Kb6Fzl 8jEnTNniBKyLi+NO4LCx4DigmINPGeytSZ3X3W6qtpOiJJ7dC6dhjEBFa2D4y3EAHHas0S PctHEOewZ8XeUwZ8E9XgK5eBA63lfsmtMzk1hYFFNkshlwaVr+cWPCCKp3ltIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9aXG+Run9xwN6RieLZiA1XNg8j5FivSRpKxLqXD7Vpg=; b=Iu/c/lpktdkSdobbXT8jhSjhp2nJSVSuBscu7XSg+QaDlcVqOzESNEcKkr5xc1NDLGjoHd BTm9I7B2URkr+JAl/6jldhdCPo5ka5jpv+kREtWm/sXdAl7vId8PQGIl2K0qzHaA/2jUay I43lBoixbfOcmn2TjHOaHUJKoozUbofgBEI57ZbN+90zpbc8Tbl1QXqeAK1kn7Ir0ZvW3E D6RwrZqrjF18UFMYQnV9OEeFB3E194Est+9I2EobzJZXece8LwLcBqc5q0vwa5MFnnL0n7 W+uXrxZct/KSNO3iAg283wXsEVoSwOvkRLIcVpe247SIC73sByShKRcSC8fJEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708326; a=rsa-sha256; cv=none; b=BDF+m+Dao7MSL7473aDih/F2HlvZ1AsoByvueJmY43VASfKGqLW8ck4b7LVmttwOmku1dK qU+SvXsTX/EkzA5AyQznLxTUNsE886jEthHnSOckYIFJAZzSta7cHCo/UzmZ7S487DfYa7 9e34iFyt3lY74lBiIiMI1q7+VCaH9AeblXMeY/NA6gAjN3wmYC3rEZcck3XfFm5WwoeF2f XrlVu2ALl+N73vSFDNC6TcYHWcV6UNCpSyAAbK8XQf20prVHSqK3VPC6HMIlQNDzJPoXFK U7fhwPWxL2JxuqwHZIvVIXqt/AoWsuDdRZTD9SN577qYUVNyQwhqMR2uCm+Xsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd1f6Wbmz18fb; Wed, 23 Oct 2024 18:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIW69Q077765; Wed, 23 Oct 2024 18:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIW0bw073561; Wed, 23 Oct 2024 18:32:00 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:32:00 GMT Message-Id: <202410231832.49NIW0bw073561@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: c80e69b00d97 - main - Merge llvm-project release/19.x llvmorg-19.1.0-0-ga4bf6cd7cfb1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c80e69b00d976a5a3b3e84527f270fa7e72a8205 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c80e69b00d976a5a3b3e84527f270fa7e72a8205 commit c80e69b00d976a5a3b3e84527f270fa7e72a8205 Merge: 835c3a3e69af 1de139fdd502 Author: Dimitry Andric AuthorDate: 2024-09-22 09:48:03 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:27:22 +0000 Merge llvm-project release/19.x llvmorg-19.1.0-0-ga4bf6cd7cfb1 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.0-0-ga4bf6cd7cfb1, a.k.a. 19.1.0 release. PR: 280562 MFC after: 1 month .../llvm-project/clang/lib/Basic/Targets/X86.cpp | 4 + contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 146 +++++++++------------ .../llvm-project/clang/lib/CodeGen/CGExprAgg.cpp | 23 ++-- contrib/llvm-project/clang/lib/CodeGen/CGStmt.cpp | 2 +- .../clang/lib/CodeGen/CodeGenFunction.h | 7 +- .../clang/lib/Format/UnwrappedLineParser.cpp | 6 +- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 21 ++- contrib/llvm-project/clang/lib/Sema/SemaLambda.cpp | 1 - contrib/llvm-project/clang/lib/Sema/SemaLookup.cpp | 2 +- .../clang/lib/StaticAnalyzer/Core/ExprEngine.cpp | 5 +- .../compiler-rt/lib/builtins/cpu_model/x86.c | 20 +++ .../llvm-project/compiler-rt/lib/builtins/divtc3.c | 2 +- .../llvm-project/compiler-rt/lib/builtins/multc3.c | 2 +- contrib/llvm-project/libcxx/include/chrono | 2 +- contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 8 +- .../include/llvm/TargetParser/X86TargetParser.def | 3 + .../include/llvm/TargetParser/X86TargetParser.h | 1 + .../llvm/lib/CodeGen/ModuloSchedule.cpp | 3 + .../lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 4 + contrib/llvm-project/llvm/lib/IR/BasicBlock.cpp | 12 +- .../lib/Target/AArch64/AArch64FrameLowering.cpp | 33 ----- .../llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 4 - .../llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 30 +++-- .../llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 9 +- .../llvm/lib/Target/RISCV/RISCVInstrInfo.cpp | 2 +- contrib/llvm-project/llvm/lib/Target/X86/X86.td | 15 +++ .../llvm/lib/Target/X86/X86PfmCounters.td | 1 + .../llvm-project/llvm/lib/TargetParser/Host.cpp | 19 +++ .../llvm/lib/TargetParser/X86TargetParser.cpp | 5 + .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 8 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 4 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 4 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 37 files changed, 237 insertions(+), 187 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 5c86affe3309,000000000000..cac840266348 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" ++#define LLVM_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" ++#define CLANG_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" ++#define LLDB_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index 834f0b9f93fb,000000000000..f5e540cec4fd mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 19.1.0-rc4 - #define CLANG_VERSION_STRING "19.1.0-rc4" ++#define CLANG_VERSION 19.1.0 ++#define CLANG_VERSION_STRING "19.1.0" +#define CLANG_VERSION_MAJOR 19 +#define CLANG_VERSION_MAJOR_STRING "19" +#define CLANG_VERSION_MINOR 1 +#define CLANG_VERSION_PATCHLEVEL 0 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 1d00a072c541,000000000000..508683a6285d mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500001 + - #define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-rc4-0-g0c641568515a-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-0-ga4bf6cd7cfb1-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index bd8cfa6fea9a,000000000000..19d9c6aa9fea mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 19.1.0-rc4 - #define LLDB_VERSION_STRING "19.1.0-rc4" ++#define LLDB_VERSION 19.1.0 ++#define LLDB_VERSION_STRING "19.1.0" +#define LLDB_VERSION_MAJOR 19 +#define LLDB_VERSION_MINOR 1 +#define LLDB_VERSION_PATCH 0 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 4135d560630c,000000000000..6ba63cec315a mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,372 -1,0 +1,372 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Whether tools show optional build config flags when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_BUILD_CONFIG 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 19.1.0-rc4" ++#define PACKAGE_STRING "LLVM 19.1.0" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "19.1.0-rc4" ++#define PACKAGE_VERSION "19.1.0" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 0d4ff6133d95,000000000000..523243f5a434 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,232 -1,0 +1,232 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#define LLVM_HAS_SPARC_TARGET 0 + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 19 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ +#define LLVM_VERSION_PATCH 0 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "19.1.0-rc4" ++#define LLVM_VERSION_STRING "19.1.0" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +/* Define if logf128 is available */ +/* #undef LLVM_HAS_LOGF128 */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 94081b2dd066,000000000000..7c6e264916f0 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-rc4-0-g0c641568515a" ++#define LLVM_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Wed Oct 23 18:32: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 4XYd223Fldz5ZXKH; Wed, 23 Oct 2024 18:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd220nJwz42cd; Wed, 23 Oct 2024 18:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8fRkH5jZJ42NuY96qo8Hdrz5NWyh3ByAT4nMww5m4Q=; b=bvscO7XNBEpOPW55BN+7F9rm0XEo8HQsmKhTMOrWSVueIFRcVYTyxITG7KDczIZVlTXY17 SJGszwyzDB4TvUKZ05wQ3CGgyyV1ejdgwey5dv4oCAuVosg9B2ZA7Yw/zrfX3SCWdZiWWq a85zEurgwNRpPcvc3nDlTXORo63Le5dzY2mXsJ2OZX/wKBeinzvW+zhSApPzTqlTctf1pt ANpKSTplioisvbMyZlAdAqLy9WRNCN5T32s6/9Q03xpvAtIhcBeSPYEjuES8nJoQpwwyFg gcMNQhAlYhLyo6irEjvGTOvQLSZL7EkO0//VaBvWwjUP6dKKKI38OQWag2tt1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8fRkH5jZJ42NuY96qo8Hdrz5NWyh3ByAT4nMww5m4Q=; b=wVit3e1bGtLeIIfg9BQtXRljH52aA7A81Xr4zlDza8BdOmNFLyx05WSb7FGCICgF6uH8L7 Qta/BWicGOA/8cZBzOZ2blw+L6VeF4US8jN8bo3cRuTf0H0eObP+4LQzfmc8G/nYEwuKgx Ljvu4324UHv0nYTrQpp+4cAHwNrLPyBTdsmjGUVqxmweZAg6P3E5YHBLwq7PoBpqkdihxD TczUw+PtSsYu6Zk37pMNLUPqySjRx17Z5ISJgCRaurOXawQ1qiV2zEjH+WzJaPm3z/8IGP bFjMZaLpP1vbskpUpt0w+nrDbobya2tKVwNeF88lQamIQkfN2BEKWY6tJ0DKrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708346; a=rsa-sha256; cv=none; b=vgZgYjQZ6Xbwvf1EH5K38qewSC34lm1wWZEozGxboj9G7FXSpcsNnSCSYO6KUAbW48FBY/ o5s02zBzPdTU59iHV/+dI9X4QOB3W/QcBfLoA4EI3TC445E8LhN0nVhy1bo5SkM2T+WE9/ N5qhhRme3gCoI5GjRAC7eBWUTJpCTuS7TaTPWpNTI8efysxyx4/Xjsk11L3F2zvU382aNw bJ18GsKggrEJ+FrxRtuGD0az1vMuql4EZrKLj/n4ylRIOWvXiTiMLc8hm6I3ogcNEj4DoW fSS9CFMiSdrNBP/6nkpY//TAw/mcqBFfNzYkcDpqhD3AfbnJb+IkYL0D95GhUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd220Ff4z18VF; Wed, 23 Oct 2024 18:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIWPQR077926; Wed, 23 Oct 2024 18:32:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIWJg5077885; Wed, 23 Oct 2024 18:32:19 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:32:19 GMT Message-Id: <202410231832.49NIWJg5077885@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: 6e516c87b6d7 - main - Merge llvm-project release/19.x llvmorg-19.1.1-0-gd401987fe349 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6e516c87b6d779911edde7481d8aef165b837a03 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6e516c87b6d779911edde7481d8aef165b837a03 commit 6e516c87b6d779911edde7481d8aef165b837a03 Merge: c80e69b00d97 0370629593a6 Author: Dimitry Andric AuthorDate: 2024-10-08 17:05:26 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:27:28 +0000 Merge llvm-project release/19.x llvmorg-19.1.1-0-gd401987fe349 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.1-0-gd401987fe349, a.k.a. 19.1.1 release. PR: 280562 MFC after: 1 month .../clang/include/clang/AST/DeclBase.h | 3 + .../include/clang/Tooling/CompilationDatabase.h | 6 ++ contrib/llvm-project/clang/lib/AST/DeclBase.cpp | 4 ++ .../clang/lib/CodeGen/CGExprScalar.cpp | 26 ++++--- .../clang/lib/Driver/ToolChains/Clang.cpp | 26 +++++++ .../clang/lib/Format/FormatTokenLexer.cpp | 7 ++ .../clang/lib/Format/TokenAnnotator.cpp | 5 -- .../llvm-project/clang/lib/Sema/SemaConcept.cpp | 26 ++++++- contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp | 3 +- .../lib/Tooling/LocateToolCompilationDatabase.cpp | 71 ++++++++++++++++++ .../lib/sanitizer_common/sanitizer_linux.cpp | 12 ++++ contrib/llvm-project/libcxx/include/__config | 2 +- .../vendor/llvm/default_assertion_handler.in | 3 +- contrib/llvm-project/lld/ELF/ICF.cpp | 4 +- contrib/llvm-project/lld/ELF/InputSection.cpp | 6 +- contrib/llvm-project/lld/ELF/InputSection.h | 4 ++ .../llvm/include/llvm/Analysis/AliasAnalysis.h | 2 +- .../llvm/lib/Analysis/AliasAnalysis.cpp | 2 + .../llvm-project/llvm/lib/CodeGen/InitUndef.cpp | 1 + .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 83 +++++++++++++--------- .../llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 3 +- .../llvm/lib/ExecutionEngine/Orc/Core.cpp | 15 ++++ .../llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp | 6 +- .../llvm/lib/Target/AVR/AVRISelDAGToDAG.cpp | 9 ++- .../lib/Target/LoongArch/LoongArchISelLowering.cpp | 6 +- .../lib/Target/LoongArch/LoongArchInstrInfo.td | 5 +- .../lib/Target/LoongArch/LoongArchLASXInstrInfo.td | 6 ++ .../lib/Target/LoongArch/LoongArchOptWInstrs.cpp | 15 ++++ .../llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 3 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 2 +- .../llvm/lib/Target/X86/X86InstrAVX512.td | 4 +- .../llvm/lib/Transforms/Utils/InlineFunction.cpp | 20 ++++-- .../llvm/lib/Transforms/Utils/LoopPeel.cpp | 2 +- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 40 files changed, 330 insertions(+), 92 deletions(-) diff --cc contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp index c34d32002b5a,244f6ef2f53f..244f6ef2f53f mode 100755,100644..100755 --- a/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaConcept.cpp diff --cc contrib/llvm-project/clang/lib/Tooling/LocateToolCompilationDatabase.cpp index 000000000000,033f69f3760c..033f69f3760c mode 000000,100644..100644 --- a/contrib/llvm-project/clang/lib/Tooling/LocateToolCompilationDatabase.cpp +++ b/contrib/llvm-project/clang/lib/Tooling/LocateToolCompilationDatabase.cpp diff --cc lib/clang/include/VCSVersion.inc index cac840266348,000000000000..776ac0ea1544 mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" ++#define LLVM_REVISION "llvmorg-19.1.1-0-gd401987fe349" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" ++#define CLANG_REVISION "llvmorg-19.1.1-0-gd401987fe349" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" ++#define LLDB_REVISION "llvmorg-19.1.1-0-gd401987fe349" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index f5e540cec4fd,000000000000..d383f17c1532 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 19.1.0 - #define CLANG_VERSION_STRING "19.1.0" ++#define CLANG_VERSION 19.1.1 ++#define CLANG_VERSION_STRING "19.1.1" +#define CLANG_VERSION_MAJOR 19 +#define CLANG_VERSION_MAJOR_STRING "19" +#define CLANG_VERSION_MINOR 1 - #define CLANG_VERSION_PATCHLEVEL 0 ++#define CLANG_VERSION_PATCHLEVEL 1 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 508683a6285d,000000000000..6ba05cfdf91f mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500001 + - #define LLD_VERSION_STRING "19.1.0 (FreeBSD llvmorg-19.1.0-0-ga4bf6cd7cfb1-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "19.1.1 (FreeBSD llvmorg-19.1.1-0-gd401987fe349-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index 19d9c6aa9fea,000000000000..d43597e9b482 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 19.1.0 - #define LLDB_VERSION_STRING "19.1.0" ++#define LLDB_VERSION 19.1.1 ++#define LLDB_VERSION_STRING "19.1.1" +#define LLDB_VERSION_MAJOR 19 +#define LLDB_VERSION_MINOR 1 - #define LLDB_VERSION_PATCH 0 ++#define LLDB_VERSION_PATCH 1 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index 6ba63cec315a,000000000000..be742d5fc932 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,372 -1,0 +1,372 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Whether tools show optional build config flags when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_BUILD_CONFIG 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 19.1.0" ++#define PACKAGE_STRING "LLVM 19.1.1" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "19.1.0" ++#define PACKAGE_VERSION "19.1.1" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index 523243f5a434,000000000000..a0ac378c1b68 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,232 -1,0 +1,232 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#define LLVM_HAS_SPARC_TARGET 0 + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 19 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 0 ++#define LLVM_VERSION_PATCH 1 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "19.1.0" ++#define LLVM_VERSION_STRING "19.1.1" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +/* Define if logf128 is available */ +/* #undef LLVM_HAS_LOGF128 */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index 7c6e264916f0,000000000000..c99531b9c830 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-19.1.0-0-ga4bf6cd7cfb1" ++#define LLVM_REVISION "llvmorg-19.1.1-0-gd401987fe349" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Wed Oct 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 4XYd2Q4fD7z5ZXCx; Wed, 23 Oct 2024 18:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd2Q2Htgz43YQ; Wed, 23 Oct 2024 18:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBYilvumi03zf7bUZCDJJlcG96h9Zyg1iDCET/yENqg=; b=sxdCGcGVJZToTLWLlBkdSN984/zgRZqHE00rbB8v4xd0pNUvKhUzYoxa5lzFzKnq2QHxsE 0TedSsbtljjCtFB+nfiQLGtuD7cSzR09XaBOWXlndZ9Xr4SG3O1HUnrSYqO5lRISqsnDV4 5yd4Kn4LgsJKntsFPgaPdDKzE1QPe4IRntDHoKU+f94e5IdcV+K2gFi19W+eGQLIwEhRZ2 XZ8Kx8It4yiUCmWSmNkMxAnWvvwH6SEpoTbxx+S6JOuaNv1d0kmCB2h9D7Kh/iPCyz6ydz uETuqAsZ8I6eAOrpeNUYUV//dwyIizuXzC7cbr0rNxFIM0Vhmx7b2GJKZQqTTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBYilvumi03zf7bUZCDJJlcG96h9Zyg1iDCET/yENqg=; b=GmHcbpVwEOdcG/3PMOQhmlCAG8+7ohD9hjTE1+Vg96XFHfassZN1G0l0OIpUmM4cBNKenT T/oKtyu3Y4VP49dM125Cx1u1eYAvU1gTxp6L5oG2tjrD8kHc8fv/2KqIpIj10em+2b1oLb fi/D+WoQUcdxKNKyC6Aij6/3S3SfqcIbRduRdIH7w8Pj4GumXj9hiJ1MEe1MYTnMHLxNSR eiSVIhxiD1y/l07BQa9pfgNOQIv7MzAi7ohcg2EVe2E+QP2vTg0j7Q6UfiGtMPgGleP2+A aGgg8wit7neziHNnW2m+O8QjUWdQ6gQJYG385R/oyFe5imNzqjk+sC/WsXvlJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708366; a=rsa-sha256; cv=none; b=HfYnFY7eLi4lcvAsQIn1LtArx5rnMECrJoXJ+pLO68i70aFQzPpQc0TR2O5EQzOKdMdI7W fZm6aLCyCdcBnSpYoXg5t0dJcXWiivkfEJiK0FBWTC80fduxN2nbvdFSAM6PRuqHSbtTP6 ujbCKnA9xd04CJ2Z8p3SEsMdXNjLASqEyFR+iuTkyYzHsxRIINx9dhkYD3VM7n2HAnrMaC hPIW4IrIFsUhkLEymGau5MrAYjgmAx29Ixixw3D2R7/RLZNZ4lEqNs7J2lhffwcK32L6Z0 kApcbumo4PgMaLi9IWjUVg3FPlyhTVvDcB5WByWJP5ZQk8BxSMGSborwTg/cXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd2Q1ZXHz181l; Wed, 23 Oct 2024 18:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIWkbb078106; Wed, 23 Oct 2024 18:32:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIWkas078103; Wed, 23 Oct 2024 18:32:46 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:32:46 GMT Message-Id: <202410231832.49NIWkas078103@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: f3dbef108212 - main - Bump __FreeBSD_version for llvm 19.1.2 merge List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f3dbef108212460489ae68b4c47e20b73984f433 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f3dbef108212460489ae68b4c47e20b73984f433 commit f3dbef108212460489ae68b4c47e20b73984f433 Author: Dimitry Andric AuthorDate: 2024-10-23 16:49:02 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:27:43 +0000 Bump __FreeBSD_version for llvm 19.1.2 merge PR: 280562 MFC after: 1 month --- 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 8af2f9594bc1..7647c0d6e518 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 1500025 +#define __FreeBSD_version 1500026 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Oct 23 18:32: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 4XYd2P28nRz5ZX8k; Wed, 23 Oct 2024 18:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYd2P1YGkz439F; Wed, 23 Oct 2024 18:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gtg+XveFNTO7FFDGozOa9Xqtt9xzQsWj1ixVCnuqJFA=; b=OH1rlOwkydNS8+Q6exZ5bgEuYCTDxFvNIA/wJhLKROBvT52ZsQHb+mmYaC5OTsLsXx3w3h KJURmuZ7nrwarsng2mnrDghp50d1DF6t3BKJ0QQ0mV0TNhZnFIMZ8NtfC40jiNmXFO+QBj rPTBMXLC7kb25uKqwP5+GqWr87SGVC4VT1wCjx6tk0zrK2EVXXFWFIif1cCBiGUWF0Ihv9 6ekZG7WCxbrWAhW1A3PdLaakS9Lqw8o2MHV8ayqhYcwPSSullbKbcllLsdCd5GWXf8TF1M T8U7vi19hgV9EiZa0Gco0cLpl+1CNM5HSbn6OpgmP4X74zZiqkXum2r5ejCWCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gtg+XveFNTO7FFDGozOa9Xqtt9xzQsWj1ixVCnuqJFA=; b=wyH/IQucMvAC5b8HNeGgkoAzZxCoBmORNGUyQQfLa5DbBWg+DUzfvrelm3rtTjvdUNCbor 9StSGSWkrnT8ZJD1xZx1EYulOCV+3quZsaNUSPL20NIfswhParColNcSj5ezwCyCsmXwGq jiSAM/NvsiowzFvD3f9pRlIZZC5CmfY7foVejCDIWsquv15umUu8D+Fd2Z5QOuPIyseLut bAU8fHX+ZZ28jbAV8F6SMEH8/eRIRoR/8cPvlDg9/98kb7kzI2TVuXrmLJtJq7eWIbNLtO S5Oji8GJjg27lXBN1Yn7t3msGvuKYo8TlBW8a9mT3D6W4Nj0zKL3/BpB8ucoXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708365; a=rsa-sha256; cv=none; b=y4pdZA6onHAp6S6xp9cuXw2wJzlk12vcAIj4pWLS0e52r356wjdDrIyk88U92WUamCtLfB GkgDaJgb5Ssn1QkyTIsfO3HocFlFTM6fjq+T3wIXdAjfArcnvCo5DLLu1mUlRW3RkoRnH1 Qsn+HIQCDQFInaO59ymok3yNJ5hfjjA6Hh4SPdoi6AfrtIl9ika6d8qvQktSvt9k7WwXHC NbsaJVjBNG73trMcZziGFk/44G7KUU8vQoqxIJIFdjMhqHVvoQYF0hs1bxDuHlhq9xcX5n Qx/zD6D+pTKBglaCe41o+dyKyIvtnASnDhAuTjIl7v1bTAdEOb6hCuxGBYILvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYd2P0Wxlz18k3; Wed, 23 Oct 2024 18:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIWjwT078061; Wed, 23 Oct 2024 18:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIWcTJ078019; Wed, 23 Oct 2024 18:32:38 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:32:38 GMT Message-Id: <202410231832.49NIWcTJ078019@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: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5deeebd8c6ca991269e72902a7a62cada57947f6 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5deeebd8c6ca991269e72902a7a62cada57947f6 commit 5deeebd8c6ca991269e72902a7a62cada57947f6 Merge: 6e516c87b6d7 e6b732792813 Author: Dimitry Andric AuthorDate: 2024-10-21 12:59:26 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:27:38 +0000 Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, a.k.a. 19.1.2 release. PR: 280562 MFC after: 1 month .../clang/include/clang/Basic/TokenKinds.def | 5 +- contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + .../sanitizer_common_interceptors.inc | 180 --------------------- .../sanitizer_platform_interceptors.h | 2 - contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/libcxx/include/version | 7 +- contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- .../llvm/include/llvm/CodeGen/FastISel.h | 3 + .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 37 files changed, 260 insertions(+), 350 deletions(-) diff --cc lib/clang/include/VCSVersion.inc index 776ac0ea1544,000000000000..5b4ac649986a mode 100644,000000..100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@@ -1,8 -1,0 +1,8 @@@ - #define LLVM_REVISION "llvmorg-19.1.1-0-gd401987fe349" ++#define LLVM_REVISION "llvmorg-19.1.2-0-g7ba7d8e2f7b6" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define CLANG_REVISION "llvmorg-19.1.1-0-gd401987fe349" ++#define CLANG_REVISION "llvmorg-19.1.2-0-g7ba7d8e2f7b6" +#define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" + - #define LLDB_REVISION "llvmorg-19.1.1-0-gd401987fe349" ++#define LLDB_REVISION "llvmorg-19.1.2-0-g7ba7d8e2f7b6" +#define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --cc lib/clang/include/clang/Basic/Version.inc index d383f17c1532,000000000000..163d9b601b93 mode 100644,000000..100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@@ -1,8 -1,0 +1,8 @@@ - #define CLANG_VERSION 19.1.1 - #define CLANG_VERSION_STRING "19.1.1" ++#define CLANG_VERSION 19.1.2 ++#define CLANG_VERSION_STRING "19.1.2" +#define CLANG_VERSION_MAJOR 19 +#define CLANG_VERSION_MAJOR_STRING "19" +#define CLANG_VERSION_MINOR 1 - #define CLANG_VERSION_PATCHLEVEL 1 ++#define CLANG_VERSION_PATCHLEVEL 2 + +#define CLANG_VENDOR "FreeBSD " diff --cc lib/clang/include/lld/Common/Version.inc index 6ba05cfdf91f,000000000000..555a95af9183 mode 100644,000000..100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@@ -1,4 -1,0 +1,4 @@@ +// Local identifier in __FreeBSD_version style +#define LLD_FREEBSD_VERSION 1500001 + - #define LLD_VERSION_STRING "19.1.1 (FreeBSD llvmorg-19.1.1-0-gd401987fe349-" __XSTRING(LLD_FREEBSD_VERSION) ")" ++#define LLD_VERSION_STRING "19.1.2 (FreeBSD llvmorg-19.1.2-0-g7ba7d8e2f7b6-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --cc lib/clang/include/lldb/Version/Version.inc index d43597e9b482,000000000000..be36ec215810 mode 100644,000000..100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@@ -1,6 -1,0 +1,6 @@@ - #define LLDB_VERSION 19.1.1 - #define LLDB_VERSION_STRING "19.1.1" ++#define LLDB_VERSION 19.1.2 ++#define LLDB_VERSION_STRING "19.1.2" +#define LLDB_VERSION_MAJOR 19 +#define LLDB_VERSION_MINOR 1 - #define LLDB_VERSION_PATCH 1 ++#define LLDB_VERSION_PATCH 2 +/* #undef LLDB_FULL_VERSION_STRING */ diff --cc lib/clang/include/llvm/Config/config.h index be742d5fc932,000000000000..2ad54b836743 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@@ -1,372 -1,0 +1,372 @@@ +#ifndef CONFIG_H +#define CONFIG_H + +// Include this header only under the llvm source tree. +// This is a private header. + +/* Exported configuration */ +#include "llvm/Config/llvm-config.h" + +/* Bug report URL. */ +#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" + +/* Define to 1 to enable backtraces, and to 0 otherwise. */ +#define ENABLE_BACKTRACES 1 + +/* Define to 1 to enable crash overrides, and to 0 otherwise. */ +#define ENABLE_CRASH_OVERRIDES 1 + +/* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ +#define LLVM_ENABLE_CRASH_DUMPS 0 + +/* Define to 1 to prefer forward slashes on Windows, and to 0 prefer + backslashes. */ +#define LLVM_WINDOWS_PREFER_FORWARD_SLASH 0 + +/* Define to 1 if you have the `backtrace' function. */ +#define HAVE_BACKTRACE TRUE + +#define BACKTRACE_HEADER + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRASHREPORTERCLIENT_H */ + +/* can use __crashreporter_info__ */ +#if defined(__APPLE__) +#define HAVE_CRASHREPORTER_INFO 1 +#else +#define HAVE_CRASHREPORTER_INFO 0 +#endif + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#define HAVE_DECL_ARC4RANDOM 1 + +/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_ALL_EXCEPT 1 + +/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you + don't. */ +#define HAVE_DECL_FE_INEXACT 1 + +/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_S 0 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if dlopen() is available on this platform. */ +#define HAVE_DLOPEN 1 + +/* Define if dladdr() is available on this platform. */ +#define HAVE_DLADDR 1 + +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) +/* Define to 1 if we can register EH frames on this platform. */ +#define HAVE_REGISTER_FRAME 1 + +/* Define to 1 if we can deregister EH frames on this platform. */ +#define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ + +/* Define if __unw_add_dynamic_fde() is available on this platform. */ +/* #undef HAVE_UNW_ADD_DYNAMIC_FDE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FENV_H 1 + +/* Define if libffi is available on this platform. */ +/* #undef HAVE_FFI_CALL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_FFI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FFI_H */ + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the `edit' library (-ledit). */ +#define HAVE_LIBEDIT TRUE + +/* Define to 1 if you have the `pfm' library (-lpfm). */ +/* #undef HAVE_LIBPFM */ + +/* Define to 1 if the `perf_branch_entry' struct has field cycles. */ +/* #undef LIBPFM_HAS_FIELD_CYCLES */ + +/* Define to 1 if you have the `psapi' library (-lpsapi). */ +/* #undef HAVE_LIBPSAPI */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#define HAVE_LIBPTHREAD 1 + +/* Define to 1 if you have the `pthread_getname_np' function. */ +#define HAVE_PTHREAD_GETNAME_NP 1 + +/* Define to 1 if you have the `pthread_setname_np' function. */ +#define HAVE_PTHREAD_SETNAME_NP 1 + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_LINK_H 1 +#else +#define HAVE_LINK_H 0 +#endif + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MACH_MACH_H 1 +#endif + +/* Define to 1 if you have the `mallctl' function. */ +#if defined(__FreeBSD__) +#define HAVE_MALLCTL 1 +#endif + +/* Define to 1 if you have the `mallinfo' function. */ +#if defined(__linux__) +#define HAVE_MALLINFO 1 +#endif + +/* Define to 1 if you have the `mallinfo2' function. */ +/* #undef HAVE_MALLINFO2 */ + +/* Define to 1 if you have the header file. */ +#if __has_include() +#define HAVE_MALLOC_MALLOC_H 1 +#endif + +/* Define to 1 if you have the `malloc_zone_statistics' function. */ +#if defined(__APPLE__) +#define HAVE_MALLOC_ZONE_STATISTICS 1 +#endif + +/* Define to 1 if you have the `posix_spawn' function. */ +#define HAVE_POSIX_SPAWN 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PTHREAD_H 1 + +/* Have pthread_mutex_lock */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Have pthread_rwlock_init */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sigaltstack' function. */ +#define HAVE_SIGALTSTACK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if stat struct has st_mtimespec member .*/ +#if !defined(__linux__) +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 +#endif + +/* Define to 1 if stat struct has st_mtim member. */ +#if !defined(__APPLE__) +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VALGRIND_VALGRIND_H */ + +/* Have host's _alloca */ +/* #undef HAVE__ALLOCA */ + +/* Define to 1 if you have the `_chsize_s' function. */ +/* #undef HAVE__CHSIZE_S */ + +/* Define to 1 if you have the `_Unwind_Backtrace' function. */ +#define HAVE__UNWIND_BACKTRACE 1 + +/* Have host's __alloca */ +/* #undef HAVE___ALLOCA */ + +/* Have host's __ashldi3 */ +/* #undef HAVE___ASHLDI3 */ + +/* Have host's __ashrdi3 */ +/* #undef HAVE___ASHRDI3 */ + +/* Have host's __chkstk */ +/* #undef HAVE___CHKSTK */ + +/* Have host's __chkstk_ms */ +/* #undef HAVE___CHKSTK_MS */ + +/* Have host's __cmpdi2 */ +/* #undef HAVE___CMPDI2 */ + +/* Have host's __divdi3 */ +/* #undef HAVE___DIVDI3 */ + +/* Have host's __fixdfdi */ +/* #undef HAVE___FIXDFDI */ + +/* Have host's __fixsfdi */ +/* #undef HAVE___FIXSFDI */ + +/* Have host's __floatdidf */ +/* #undef HAVE___FLOATDIDF */ + +/* Have host's __lshrdi3 */ +/* #undef HAVE___LSHRDI3 */ + +/* Have host's __main */ +/* #undef HAVE___MAIN */ + +/* Have host's __moddi3 */ +/* #undef HAVE___MODDI3 */ + +/* Have host's __udivdi3 */ +/* #undef HAVE___UDIVDI3 */ + +/* Have host's __umoddi3 */ +/* #undef HAVE___UMODDI3 */ + +/* Have host's ___chkstk */ +/* #undef HAVE____CHKSTK */ + +/* Have host's ___chkstk_ms */ +/* #undef HAVE____CHKSTK_MS */ + +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + +/* Define if overriding target triple is enabled */ +/* #undef LLVM_TARGET_TRIPLE_ENV */ + +/* Whether tools show host and target info when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO 1 + +/* Whether tools show optional build config flags when invoked with --version */ +#define LLVM_VERSION_PRINTER_SHOW_BUILD_CONFIG 1 + +/* Define if libxml2 is supported on this platform. */ +/* #undef LLVM_ENABLE_LIBXML2 */ + +/* Define to the extension used for shared libraries, say, ".so". */ +#if defined(__APPLE__) +#define LTDL_SHLIB_EXT ".dylib" +#else +#define LTDL_SHLIB_EXT ".so" +#endif + +/* Define to the extension used for plugin libraries, say, ".so". */ +#if defined(__APPLE__) +#define LLVM_PLUGIN_EXT ".dylib" +#else +#define LLVM_PLUGIN_EXT ".so" +#endif + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LLVM" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "LLVM 19.1.1" ++#define PACKAGE_STRING "LLVM 19.1.2" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "19.1.1" ++#define PACKAGE_VERSION "19.1.2" + +/* Define to the vendor of this package. */ +/* #undef PACKAGE_VENDOR */ + +/* Define to a function implementing stricmp */ +/* #undef stricmp */ + +/* Define to a function implementing strdup */ +/* #undef strdup */ + +/* Whether GlobalISel rule coverage is being collected */ +#define LLVM_GISEL_COV_ENABLED 0 + +/* Define to the default GlobalISel coverage file prefix */ +/* #undef LLVM_GISEL_COV_PREFIX */ + +/* Whether Timers signpost passes in Xcode Instruments */ +#if defined(__APPLE__) +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 1 +#else +#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0 +#endif + +/* #undef HAVE_PROC_PID_RUSAGE */ + +#define HAVE_BUILTIN_THREAD_POINTER 1 + +#endif diff --cc lib/clang/include/llvm/Config/llvm-config.h index a0ac378c1b68,000000000000..0d8253e78646 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@@ -1,232 -1,0 +1,232 @@@ +/*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/ +/* */ +/* Part of the LLVM Project, under the Apache License v2.0 with LLVM */ +/* Exceptions. */ +/* See https://llvm.org/LICENSE.txt for license information. */ +/* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception */ +/* */ +/*===----------------------------------------------------------------------===*/ + +/* This file enumerates variables from the LLVM configuration so that they + can be in exported headers and won't override package specific directives. + This is a C header that can be included in the llvm-c headers. */ + +#ifndef LLVM_CONFIG_H +#define LLVM_CONFIG_H + +/* Define if LLVM_ENABLE_DUMP is enabled */ +/* #undef LLVM_ENABLE_DUMP */ + +/* Target triple LLVM will generate code for by default */ +/* Doesn't use `cmakedefine` because it is allowed to be empty. */ +/* #undef LLVM_DEFAULT_TARGET_TRIPLE */ + +/* Define if threads enabled */ +#define LLVM_ENABLE_THREADS 1 + +/* Has gcc/MSVC atomic intrinsics */ +#define LLVM_HAS_ATOMICS 1 + +/* Host triple LLVM will be executed on */ +/* #undef LLVM_HOST_TRIPLE */ + +/* LLVM architecture name for the native architecture, if available */ +/* #undef LLVM_NATIVE_ARCH */ + +/* LLVM name for the native AsmParser init function, if available */ +/* #undef LLVM_NATIVE_ASMPARSER */ + +/* LLVM name for the native AsmPrinter init function, if available */ +/* #undef LLVM_NATIVE_ASMPRINTER */ + +/* LLVM name for the native Disassembler init function, if available */ +/* #undef LLVM_NATIVE_DISASSEMBLER */ + +/* LLVM name for the native Target init function, if available */ +/* #undef LLVM_NATIVE_TARGET */ + +/* LLVM name for the native TargetInfo init function, if available */ +/* #undef LLVM_NATIVE_TARGETINFO */ + +/* LLVM name for the native target MC init function, if available */ +/* #undef LLVM_NATIVE_TARGETMC */ + +/* LLVM name for the native target MCA init function, if available */ +/* #undef LLVM_NATIVE_TARGETMCA */ + +/* Define if the AArch64 target is built in */ +#ifdef LLVM_TARGET_ENABLE_AARCH64 +#define LLVM_HAS_AARCH64_TARGET 1 +#else +#define LLVM_HAS_AARCH64_TARGET 0 +#endif + +/* Define if the AMDGPU target is built in */ +#define LLVM_HAS_AMDGPU_TARGET 0 + +/* Define if the ARC target is built in */ +#define LLVM_HAS_ARC_TARGET 0 + +/* Define if the ARM target is built in */ +#ifdef LLVM_TARGET_ENABLE_ARM +#define LLVM_HAS_ARM_TARGET 1 +#else +#define LLVM_HAS_ARM_TARGET 0 +#endif + +/* Define if the AVR target is built in */ +#define LLVM_HAS_AVR_TARGET 0 + +/* Define if the BPF target is built in */ +#ifdef LLVM_TARGET_ENABLE_BPF +#define LLVM_HAS_BPF_TARGET 1 +#else +#define LLVM_HAS_BPF_TARGET 0 +#endif + +/* Define if the CSKY target is built in */ +#define LLVM_HAS_CSKY_TARGET 0 + +/* Define if the DirectX target is built in */ +#define LLVM_HAS_DIRECTX_TARGET 0 + +/* Define if the Hexagon target is built in */ +#define LLVM_HAS_HEXAGON_TARGET 0 + +/* Define if the Lanai target is built in */ +#define LLVM_HAS_LANAI_TARGET 0 + +/* Define if the LoongArch target is built in */ +#define LLVM_HAS_LOONGARCH_TARGET 0 + +/* Define if the M68k target is built in */ +#define LLVM_HAS_M68K_TARGET 0 + +/* Define if the Mips target is built in */ +#ifdef LLVM_TARGET_ENABLE_MIPS +#define LLVM_HAS_MIPS_TARGET 1 +#else +#define LLVM_HAS_MIPS_TARGET 0 +#endif + +/* Define if the MSP430 target is built in */ +#define LLVM_HAS_MSP430_TARGET 0 + +/* Define if the NVPTX target is built in */ +#define LLVM_HAS_NVPTX_TARGET 0 + +/* Define if the PowerPC target is built in */ +#ifdef LLVM_TARGET_ENABLE_POWERPC +#define LLVM_HAS_POWERPC_TARGET 1 +#else +#define LLVM_HAS_POWERPC_TARGET 0 +#endif + +/* Define if the RISCV target is built in */ +#ifdef LLVM_TARGET_ENABLE_RISCV +#define LLVM_HAS_RISCV_TARGET 1 +#else +#define LLVM_HAS_RISCV_TARGET 0 +#endif + +/* Define if the Sparc target is built in */ +#define LLVM_HAS_SPARC_TARGET 0 + +/* Define if the SPIRV target is built in */ +#define LLVM_HAS_SPIRV_TARGET 0 + +/* Define if the SystemZ target is built in */ +#define LLVM_HAS_SYSTEMZ_TARGET 0 + +/* Define if the VE target is built in */ +#define LLVM_HAS_VE_TARGET 0 + +/* Define if the WebAssembly target is built in */ +#define LLVM_HAS_WEBASSEMBLY_TARGET 0 + +/* Define if the X86 target is built in */ +#ifdef LLVM_TARGET_ENABLE_X86 +#define LLVM_HAS_X86_TARGET 1 +#else +#define LLVM_HAS_X86_TARGET 0 +#endif + +/* Define if the XCore target is built in */ +#define LLVM_HAS_XCORE_TARGET 0 + +/* Define if the Xtensa target is built in */ +#define LLVM_HAS_XTENSA_TARGET 0 + +/* Define if this is Unixish platform */ +#define LLVM_ON_UNIX 1 + +/* Define if we have the Intel JIT API runtime support library */ +#define LLVM_USE_INTEL_JITEVENTS 0 + +/* Define if we have the oprofile JIT-support library */ +#define LLVM_USE_OPROFILE 0 + +/* Define if we have the perf JIT-support library */ +#define LLVM_USE_PERF 0 + +/* Major version of the LLVM API */ +#define LLVM_VERSION_MAJOR 19 + +/* Minor version of the LLVM API */ +#define LLVM_VERSION_MINOR 1 + +/* Patch version of the LLVM API */ - #define LLVM_VERSION_PATCH 1 ++#define LLVM_VERSION_PATCH 2 + +/* LLVM version string */ - #define LLVM_VERSION_STRING "19.1.1" ++#define LLVM_VERSION_STRING "19.1.2" + +/* Whether LLVM records statistics for use with GetStatistics(), + * PrintStatistics() or PrintStatisticsJSON() + */ +#define LLVM_FORCE_ENABLE_STATS 0 + +/* Define if we have z3 and want to build it */ +/* #undef LLVM_WITH_Z3 */ + +/* Define if we have curl and want to use it */ +/* #undef LLVM_ENABLE_CURL */ + +/* Define if we have cpp-httplib and want to use it */ +/* #undef LLVM_ENABLE_HTTPLIB */ + +/* Define if zlib compression is available */ +#define LLVM_ENABLE_ZLIB 1 + +/* Define if zstd compression is available */ +#define LLVM_ENABLE_ZSTD 1 + +/* Define if LLVM is using tflite */ +/* #undef LLVM_HAVE_TFLITE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSEXITS_H 1 + +/* Define if building libLLVM shared library */ +/* #undef LLVM_BUILD_LLVM_DYLIB */ + +/* Define if building LLVM with BUILD_SHARED_LIBS */ +/* #undef LLVM_BUILD_SHARED_LIBS */ + +/* Define if building LLVM with LLVM_FORCE_USE_OLD_TOOLCHAIN_LIBS */ +/* #undef LLVM_FORCE_USE_OLD_TOOLCHAIN */ + +/* Define if llvm_unreachable should be optimized with undefined behavior + * in non assert builds */ +#define LLVM_UNREACHABLE_OPTIMIZE 1 + +/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */ +#define LLVM_ENABLE_DIA_SDK 0 + +/* Define if plugins enabled */ +/* #undef LLVM_ENABLE_PLUGINS */ + +/* Define if logf128 is available */ +/* #undef LLVM_HAS_LOGF128 */ + +#endif diff --cc lib/clang/include/llvm/Support/VCSRevision.h index c99531b9c830,000000000000..a9cdf75b6b13 mode 100644,000000..100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@@ -1,2 -1,0 +1,2 @@@ - #define LLVM_REVISION "llvmorg-19.1.1-0-gd401987fe349" ++#define LLVM_REVISION "llvmorg-19.1.2-0-g7ba7d8e2f7b6" +#define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Wed Oct 23 19:40: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 4XYfY553jKz5Zbxg; Wed, 23 Oct 2024 19:40:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYfY52scTz4M9Z; Wed, 23 Oct 2024 19:40:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id 3VvOtPXfdAHbZ3hE0tcrpf; Wed, 23 Oct 2024 19:40:56 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id 3hDytZqjPKHV83hDztB8Wq; Wed, 23 Oct 2024 19:40:56 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=XeEqz555 c=1 sm=1 tr=0 ts=67195148 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=DAUX931o1VcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=qoAqGToZgayQw9Nkhg8A:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 5DD7231E; Wed, 23 Oct 2024 12:40:54 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 2CC0611B; Wed, 23 Oct 2024 12:40:54 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 In-reply-to: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> References: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> Comments: In-reply-to Dimitry Andric message dated "Wed, 23 Oct 2024 18:32:38 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 23 Oct 2024 12:40:54 -0700 Message-Id: <20241023194054.2CC0611B@slippy.cwsent.com> X-CMAE-Envelope: MS4xfNs/47Rmb7MYRelHtHxZgPgFh4LOMrRvZ7wx8SB6wzzfPlSsYWjW0zXrTx34GtZYewos21tz/qmO1M4uwGOWolHAEvzWyWHGC62SbD0eKeDLS2OvriY/ wLo1/1OqFKMi0Wiuf5ENuFhyM8jBwJzc+04IY49G7XZC8l+0ktVbxhpjF83LDnhq7pU+t6GrqMgf8sRcxlD7Qo5I+LllhbFP0WkQzZ5thOMY0Smk3jCBU8dq tgzgakhRS08S6hD4DiciIVSNVmddP6YlCFOfrlCd6PsgOMTe2n3S9f+US0FEf3J0ZWTMualt2/Rd2b42MB0uufet/25bOtmA3gh3Zk2HteI= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4XYfY52scTz4M9Z X-Spamd-Bar: ---- In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, Dimitry Andric wr ites: > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5deeebd8c6ca991269e72902a7a62cad > a57947f6 > > commit 5deeebd8c6ca991269e72902a7a62cada57947f6 > Merge: 6e516c87b6d7 e6b732792813 > Author: Dimitry Andric > AuthorDate: 2024-10-21 12:59:26 +0000 > Commit: Dimitry Andric > CommitDate: 2024-10-23 18:27:38 +0000 > > Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 > > This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and > openmp to llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, > a.k.a. 19.1.2 release. > > PR: 280562 > MFC after: 1 month > > .../clang/include/clang/Basic/TokenKinds.def | 5 +- > contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- > contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- > contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- > .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- > .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- > .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- > .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- > .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- > .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- > .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- > .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- > .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- > contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- > contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- > .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- > contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- > .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- > .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + > .../sanitizer_common_interceptors.inc | 180 ------------------- > -- > .../sanitizer_platform_interceptors.h | 2 - > contrib/llvm-project/libcxx/include/__config | 2 +- > contrib/llvm-project/libcxx/include/version | 7 +- > contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- > .../llvm/include/llvm/CodeGen/FastISel.h | 3 + > .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- > .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- > .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- > .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- > .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- > lib/clang/include/VCSVersion.inc | 6 +- > lib/clang/include/clang/Basic/Version.inc | 6 +- > lib/clang/include/lld/Common/Version.inc | 2 +- > lib/clang/include/lldb/Version/Version.inc | 6 +- > lib/clang/include/llvm/Config/config.h | 4 +- > lib/clang/include/llvm/Config/llvm-config.h | 4 +- > lib/clang/include/llvm/Support/VCSRevision.h | 2 +- > 37 files changed, 260 insertions(+), 350 deletions(-) > Hi, One of these commits fails to build. c++ -O2 -pipe -pipe -fno-common -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm -I/opt/src/git-src/sys/contrib/zstd/lib -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA KE3_USE_NEON=0 -I/opt/src/git-src/lib/clang/include -I/opt/src/git-src/contrib/llvm-project/llvm/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DHAVE_VCS_VERSION_INC -DNDEBUG -DLLVM_DEFAULT_TARGET_TRIPLE=\"x86_64-unknown-freebsd15.0\" -D LLVM_HOST_TRIPLE=\"x86_64-unknown-freebsd15.0\" -DDEFAULT_SYSROOT=\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" -DLLVM_TARGET_ENABLE_X86 -DLLVM_NATIVE_ASMPARSER=LLVMInitializeX86AsmParser -DLLVM_NATIVE_ASMPRINTER=LLVMInitializeX86AsmPrinter -DLLVM_NATIVE_DISASSEMBLER =LLVMInitializeX86Disassembler -DLLVM_NATIVE_TARGET=LLVMInitializeX86Target -DLLVM_NATIVE_TARGETINFO=LLVMInitializeX86TargetInfo -DLLVM_NATIVE_TARGETMC=LLVMInitializeX86TargetMC -ffunction-sections -fdata-sections -gline-tables-only -Wno-format-zero-length -Wdate-time -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=unused-but-set-parameter -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member - Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses -Qunused-arguments -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include -fno-exceptions -fno-rtti -gline-tables-only -std=c++17 -stdlib=libc++ -Wno-c++11-extensions -c /opt/src/ git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp -o CodeGen/ShadowStackGCLowering.o /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 921 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 941 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 963 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 987 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 1005 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 1021 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 1041 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 1061 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 1081 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Oct 23 19:53: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 4XYfqH04NVz5ZcVL; Wed, 23 Oct 2024 19:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYfqG6fW6z4MvY; Wed, 23 Oct 2024 19:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nregX+34VuksDLxLFwdZkzh7SsndOj8fYKa4yrBAyHc=; b=MCx5Kw6YtDO166adTB6CRs3MUHxvAAquzpeHI/HgOKVt6+E/S8pWHw6ThAV6T8Swkc7r68 klu3DTWhLm9MJdb8T91/yl6tgHzq9cnC6PJxnJKvWajv8V8MD5SiPOgoXDbqGNVaDrsImT c0rdMLQPTsHmbDy+1BP5XXgjkrwZmCEfryZ/BbvqldSJcfrkNGy8OHtmCbphstWEJeJZNf jf8O/V2PflfVCCfRZiKWLDXo5Q7wIBu+DnHpKOxG9ajSkR7CPMjfDESSeSlCIE/tZCen0z YwHK3QbQV2QS+Ij/MtueCIstdbl1lAv0kN0z0Guoj2N4F6Mr4q1D4N/OjFNtZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nregX+34VuksDLxLFwdZkzh7SsndOj8fYKa4yrBAyHc=; b=N3fyr9ndW3jbvvLSzKdRt714MBMkV8VpIyXVRU6g5FJ0Y3kTIjmIU4GwPmNwSGze9IsZ+O jjoCFBz7zQEBFUP/Z2drEgfZT0b99B4qhK1rpQWhIK2Z3npI3cENb50nhLIP8j/KocwV3C FtdfxLUtYTudYeAfp+y67MkByuBrw9cDxbzC+blmvrZ7iFzW/GAXw8mVoEqXOyKs5PITg8 HlMC3i1OOtg61GtcgweLhpkN2QWBDbP413OGhvjfUnOtcPtHA7PtENtJhOq4WmYViVKk0a MIpGKAOXwu3Mv5DhI1XTk35Rw+ylw9NMmymjzuvmF5mHyWT2wZwNn8K7Lkv/Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729713194; a=rsa-sha256; cv=none; b=VMnGckNDRih9iR7iHBq2ZtCr0waNxGYhFubiYuhIYB5lzYdRB81kGUEyNpN1YUL3LYIRIG X9J8+E0g0DHs0KDscAxhZphKdrOx6AoPRMEgYyCTIB0/qFM8WgwgT+ImdResblesVL+Oaq iRS8v1eANRmhGCk3ITkNgKqwDWOt0+sfOUvaXEwCrNWGX6R+mh7wO432SB0xKb0VOLFfpM C89LgnfFZwlXx27m6aqz0Lh1JgTTWCQ1IkjXtXy5ZW5aPU+dTW924GnoFbiBrvH3jobzvZ th9TfvIL7gfiXhA8jJsBgnXOOHiPV96nSzJ6Am6q8x1eWyUpQOmRcpglMW5wJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYfqG6673z19c2; Wed, 23 Oct 2024 19:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NJrEAr026699; Wed, 23 Oct 2024 19:53:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NJrE2h026696; Wed, 23 Oct 2024 19:53:14 GMT (envelope-from git) Date: Wed, 23 Oct 2024 19:53:14 GMT Message-Id: <202410231953.49NJrE2h026696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 81dbc22ce8b6 - main - mlx5e: Immediately initialize TLS send tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81dbc22ce8b66759a9fc4ebdef5cfc7a6185af22 Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=81dbc22ce8b66759a9fc4ebdef5cfc7a6185af22 commit 81dbc22ce8b66759a9fc4ebdef5cfc7a6185af22 Author: Andrew Gallatin AuthorDate: 2024-10-23 19:16:19 +0000 Commit: Andrew Gallatin CommitDate: 2024-10-23 19:16:19 +0000 mlx5e: Immediately initialize TLS send tags Under massive connection thrashing (web server restarting), we see long periods where the web server blocks when enabling ktls offload when NIC ktls offload is enabled. It turns out the driver uses a single-threaded linux work queue to serialize the commands that must be sent to the nic to allocate and free tls resources. When freeing sessions, this work is handled asynchronously. However, when allocating sessions, the work is handled synchronously and the driver waits for the work to complete before returning. When under massive connection thrashing, the work queue is first filled by TLS sessions closing. Then when new sessions arrive, the web server enables kTLS and blocks while the tens or hundreds of thousands of sessions closes queued up are processed by the NIC. Rather than using the work queue to open a TLS session on the NIC, switch to doing the open directly. This allows use to cut in front of all those sessions that are waiting to close, and minimize the amount of time the web server blocks. The risk is that the NIC may be out of resources because it has not processed all of those session frees. So if we fail to open a session directly, we fall back to using the work queue. Differential Revision: https://reviews.freebsd.org/D47260 Sponsored by: Netflix Reviewed by: kib --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 86 +++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 34 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index a8522d68d5aa..c347de650250 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -213,54 +213,63 @@ mlx5e_tls_cleanup(struct mlx5e_priv *priv) counter_u64_free(ptls->stats.arg[x]); } + +static int +mlx5e_tls_st_init(struct mlx5e_priv *priv, struct mlx5e_tls_tag *ptag) +{ + int err; + + /* try to open TIS, if not present */ + if (ptag->tisn == 0) { + err = mlx5_tls_open_tis(priv->mdev, 0, priv->tdn, + priv->pdn, &ptag->tisn); + if (err) { + MLX5E_TLS_STAT_INC(ptag, tx_error, 1); + return (err); + } + } + MLX5_SET(sw_tls_cntx, ptag->crypto_params, progress.pd, ptag->tisn); + + /* try to allocate a DEK context ID */ + err = mlx5_encryption_key_create(priv->mdev, priv->pdn, + MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_TLS, + MLX5_ADDR_OF(sw_tls_cntx, ptag->crypto_params, key.key_data), + MLX5_GET(sw_tls_cntx, ptag->crypto_params, key.key_len), + &ptag->dek_index); + if (err) { + MLX5E_TLS_STAT_INC(ptag, tx_error, 1); + return (err); + } + + MLX5_SET(sw_tls_cntx, ptag->crypto_params, param.dek_index, ptag->dek_index); + + ptag->dek_index_ok = 1; + + MLX5E_TLS_TAG_LOCK(ptag); + if (ptag->state == MLX5E_TLS_ST_INIT) + ptag->state = MLX5E_TLS_ST_SETUP; + MLX5E_TLS_TAG_UNLOCK(ptag); + return (0); +} + static void mlx5e_tls_work(struct work_struct *work) { struct mlx5e_tls_tag *ptag; struct mlx5e_priv *priv; - int err; ptag = container_of(work, struct mlx5e_tls_tag, work); priv = container_of(ptag->tls, struct mlx5e_priv, tls); switch (ptag->state) { case MLX5E_TLS_ST_INIT: - /* try to open TIS, if not present */ - if (ptag->tisn == 0) { - err = mlx5_tls_open_tis(priv->mdev, 0, priv->tdn, - priv->pdn, &ptag->tisn); - if (err) { - MLX5E_TLS_STAT_INC(ptag, tx_error, 1); - break; - } - } - MLX5_SET(sw_tls_cntx, ptag->crypto_params, progress.pd, ptag->tisn); - - /* try to allocate a DEK context ID */ - err = mlx5_encryption_key_create(priv->mdev, priv->pdn, - MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_TLS, - MLX5_ADDR_OF(sw_tls_cntx, ptag->crypto_params, key.key_data), - MLX5_GET(sw_tls_cntx, ptag->crypto_params, key.key_len), - &ptag->dek_index); - if (err) { - MLX5E_TLS_STAT_INC(ptag, tx_error, 1); - break; - } - - MLX5_SET(sw_tls_cntx, ptag->crypto_params, param.dek_index, ptag->dek_index); - - ptag->dek_index_ok = 1; - - MLX5E_TLS_TAG_LOCK(ptag); - if (ptag->state == MLX5E_TLS_ST_INIT) - ptag->state = MLX5E_TLS_ST_SETUP; - MLX5E_TLS_TAG_UNLOCK(ptag); + (void)mlx5e_tls_st_init(priv, ptag); break; case MLX5E_TLS_ST_RELEASE: /* try to destroy DEK context by ID */ if (ptag->dek_index_ok) - err = mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); + (void)mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); /* free tag */ mlx5e_tls_tag_zfree(ptag); @@ -441,8 +450,17 @@ mlx5e_tls_snd_tag_alloc(if_t ifp, /* reset state */ ptag->state = MLX5E_TLS_ST_INIT; - queue_work(priv->tls.wq, &ptag->work); - flush_work(&ptag->work); + /* + * Try to immediately init the tag. We may fail if the NIC's + * resources are tied up with send tags that are in the work + * queue, waiting to be freed. So if we fail, put ourselves + * on the queue so as to try again after resouces have been freed. + */ + error = mlx5e_tls_st_init(priv, ptag); + if (error != 0) { + queue_work(priv->tls.wq, &ptag->work); + flush_work(&ptag->work); + } return (0); From nobody Wed Oct 23 19:57: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 4XYfwD3HVkz5Zcvq; Wed, 23 Oct 2024 19:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYfwD2gLLz4P7D; Wed, 23 Oct 2024 19:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5yzW0X20l+GHy5MG+wi6tyZ6AVpeLG7md2zJmhhkQ3s=; b=pQ7BCdR5wSB6+03TcnIEv/ndgsqtP85aXx5eRjEStAdjAjr1UJeIwmWP+iJIHamznio87Q eP7FRPo4dzTYMC5Abevb4V+ts3s1hJY8EQNTlEHcSmRPEpoHyLraviNPP8WL5XSDthjMCA QlpENUgaaIgdsyUC4mZ+Y2P1Pz5Gx4WdQai9y3+clT+vFoZJ4Xvr3h3ycdDj3GTiNHeexo OM8wzCgrfdhYptwUs89Jea3xfc5MePiNVMDO1woy1MStf1j7EvFkdnJMVnVi9NFdNAOohu yV3VnJOhV1Yn4Gp+CBdL0GL76tCwCChHmakun5xKCXEtHO9j1DtO+OQF1y0ldw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5yzW0X20l+GHy5MG+wi6tyZ6AVpeLG7md2zJmhhkQ3s=; b=ZlHzdUmQzCIBg9V1ri7/FQnwgA6JfkaMYYThoUTKBkXHLzZ6itPX39+sQAxlOOrGzcbJxp +HOtrbYYHXI4OhuzBj/K9xk3UzNIIQUsN7HcN0Ye0c6ow1mg6cvLiU+m5uyOQ6GDzH8q5b yz3pxfVI169C/qavaBxS6hJhtrMwfsPzEouoNZxNCfQv3i9T05a/tZkHLnfHj9D1eERu1h CHvupP1o/A1an+siSsKh8w9zG2WqyqSUhlKkRa4PX69vEnfhjRnMc85IalffNlTpYhgoNG YQkmS+aHDVSLNI+6ErftpaGNJLvLxKyVYfgbRZd6dwfin92C2hbQA3m71q9HQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729713452; a=rsa-sha256; cv=none; b=khPX5zya63fOxk/0iHc/+ncQucdQVfBhsUxrLpxKH6sJmfWs/Oo+v5ykhKAkdXam2vgzt0 8M+xg320c8IY4Vap2vj8wUA7uczV7iePKeywwxNOh/CkRQbQLGlxYwtzARmuulPGV20kbr kOozDgAqlvtVbJem7jvIUKuq+NnDlLBmaiySsoT0MQ5FvMlVqrtCOTvnjzY82T0UxVzhlA LJ8MBlHkNPALSyH1l8//brkRyvgfOUU44bxdv2Ai75pB92tnp4/+jbcafJxGktVvto4M/6 kUhTWmhU79NFPq7xrqtHMyMW/ApPhklMaIlR1/N0QWp2W6xEYg0M1ebefVqjiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYfwD27bNz1BRX; Wed, 23 Oct 2024 19:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NJvWH5028459; Wed, 23 Oct 2024 19:57:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NJvWv3028456; Wed, 23 Oct 2024 19:57:32 GMT (envelope-from git) Date: Wed, 23 Oct 2024 19:57:32 GMT Message-Id: <202410231957.49NJvWv3028456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 49597c3e84c4 - main - mlx5e: Use M_WAITOK when allocating TLS tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49597c3e84c4a1cc35f2c392d93db8d0a1cccac2 Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=49597c3e84c4a1cc35f2c392d93db8d0a1cccac2 commit 49597c3e84c4a1cc35f2c392d93db8d0a1cccac2 Author: Andrew Gallatin AuthorDate: 2024-10-23 19:56:14 +0000 Commit: Andrew Gallatin CommitDate: 2024-10-23 19:56:14 +0000 mlx5e: Use M_WAITOK when allocating TLS tags Now that it is clear we're in a sleepable context, use M_WAITOK when allocating TLS tags. Suggested by: kib Sponsored by: Netflix --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index c347de650250..b5caa3ba53dd 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -335,9 +335,7 @@ mlx5e_tls_snd_tag_alloc(if_t ifp, return (EOPNOTSUPP); /* allocate new tag from zone, if any */ - ptag = uma_zalloc(priv->tls.zone, M_NOWAIT); - if (ptag == NULL) - return (ENOMEM); + ptag = uma_zalloc(priv->tls.zone, M_WAITOK); /* sanity check default values */ MPASS(ptag->dek_index == 0); From nobody Wed Oct 23 20:00: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 4XYfzr4SV8z5Zd7T; Wed, 23 Oct 2024 20:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYfzr3m3lz4Ph2; Wed, 23 Oct 2024 20:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3i0wQCrmcTVQwsucAhYOi6mu5KMGYB8B9VaEQOY6JU=; b=AxV2eVNP39wKWTx8HZYJTf97Ayfpc9BPnUbR65HVdYZ+6IyMw/YJYvPrhmBC6AXwNddDas 17I+HZCa9qkOX0jlx/gUHOprlIe98eFGvi8swknKVrL2aUPIpD74l+x1Ak5aEa6s2tFVdN gUrLccXqzsgcu/Sgtsj8ehRr6NJLYH5lsXcjZRo+zqTkkovXcuLVmC+Tup7Jm1Vq7jLZI6 NKLhYaM8MHHQOfW/790wX4e5/6HQU/99WZeMiE1g+tHzwSezA4bbzPSHEaEWWrMFqAZCCh hCB1zcZukT8DdS+HZenchcYrZ/W3hwsONJExofdSrDoYN4CxCjp/mNSCEIiEyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3i0wQCrmcTVQwsucAhYOi6mu5KMGYB8B9VaEQOY6JU=; b=kN1TDYMjMbBcZFIbiw+HBufTyKEAXm87X0CR0Vf0ktH9fbNPpUWkad9Q4dDyWHtsdIsBTQ yrP9eNImf1KUjLgJJlQyCc2GjlvcZj6RezljmYAQNUMQ+tnP8Yu6B+fYdqspQyPpO4EFjp oMa6ZAGUiNuwI1eWNH588SIyvAF+BL0Ix6i+a0j78Y7Hd9BcI9qmn2gdnHbBOXnLW206z/ VYehOLaQhMgs4fYUb8zl/nVg+HP1tDA/yab5R+Gmj8XOy++y3W/RY9c0nSdV0Th9uLHkia 1miuJBGfI9FylmdH3mlNh5BUwIxtTNl64PJC/zdiunB7U0LmIYkOQdNu3f+6IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729713640; a=rsa-sha256; cv=none; b=bJXlYhKwpitVKpwLpfs/3HC8ExU8kYHK05LaVxj1aD73N7zznE8TYQsv188eafUTJW+OSn bPGD7QMQPMIOJIM/FHh0NUmePC5KG50brbceA6m7+/xTtMenVma6smxqdBbkIKa1Z4hWoV f+ZVVuJqGomrMX5NfIgsd+gUt9iJeciM8plwbDF1kh542fr7YBzZnvOYnykGoXXBJjF+QF ioviXUMJsHLhk6t48n6oQpz/ruOzFFMPIk3nfnmOj8XF+lm8Z6PS4HqbfEzcDdQP+3Y7v/ gsAFp8AZ5boWwQE/rfUSquJQUajU8eVFdSFeKlyAu3reIOw18imXJF3ZkBB/oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYfzr391Xz1BKv; Wed, 23 Oct 2024 20:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NK0eGH040188; Wed, 23 Oct 2024 20:00:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NK0eF9040185; Wed, 23 Oct 2024 20:00:40 GMT (envelope-from git) Date: Wed, 23 Oct 2024 20:00:40 GMT Message-Id: <202410232000.49NK0eF9040185@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: 705090cba428 - main - DMAR: handle affinity for in-memory data structures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 705090cba428525507fd0e8597cbf1cf8a68ae35 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=705090cba428525507fd0e8597cbf1cf8a68ae35 commit 705090cba428525507fd0e8597cbf1cf8a68ae35 Author: Konstantin Belousov AuthorDate: 2024-10-22 01:03:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-23 20:00:10 +0000 DMAR: handle affinity for in-memory data structures Reviewed and tested by: markj Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D47254 --- sys/x86/iommu/intel_dmar.h | 1 + sys/x86/iommu/intel_drv.c | 33 +++++++++++++++++++++++++++++++++ sys/x86/iommu/intel_idpgtbl.c | 17 ++++++++++++++--- sys/x86/iommu/intel_intrmap.c | 19 +++++++++++++++---- 4 files changed, 63 insertions(+), 7 deletions(-) diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index c3163abf6f92..1a9b5041975c 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -109,6 +109,7 @@ struct dmar_unit { struct x86_unit_common x86c; uint16_t segment; uint64_t base; + int memdomain; /* Resources */ int reg_rid; diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index f4a1ec06b721..22d04029f9ae 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -325,12 +326,34 @@ dmar_print_caps(device_t dev, struct dmar_unit *unit, DMAR_ECAP_IRO(unit->hw_ecap)); } +/* Remapping Hardware Static Affinity Structure lookup */ +struct rhsa_iter_arg { + uint64_t base; + u_int proxim_dom; +}; + +static int +dmar_rhsa_iter(ACPI_DMAR_HEADER *dmarh, void *arg) +{ + struct rhsa_iter_arg *ria; + ACPI_DMAR_RHSA *adr; + + if (dmarh->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) { + ria = arg; + adr = (ACPI_DMAR_RHSA *)dmarh; + if (adr->BaseAddress == ria->base) + ria->proxim_dom = adr->ProximityDomain; + } + return (1); +} + static int dmar_attach(device_t dev) { struct dmar_unit *unit; ACPI_DMAR_HARDWARE_UNIT *dmaru; struct iommu_msi_data *dmd; + struct rhsa_iter_arg ria; uint64_t timeout; int disable_pmr; int i, error; @@ -358,6 +381,12 @@ dmar_attach(device_t dev) if (bootverbose) dmar_print_caps(dev, unit, dmaru); dmar_quirks_post_ident(unit); + unit->memdomain = -1; + ria.base = unit->base; + ria.proxim_dom = -1; + dmar_iterate_tbl(dmar_rhsa_iter, &ria); + if (ria.proxim_dom != -1) + unit->memdomain = acpi_map_pxm_to_vm_domainid(ria.proxim_dom); timeout = dmar_get_timeout(); TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); @@ -424,6 +453,10 @@ dmar_attach(device_t dev) unit->ctx_obj = vm_pager_allocate(OBJT_PHYS, NULL, IDX_TO_OFF(1 + DMAR_CTX_CNT), 0, 0, NULL); + if (unit->memdomain != -1) { + unit->ctx_obj->domain.dr_policy = DOMAINSET_PREF( + unit->memdomain); + } /* * Allocate and load the root entry table pointer. Enable the diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 6f66106822fe..b133dc875515 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -30,12 +30,13 @@ #include #include -#include +#include #include #include #include #include #include +#include #include #include #include @@ -231,6 +232,10 @@ dmar_get_idmap_pgtbl(struct dmar_domain *domain, iommu_gaddr_t maxaddr) tbl->maxaddr = maxaddr; tbl->pgtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL, IDX_TO_OFF(pglvl_max_pages(tbl->pglvl)), 0, 0, NULL); + /* + * Do not set NUMA policy, the identity table might be used + * by more than one unit. + */ VM_OBJECT_WLOCK(tbl->pgtbl_obj); dmar_idmap_nextlvl(tbl, 0, 0, 0); VM_OBJECT_WUNLOCK(tbl->pgtbl_obj); @@ -675,21 +680,27 @@ int dmar_domain_alloc_pgtbl(struct dmar_domain *domain) { vm_page_t m; + struct dmar_unit *unit; KASSERT(domain->pgtbl_obj == NULL, ("already initialized %p", domain)); + unit = domain->dmar; domain->pgtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL, IDX_TO_OFF(pglvl_max_pages(domain->pglvl)), 0, 0, NULL); + if (unit->memdomain != -1) { + domain->pgtbl_obj->domain.dr_policy = DOMAINSET_PREF( + unit->memdomain); + } DMAR_DOMAIN_PGLOCK(domain); m = iommu_pgalloc(domain->pgtbl_obj, 0, IOMMU_PGF_WAITOK | IOMMU_PGF_ZERO | IOMMU_PGF_OBJL); /* No implicit free of the top level page table page. */ vm_page_wire(m); DMAR_DOMAIN_PGUNLOCK(domain); - DMAR_LOCK(domain->dmar); + DMAR_LOCK(unit); domain->iodom.flags |= IOMMU_DOMAIN_PGTBL_INITED; - DMAR_UNLOCK(domain->dmar); + DMAR_UNLOCK(unit); return (0); } diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c index 87bb7c791dd0..06e41523624b 100644 --- a/sys/x86/iommu/intel_intrmap.c +++ b/sys/x86/iommu/intel_intrmap.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -337,10 +338,20 @@ dmar_init_irt(struct dmar_unit *unit) return (0); } unit->irte_cnt = roundup_pow_of_two(num_io_irqs); - unit->irt = kmem_alloc_contig(unit->irte_cnt * sizeof(dmar_irte_t), - M_ZERO | M_WAITOK, 0, iommu_high, PAGE_SIZE, 0, - DMAR_IS_COHERENT(unit) ? - VM_MEMATTR_DEFAULT : VM_MEMATTR_UNCACHEABLE); + if (unit->memdomain == -1) { + unit->irt = kmem_alloc_contig( + unit->irte_cnt * sizeof(dmar_irte_t), + M_ZERO | M_WAITOK, 0, iommu_high, PAGE_SIZE, 0, + DMAR_IS_COHERENT(unit) ? + VM_MEMATTR_DEFAULT : VM_MEMATTR_UNCACHEABLE); + } else { + unit->irt = kmem_alloc_contig_domainset( + DOMAINSET_PREF(unit->memdomain), + unit->irte_cnt * sizeof(dmar_irte_t), + M_ZERO | M_WAITOK, 0, iommu_high, PAGE_SIZE, 0, + DMAR_IS_COHERENT(unit) ? + VM_MEMATTR_DEFAULT : VM_MEMATTR_UNCACHEABLE); + } if (unit->irt == NULL) return (ENOMEM); unit->irt_phys = pmap_kextract((vm_offset_t)unit->irt); From nobody Wed Oct 23 20:00: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 4XYfzs56Hcz5Zcw1; Wed, 23 Oct 2024 20:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYfzs4WYgz4PmS; Wed, 23 Oct 2024 20:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVRK381zcamouxYzEE3pr0t0uXlstrPQrFup6KygbIs=; b=TT6lvYViekzFEa/07EzsL20QlSgVVFLgxnUt1fj/Ee1k2F4IBuenCBZcRnvnHGE4KDRnFI Cynu+TX53BctKuQkAj+8aIyyxWNs58AXqh2UtyZX3+FD8CYOa1WMNt/XAbnSKALeZGAn9f sANbHYSeNFY9TWhuynoDFSBe0SJhsMDnWWlnOncF1qgSacGNB6eIpnLeERvQmPnPzSpwNU lNy/c/OmA3v9IAd4GOmJ/lV3GIHsvpnNfzf5dp6nFGkvZ8zBUtv5I+8/kmDufR3Eh5aE+g Rtbn0cAKpsKxkXevMCA0MbAhDSYon3fUBxd264MpHOZTJSJ6ir0m72eCMt5j8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729713641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVRK381zcamouxYzEE3pr0t0uXlstrPQrFup6KygbIs=; b=Nkaz6QTRgJGkr/WV7rGJymYxJYRDIVKOiBwdMxqljOG01euqgu6Ih7KB1rDGY7ZckfI/Rn 3Wjw+3Pc/LQIIrYV7iiKjsW/lpiBDqohs8Pib76xkNkzVpWR2nPHbi4ZRRQcIB2LpYEic5 bhaB4mzDFCmLV0VD+EW0c4XGsYX5vNwv5tA863jUTbLatidK6Z7JBz08ogkory83N48b6z Hqyq/6tfxhQmGxt/d+wtyuqJ+J5q+AO+qzWKVKi6lH8qGFtMWeWNWUTx6St+5I4417YuUd BRZ8Gfzy9aJKoSvEt6NcW64uKyTA/B1Y3uq03IYagg+3DF23WIaUJO0mXmkbig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729713641; a=rsa-sha256; cv=none; b=qW5yDbdl8RQYvFVhQoauOL5AqRxKULbhY8FxafPwKv5FeI2GBRKzgwgq4sS20tCMUoQK/T LOqFZEJGJMa+cKS0jBn8F3Fkd7fdTR9WTb57q2sj2OHU0QUiqss/aTRNXcAvmQcv6dVmcL LeVg3SiofeX8AViY+Gi6Lltre2By8RER07oocXDrnvjj4H3YSvAIX4TWHgoXvV+JX39ta8 MwXKRqlG3N+fV4WyZEFCHxXah+f+FnhRcPImlqoLanmBAvyCUJHhxmUZ4RnUPj1Y/aWa8W f39vIsPyJKBXoNVqMw/6NVDsY71KXj93AB66LaGVLTDKKmlQzp7SnwMS5Ib0qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYfzs475Dz1BTn; Wed, 23 Oct 2024 20:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NK0f5Q040249; Wed, 23 Oct 2024 20:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NK0fhQ040246; Wed, 23 Oct 2024 20:00:41 GMT (envelope-from git) Date: Wed, 23 Oct 2024 20:00:41 GMT Message-Id: <202410232000.49NK0fhQ040246@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: 41b95006f2cd - main - acpidump(8): add const qualifier to the known tables array List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 41b95006f2cdeb16b38333254484cfb6daf15f15 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41b95006f2cdeb16b38333254484cfb6daf15f15 commit 41b95006f2cdeb16b38333254484cfb6daf15f15 Author: Konstantin Belousov AuthorDate: 2024-10-23 18:15:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-23 20:00:10 +0000 acpidump(8): add const qualifier to the known tables array Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation --- usr.sbin/acpi/acpidump/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 119f74c196d5..c9e2d5745d50 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -2547,7 +2547,7 @@ acpi_print_rsd_ptr(ACPI_TABLE_RSDP *rp) printf(END_COMMENT); } -static struct { +static const struct { const char *sig; void (*fnp)(ACPI_TABLE_HEADER *); } known[] = { From nobody Wed Oct 23 20:21: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 4XYgRc2qV1z5Zdsl; Wed, 23 Oct 2024 20:21:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYgRc2Clgz4RqX; Wed, 23 Oct 2024 20:21:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729714876; 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=5joMijinhplvls79qYxvKBbQhEQx17uzv4tFunEFgu0=; b=eCsAUCz7cMR/7VWhRBWoM/mIDaSbh0XOf/KpBXUtFVBjkuIJdCS8f/zy4WJS9EYaAmpwgd JFOnS0yvDJB1WoX6ZnKAhPeCXRZGdqqm/1GjR18AbF8l2oQZb1iG/qdgga9UozTzXmsjDJ ge+Z+uySMEYqAW4FskjQmyybvzcidt2jLa/M+AnM9EjC5ktbg1BQOotPHFZM8ZheIqsZVW fpkuz5kfmPBO6ULygssSsLD0Lh3rEfa/k613vd+IZlbyQuwpOZF4t7P9IPZNHayUozvUEJ BBsGPWQGhzSQx7ZV3N/mvKDKP/C3S4v23WlYETga6nOcLqeNqZnIArqXt7wXNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729714876; 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=5joMijinhplvls79qYxvKBbQhEQx17uzv4tFunEFgu0=; b=FkCTp+Yx03XPcKx8uTJDUEXHrYCfHzs0HwFKe+4fYLIvgo2pTGWOEZL4vh8xc89zaWZeDQ H7fLZglXS3gbXjhPX7i1+ztGo8boRl1iN0CG9S6g8auKepD9u+Bv4Yk+9IAx01MNsimuJ0 NJDTAkEVgeknJUF+a5p9aqZy+B0pkH5bqB+aLoVEuoCGnB6sXUAsTUZw9AhFvngQNlHlYT LvEqS38AN0VFonqNUWscG7ulTXC4FX6kZTtYSh5rld3p/N7JVlZxIid9VNu68P/nd1yF34 K80KhuZ37jWRAMgf8pqUhiNBLSxtC48AYsu5uCosymVWlElqVwdlWjj3jUaYDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729714876; a=rsa-sha256; cv=none; b=Zu9D40gdVlSVnyYdJ0+ETNjCvCjtJcGXr9xasbNHIDEb9Un+ugnCllrUpp0tFkc9vTl5Gl QE0QMnJU2jLEoHnKapZzNGnI+r/QfXudsIrdSQH9bId3wieuT075Cu81xKUwuZZcKdfiEc UjvjW7aW2RBfG8S39/ZUafXwHKC2n8ITzqviyvhGIlanJCNozLcPTvoeuKyUoP60fdYRgD 6IgkP0UgDWT4mBsoWvsBPiMj0PW7sSJUBDAVK1v1WN6RWndggJii6g9OkhiDV6O9wijljB CjNy5C7ZvC0EJ+wUQtgiotxS7WnWs8JQ/j+KWue8e/ItUIpGokuG7ZOME9lq5g== Received: from tensor.andric.com (tensor.andric.com [87.251.56.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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R10" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XYgRc1839z168h; Wed, 23 Oct 2024 20:21:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id F1C4260877; Wed, 23 Oct 2024 22:21:14 +0200 (CEST) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.2\)) Subject: Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 From: Dimitry Andric In-Reply-To: <20241023194054.2CC0611B@slippy.cwsent.com> Date: Wed, 23 Oct 2024 22:21:14 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> References: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> <20241023194054.2CC0611B@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3731.700.6.1.2) On 23 Oct 2024, at 21:40, Cy Schubert wrote: >=20 > In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, Dimitry = Andric wr > ites: >> The branch main has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5deeebd8c6ca991269e72902a7a62cad= >> a57947f6 >>=20 >> commit 5deeebd8c6ca991269e72902a7a62cada57947f6 >> Merge: 6e516c87b6d7 e6b732792813 >> Author: Dimitry Andric >> AuthorDate: 2024-10-21 12:59:26 +0000 >> Commit: Dimitry Andric >> CommitDate: 2024-10-23 18:27:38 +0000 >>=20 >> Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 >>=20 >> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, = lldb and >> openmp to llvm-project release/19.x = llvmorg-19.1.2-0-g7ba7d8e2f7b6, >> a.k.a. 19.1.2 release. >>=20 >> PR: 280562 >> MFC after: 1 month >>=20 >> .../clang/include/clang/Basic/TokenKinds.def | 5 +- >> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- >> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- >> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- >> .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- >> .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- >> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- >> .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- >> .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- >> contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- >> contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- >> .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- >> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- >> .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- >> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + >> .../sanitizer_common_interceptors.inc | 180 = ------------------- >> -- >> .../sanitizer_platform_interceptors.h | 2 - >> contrib/llvm-project/libcxx/include/__config | 2 +- >> contrib/llvm-project/libcxx/include/version | 7 +- >> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- >> .../llvm/include/llvm/CodeGen/FastISel.h | 3 + >> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- >> .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- >> .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- >> .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- >> .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- >> lib/clang/include/VCSVersion.inc | 6 +- >> lib/clang/include/clang/Basic/Version.inc | 6 +- >> lib/clang/include/lld/Common/Version.inc | 2 +- >> lib/clang/include/lldb/Version/Version.inc | 6 +- >> lib/clang/include/llvm/Config/config.h | 4 +- >> lib/clang/include/llvm/Config/llvm-config.h | 4 +- >> lib/clang/include/llvm/Support/VCSRevision.h | 2 +- >> 37 files changed, 260 insertions(+), 350 deletions(-) >>=20 >=20 > Hi, >=20 > One of these commits fails to build. >=20 > c++ -O2 -pipe -pipe -fno-common = -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm = -I/opt/src/git-src/sys/contrib/zstd/lib = -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 = -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA > KE3_USE_NEON=3D0 -I/opt/src/git-src/lib/clang/include = -I/opt/src/git-src/contrib/llvm-project/llvm/include = -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS = -DHAVE_VCS_VERSION_INC -DNDEBUG = -DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-unknown-freebsd15.0\" -D > LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd15.0\" = -DDEFAULT_SYSROOT=3D\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" = -DLLVM_TARGET_ENABLE_X86 = -DLLVM_NATIVE_ASMPARSER=3DLLVMInitializeX86AsmParser = -DLLVM_NATIVE_ASMPRINTER=3DLLVMInitializeX86AsmPrinter = -DLLVM_NATIVE_DISASSEMBLER > =3DLLVMInitializeX86Disassembler = -DLLVM_NATIVE_TARGET=3DLLVMInitializeX86Target = -DLLVM_NATIVE_TARGETINFO=3DLLVMInitializeX86TargetInfo = -DLLVM_NATIVE_TARGETMC=3DLLVMInitializeX86TargetMC -ffunction-sections = -fdata-sections -gline-tables-only -Wno-format-zero-length -Wdate-time=20= > -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable = -Wno-error=3Dunused-but-set-parameter -Wno-tautological-compare = -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function = -Wno-enum-conversion -Wno-unused-local-typedef = -Wno-address-of-packed-member - > Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter = -Wno-parentheses -Qunused-arguments = -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include = -fno-exceptions -fno-rtti -gline-tables-only -std=3Dc++17 = -stdlib=3Dlibc++ -Wno-c++11-extensions -c /opt/src/ > = git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp = -o CodeGen/ShadowStackGCLowering.o > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 921 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 941 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 963 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 987 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 1005 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 1021 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 1041 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 1061 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= ionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' in = 'llvm::SelectionDAG' > 1081 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ I haven't fully universe-tested each and every individual squashed = merge, so please use only the last one. If that one doesn't build, I = would be amazed, since it has gone through more than one universe build. = That said, some exotic configurations might not build. Do you have any = special make.conf or src.conf settings? -Dimitry From nobody Wed Oct 23 20:35: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 4XYgmB4xhvz5ZfKb; Wed, 23 Oct 2024 20:35:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYgmB2Tz9z4SfC; Wed, 23 Oct 2024 20:35:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id 3g80tSiutMArN3i4vt7Pul; Wed, 23 Oct 2024 20:35:37 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id 3i4uta4WjKHV83i4vtBFvc; Wed, 23 Oct 2024 20:35:37 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=XeEqz555 c=1 sm=1 tr=0 ts=67195e19 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=DAUX931o1VcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=LsmaJF77FTHzwPGPRFkA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E3754354; Wed, 23 Oct 2024 13:35:35 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id D652666; Wed, 23 Oct 2024 13:35:35 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 In-reply-to: <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> References: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> <20241023194054.2CC0611B@slippy.cwsent.com> <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> Comments: In-reply-to Dimitry Andric message dated "Wed, 23 Oct 2024 22:21:14 +0200." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 23 Oct 2024 13:35:35 -0700 Message-Id: <20241023203535.D652666@slippy.cwsent.com> X-CMAE-Envelope: MS4xfMn5NsdkZJW/GhnpyRbZJX4A6ugJkFzbzX6+qyiE+DW/6w+VOwNNQ5UfHmBwzxYJwkjiLcfRxsPKV7UmWQ6CxIQaN6ZQjbqcW0NwghCrAjl2yyGFljLq +EyNUHM3emr/esGpQSltZzCeWXmzvSG+LUqSgdRFUc2QvVWok+ZprvufrPlR/6AVb8Df1iyJzFQ0PVhr02v6btJaaBqpfuOUuQmpzMDOZ1HN5ZqR9CRyAUBs Mh5oNQW01esZq4t7PC+rMU66XAFh69hzBfX09FpmErQ90aVGzX1h8FBj/N2fO0wOapPSNzaP7mxb/kGaITVsMwmEk17tXH3cbHgK5BhGW5k= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4XYgmB2Tz9z4SfC X-Spamd-Bar: ---- In message <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org>, Dimitry Andric w rites: > On 23 Oct 2024, at 21:40, Cy Schubert wrote: > >=20 > > In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, Dimitry = > Andric wr > > ites: > >> The branch main has been updated by dim: > >>=20 > >> URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D5deeebd8c6ca991269e72902a7a62cad= > > >> a57947f6 > >>=20 > >> commit 5deeebd8c6ca991269e72902a7a62cada57947f6 > >> Merge: 6e516c87b6d7 e6b732792813 > >> Author: Dimitry Andric > >> AuthorDate: 2024-10-21 12:59:26 +0000 > >> Commit: Dimitry Andric > >> CommitDate: 2024-10-23 18:27:38 +0000 > >>=20 > >> Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 > >>=20 > >> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, = > lldb and > >> openmp to llvm-project release/19.x = > llvmorg-19.1.2-0-g7ba7d8e2f7b6, > >> a.k.a. 19.1.2 release. > >>=20 > >> PR: 280562 > >> MFC after: 1 month > >>=20 > >> .../clang/include/clang/Basic/TokenKinds.def | 5 +- > >> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- > >> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- > >> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- > >> .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- > >> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- > >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- > >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- > >> .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- > >> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- > >> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- > >> .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- > >> .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- > >> contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- > >> contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- > >> .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- > >> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- > >> .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- > >> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + > >> .../sanitizer_common_interceptors.inc | 180 = > ------------------- > >> -- > >> .../sanitizer_platform_interceptors.h | 2 - > >> contrib/llvm-project/libcxx/include/__config | 2 +- > >> contrib/llvm-project/libcxx/include/version | 7 +- > >> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- > >> .../llvm/include/llvm/CodeGen/FastISel.h | 3 + > >> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- > >> .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- > >> .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- > >> .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- > >> .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- > >> lib/clang/include/VCSVersion.inc | 6 +- > >> lib/clang/include/clang/Basic/Version.inc | 6 +- > >> lib/clang/include/lld/Common/Version.inc | 2 +- > >> lib/clang/include/lldb/Version/Version.inc | 6 +- > >> lib/clang/include/llvm/Config/config.h | 4 +- > >> lib/clang/include/llvm/Config/llvm-config.h | 4 +- > >> lib/clang/include/llvm/Support/VCSRevision.h | 2 +- > >> 37 files changed, 260 insertions(+), 350 deletions(-) > >>=20 > >=20 > > Hi, > >=20 > > One of these commits fails to build. > >=20 > > c++ -O2 -pipe -pipe -fno-common = > -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm = > -I/opt/src/git-src/sys/contrib/zstd/lib = > -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 = > -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA > > KE3_USE_NEON=3D0 -I/opt/src/git-src/lib/clang/include = > -I/opt/src/git-src/contrib/llvm-project/llvm/include = > -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS = > -DHAVE_VCS_VERSION_INC -DNDEBUG = > -DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-unknown-freebsd15.0\" -D > > LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd15.0\" = > -DDEFAULT_SYSROOT=3D\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" = > -DLLVM_TARGET_ENABLE_X86 = > -DLLVM_NATIVE_ASMPARSER=3DLLVMInitializeX86AsmParser = > -DLLVM_NATIVE_ASMPRINTER=3DLLVMInitializeX86AsmPrinter = > -DLLVM_NATIVE_DISASSEMBLER > > =3DLLVMInitializeX86Disassembler = > -DLLVM_NATIVE_TARGET=3DLLVMInitializeX86Target = > -DLLVM_NATIVE_TARGETINFO=3DLLVMInitializeX86TargetInfo = > -DLLVM_NATIVE_TARGETMC=3DLLVMInitializeX86TargetMC -ffunction-sections = > -fdata-sections -gline-tables-only -Wno-format-zero-length -Wdate-time=20= > > > -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable = > -Wno-error=3Dunused-but-set-parameter -Wno-tautological-compare = > -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function = > -Wno-enum-conversion -Wno-unused-local-typedef = > -Wno-address-of-packed-member - > > Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter = > -Wno-parentheses -Qunused-arguments = > -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include = > -fno-exceptions -fno-rtti -gline-tables-only -std=3Dc++17 = > -stdlib=3Dlibc++ -Wno-c++11-extensions -c /opt/src/ > > = > git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp = > -o CodeGen/ShadowStackGCLowering.o > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 921 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 941 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 963 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 987 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 1005 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 1021 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 1041 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 1061 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > ionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' in = > 'llvm::SelectionDAG' > > 1081 | CurDAG->VerifyDAGDivergence(); > > | ~~~~~~ ^ > > I haven't fully universe-tested each and every individual squashed = > merge, so please use only the last one. If that one doesn't build, I = > would be amazed, since it has gone through more than one universe build. = > That said, some exotic configurations might not build. Do you have any = > special make.conf or src.conf settings? > > -Dimitry I have nothing that would affect this. The following patch addresses the breakage. diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h index 16ec65f2e7da..d2985d172711 100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h @@ -582,9 +582,7 @@ class SelectionDAG { return Root; } -#ifndef NDEBUG void VerifyDAGDivergence(); -#endif /// This iterates over the nodes in the SelectionDAG, folding /// certain types of nodes together, or eliminating superfluous nodes. The -- 2.47.0 But, NDEBUG is defined in bsd.lib.mk when MK_ASSERT_DEBUG == "no". I do not define MK_ASSERT_DEBUG anywhere. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Oct 23 20:41: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 4XYgv86Kwdz5Zfqq; Wed, 23 Oct 2024 20:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYgv85f65z4TFN; Wed, 23 Oct 2024 20:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBFUsaNzsLv28pE6KS8DkX4U0eSdxu3DwuoQbcLb91I=; b=VCZ0MlUGOpGR60ymnQqkuc+adPQVKpw9Eb+kasmsph6jonoASfVXWM0bdqapAxDoZIA7pu X2iFUkNJeO4UMyiqF5ZF2PJ7w6QrMgcoDPZL5uGdWKFVo68I2yRdIVMbtRuv2luthNG7pC LIwj9DAnAfVkBi38g5Q/ciUGMgLbAXmwbWn2HzMezGy6MbN7/nfA14XaF0lxuHU/OGEdkK Wb99WMj/yAMx0q4rjVk4xtkmJ3Bl6S9hbQ1yII0JcHY0w6Y2z7xg2cONUcC1Ber2RA+OiJ xFn1VllKhRhO9VJwDFvZwheTWsEurukMbrIscxRObO/QNKL5ZkMUwzU00If3ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBFUsaNzsLv28pE6KS8DkX4U0eSdxu3DwuoQbcLb91I=; b=ih85JkgaDe+Ul832c+JqJV1HhZfQidCin6F/PQzOnfaqEbCe9X+u3aVMg+BWTk8Iu2UrFv NqwBCSVQoMcMqNcB2Vrk9FbAUPvupla3A0EUg4AOfkBaxClUrq385PDcyumeq569OQtYJ0 cS+cpi7gT/yzEIZbMwUPKOJP7FClCmuPsrdiWkLTR4duKYAsRZ8HHIHqwPs6oHeQR8/1QG 1+Vyttlwf0z/uPlqAowkZ2ebv+sgCJCgpwCTZkA+Jk+VSDErFXqfyQvJJlftQ6NF1AiLCk p7GQFeJJAbkP0RVlwTWTItzJF4FGjJd8MUZ7rx/HlDSIgMpdP9y3X25o4c9paw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729716100; a=rsa-sha256; cv=none; b=gKdNT5SjPNQhECS2Ql7gPtUhyESUjFKHk9zSDx8KU6LmVz6bJxHw+C4Qna48pPzEqHsTrT XKBGJ5lRQSFs+KFOS3OZtXfQQb+MunDBFLNiJlUpL4sgcBKqnIjHf4JixuwVChk3oB8g7V 0Xp+fZFHF29aYkR5YxEV5M581pz4mefTWFgGWh1bK9tK9FUmKWgPXGr+gsFvcBfst7lWqg sAKdmPf+fu+Pw6AWwOQrbwtoAs08IlE6L30uJdPPPCSTwjoTrhw8S9Hmhr/+7ezHqD14I1 TKtBEQc79UQLiRmc4f7PexvCrbtK91V3LYI66TZ4JuxHnMd17HKvwyXe7m2CiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYgv85FSJz1CkY; Wed, 23 Oct 2024 20:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NKfeBw014567; Wed, 23 Oct 2024 20:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NKfemF014564; Wed, 23 Oct 2024 20:41:40 GMT (envelope-from git) Date: Wed, 23 Oct 2024 20:41:40 GMT Message-Id: <202410232041.49NKfemF014564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 514f4e89acd2 - main - ncurses: Fix codegen for key names and codes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 514f4e89acd2e7b1824b261055bef49a3da6a956 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=514f4e89acd2e7b1824b261055bef49a3da6a956 commit 514f4e89acd2e7b1824b261055bef49a3da6a956 Author: SHENG-YI HONG AuthorDate: 2024-10-23 20:38:33 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-23 20:39:36 +0000 ncurses: Fix codegen for key names and codes Adding back arguments, which were missed during the import of ncurses version 6.5, to the code gen awk script. This is modified from lib_keyname.c and keys.list targets in contrib/ncurses/ncurses/Makefile.in of 21817992b3314c908ab50f0bb88d2ee750b9c4ac PR: 280697 Reported by: np Reviewed by: bapt Tested by: scf Fixes: 21817992b331 ncurses: vendor import version 6.5 MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47153 --- lib/ncurses/tinfo/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index 55b24cd3bc97..ea06e7bec03f 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -230,7 +230,8 @@ codes.c: MKcodes.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c lib_keyname.c: keys.list MKkeyname.awk - ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c + ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk use_sigwinch=${ENABLE_SIGWINCH} \ + bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c unctrl.c: MKunctrl.awk echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk bigstrings=${USE_BIG_STRINGS} > unctrl.c @@ -278,7 +279,7 @@ curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses # Generated intermediate files keys.list: MKkeys_list.sh Caps Caps-ncurses - AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ + AWK=${AWK} USE_SIGWINCH=${ENABLE_SIGWINCH} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses | LC_ALL=C sort > keys.list .if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" From nobody Wed Oct 23 20:44: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 4XYgy72fXvz5Zg0L; Wed, 23 Oct 2024 20:44:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYgy727Y2z4TfB; Wed, 23 Oct 2024 20:44:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716255; 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=T53Y/MwYWmq8dlNL5kTgZDAIySw/8UHsTH3wayyl2EE=; b=TVVWB0Wlf+ffUmHNKav24jzScgPeTmYd54OdOBqsV5DcRxn8NAXOk5x5X2Fg2AyNRCZM2a BDvwCL5qr3Syz51jIKFv6jkBW8J9EOzwHTxNAKSjHbfuehnQoSzHO0NzW9q2wS2CKakFEQ ez7SqTFpavycwIVUXIcIR7qgegBp6nq+OStaGdHNtkWhu815G00fUtxthru57nR3qzfiCU IQvxshSmU54xlpYYkEcAvIyGqvywxsLOgYdbxepEYJyT+EiMtD9T1Fu7RZjOUti5gdRgY6 PuorY6XEbGJdChEVtybNkPbypdbOpSX4VS2oNRlnSGYXBhBTN0tlxpRPLZp5og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716255; 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=T53Y/MwYWmq8dlNL5kTgZDAIySw/8UHsTH3wayyl2EE=; b=SAPiM3NQvBT11et7i/1LZ7jES80f5LaVQc0D0C4m3CQ4eFBpJsJd64RjFl6hvrrZhQnvVW KzZjcUDALWHn/ISL4IDV61TweuVAwZcOX181ktwAaX59yud42BmvdCa+Icz7sUgciTTDqg +wxxYtNkqLHLp7n7rhkAkGvPeHc/MqPlY5vL4hYo6apgE5m75V+/gMHYpRJqiFQEXYBVy/ r/FT2N8Yo7M+ntGjRrhWoylbd/UunVssxOiKtAKuLkJ50q4gD0LZL9LjAuvdgeh0eJ05yv P0PNR3TPM/X5lDI4N8ZPZlzJdDbsJKnyQEiqUwuGhNv7dmFVgFDpJ1CPCEYoJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729716255; a=rsa-sha256; cv=none; b=fjw5tbDyXWpAkwNyuh9M9XOm4SW9ZrX7/pdotSejDLUJRTqzDyvOeP7FAGxxiMxkl7mLj2 dLwzCfB2VBG0I+lsGPoFGGMTCu6PCjScjG0PMLvrcOSyGD5w4t8Rf6AFO+uoMDUc6+GLIm US+Q8WfFsYhICtyfLq1gHm4FqISc7CInqvRFH9jF9emScm4NjTp/JyzZRtdFHfwVfv1ssU dCc1pokk7a1VgBQeNk9u9n6IYrFYucAjZLiIekosFM/LOZKLtVTNFO7VdpdDpFdnpXlEtx 3HJt+RWhJ1f4YmTWj3nhtsiw/TqB044MFG73jr7eAtPpX4GF1PUxrcK6r3MRxA== Received: from tensor.andric.com (tensor.andric.com [87.251.56.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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R10" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XYgy712Ytz17sC; Wed, 23 Oct 2024 20:44:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 33EA460A8B; Wed, 23 Oct 2024 22:44:14 +0200 (CEST) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.2\)) Subject: Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 From: Dimitry Andric In-Reply-To: <20241023203535.D652666@slippy.cwsent.com> Date: Wed, 23 Oct 2024 22:44:14 +0200 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: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> <20241023194054.2CC0611B@slippy.cwsent.com> <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> <20241023203535.D652666@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3731.700.6.1.2) On 23 Oct 2024, at 22:35, Cy Schubert wrote: >=20 > In message <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org>, Dimitry=20= > Andric w > rites: >> On 23 Oct 2024, at 21:40, Cy Schubert = wrote: >>> =3D20 >>> In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, = Dimitry =3D >> Andric wr >>> ites: >>>> The branch main has been updated by dim: >>>> =3D20 >>>> URL: =3D >> = https://cgit.FreeBSD.org/src/commit/?id=3D3D5deeebd8c6ca991269e72902a7a62c= ad=3D >>=20 >>>> a57947f6 >>>> =3D20 >>>> commit 5deeebd8c6ca991269e72902a7a62cada57947f6 >>>> Merge: 6e516c87b6d7 e6b732792813 >>>> Author: Dimitry Andric >>>> AuthorDate: 2024-10-21 12:59:26 +0000 >>>> Commit: Dimitry Andric >>>> CommitDate: 2024-10-23 18:27:38 +0000 >>>> =3D20 >>>> Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 >>>> =3D20 >>>> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, =3D >> lldb and >>>> openmp to llvm-project release/19.x =3D >> llvmorg-19.1.2-0-g7ba7d8e2f7b6, >>>> a.k.a. 19.1.2 release. >>>> =3D20 >>>> PR: 280562 >>>> MFC after: 1 month >>>> =3D20 >>>> .../clang/include/clang/Basic/TokenKinds.def | 5 +- >>>> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- >>>> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- >>>> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- >>>> .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- >>>> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- >>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- >>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- >>>> .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- >>>> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- >>>> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- >>>> .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- >>>> .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- >>>> contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- >>>> contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- >>>> .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- >>>> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- >>>> .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- >>>> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + >>>> .../sanitizer_common_interceptors.inc | 180 =3D >> ------------------- >>>> -- >>>> .../sanitizer_platform_interceptors.h | 2 - >>>> contrib/llvm-project/libcxx/include/__config | 2 +- >>>> contrib/llvm-project/libcxx/include/version | 7 +- >>>> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- >>>> .../llvm/include/llvm/CodeGen/FastISel.h | 3 + >>>> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- >>>> .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- >>>> .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- >>>> .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- >>>> .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- >>>> lib/clang/include/VCSVersion.inc | 6 +- >>>> lib/clang/include/clang/Basic/Version.inc | 6 +- >>>> lib/clang/include/lld/Common/Version.inc | 2 +- >>>> lib/clang/include/lldb/Version/Version.inc | 6 +- >>>> lib/clang/include/llvm/Config/config.h | 4 +- >>>> lib/clang/include/llvm/Config/llvm-config.h | 4 +- >>>> lib/clang/include/llvm/Support/VCSRevision.h | 2 +- >>>> 37 files changed, 260 insertions(+), 350 deletions(-) >>>> =3D20 >>> =3D20 >>> Hi, >>> =3D20 >>> One of these commits fails to build. >>> =3D20 >>> c++ -O2 -pipe -pipe -fno-common =3D >> = -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm = =3D >> -I/opt/src/git-src/sys/contrib/zstd/lib =3D >> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 =3D >> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA >>> KE3_USE_NEON=3D3D0 -I/opt/src/git-src/lib/clang/include =3D >> -I/opt/src/git-src/contrib/llvm-project/llvm/include =3D >> -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS = =3D >> -DHAVE_VCS_VERSION_INC -DNDEBUG =3D >> -DLLVM_DEFAULT_TARGET_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" -D >>> LLVM_HOST_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" =3D >> -DDEFAULT_SYSROOT=3D3D\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" = =3D >> -DLLVM_TARGET_ENABLE_X86 =3D >> -DLLVM_NATIVE_ASMPARSER=3D3DLLVMInitializeX86AsmParser =3D >> -DLLVM_NATIVE_ASMPRINTER=3D3DLLVMInitializeX86AsmPrinter =3D >> -DLLVM_NATIVE_DISASSEMBLER >>> =3D3DLLVMInitializeX86Disassembler =3D >> -DLLVM_NATIVE_TARGET=3D3DLLVMInitializeX86Target =3D >> -DLLVM_NATIVE_TARGETINFO=3D3DLLVMInitializeX86TargetInfo =3D >> -DLLVM_NATIVE_TARGETMC=3D3DLLVMInitializeX86TargetMC = -ffunction-sections =3D >> -fdata-sections -gline-tables-only -Wno-format-zero-length = -Wdate-time=3D20=3D >>=20 >>> -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable =3D >> -Wno-error=3D3Dunused-but-set-parameter -Wno-tautological-compare =3D >> -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function =3D >> -Wno-enum-conversion -Wno-unused-local-typedef =3D >> -Wno-address-of-packed-member - >>> Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter =3D >> -Wno-parentheses -Qunused-arguments =3D >> -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include =3D >> -fno-exceptions -fno-rtti -gline-tables-only -std=3D3Dc++17 =3D >> -stdlib=3D3Dlibc++ -Wno-c++11-extensions -c /opt/src/ >>> =3D >> = git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp = =3D >> -o CodeGen/ShadowStackGCLowering.o >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 921 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 941 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 963 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 987 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 1005 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 1021 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 1041 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 1061 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>> =3D >> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >> ionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' = in =3D >> 'llvm::SelectionDAG' >>> 1081 | CurDAG->VerifyDAGDivergence(); >>> | ~~~~~~ ^ >>=20 >> I haven't fully universe-tested each and every individual squashed =3D >> merge, so please use only the last one. If that one doesn't build, I = =3D >> would be amazed, since it has gone through more than one universe = build. =3D >> That said, some exotic configurations might not build. Do you have = any =3D >> special make.conf or src.conf settings? >>=20 >> -Dimitry >=20 > I have nothing that would affect this. >=20 > The following patch addresses the breakage. >=20 > diff --git = a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h=20 > b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > index 16ec65f2e7da..d2985d172711 100644 > --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > @@ -582,9 +582,7 @@ class SelectionDAG { > return Root; > } >=20 > -#ifndef NDEBUG > void VerifyDAGDivergence(); > -#endif >=20 > /// This iterates over the nodes in the SelectionDAG, folding > /// certain types of nodes together, or eliminating superfluous = nodes. =20 > The > --=20 > 2.47.0 >=20 > But, NDEBUG is defined in bsd.lib.mk when MK_ASSERT_DEBUG =3D=3D "no". = I do not=20 > define MK_ASSERT_DEBUG anywhere. It looks like upstream has this covered in = https://github.com/llvm/llvm-project/commit/6c7a3f80e75d, but at the = moment I am still trying to understand why it all builds fine for me, on = a (I hope) clean 15.0-CURRENT machine. In fact, one of the offical = FreeBSD cluster machines. :) I would like to make sure that whatever fix I will commit, I can verify = works. To be able to do that, I will have to reproduce a failure = first... -Dimitry From nobody Wed Oct 23 20:45: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 4XYgzB2Wxcz5Zfr3; Wed, 23 Oct 2024 20:45:10 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYgzB1JLwz4V7d; Wed, 23 Oct 2024 20:45:10 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id 3fA3tSerVMArN3iE9t7Rnf; Wed, 23 Oct 2024 20:45:09 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id 3iE8ta6ueKHV83iE8tBH89; Wed, 23 Oct 2024 20:45:09 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=XeEqz555 c=1 sm=1 tr=0 ts=67196055 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=DAUX931o1VcA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=Fz5QYoY-VbI-GyEvdYEA:9 a=CjuIK1q_8ugA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A0A47392; Wed, 23 Oct 2024 13:45:07 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 9C34DB7; Wed, 23 Oct 2024 13:45:07 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Dimitry Andric , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 In-reply-to: <20241023203535.D652666@slippy.cwsent.com> References: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> <20241023194054.2CC0611B@slippy.cwsent.com> <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> <20241023203535.D652666@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Wed, 23 Oct 2024 13:35:35 -0700." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 23 Oct 2024 13:45:07 -0700 Message-Id: <20241023204507.9C34DB7@slippy.cwsent.com> X-CMAE-Envelope: MS4xfOzaWTSiPS+dDx9I9IK5QvNxtS0a54iMotDrDLjMNJgNfuSCqdf7g+F2UL1UiZ2dkf5qIf3vKB9Uiwm8E3m7gnGt5zghwdCc3R8SSANJjoZzTXUKibtd NDM5op2ErvDwdsB35Q6Xh2X4GF+2vN/h3VZ/QvjSqa4PGVT017l4XbDct9sR5h9TaU+gs46TwMMXZox9aN8jKbGs6NvhXev7XHmqEbnNQ2SgZNYThwFDnEtC R9SWRh35lqwJ+anNcqBohfsIViStu5Bj/5LiSUjCV/cbb1NGrRW2NkSrNRZU7edzC9AFVL3UW8HvBIUrPypMZbv7vZqZMqubAQz0fY7GL/U= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4XYgzB1JLwz4V7d X-Spamd-Bar: ---- In message <20241023203535.D652666@slippy.cwsent.com>, Cy Schubert writes: > In message <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org>, Dimitry > Andric w > rites: > > On 23 Oct 2024, at 21:40, Cy Schubert wrote: > > >=20 > > > In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, Dimitry = > > Andric wr > > > ites: > > >> The branch main has been updated by dim: > > >>=20 > > >> URL: = > > https://cgit.FreeBSD.org/src/commit/?id=3D5deeebd8c6ca991269e72902a7a62cad= > > > > >> a57947f6 > > >>=20 > > >> commit 5deeebd8c6ca991269e72902a7a62cada57947f6 > > >> Merge: 6e516c87b6d7 e6b732792813 > > >> Author: Dimitry Andric > > >> AuthorDate: 2024-10-21 12:59:26 +0000 > > >> Commit: Dimitry Andric > > >> CommitDate: 2024-10-23 18:27:38 +0000 > > >>=20 > > >> Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 > > >>=20 > > >> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, = > > lldb and > > >> openmp to llvm-project release/19.x = > > llvmorg-19.1.2-0-g7ba7d8e2f7b6, > > >> a.k.a. 19.1.2 release. > > >>=20 > > >> PR: 280562 > > >> MFC after: 1 month > > >>=20 > > >> .../clang/include/clang/Basic/TokenKinds.def | 5 +- > > >> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- > > >> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- > > >> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- > > >> .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- > > >> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- > > >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- > > >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- > > >> .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- > > >> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- > > >> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- > > >> .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- > > >> .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- > > >> contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- > > >> contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- > > >> .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- > > >> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- > > >> .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- > > >> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + > > >> .../sanitizer_common_interceptors.inc | 180 = > > ------------------- > > >> -- > > >> .../sanitizer_platform_interceptors.h | 2 - > > >> contrib/llvm-project/libcxx/include/__config | 2 +- > > >> contrib/llvm-project/libcxx/include/version | 7 +- > > >> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- > > >> .../llvm/include/llvm/CodeGen/FastISel.h | 3 + > > >> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- > > >> .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- > > >> .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- > > >> .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- > > >> .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- > > >> lib/clang/include/VCSVersion.inc | 6 +- > > >> lib/clang/include/clang/Basic/Version.inc | 6 +- > > >> lib/clang/include/lld/Common/Version.inc | 2 +- > > >> lib/clang/include/lldb/Version/Version.inc | 6 +- > > >> lib/clang/include/llvm/Config/config.h | 4 +- > > >> lib/clang/include/llvm/Config/llvm-config.h | 4 +- > > >> lib/clang/include/llvm/Support/VCSRevision.h | 2 +- > > >> 37 files changed, 260 insertions(+), 350 deletions(-) > > >>=20 > > >=20 > > > Hi, > > >=20 > > > One of these commits fails to build. > > >=20 > > > c++ -O2 -pipe -pipe -fno-common = > > -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm = > > -I/opt/src/git-src/sys/contrib/zstd/lib = > > -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 = > > -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA > > > KE3_USE_NEON=3D0 -I/opt/src/git-src/lib/clang/include = > > -I/opt/src/git-src/contrib/llvm-project/llvm/include = > > -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS = > > -DHAVE_VCS_VERSION_INC -DNDEBUG = > > -DLLVM_DEFAULT_TARGET_TRIPLE=3D\"x86_64-unknown-freebsd15.0\" -D > > > LLVM_HOST_TRIPLE=3D\"x86_64-unknown-freebsd15.0\" = > > -DDEFAULT_SYSROOT=3D\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" = > > -DLLVM_TARGET_ENABLE_X86 = > > -DLLVM_NATIVE_ASMPARSER=3DLLVMInitializeX86AsmParser = > > -DLLVM_NATIVE_ASMPRINTER=3DLLVMInitializeX86AsmPrinter = > > -DLLVM_NATIVE_DISASSEMBLER > > > =3DLLVMInitializeX86Disassembler = > > -DLLVM_NATIVE_TARGET=3DLLVMInitializeX86Target = > > -DLLVM_NATIVE_TARGETINFO=3DLLVMInitializeX86TargetInfo = > > -DLLVM_NATIVE_TARGETMC=3DLLVMInitializeX86TargetMC -ffunction-sections = > > -fdata-sections -gline-tables-only -Wno-format-zero-length -Wdate-time=20= > > > > > -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable = > > -Wno-error=3Dunused-but-set-parameter -Wno-tautological-compare = > > -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function = > > -Wno-enum-conversion -Wno-unused-local-typedef = > > -Wno-address-of-packed-member - > > > Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter = > > -Wno-parentheses -Qunused-arguments = > > -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include = > > -fno-exceptions -fno-rtti -gline-tables-only -std=3Dc++17 = > > -stdlib=3Dlibc++ -Wno-c++11-extensions -c /opt/src/ > > > = > > git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp = > > -o CodeGen/ShadowStackGCLowering.o > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 921 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 941 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 963 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 987 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 1005 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 1021 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 1041 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 1061 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > = > > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > > ionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' in = > > 'llvm::SelectionDAG' > > > 1081 | CurDAG->VerifyDAGDivergence(); > > > | ~~~~~~ ^ > > > > I haven't fully universe-tested each and every individual squashed = > > merge, so please use only the last one. If that one doesn't build, I = > > would be amazed, since it has gone through more than one universe build. = > > That said, some exotic configurations might not build. Do you have any = > > special make.conf or src.conf settings? > > > > -Dimitry > > I have nothing that would affect this. > > The following patch addresses the breakage. > > diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > index 16ec65f2e7da..d2985d172711 100644 > --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > @@ -582,9 +582,7 @@ class SelectionDAG { > return Root; > } > > -#ifndef NDEBUG > void VerifyDAGDivergence(); > -#endif > > /// This iterates over the nodes in the SelectionDAG, folding > /// certain types of nodes together, or eliminating superfluous nodes. > The > -- > 2.47.0 > > But, NDEBUG is defined in bsd.lib.mk when MK_ASSERT_DEBUG == "no". I do not > define MK_ASSERT_DEBUG anywhere. > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=0 > Never mind. I have WITHOUT_LLVM_ASSERTIONS defined in src.conf. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Oct 23 20:49: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 4XYh413WvBz5Zg1q; Wed, 23 Oct 2024 20:49:21 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYh4130VZz4Vkd; Wed, 23 Oct 2024 20:49:21 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716561; 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=kzFliRP59zHnJD+Mp9WY4aAJhoXHpQeJbOhrbAypB5c=; b=xPESj/nlQnveZ2T8RKoFnjjgVEPuVRHD3T1QImgoo8Bh+PvAMjkuUrm0emfrkHuwSel1CT j800cU2iEqr/DxqZtKvCJnvRnysuLF8mNJaaEUHk39bAILmRLWzKwF9YNunCbTAxQ0jMmM V44ZKjLbUf7l7qeNjb+m23bUcvRYBYxaZ9X+gcKBgPbDhdR2JO/YCPwii7fO/VbzOB7pGx ONA+Q6XRZi1Zn584znoSmnFy0aV/yeGDuzNw/NyVw3uAVsiHMvMNjVlR2eKYIXMSGLoFIk yO1qfi6ESHLDtdybbmHVp1TyEM5oif4oTmTwwHUFwpBp4JXn+fCLK04bYnLo1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716561; 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=kzFliRP59zHnJD+Mp9WY4aAJhoXHpQeJbOhrbAypB5c=; b=tDV4uRuPNI5KqWwksr3SX9kfEvjPp97nT0ZgG30bWbU3d8mW89MURkxzRmSkWTXuRksbNE NOKD6hxdGoAw8t1pIE0MycDkoVb4iIO1abR1ZMtE2njvYPbQxTcsrSMW8zTezZnNVCAwqb I5iuBQWStVLe3oE8Hp9Pu/6gLqoYeQQv9sgskR0iawNYqpbStspbdtqrpI68MLmTXcqxNu tODHpMr/DHYRJIXK/Hi1Xhxyn4rCBtqo6//JONjX33n67PYPvDaqLagZQ5Q8hlTmBzwoS7 QOcfTSCtM3WADSc9EBJONf+pWYdNenjGn2upTH3FnXmj8tP2KgbenMdrgrW7nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729716561; a=rsa-sha256; cv=none; b=hFV6mEOIIgQt9UqwuZFk6vpSVzi8AahspBBIFEM+cO79AZlSx34nXxfoWSadEE3aXo/bQh NVM9v958TLPYUyfpXDfLGOBCGn/mnqbElvx3TP0/dJMl2jNoepB+daGwoGl+Fv7ZnVj6hc fkMnshhnuAyik8kBNCCgy//znnsJmpngIqosCzPdIQJdheFOZ9LaimW19Iw1mU9gkcOGnV E4MhWkqdhiv/AomuWlYc/Qhw410tUvG6y3FgshbyOPpqbcd7xLD5ETHcdcb+IlGBMvhfAH oXoSzhSKEZk6w3sghWJqGQFLoYA9U+LQGwAzyixlihySuTOlN3DzcejshQ2n7g== Received: from tensor.andric.com (tensor.andric.com [87.251.56.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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R10" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XYh411LLlz18R2; Wed, 23 Oct 2024 20:49:21 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 60AE860A2B; Wed, 23 Oct 2024 22:49:20 +0200 (CEST) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.2\)) Subject: Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 From: Dimitry Andric In-Reply-To: <20241023204507.9C34DB7@slippy.cwsent.com> Date: Wed, 23 Oct 2024 22:49:20 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <607104A9-2521-4A8A-9253-AD31D6E09BCC@FreeBSD.org> References: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> <20241023194054.2CC0611B@slippy.cwsent.com> <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> <20241023203535.D652666@slippy.cwsent.com> <20241023204507.9C34DB7@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3731.700.6.1.2) On 23 Oct 2024, at 22:45, Cy Schubert wrote: >=20 > In message <20241023203535.D652666@slippy.cwsent.com>, Cy Schubert = writes: >> In message <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org>, = Dimitry=20 >> Andric w >> rites: >>> On 23 Oct 2024, at 21:40, Cy Schubert = wrote: >>>> =3D20 >>>> In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, = Dimitry =3D >>> Andric wr >>>> ites: >>>>> The branch main has been updated by dim: >>>>> =3D20 >>>>> URL: =3D >>> = https://cgit.FreeBSD.org/src/commit/?id=3D3D5deeebd8c6ca991269e72902a7a62c= ad=3D >>>=20 >>>>> a57947f6 >>>>> =3D20 >>>>> commit 5deeebd8c6ca991269e72902a7a62cada57947f6 >>>>> Merge: 6e516c87b6d7 e6b732792813 >>>>> Author: Dimitry Andric >>>>> AuthorDate: 2024-10-21 12:59:26 +0000 >>>>> Commit: Dimitry Andric >>>>> CommitDate: 2024-10-23 18:27:38 +0000 >>>>> =3D20 >>>>> Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 >>>>> =3D20 >>>>> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, =3D= >>> lldb and >>>>> openmp to llvm-project release/19.x =3D >>> llvmorg-19.1.2-0-g7ba7d8e2f7b6, >>>>> a.k.a. 19.1.2 release. >>>>> =3D20 >>>>> PR: 280562 >>>>> MFC after: 1 month >>>>> =3D20 >>>>> .../clang/include/clang/Basic/TokenKinds.def | 5 +- >>>>> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- >>>>> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- >>>>> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- >>>>> .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- >>>>> .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- >>>>> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- >>>>> .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- >>>>> .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- >>>>> contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- >>>>> contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- >>>>> .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- >>>>> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- >>>>> .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- >>>>> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + >>>>> .../sanitizer_common_interceptors.inc | 180 =3D >>> ------------------- >>>>> -- >>>>> .../sanitizer_platform_interceptors.h | 2 - >>>>> contrib/llvm-project/libcxx/include/__config | 2 +- >>>>> contrib/llvm-project/libcxx/include/version | 7 +- >>>>> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- >>>>> .../llvm/include/llvm/CodeGen/FastISel.h | 3 + >>>>> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- >>>>> .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- >>>>> .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- >>>>> .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- >>>>> .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- >>>>> lib/clang/include/VCSVersion.inc | 6 +- >>>>> lib/clang/include/clang/Basic/Version.inc | 6 +- >>>>> lib/clang/include/lld/Common/Version.inc | 2 +- >>>>> lib/clang/include/lldb/Version/Version.inc | 6 +- >>>>> lib/clang/include/llvm/Config/config.h | 4 +- >>>>> lib/clang/include/llvm/Config/llvm-config.h | 4 +- >>>>> lib/clang/include/llvm/Support/VCSRevision.h | 2 +- >>>>> 37 files changed, 260 insertions(+), 350 deletions(-) >>>>> =3D20 >>>> =3D20 >>>> Hi, >>>> =3D20 >>>> One of these commits fails to build. >>>> =3D20 >>>> c++ -O2 -pipe -pipe -fno-common =3D >>> = -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm = =3D >>> -I/opt/src/git-src/sys/contrib/zstd/lib =3D >>> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 =3D >>> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA >>>> KE3_USE_NEON=3D3D0 -I/opt/src/git-src/lib/clang/include =3D >>> -I/opt/src/git-src/contrib/llvm-project/llvm/include =3D >>> -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS = -D__STDC_LIMIT_MACROS =3D >>> -DHAVE_VCS_VERSION_INC -DNDEBUG =3D >>> -DLLVM_DEFAULT_TARGET_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" -D >>>> LLVM_HOST_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" =3D >>> -DDEFAULT_SYSROOT=3D3D\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" = =3D >>> -DLLVM_TARGET_ENABLE_X86 =3D >>> -DLLVM_NATIVE_ASMPARSER=3D3DLLVMInitializeX86AsmParser =3D >>> -DLLVM_NATIVE_ASMPRINTER=3D3DLLVMInitializeX86AsmPrinter =3D >>> -DLLVM_NATIVE_DISASSEMBLER >>>> =3D3DLLVMInitializeX86Disassembler =3D >>> -DLLVM_NATIVE_TARGET=3D3DLLVMInitializeX86Target =3D >>> -DLLVM_NATIVE_TARGETINFO=3D3DLLVMInitializeX86TargetInfo =3D >>> -DLLVM_NATIVE_TARGETMC=3D3DLLVMInitializeX86TargetMC = -ffunction-sections =3D >>> -fdata-sections -gline-tables-only -Wno-format-zero-length = -Wdate-time=3D20=3D >>>=20 >>>> -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable =3D >>> -Wno-error=3D3Dunused-but-set-parameter -Wno-tautological-compare =3D >>> -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function =3D >>> -Wno-enum-conversion -Wno-unused-local-typedef =3D >>> -Wno-address-of-packed-member - >>>> Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter =3D >>> -Wno-parentheses -Qunused-arguments =3D >>> -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include =3D >>> -fno-exceptions -fno-rtti -gline-tables-only -std=3D3Dc++17 =3D >>> -stdlib=3D3Dlibc++ -Wno-c++11-extensions -c /opt/src/ >>>> =3D >>> = git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp = =3D >>> -o CodeGen/ShadowStackGCLowering.o >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 921 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 941 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 963 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 987 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 1005 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 1021 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 1041 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 1061 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>> =3D >>> = /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= =3D >>> ionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' = in =3D >>> 'llvm::SelectionDAG' >>>> 1081 | CurDAG->VerifyDAGDivergence(); >>>> | ~~~~~~ ^ >>>=20 >>> I haven't fully universe-tested each and every individual squashed =3D= >>> merge, so please use only the last one. If that one doesn't build, I = =3D >>> would be amazed, since it has gone through more than one universe = build. =3D >>> That said, some exotic configurations might not build. Do you have = any =3D >>> special make.conf or src.conf settings? >>>=20 >>> -Dimitry >>=20 >> I have nothing that would affect this. >>=20 >> The following patch addresses the breakage. >>=20 >> diff --git = a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h=20 >> b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h >> index 16ec65f2e7da..d2985d172711 100644 >> --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h >> +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h >> @@ -582,9 +582,7 @@ class SelectionDAG { >> return Root; >> } >>=20 >> -#ifndef NDEBUG >> void VerifyDAGDivergence(); >> -#endif >>=20 >> /// This iterates over the nodes in the SelectionDAG, folding >> /// certain types of nodes together, or eliminating superfluous = nodes. =20 >> The >> --=20 >> 2.47.0 >>=20 >> But, NDEBUG is defined in bsd.lib.mk when MK_ASSERT_DEBUG =3D=3D = "no". I do not=20 >> define MK_ASSERT_DEBUG anywhere. >>=20 >>=20 >> --=20 >> Cheers, >> Cy Schubert >> FreeBSD UNIX: Web: https://FreeBSD.org >> NTP: Web: https://nwtime.org >>=20 >> e^(i*pi)+1=3D0 >>=20 >=20 > Never mind. I have WITHOUT_LLVM_ASSERTIONS defined in src.conf. Yeah I think that is it. I will test with that setting too, and probably = import the upstream fix for it. I will keep you posted. -Dimitry From nobody Wed Oct 23 20:57: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 4XYhF4391xz5ZgNL; Wed, 23 Oct 2024 20:57:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYhF4119yz4WbZ; Wed, 23 Oct 2024 20:57:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id 3g81tQ14mAHbZ3iPntd6ua; Wed, 23 Oct 2024 20:57:11 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id 3iPmta9jnKHV83iPmtBIS1; Wed, 23 Oct 2024 20:57:11 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=XeEqz555 c=1 sm=1 tr=0 ts=67196327 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=DAUX931o1VcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=VxmjJ2MpAAAA:8 a=EkcXrb_YAAAA:8 a=RQ9pxixKUHAeIyCSUM8A:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 9C426376; Wed, 23 Oct 2024 13:57:09 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 8BD3C211; Wed, 23 Oct 2024 13:57:09 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 In-reply-to: <607104A9-2521-4A8A-9253-AD31D6E09BCC@FreeBSD.org> References: <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> <20241023194054.2CC0611B@slippy.cwsent.com> <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> <20241023203535.D652666@slippy.cwsent.com> <20241023204507.9C34DB7@slippy.cwsent.com> <607104A9-2521-4A8A-9253-AD31D6E09BCC@FreeBSD.org> Comments: In-reply-to Dimitry Andric message dated "Wed, 23 Oct 2024 22:49:20 +0200." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 23 Oct 2024 13:57:09 -0700 Message-Id: <20241023205709.8BD3C211@slippy.cwsent.com> X-CMAE-Envelope: MS4xfM79aAPvz4jg0GCY7SmBtTRrzX5e0RoQ4qVHmdMKRq7BXb1j25UhR6MBwkOzpu7lvnh25ODAPAO92GTJLsj7AWguxyl7Uc/3GIcKHcrAlZJwdJzyzfud hrDctCSLFmQ9b2Vy9+UabEhi1JfjdFsWvY7NrKerDRRF0rS2xZ3kGH0Z+SR92A+8zI30bCEQTq3vcUlbuHV43Pi46TtraaYnuklp3A9xcY/XjbEMk3jfqdGp aM9iWcEKA/G32O6/UPoqyzyvntIEHC+CPnUqo/luMLSJ5LpXHoSjHcOPkMsY4xQG8b1lSCVOOSZIP4gk1oofMquUMZauBJ0TiUk9J3EeaEQ= X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4XYhF4119yz4WbZ X-Spamd-Bar: ---- In message <607104A9-2521-4A8A-9253-AD31D6E09BCC@FreeBSD.org>, Dimitry Andric w rites: > On 23 Oct 2024, at 22:45, Cy Schubert wrote: > >=20 > > In message <20241023203535.D652666@slippy.cwsent.com>, Cy Schubert = > writes: > >> In message <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org>, = > Dimitry=20 > >> Andric w > >> rites: > >>> On 23 Oct 2024, at 21:40, Cy Schubert = > wrote: > >>>> =3D20 > >>>> In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, = > Dimitry =3D > >>> Andric wr > >>>> ites: > >>>>> The branch main has been updated by dim: > >>>>> =3D20 > >>>>> URL: =3D > >>> = > https://cgit.FreeBSD.org/src/commit/?id=3D3D5deeebd8c6ca991269e72902a7a62c= > ad=3D > >>>=20 > >>>>> a57947f6 > >>>>> =3D20 > >>>>> commit 5deeebd8c6ca991269e72902a7a62cada57947f6 > >>>>> Merge: 6e516c87b6d7 e6b732792813 > >>>>> Author: Dimitry Andric > >>>>> AuthorDate: 2024-10-21 12:59:26 +0000 > >>>>> Commit: Dimitry Andric > >>>>> CommitDate: 2024-10-23 18:27:38 +0000 > >>>>> =3D20 > >>>>> Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 > >>>>> =3D20 > >>>>> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, =3D= > > >>> lldb and > >>>>> openmp to llvm-project release/19.x =3D > >>> llvmorg-19.1.2-0-g7ba7d8e2f7b6, > >>>>> a.k.a. 19.1.2 release. > >>>>> =3D20 > >>>>> PR: 280562 > >>>>> MFC after: 1 month > >>>>> =3D20 > >>>>> .../clang/include/clang/Basic/TokenKinds.def | 5 +- > >>>>> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- > >>>>> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- > >>>>> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- > >>>>> .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- > >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- > >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- > >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- > >>>>> .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- > >>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- > >>>>> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- > >>>>> .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- > >>>>> .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- > >>>>> contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- > >>>>> contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- > >>>>> .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- > >>>>> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- > >>>>> .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- > >>>>> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + > >>>>> .../sanitizer_common_interceptors.inc | 180 =3D > >>> ------------------- > >>>>> -- > >>>>> .../sanitizer_platform_interceptors.h | 2 - > >>>>> contrib/llvm-project/libcxx/include/__config | 2 +- > >>>>> contrib/llvm-project/libcxx/include/version | 7 +- > >>>>> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- > >>>>> .../llvm/include/llvm/CodeGen/FastISel.h | 3 + > >>>>> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- > >>>>> .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- > >>>>> .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- > >>>>> .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- > >>>>> .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- > >>>>> lib/clang/include/VCSVersion.inc | 6 +- > >>>>> lib/clang/include/clang/Basic/Version.inc | 6 +- > >>>>> lib/clang/include/lld/Common/Version.inc | 2 +- > >>>>> lib/clang/include/lldb/Version/Version.inc | 6 +- > >>>>> lib/clang/include/llvm/Config/config.h | 4 +- > >>>>> lib/clang/include/llvm/Config/llvm-config.h | 4 +- > >>>>> lib/clang/include/llvm/Support/VCSRevision.h | 2 +- > >>>>> 37 files changed, 260 insertions(+), 350 deletions(-) > >>>>> =3D20 > >>>> =3D20 > >>>> Hi, > >>>> =3D20 > >>>> One of these commits fails to build. > >>>> =3D20 > >>>> c++ -O2 -pipe -pipe -fno-common =3D > >>> = > -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm = > =3D > >>> -I/opt/src/git-src/sys/contrib/zstd/lib =3D > >>> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 =3D > >>> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA > >>>> KE3_USE_NEON=3D3D0 -I/opt/src/git-src/lib/clang/include =3D > >>> -I/opt/src/git-src/contrib/llvm-project/llvm/include =3D > >>> -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS = > -D__STDC_LIMIT_MACROS =3D > >>> -DHAVE_VCS_VERSION_INC -DNDEBUG =3D > >>> -DLLVM_DEFAULT_TARGET_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" -D > >>>> LLVM_HOST_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" =3D > >>> -DDEFAULT_SYSROOT=3D3D\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" = > =3D > >>> -DLLVM_TARGET_ENABLE_X86 =3D > >>> -DLLVM_NATIVE_ASMPARSER=3D3DLLVMInitializeX86AsmParser =3D > >>> -DLLVM_NATIVE_ASMPRINTER=3D3DLLVMInitializeX86AsmPrinter =3D > >>> -DLLVM_NATIVE_DISASSEMBLER > >>>> =3D3DLLVMInitializeX86Disassembler =3D > >>> -DLLVM_NATIVE_TARGET=3D3DLLVMInitializeX86Target =3D > >>> -DLLVM_NATIVE_TARGETINFO=3D3DLLVMInitializeX86TargetInfo =3D > >>> -DLLVM_NATIVE_TARGETMC=3D3DLLVMInitializeX86TargetMC = > -ffunction-sections =3D > >>> -fdata-sections -gline-tables-only -Wno-format-zero-length = > -Wdate-time=3D20=3D > >>>=20 > >>>> -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable =3D > >>> -Wno-error=3D3Dunused-but-set-parameter -Wno-tautological-compare =3D > >>> -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function =3D > >>> -Wno-enum-conversion -Wno-unused-local-typedef =3D > >>> -Wno-address-of-packed-member - > >>>> Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter =3D > >>> -Wno-parentheses -Qunused-arguments =3D > >>> -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include =3D > >>> -fno-exceptions -fno-rtti -gline-tables-only -std=3D3Dc++17 =3D > >>> -stdlib=3D3Dlibc++ -Wno-c++11-extensions -c /opt/src/ > >>>> =3D > >>> = > git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp = > =3D > >>> -o CodeGen/ShadowStackGCLowering.o > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 921 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 941 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 963 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 987 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 1005 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 1021 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 1041 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 1061 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>> =3D > >>> = > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select= > =3D > >>> ionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' = > in =3D > >>> 'llvm::SelectionDAG' > >>>> 1081 | CurDAG->VerifyDAGDivergence(); > >>>> | ~~~~~~ ^ > >>>=20 > >>> I haven't fully universe-tested each and every individual squashed =3D= > > >>> merge, so please use only the last one. If that one doesn't build, I = > =3D > >>> would be amazed, since it has gone through more than one universe = > build. =3D > >>> That said, some exotic configurations might not build. Do you have = > any =3D > >>> special make.conf or src.conf settings? > >>>=20 > >>> -Dimitry > >>=20 > >> I have nothing that would affect this. > >>=20 > >> The following patch addresses the breakage. > >>=20 > >> diff --git = > a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h=20 > >> b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > >> index 16ec65f2e7da..d2985d172711 100644 > >> --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > >> +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h > >> @@ -582,9 +582,7 @@ class SelectionDAG { > >> return Root; > >> } > >>=20 > >> -#ifndef NDEBUG > >> void VerifyDAGDivergence(); > >> -#endif > >>=20 > >> /// This iterates over the nodes in the SelectionDAG, folding > >> /// certain types of nodes together, or eliminating superfluous = > nodes. =20 > >> The > >> --=20 > >> 2.47.0 > >>=20 > >> But, NDEBUG is defined in bsd.lib.mk when MK_ASSERT_DEBUG =3D=3D = > "no". I do not=20 > >> define MK_ASSERT_DEBUG anywhere. > >>=20 > >>=20 > >> --=20 > >> Cheers, > >> Cy Schubert > >> FreeBSD UNIX: Web: https://FreeBSD.org > >> NTP: Web: https://nwtime.org > >>=20 > >> e^(i*pi)+1=3D0 > >>=20 > >=20 > > Never mind. I have WITHOUT_LLVM_ASSERTIONS defined in src.conf. > > Yeah I think that is it. I will test with that setting too, and probably = > import the upstream fix for it. I will keep you posted. > > -Dimitry Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Oct 23 21:03: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 4XYhNC1GBcz5ZgRt; Wed, 23 Oct 2024 21:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYhNC0kBMz4X3k; Wed, 23 Oct 2024 21:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729717403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1a0ip7X/xwnsy8Bwp+Xv2+8JF4KNT8YBWQEVyLhvWc=; b=sNON4LqELt5wllqaDxhcBoO2oR4v9PD6Kl6oIdo0cxCNdjThVWSyJUjGlqmH1CWvctppUD n5MWty4TwSERW3TB/J2SPkpg4vCZSmI/57NZiOjlNutDd3JIQUUTlhyTLvkTovTltoqLn9 /i4yQ/uaroeUs7ah5KotlcOajPphW1d5aG2l6BDZXhIUGPhmkO6ERoGwRm+Ke52EOdEqvr i2D5DSE0kCtg4pooZ/mrQtsiukfEupsVZqWAsxP5jePKxH60u9Q4uoazC9SEDAMg0STr+p zhzQP+XRg2WVGbDmbabl71abIsj+rgqkafr3HSO6mlV1qGQsMDNZTi1vyxJDoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729717403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1a0ip7X/xwnsy8Bwp+Xv2+8JF4KNT8YBWQEVyLhvWc=; b=x9U4eYxtiommXCUDlR4jce2mHuqUoyrSWRdiGC+VqqNNeqlCYSDDmUpQuuPfOInHXuq2MO VSEevNS/kdOVLU8003HMtcOXgrM1QhGuH+RS9sHf8tr3/OtTOYmooP0RWUEKtxCUPzGlW/ mrtSX7y5hU4qb+fH0R0V94dTKexc/N2QlISr/cO8TnC1jntVDAqtwZwTUULzehbWWyGjKX HirU4LI5PtKCtjK7S4+F2VmKI2ygna3ENEX7s9ilSVp99bcIADdcAkQxu1G76R2Zysb0XE K4kc5Wg0vmOEUK1W6dWO0wRt3ritjq/+UDrkJ1PM0qpsPxWJbD5AWHi9tLq60g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729717403; a=rsa-sha256; cv=none; b=jb05Eaf9ftYVO1e9RKtocSQ+5yQgqU68t3wYUDmmn6d1ZpCNchuKVCzbTvevzxM++x4Q9Q K4ocvPVdiFXtfnksW92Jbd08+eDZmQOGqXv/pprEODkluMGB+K3ZOZ3meouowIPayu3TKh iVxPIrsO0DPm/JY3QKocPepYxPNIC2aENl7LH6ajOfXQj0GfnbbapSryVxWjOibN3eS3Ml JqRuguzPJr6wWm15Kj44bkMZf2XphvtMLh9/CePCVU65lGt5PdGuKh0VIzou8zBtazXo0O 6mDroxamLD/Grs1GDdfRo22LV3jSlOCIXc8CHaiac+SeEtSVu2vRdqzWqP++Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYhNC0H8GzDlN; Wed, 23 Oct 2024 21:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NL3MT3057728; Wed, 23 Oct 2024 21:03:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NL3MKA057725; Wed, 23 Oct 2024 21:03:22 GMT (envelope-from git) Date: Wed, 23 Oct 2024 21:03:22 GMT Message-Id: <202410232103.49NL3MKA057725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: dab59af3bcc7 - main - Canonicalize the name of the FreeBSD Foundation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dab59af3bcc7cb7ba01569d3044894b3e860ad56 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=dab59af3bcc7cb7ba01569d3044894b3e860ad56 commit dab59af3bcc7cb7ba01569d3044894b3e860ad56 Author: Li-Wen Hsu AuthorDate: 2024-10-23 21:03:07 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-23 21:03:07 +0000 Canonicalize the name of the FreeBSD Foundation Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- crypto/openssh/blacklist.c | 2 +- crypto/openssh/blacklist_client.h | 2 +- lib/libsys/_umtx_op.2 | 2 +- lib/libsys/fsync.2 | 2 +- lib/libsys/getrlimitusage.2 | 2 +- lib/libsys/sigfastblock.2 | 2 +- lib/libsys/thr_exit.2 | 2 +- lib/libsys/thr_kill.2 | 2 +- lib/libsys/thr_new.2 | 2 +- lib/libsys/thr_self.2 | 2 +- lib/libsys/thr_set_name.2 | 2 +- lib/libsys/thr_suspend.2 | 2 +- lib/libsys/thr_wake.2 | 2 +- lib/libsys/x86/pkru.3 | 2 +- lib/libthr/libthr.3 | 2 +- sbin/ldconfig/ldconfig.8 | 2 +- share/man/man3/pthread_mutex_consistent.3 | 2 +- share/man/man3/pthread_mutexattr.3 | 2 +- share/man/man3/pthread_sigqueue.3 | 2 +- share/man/man4/fdescfs.4 | 2 +- share/man/man4/nvdimm.4 | 2 +- share/man/man4/tmpfs.4 | 2 +- share/man/man7/security.7 | 2 +- share/man/man9/VOP_READ_PGCACHE.9 | 2 +- share/man/man9/refcount.9 | 2 +- share/man/man9/vm_map_protect.9 | 2 +- stand/man/loader.efi.8 | 2 +- sys/dev/mgb/if_mgb.c | 2 +- sys/dev/mgb/if_mgb.h | 2 +- usr.bin/posixshmcontrol/posixshmcontrol.1 | 2 +- usr.bin/proccontrol/proccontrol.1 | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/crypto/openssh/blacklist.c b/crypto/openssh/blacklist.c index f118edab40cf..33d02607dd98 100644 --- a/crypto/openssh/blacklist.c +++ b/crypto/openssh/blacklist.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. - * Copyright (c) 2016 The FreeBSD Foundation, Inc. + * Copyright (c) 2016 The FreeBSD Foundation * All rights reserved. * * Portions of this software were developed by Kurt Lidl diff --git a/crypto/openssh/blacklist_client.h b/crypto/openssh/blacklist_client.h index 236884092010..601a44461e20 100644 --- a/crypto/openssh/blacklist_client.h +++ b/crypto/openssh/blacklist_client.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. - * Copyright (c) 2016 The FreeBSD Foundation, Inc. + * Copyright (c) 2016 The FreeBSD Foundation * All rights reserved. * * Portions of this software were developed by Kurt Lidl diff --git a/lib/libsys/_umtx_op.2 b/lib/libsys/_umtx_op.2 index 60f90c32ba35..974850fb8425 100644 --- a/lib/libsys/_umtx_op.2 +++ b/lib/libsys/_umtx_op.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/fsync.2 b/lib/libsys/fsync.2 index f4b8c183b64c..d05c078af1e6 100644 --- a/lib/libsys/fsync.2 +++ b/lib/libsys/fsync.2 @@ -1,6 +1,6 @@ .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" Parts of this documentation were written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/getrlimitusage.2 b/lib/libsys/getrlimitusage.2 index e82e7b4443fd..e2114def56c2 100644 --- a/lib/libsys/getrlimitusage.2 +++ b/lib/libsys/getrlimitusage.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2024 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2024 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/sigfastblock.2 b/lib/libsys/sigfastblock.2 index 72897191c4bc..19d649e63db9 100644 --- a/lib/libsys/sigfastblock.2 +++ b/lib/libsys/sigfastblock.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/thr_exit.2 b/lib/libsys/thr_exit.2 index 62d6e6da22ce..98c6dd63f7ec 100644 --- a/lib/libsys/thr_exit.2 +++ b/lib/libsys/thr_exit.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/thr_kill.2 b/lib/libsys/thr_kill.2 index 63a6e40ef6fc..3f3cb0af2a00 100644 --- a/lib/libsys/thr_kill.2 +++ b/lib/libsys/thr_kill.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/thr_new.2 b/lib/libsys/thr_new.2 index 27408008c1a0..c0bcc8bbc7c2 100644 --- a/lib/libsys/thr_new.2 +++ b/lib/libsys/thr_new.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/thr_self.2 b/lib/libsys/thr_self.2 index 0637dca1d7b7..42d146448c05 100644 --- a/lib/libsys/thr_self.2 +++ b/lib/libsys/thr_self.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/thr_set_name.2 b/lib/libsys/thr_set_name.2 index f43a60a4b3a5..38205f7f30b8 100644 --- a/lib/libsys/thr_set_name.2 +++ b/lib/libsys/thr_set_name.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/thr_suspend.2 b/lib/libsys/thr_suspend.2 index ee4261b3676c..74eacb0daa3c 100644 --- a/lib/libsys/thr_suspend.2 +++ b/lib/libsys/thr_suspend.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/thr_wake.2 b/lib/libsys/thr_wake.2 index 0a196c2dd18b..9091a2b0c06e 100644 --- a/lib/libsys/thr_wake.2 +++ b/lib/libsys/thr_wake.2 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libsys/x86/pkru.3 b/lib/libsys/x86/pkru.3 index 7b5ceb025d62..95bc66c979ac 100644 --- a/lib/libsys/x86/pkru.3 +++ b/lib/libsys/x86/pkru.3 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2019 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2019 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3 index 35a7467eec14..b84176abcd32 100644 --- a/lib/libthr/libthr.3 +++ b/lib/libthr/libthr.3 @@ -1,5 +1,5 @@ .\" Copyright (c) 2005 Robert N. M. Watson -.\" Copyright (c) 2014,2015,2021 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2014,2015,2021 The FreeBSD Foundation .\" All rights reserved. .\" .\" Part of this documentation was written by diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8 index fd36540b48d6..cf7037b86bd6 100644 --- a/sbin/ldconfig/ldconfig.8 +++ b/sbin/ldconfig/ldconfig.8 @@ -1,7 +1,7 @@ .\" .\" Copyright (c) 1993 Paul Kranenburg .\" All rights reserved. -.\" Copyright (c) 2021 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2021 The FreeBSD Foundation .\" .\" Portions of this documentation were written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man3/pthread_mutex_consistent.3 b/share/man/man3/pthread_mutex_consistent.3 index ac44a8d99718..e22be52ba618 100644 --- a/share/man/man3/pthread_mutex_consistent.3 +++ b/share/man/man3/pthread_mutex_consistent.3 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2016 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2016 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3 index 8f4d0d9a06a4..b18d93e2e13e 100644 --- a/share/man/man3/pthread_mutexattr.3 +++ b/share/man/man3/pthread_mutexattr.3 @@ -1,5 +1,5 @@ .\" Copyright (C) 2000 Jason Evans . -.\" Copyright (c) 2021 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2021 The FreeBSD Foundation .\" All rights reserved. .\" .\" Part of this documentation was written by diff --git a/share/man/man3/pthread_sigqueue.3 b/share/man/man3/pthread_sigqueue.3 index bf5dd62f04e6..852f6314e9d0 100644 --- a/share/man/man3/pthread_sigqueue.3 +++ b/share/man/man3/pthread_sigqueue.3 @@ -1,6 +1,6 @@ .\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" Copyright 2024 The FreeBSD Foundation, Inc. +.\" Copyright 2024 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man4/fdescfs.4 b/share/man/man4/fdescfs.4 index b050f024ac40..f8bf413fc274 100644 --- a/share/man/man4/fdescfs.4 +++ b/share/man/man4/fdescfs.4 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2021 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2021 The FreeBSD Foundation .\" .\" Copyright (c) 1996 .\" Mike Pritchard . All rights reserved. diff --git a/share/man/man4/nvdimm.4 b/share/man/man4/nvdimm.4 index ffeac1a673fd..5b7dbe435c46 100644 --- a/share/man/man4/nvdimm.4 +++ b/share/man/man4/nvdimm.4 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2019 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2019 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man4/tmpfs.4 b/share/man/man4/tmpfs.4 index ce6b23e3ae7b..7d24f7db9aea 100644 --- a/share/man/man4/tmpfs.4 +++ b/share/man/man4/tmpfs.4 @@ -1,6 +1,6 @@ .\"- .\" Copyright (c) 2007 Xin LI -.\" Copyright (c) 2017 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2017 The FreeBSD Foundation .\" .\" Part of this documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index 7cb906304861..cdb4d066d3e6 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -1,5 +1,5 @@ .\" Copyright (C) 1998 Matthew Dillon. All rights reserved. -.\" Copyright (c) 2019 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2019 The FreeBSD Foundation .\" .\" Parts of this documentation were written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man9/VOP_READ_PGCACHE.9 b/share/man/man9/VOP_READ_PGCACHE.9 index f8f67eb00f13..8a99365eba28 100644 --- a/share/man/man9/VOP_READ_PGCACHE.9 +++ b/share/man/man9/VOP_READ_PGCACHE.9 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2021 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2021 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man9/refcount.9 b/share/man/man9/refcount.9 index 0c8e4380aed3..78631f9a865a 100644 --- a/share/man/man9/refcount.9 +++ b/share/man/man9/refcount.9 @@ -3,7 +3,7 @@ .\" Written by: John H. Baldwin .\" All rights reserved. .\" -.\" Copyright (c) 2019 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2019 The FreeBSD Foundation .\" .\" Parts of this documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/share/man/man9/vm_map_protect.9 b/share/man/man9/vm_map_protect.9 index 21e7b53a6bc6..5ece889a85df 100644 --- a/share/man/man9/vm_map_protect.9 +++ b/share/man/man9/vm_map_protect.9 @@ -1,6 +1,6 @@ .\" .\" Copyright (c) 2003 Bruce M Simpson -.\" Copyright (c) 2021 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2021 The FreeBSD Foundation .\" All rights reserved. .\" .\" Parts of this documentation were written by diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 84ba5c4fdb30..9feafd820f9c 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -3,7 +3,7 @@ .\" .\" Copyright (c) 2019-2022 Netflix, Inc .\" Copyright (c) 2022 Mateusz Piotrowski <0mp@FreeBSD.org> -.\" Copyright 2022 The FreeBSD Foundation, Inc. +.\" Copyright 2022 The FreeBSD Foundation .\" .\" Part of this documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index 6fafb303143c..05c4c242f739 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2019 The FreeBSD Foundation, Inc. + * Copyright (c) 2019 The FreeBSD Foundation * * This driver was written by Gerald ND Aryeetey * under sponsorship from the FreeBSD Foundation. diff --git a/sys/dev/mgb/if_mgb.h b/sys/dev/mgb/if_mgb.h index fa49805d73b7..19f6d4a20cc7 100644 --- a/sys/dev/mgb/if_mgb.h +++ b/sys/dev/mgb/if_mgb.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2019 The FreeBSD Foundation, Inc. + * Copyright (c) 2019 The FreeBSD Foundation * * This driver was written by Gerald ND Aryeetey * under sponsorship from the FreeBSD Foundation. diff --git a/usr.bin/posixshmcontrol/posixshmcontrol.1 b/usr.bin/posixshmcontrol/posixshmcontrol.1 index 84c2b845b99b..bfa43a0bbeab 100644 --- a/usr.bin/posixshmcontrol/posixshmcontrol.1 +++ b/usr.bin/posixshmcontrol/posixshmcontrol.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2019 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2019 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship diff --git a/usr.bin/proccontrol/proccontrol.1 b/usr.bin/proccontrol/proccontrol.1 index 7c4330fb1166..e0d0e9416d35 100644 --- a/usr.bin/proccontrol/proccontrol.1 +++ b/usr.bin/proccontrol/proccontrol.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2019 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2019 The FreeBSD Foundation .\" .\" This documentation was written by .\" Konstantin Belousov under sponsorship From nobody Wed Oct 23 22:13: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 4XYjwx225kz5ZkHq; Wed, 23 Oct 2024 22:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYjwx1TWYz4ccx; Wed, 23 Oct 2024 22:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GDD/NSRRb/TscE2/O74Xl7SMSW+q4aqwNay6sKEpuRo=; b=mwYYFGu4Y0jCPW8AzzsqTUoxc7k6JPuFDTxjteTOaMMno4MvXIHNEWxBoLYjF42fa20ZdM w/CbcThETxKR16XeY2/fOIgGR4dKW+TCmpTjHNdwljYrJeUVCi9eKrsmhN7NEFEj8q7V3c uG/ShTbXp85uSTGkHW/Tk5na5UMNyMExhEjbvErE6ADLPl8kTP7hYdd5CcwctGBvEH/gl7 oYHnOkcgd/HwtmISxzKisqRMhrfiYxMAdfX3jB8RpJJyd+g6xmVt27nVoxxJMMJgOtUKfp YVqaZeT+2RCeuaKCdTDJCNSyR0DQ8aFCWPOpvG6RlOdicEHOrGZHzdfKxBJgLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GDD/NSRRb/TscE2/O74Xl7SMSW+q4aqwNay6sKEpuRo=; b=Ny6ieQq3OOzi7im0V6zkFIEPE+FenLM4ZtTpc2oI7bL/kTHK8YBBFVlfIJBmdKNp74+qV4 SVOKlSYvnBcSTFG6yfcCer201cnsk0aHEXUJV8AgZyxK0Ud2bu/pD15x/JIgJaNSIojhYo Gf0cUBKG85drVpCZ+m8osgnqNcPTAt+Cq608ySVlia/eVLZdLYQygqECTWxmcvzlDMRj8k sI6ncifDOD9T1dWU7bicaKMYCRhadUTCeGY5DLyKhU/3bWTsarqRcNJmtsKobvleWbvO5J AF/UnCQoe3qVetw7UkX/u4qVQjNsK1NZMa+yX8kUMegDIuMB2RaiaJceLqnpWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729721601; a=rsa-sha256; cv=none; b=HeHiHzh6S1wYYJLqNZpgmlnwIyqVQuRbP3CWG0/T/0TP0K2+ZsOAfWgyAfx+O/j7DZHLCt 7fH8pDRRozsJWwTeQetcpBTqfd0ZTxVDMkgWtCAXK2UpSJLZK5z8Hgb/IsBkQY8opD6k8J poCTFBHk6JCObp7QB3jKpNAQaZhabZb91P4bxNQRs6TE+3wbgtx4k5uiHpH/WzxZrEnf60 /QalZtz/eDC96nNvywZOaFfzq9kzkCISqUc3DImv5gkvOmLn2AeoHtcJ7mrZGDVEfE5e40 y4KUUd0afsFjxSdM4EAG1b+kdLtu3tsfTG7dOfUuOcpNvfaAWdogoYQLL/Fk9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYjwx0z7YzGfg; Wed, 23 Oct 2024 22:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NMDKdu085580; Wed, 23 Oct 2024 22:13:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NMDKaG085577; Wed, 23 Oct 2024 22:13:20 GMT (envelope-from git) Date: Wed, 23 Oct 2024 22:13:20 GMT Message-Id: <202410232213.49NMDKaG085577@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: b5149b265346 - main - linker: Handle a truncated hints file properly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b5149b265346c55994c7ebaab2a6a6fd1bd6fe5e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b5149b265346c55994c7ebaab2a6a6fd1bd6fe5e commit b5149b265346c55994c7ebaab2a6a6fd1bd6fe5e Author: Mark Johnston AuthorDate: 2024-10-23 16:54:56 +0000 Commit: Mark Johnston CommitDate: 2024-10-23 22:12:45 +0000 linker: Handle a truncated hints file properly If vattr.va_size is 0, we will end up accessing invalid memory. This is mostly harmless (because malloc(0) still allocates some memory), but it triggers a KASAN report. PR: 282268 Reviewed by: christos, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47240 --- sys/kern/kern_linker.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 3f34bb12aeaa..f388ac8a583a 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -2030,6 +2030,10 @@ linker_hints_lookup(const char *path, int pathlen, const char *modname, printf("linker.hints file too large %ld\n", (long)vattr.va_size); goto bad; } + if (vattr.va_size < sizeof(ival)) { + printf("linker.hints file truncated\n"); + goto bad; + } hints = malloc(vattr.va_size, M_TEMP, M_WAITOK); error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)hints, vattr.va_size, 0, UIO_SYSSPACE, IO_NODELOCKED, cred, NOCRED, &reclen, td); From nobody Wed Oct 23 22:13: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 4XYjwy2vgpz5Zk2P; Wed, 23 Oct 2024 22:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYjwy1pyWz4cs3; Wed, 23 Oct 2024 22:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gccm0gXj22OFK+rPeyWpD+l7h7ykC3iuMb7IWH7SlzY=; b=BYE+YHpWYOWc6md63kzDQBKD26Z/9n87riK3c4Fx144qCYBt8LCd1vXmCaGaPw7pr3N3nG 9YkAEoaLF9GIZHxUDqdKEkeXizm10vI4iePw3p/GwzTTllId2D8nzUIGZIj9ERjFz4Dy/D zzs3otfNz7zcJMkdy9NlBHuhuzJYoSJ58VqB7Tngg+x0/LUP3IycAT/BHGaVZYqntqcQYM 0F0OvJnTs2lxWcbXkkbpUGOJG7/80tHgOUMOR18YHfGhjKrArEwSahaVdXySp1tjdS64R5 612GVCEvDGNpDvVbV7b75CRX64bXh9vB2qT68gIYEDInqsRcVWFZeZVr5haKDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gccm0gXj22OFK+rPeyWpD+l7h7ykC3iuMb7IWH7SlzY=; b=dG6b3p4F8KtbihYzryIFO1iuP5G5PALLi6+luHgM1l7/yJ5eCPaw/EAVN6rw6qIPFF7zLL 4nXtVK+lxOkkutZAcvd/qb+oTdJOTlrz+95tfsr6q3fItQ73b3IK1+c+JoVfv2U9Z+0aoB +g8AF6EmIuLrYRuSGx70WTCtuTjU5aAMdCHHVp11QFJazq7PeKJrKz/9q5y3/zT31SF0LB 228ZVy8TCHJot5Rjmy0OI3D1cYn6MIUB0ML4+BFRzE3E0FnzzdaQZ0kgqORzz3o/8DR8nF IojT0NsLvgB0AaTJkidBk554df0OYCRfJmxpSXJwJabcKjxW1zc9t8TN033UgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729721602; a=rsa-sha256; cv=none; b=LyKZ+BwPKq0wg91Q1422hgo2M16VH57m5aSxY3vvo5IZ6YzVSpV4IwXgXvSAR3dqiVCdPd qt6OyBsBYfK2FwRBDMp72QvjOiJfWkm2d6uNoiPwH1S6J4hgpzf0HmUQBNXESgrFBx1Drf QHLDGPSWr0tHXDX+XUFqlHwxUR9KnTRpbuQNG78/jYc6et10fSIZX6hiSgWLo4SjXHo0g2 Ft6YnHrbzPnXqtkh6o1JAZaMYLNPwgrA2Po7O+IJ6UYjFmFEGNx/x3ddLb0h1t242Pvl6s eIvxHnO6Oc1p5E89hU83IS4d2SQmqBele+pzvWyIFzq6KwV8WYvEpGIPn6U7YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYjwy1Qf8zGfh; Wed, 23 Oct 2024 22:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NMDMmW085627; Wed, 23 Oct 2024 22:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NMDMwx085624; Wed, 23 Oct 2024 22:13:22 GMT (envelope-from git) Date: Wed, 23 Oct 2024 22:13:22 GMT Message-Id: <202410232213.49NMDMwx085624@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: 9b2f2fbfcbc5 - main - devmatch: Catch truncated linker hints 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15 commit 9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15 Author: Mark Johnston AuthorDate: 2024-10-23 16:55:16 +0000 Commit: Mark Johnston CommitDate: 2024-10-23 22:12:45 +0000 devmatch: Catch truncated linker hints files PR: 282268 Reviewed by: christos, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47243 --- sbin/devmatch/devmatch.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 49f9be00a2e7..4a5a300ca313 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -127,6 +127,12 @@ read_linker_hints(void) err(1, "Can't open %s for reading", fn); } + if (len < sizeof(int)) { + warnx("Linker hints file too short."); + free(hints); + hints = NULL; + return; + } if (*(int *)(intptr_t)hints != LINKER_HINTS_VERSION) { warnx("Linker hints version %d doesn't match expected %d.", *(int *)(intptr_t)hints, LINKER_HINTS_VERSION); From nobody Wed Oct 23 22:13: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 4XYjwz5HCBz5ZkVX; Wed, 23 Oct 2024 22:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYjwz2krWz4cq4; Wed, 23 Oct 2024 22:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ORppuBflCJ82eEQcZ6t+vbGWVF+t86S85c+zm3zex80=; b=Pfc6VxnfMIyl8nH+qRZ8UC1i9UzIDnupoeWoZSAFu8YAL46I14Vx0c2hjJbIIGgmUPRcFi KntQNcLSMpDDWshMLyy/739rIxbxJz4/kXifz4pAObF42C6yI9hxmketfCfXjQhr2isO5J dv/zK056aqIw0quQCzqZDpaoQoPPVsjcAkt5c+aTX+X1NpAUYjBmfGlvz6XjD6c4rR7gZh tZPMjNT15Mpiunx79VYGqDmu6CxUP/tUh8EoV3WbhutiHRM6vFVSUTcKQgkWSPY8BVZohc PCzA0c0PpPyrrVdk1Y0EsCIhx5ypMl96983s58qk6Usw0XDDbPTTmXwUWhn7dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ORppuBflCJ82eEQcZ6t+vbGWVF+t86S85c+zm3zex80=; b=ux4nSMbdgunCytJFEzEMtCKeu9eomh6Ln/mihdOxGjM5z77PyMFqyV7R5ceGLQt9hkxOBE MTKNVp7FmFIZy72MhXPo8vvWsYSn1uhm4GsBbIfthz7hCqQImQ3Ex/q0CWy71mImi42oqr I/2F+MoPAYOaHpbFoVCjhqWXIVjVTQj/FjBXI96DMiZCWl9YZIYR+CvGNeCvE1B0nilvFZ E13PUSMclZfWk5DOcAwGkLQibsXEq1Jz6H1hI8x3KWS3sShC+86PPl3WkJfLW0TBwXYIF3 +aESouUcdoDKIHc+VT1mIvqhjJUjFPCoFsBnmFI030hv1jjOaPp1bSijv+zQTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729721603; a=rsa-sha256; cv=none; b=qjIzyvvcvvOAFPuJ6K2cNI3LCizjn4Dn8tv7c7X+QlEhaxqlqb426XScKO0xKYQgCKhBq3 vCjNxqYbcAMquCdBL+6SCJzcadY1g8gw7bodP46AOKv4pOjIX5xEDWpchJZkMu9HMojOQk cPLdOn+lEfdzx0CX2fUvFST5iyKfj5vKTilWxoS/0N+JLN+eaFzETrrYNBbKqi/3cVPwGi dVFxb1VHJXIlTR97nKzFDaharK9NwTDn9QOjfhLDThMiOB1k0A2lbn+Rcoo+vq+WqQnkm4 lXoP7xsrEMlY/lfh2nIYMmTY1m9n2NtAcAeot6xJwydSVyuCxzcWDHt0iArHCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYjwz2KKlzGcq; Wed, 23 Oct 2024 22:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NMDNb0085690; Wed, 23 Oct 2024 22:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NMDNbb085687; Wed, 23 Oct 2024 22:13:23 GMT (envelope-from git) Date: Wed, 23 Oct 2024 22:13:23 GMT Message-Id: <202410232213.49NMDNbb085687@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: c22be0b181e9 - main - mixer: Fix a bogus free() call in the main 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c22be0b181e954a4cc00ed4f5c7df974f3061c3c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c22be0b181e954a4cc00ed4f5c7df974f3061c3c commit c22be0b181e954a4cc00ed4f5c7df974f3061c3c Author: Mark Johnston AuthorDate: 2024-10-23 16:55:39 +0000 Commit: Mark Johnston CommitDate: 2024-10-23 22:12:45 +0000 mixer: Fix a bogus free() call in the main loop After a strsep() call, p might not point at the original allocation anymore. Reported by: CHERI Reviewed by: christos MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47266 --- usr.sbin/mixer/mixer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 468130ddaa88..70a35f71b25f 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -147,7 +147,9 @@ main(int argc, char *argv[]) parse: while (argc > 0) { - if ((p = strdup(*argv)) == NULL) + char *orig; + + if ((orig = p = strdup(*argv)) == NULL) err(1, "strdup(%s)", *argv); /* Check if we're using the shorthand syntax for volume setting. */ @@ -200,7 +202,7 @@ parse: /* Input: `dev.control=val`. */ cp->mod(cp->parent_dev, valstr); next: - free(p); + free(orig); argc--; argv++; } From nobody Wed Oct 23 22:38: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 4XYkV44Ldmz5ZlSc; Wed, 23 Oct 2024 22:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYkV43m90z4hQc; Wed, 23 Oct 2024 22:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729723116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/eCOfF+jBpnqIeA9PGh+ssu6Pm/L2vp6x0Jh3vh12A=; b=ij77xCHkJM+hnesFwJ4tr8KFgCe/dlm0KVsDyO4g4a7bMui+5hpWE8U28/Tcrg9D5C9lKx 7deLFPjXmX/+QaXFy1c4IrH+qTHTNVzONlIcTC9ToSHpWCl+m73uFYfX/xxDeKcGPT2x3e V8eaQh1CKR7lvwysD7ag6NNtGHfubbheT83tGSGLedNWMcPB9Zqqyf7WKhtgoOYUyW1pn+ IYVqniVrd2ngP8s/F4hUft0vIga1S1ozeueHOQ6xoDk5q8sb9zVfc5Xu/cSpNmAgJmsQyB yZUmRquCyNbfm/wFWLOKqTN2Zfu5yr7NxOdkYV8BrD/9juPpFdb3T/0ukj83OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729723116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/eCOfF+jBpnqIeA9PGh+ssu6Pm/L2vp6x0Jh3vh12A=; b=W15dP8GcRpdHgsfvKouTqXsWB3lvseeeYN7M/9SRBnbus7O0RvRqfgd0ZGncCGHrHglxIy 93tc+BXDFsu68pWVIg5ixOXpw485cCKsHc/Uoz0xTQBU5ioVXCLk1va3TSE+5mGOH4ruG4 dzpcLdVRybnZ+JmruAemWt/pcwiopef62pqryeP4eDDNz2jlSmEPjZFhjJDhNoOp7Z3Dyp sD4uBKKgIa2e8nZfZr/eJhKs0vtLVMbzQzct8Q3NcZL6B5jF9Ip2hKKgGXzWPvbPTJgZJY mXSXpX6LF81hA1pUs6TWz7d2joL6tOZEU1LVsF2MqqRq8Vp/6tcuEZoLuAyjhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729723116; a=rsa-sha256; cv=none; b=UpznB8MgfjTdmhJOCsT5iGZm2hxBs+WVTXpJd6cFhUstHVjWoQxC2ckrh6J3iCZfT8LNbT 3k5Od18ogULFTdsbIvRCHHe8yrBji3g+zdci4tnyZaRz+Uze6RWQLvWcBZJLWuCN9gYmaT 1Dk7Zzz926EpBW1bvPUoKUPtGriu6GuPn8gnguPD+SF5XrFRYYofIcM/Bv5BdtZ6ynJiq/ aquVkC3DOWAfzLSow4jq9qCuC+8RJCVk0z493ombxfkTxDSYNXfKHuTCk1ddtbwfBWeU9o 8VaKOu3ngkZocX76gBcsldrmV/Ly4n8ZuytNjqKdJ9V6GugO6C6m67WMJ1XXjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYkV43MJ9zGyW; Wed, 23 Oct 2024 22:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NMcaF9024386; Wed, 23 Oct 2024 22:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NMca8J024383; Wed, 23 Oct 2024 22:38:36 GMT (envelope-from git) Date: Wed, 23 Oct 2024 22:38:36 GMT Message-Id: <202410232238.49NMca8J024383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8b2e7da70855 - main - llvm19: permit incremental builds from llvm18 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b2e7da70855e48c0ba8c874fa528b599fb7c9a9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8b2e7da70855e48c0ba8c874fa528b599fb7c9a9 commit 8b2e7da70855e48c0ba8c874fa528b599fb7c9a9 Author: Brooks Davis AuthorDate: 2024-10-23 22:37:28 +0000 Commit: Brooks Davis CommitDate: 2024-10-23 22:38:18 +0000 llvm19: permit incremental builds from llvm18 Detect and delete out of date clang-tblgen produced output. I found it sufficent for compilation to delete only arm_*.inc files, but it seems safer to regenerate all output and a few extra clang-tblgen runs pales in comparison to the full build we're doing at this point. Reviewed by: dim, emaste Differential Revision: https://reviews.freebsd.org/D47270 --- tools/build/depend-cleanup.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 001a450bf182..3678e3368b39 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -215,3 +215,13 @@ if [ ${MACHINE} = riscv ]; then fi done fi + +# 20241018 5deeebd8c6ca Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 +p="$OBJTOP"/lib/clang/libclang/clang/Basic +f="$p"/arm_mve_builtin_sema.inc +if [ -e "$f" ]; then + if grep -q SemaBuiltinConstantArgRange "$f"; then + echo "Removing pre-llvm19 clang-tblgen output" + run rm -f "$p"/*.inc + fi +fi From nobody Thu Oct 24 01:07: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 4XYnnw29hdz5Zsg9; Thu, 24 Oct 2024 01:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYnnw1dPqz4tgp; Thu, 24 Oct 2024 01:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729732052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ecQd4BdCtG8uCxJy4FkWHrr9Y5mNAoDNeBlOPqKgy/4=; b=yti7JFMs47E/WCzcbj9CGR83kRuugoVyO0VzRgHwOTonsAkenYegM+yKnZLDjsL0Tn9i3P 5bjTKHDH2h4OrshJ8kwAmSqESLwL/B4WM0elTI7XkDfXCxjCA3W3vUy56ujap40fZs9GoD KRmC0NGiVEduzERzClRrxhhh5PFpjPPzEz607wvVnx1+TMS7XroWKjRohr2NQtS2/WV1cJ 910iOGSIFeq9AsnT8QdN9eKaXiDWc3vNV0zkR6Y8VGGaclXmeZprAhO8YlcMgEzfkrDXOZ pxwHvLSaQnVqHUJ2xX57PRK+U14njlGBe9Hciu+a2Jo2zcREdNj3CcENOCkYwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729732052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ecQd4BdCtG8uCxJy4FkWHrr9Y5mNAoDNeBlOPqKgy/4=; b=Llba4hajWBSN3v7d7UVuqmbSqpLXhYp2yv4u2GyyC7v5ZZ9BYfASoYJLPKc54hUaOhVz+t RtbWV/8y7yZ+4757P8PVrc0aotERrpl8U0mfJWibuBPtYItrh9hRM4lHbG9x6+kmQZ0HiH gslfRL9knA6SGLwTYui3p/tUBjdYavPXilKftzsxNrb1vuwqqT/mfnlQa0+FWQNch33DAD ch0My+wWz7XGqYMR3i/k/bxDq15/LULmBW4Mwd4Vk/WpRsIwmkG6LwwxNoGg7KUhVrEKb+ 7nPbWDWLKvEI9HmWHBm2pya/g54ahXv78ZxuBY+LRvAv1wrikI6boWhwcXqgDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729732052; a=rsa-sha256; cv=none; b=jCnonBG2r3/Nmss6mJRzPs72lzwpml1PbsJ2Of2la1iWx+qUu+F9Glt3kJZeOOgY41YgZ8 0qPf2HjR2NcDNgCOkuEJhvxe+BFtieQTFIJODztpHT7e++dqxF+X1t2I7YNK70FerCYn7b upBMG6Lf0hlbvAtJOd3FvJ1dt9Bl/1JfOgehMOR02DygcyJw+DWT98CFdfagVaHp2/o25k aTz3rnag8YX31CfrfeG1PsUtvp9F9lmEQG2ouwLGrKRou1uHJjgOZJVUSkXtueKdPUELV0 GVIHQ3B+m/U2Txb2c9+Gjj20m543GPW/nKO0cqpmps1qyhmOX+YfLKiRdIXg7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYnnw1FM8zLQB; Thu, 24 Oct 2024 01:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O17Wc7001732; Thu, 24 Oct 2024 01:07:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O17WFB001729; Thu, 24 Oct 2024 01:07:32 GMT (envelope-from git) Date: Thu, 24 Oct 2024 01:07:32 GMT Message-Id: <202410240107.49O17WFB001729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: f6e1add0c9d3 - stable/14 - nfsd: Fix handling of credentials with cr_ngroups == 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6e1add0c9d3a3629f6968cb02a031c1d78b24c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f6e1add0c9d3a3629f6968cb02a031c1d78b24c5 commit f6e1add0c9d3a3629f6968cb02a031c1d78b24c5 Author: Rick Macklem AuthorDate: 2024-10-21 22:48:39 +0000 Commit: Rick Macklem CommitDate: 2024-10-24 01:06:26 +0000 nfsd: Fix handling of credentials with cr_ngroups == 0 There has been a documented case in the exports(5) man page forever, which specifies that the -maproot or -mapall may have a single user entry, followed by a ':'. This case is defined as specifying no groups (aka cr_ngroups == 0). This patch fixes the NFS server so that it handles this case correctly. After MFC'ng this patch to stable/13 and stable/14, I propose that this unusual case be deprecated and no longer allowed in FreeBSD15. At that point, this patch can be reverted. (cherry picked from commit caa309c8811d62a24cd07e3a1f6e9095eaf10c90) --- sys/fs/nfsserver/nfs_nfsdsubs.c | 5 ++--- sys/kern/kern_prot.c | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c index d80826993f23..2fd877775c79 100644 --- a/sys/fs/nfsserver/nfs_nfsdsubs.c +++ b/sys/fs/nfsserver/nfs_nfsdsubs.c @@ -1620,7 +1620,7 @@ nfsrv_checkuidgid(struct nfsrv_descript *nd, struct nfsvattr *nvap) if (nd->nd_cred->cr_uid == 0) goto out; if ((NFSVNO_ISSETUID(nvap) && nvap->na_uid != nd->nd_cred->cr_uid) || - (NFSVNO_ISSETGID(nvap) && nvap->na_gid != nd->nd_cred->cr_gid && + (NFSVNO_ISSETGID(nvap) && !groupmember(nvap->na_gid, nd->nd_cred))) error = NFSERR_PERM; @@ -1679,8 +1679,7 @@ nfsrv_fixattr(struct nfsrv_descript *nd, vnode_t vp, } if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_OWNERGROUP) && NFSVNO_ISSETGID(nvap)) { - if (nvap->na_gid == nd->nd_cred->cr_gid || - groupmember(nvap->na_gid, nd->nd_cred)) { + if (groupmember(nvap->na_gid, nd->nd_cred)) { nd->nd_cred->cr_uid = 0; nva.na_gid = nvap->na_gid; change++; diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 7d28475b5db8..d7de7deb2c0c 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1310,6 +1310,13 @@ bool groupmember(gid_t gid, struct ucred *cred) { + /* + * The nfsd server can use a credential with zero groups in it + * when certain mapped export credentials are specified via exports(5). + */ + if (cred->cr_ngroups == 0) + return (false); + if (gid == cred->cr_groups[0]) return (true); From nobody Thu Oct 24 01:14: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 4XYnxp4mnHz5ZtD1; Thu, 24 Oct 2024 01:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYnxp42nqz4vWt; Thu, 24 Oct 2024 01:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729732462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vQTKpkiQyPlbboTfhV7Z2+1LMEtZCCM1pXL4Yqxl6LI=; b=DJbhFvMD6t4+QSdrLY9GFrq0iZUvS2VMe2KJ1aElXzRx3kLK0G3pjS9Kr9V6BWrku6MkBw Yki0tBtM+PwYORdEgBOBhRhymWvuB+FTVKwEiilfU6jb4lPxxUj4WVMyc8s7mO4qIed/Nk 0bdyB4xHuDHm2iOJgBL39AsfaK7Y5wY2J46ybKIrI1c69WIJJNSaPNMHORH8/jto2hgRrd bSv04dN4gnlHF0vjx8xdyivUZ1on9sFToFeBxXMYcBb4sbf5KXkVijulUqS15dOigzw33z SWvN2rEOp0+ic01+dcyLcJJsCEhIo4+66ysO6rNTWoVLesUYCCk3yb4hp2ELVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729732462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vQTKpkiQyPlbboTfhV7Z2+1LMEtZCCM1pXL4Yqxl6LI=; b=h61ev12aGVrQ/UiYrK4njqoXzLlUSF2vB33zUUGM+i85OwbZvyaaHExpF5JvVK6BeJxK0Y 4zk6CPE79sD2YKKwUojFKb/7Iww34GpFhNn9SaR3/YykHGHB5H9UZ9n1UAVWDN8KCye2pm cEvwEafvadXUbKxR4/S2Lq1IH5mep0PP8ieHxwGLpbZoRMDMnBxW25lV4Pyuc5AI4VEvLb /UDLkOJ0iB6rYYQYbkExr04/DwLhy8LcRKJ5hVsqqpN/zCdxG4cmr8aCkonnd74candpfv O2lyD1B8fEJTw8h3cLVEPcfiSzQDtQlqS5INW4H7YIi9WlI0A1SI9fd0dyN7qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729732462; a=rsa-sha256; cv=none; b=XWXOwtu/DOP4g5Z+IAT34jhvx74eF/5HigJb5G3zQWUzdIUnyCWLlvrnWYQU3GnsxIwElV BF45W9o03+B/P00t2ngP7yvEpzz2fFY8cPoITCiUiAbpKGhVqyFTSDIXjTrNNFUABeO3qo 3kSh55TPGCftKPKLIVaz2Rq8b47fAearShtHluh53SWme5VNskjCuZmLQt8d4QBq9NQLRt MOSvoxdIQnAwU2FDDT3BuT4jRfXVcTtLVs/PATTOUE4+PYyBHzZFaQQD2lGMwEHq9cr9Bo HIqF1M88CyoT8oAI/xDveKs+s5cw8H1uEMqYEOe1UQuVG4FRQKhIxLbsKNxRFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYnxp3dzrzLd2; Thu, 24 Oct 2024 01:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O1EMPR018872; Thu, 24 Oct 2024 01:14:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O1EMwr018869; Thu, 24 Oct 2024 01:14:22 GMT (envelope-from git) Date: Thu, 24 Oct 2024 01:14:22 GMT Message-Id: <202410240114.49O1EMwr018869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: fcd20d3181a7 - stable/13 - nfsd: Fix handling of credentials with cr_ngroups == 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fcd20d3181a7df9ebbb8d333db594a210194959f Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fcd20d3181a7df9ebbb8d333db594a210194959f commit fcd20d3181a7df9ebbb8d333db594a210194959f Author: Rick Macklem AuthorDate: 2024-10-21 22:48:39 +0000 Commit: Rick Macklem CommitDate: 2024-10-24 01:13:24 +0000 nfsd: Fix handling of credentials with cr_ngroups == 0 There has been a documented case in the exports(5) man page forever, which specifies that the -maproot or -mapall may have a single user entry, followed by a ':'. This case is defined as specifying no groups (aka cr_ngroups == 0). This patch fixes the NFS server so that it handles this case correctly. After MFC'ng this patch to stable/13 and stable/14, I propose that this unusual case be deprecated and no longer allowed in FreeBSD15. At that point, this patch can be reverted. (cherry picked from commit caa309c8811d62a24cd07e3a1f6e9095eaf10c90) --- sys/fs/nfsserver/nfs_nfsdsubs.c | 5 ++--- sys/kern/kern_prot.c | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c index 0d7e4c73fe69..fa0222bbf3b2 100644 --- a/sys/fs/nfsserver/nfs_nfsdsubs.c +++ b/sys/fs/nfsserver/nfs_nfsdsubs.c @@ -1623,7 +1623,7 @@ nfsrv_checkuidgid(struct nfsrv_descript *nd, struct nfsvattr *nvap) if (nd->nd_cred->cr_uid == 0) goto out; if ((NFSVNO_ISSETUID(nvap) && nvap->na_uid != nd->nd_cred->cr_uid) || - (NFSVNO_ISSETGID(nvap) && nvap->na_gid != nd->nd_cred->cr_gid && + (NFSVNO_ISSETGID(nvap) && !groupmember(nvap->na_gid, nd->nd_cred))) error = NFSERR_PERM; @@ -1682,8 +1682,7 @@ nfsrv_fixattr(struct nfsrv_descript *nd, vnode_t vp, } if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_OWNERGROUP) && NFSVNO_ISSETGID(nvap)) { - if (nvap->na_gid == nd->nd_cred->cr_gid || - groupmember(nvap->na_gid, nd->nd_cred)) { + if (groupmember(nvap->na_gid, nd->nd_cred)) { nd->nd_cred->cr_uid = 0; nva.na_gid = nvap->na_gid; change++; diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 5dea43971e3d..abe989045fb8 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1306,6 +1306,13 @@ int groupmember(gid_t gid, struct ucred *cred) { + /* + * The nfsd server can use a credential with zero groups in it + * when certain mapped export credentials are specified via exports(5). + */ + if (cred->cr_ngroups == 0) + return (0); + if (cred->cr_groups[0] == gid) return (1); From nobody Thu Oct 24 02: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 4XYqGl2WB8z5ZwbG; Thu, 24 Oct 2024 02:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqGl1blmz42VS; Thu, 24 Oct 2024 02: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=1729736047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frf+DupAL0cJLrCfqhF2D/882DkXuRSK1lkN7LZ2J68=; b=CheU8Bwa12IhTVMQ2CHJV11dVvEFXVoFZteZXzNrjt7MoJypiei3KpsVDlJVYt28nWNn51 qobc1GUOY/qecyddtJCTzRl5tw4DxdnCvWF0wqPtdw5M2RFYLmhCEI4HbsCiY0Q4lTHzfC qdgq2zsRAoWWnL7zfh28SuiIH3/3WwqCImGnz45Yih0qCpi2naQYY+nee24YmYl14bf6Jh OmkrPOrAqI7AWSBpn0BS2lRvZDndB9C0pokegLv224tyFEykAMQpMzZpsf2x8tTHmPqk+3 SWG6ICa9YMyjlGJzRnXYzUbHHkhMbncY4C8q6pMv7XfxlgKQKTDE/6vNw8YaIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frf+DupAL0cJLrCfqhF2D/882DkXuRSK1lkN7LZ2J68=; b=AXPR5LvLJhcVfohfTgDTr4htgFkrYIw1lW1GsQDZ+dLf39tX8MLnSD3Udb8Fk2BWEnNsKn XssmHpA4YSIWkL75SaehtQ+EQwwBqwyliObB8AgeKzmarGYR7JwfJUP6Dc8mWK7UquWC60 OUSTTTG65U0SRPsUs1iQyZEmI+Tw7g4JEDOedTB4fNe5NIkAzE7YRI7qKhXsb/rmIPEpRk HIwDWoPAT+jNfv6Yh4UCmzlL8+CHpLIeMGw2U3YGYojcOqLckMfveYj7LQXZ9xk6aFbYUE PACFsIU8PEzLOOANkKlw30NTyjX2eWAKfEiSxuPdkBCa+mv6eKPPHMZuhccb8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729736047; a=rsa-sha256; cv=none; b=kvU1F3ZI2YezyInyH/GQy+Xb4pDLoUnVA2xJTCr+n5dfK/A/jag5UZo2QVo5DYzhxDH9aM S3gDgKfyqwHofAnn6byGuMgY8wrKi2MHx/kVwEbmY5i9MCJNd0VjI/89foCBUvxpgK4Mc0 XDIrM50SCi85yXxrsiOUu2zs7vBGK7mF1Uv7bE572JMn3TKl2SDzNR5yg0Ekc80DqK83OX 9Sj/4GYGty6TXWVEyngAMGEVVLnSwc/RZg5wtM+hX5D57/hLKsE76niHGmTwAw1pBGC0/i on9o4zK2IKOfFITcBaVRHBZ9TL1sZp+jmwg5v0t72SrlYIyL0mJ1noXOv0eybg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqGl1CfDzNXZ; Thu, 24 Oct 2024 02:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2E7fp029752; Thu, 24 Oct 2024 02:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2E7FS029749; Thu, 24 Oct 2024 02:14:07 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:14:07 GMT Message-Id: <202410240214.49O2E7FS029749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 4f55ea6b5926 - stable/14 - loader/powerpc: Add some CAS support for newer POWER CPUs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f55ea6b592647ac8718166c0053fac048cde602 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=4f55ea6b592647ac8718166c0053fac048cde602 commit 4f55ea6b592647ac8718166c0053fac048cde602 Author: Justin Hibbits AuthorDate: 2024-10-11 21:01:15 +0000 Commit: Justin Hibbits CommitDate: 2024-10-24 02:07:20 +0000 loader/powerpc: Add some CAS support for newer POWER CPUs * Add PVR bits for POWER10 and POWER11 * Initialize the `err` outvar, in case it's not touched on success by the hypervisor, to prevent spurious errors. (cherry picked from commit f2e62e601304cea927bbeea70c484030b8e9fe45) --- stand/powerpc/ofw/cas.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stand/powerpc/ofw/cas.c b/stand/powerpc/ofw/cas.c index b112aae67d85..45fd4d8d567f 100644 --- a/stand/powerpc/ofw/cas.c +++ b/stand/powerpc/ofw/cas.c @@ -40,10 +40,13 @@ #define PVR_CPU_P8NVL 0x004c0000 #define PVR_CPU_P8 0x004d0000 #define PVR_CPU_P9 0x004e0000 +#define PVR_CPU_P10 0x00800000 +#define PVR_CPU_P11 0x00820000 #define PVR_CPU_MASK 0xffff0000 #define PVR_ISA_207 0x0f000004 #define PVR_ISA_300 0x0f000005 +#define PVR_ISA_31 0x0f000006 #define PVR_ISA_MASK 0xffffffff /* loader version of kernel's CPU_MAXSIZE */ @@ -122,7 +125,7 @@ struct opt_vec5 { } __packed; static struct ibm_arch_vec { - struct pvr pvr_list[7]; + struct pvr pvr_list[10]; uint8_t num_opts; struct opt_vec_ignore vec1; struct opt_vec_ignore vec2; @@ -135,8 +138,11 @@ static struct ibm_arch_vec { { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P8E) }, { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P8NVL) }, { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P9) }, + { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P10) }, + { htobe32(PVR_CPU_MASK), htobe32(PVR_CPU_P11) }, { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_207) }, { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_300) }, + { htobe32(PVR_ISA_MASK), htobe32(PVR_ISA_31) }, { 0, 0xffffffffu } /* terminator */ }, 4, /* num_opts (4 actually means 5 option vectors) */ @@ -185,7 +191,7 @@ ppc64_cas(void) { phandle_t pkg; ihandle_t inst; - cell_t err; + cell_t err = 0; uint8_t buf[16], idx, val; int i, len, rc, radix_mmu; const char *var; From nobody Thu Oct 24 02:14: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 4XYqGm4Hsmz5ZwbH; Thu, 24 Oct 2024 02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqGm2xjbz42Pk; Thu, 24 Oct 2024 02:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oigBcfRQ0TVwLGX8GWi3L5KzQ25eJpIk/gDXPH80bHs=; b=YFQYZ9Jxwjd+bS+6J+fP7JcHZ8wyNv0mOLJedt0EC0Qe8gXeOrKasImk7+G7/7Tsmsf3nV L50omwkElEbZiGLZQA34ZUnyVz3wPcbp1hKZynjSDrjKStFwB8DFmtZGjSLcbEA7p5WVJl aoq/vzViob9YIKiPOj8hwVL+xcha+flPoFtwBVGDbl7noMWDpErlhPJC8+qBsSxDnqMQZs /WEHZFOyVGQuDMGsId5MGPxJ9BBjZX0wORz+mujTNcVJDFjlz1ckUxF+ogKcWEYvyJbvEM bliCsNGx3DveAvClpGYPNrA5jVTE8Pz7T9oDc5SrGZBOBLcxqAUFsDHP4UwoZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oigBcfRQ0TVwLGX8GWi3L5KzQ25eJpIk/gDXPH80bHs=; b=Ugw/p4OV4yByYo/06iC555yKlIstjqboOJQ0aajYRgMT71Jpfv1IZwOzDLFvqIpjwxakPC 0h5Eqt2C/hCc7h0kDZuixGfzQpZPVqya4dHjdKvCTe9etHO0Nai48sI3N9RSw6c/CZsYCH We+VYf74yu0CwRw7spP8aEbfFFqT38TntQPV+ZGw6CmiuP3iveACpoU/fkXJxtkH5TnEDG iAwomtwIrGY5XrR3hblaRs/PP3AYpDLgkaEX0JIs1OlPgcRIoeX3ZwTHb4JC/SSnfcCxqQ EoOjOKz9KqJWmYont57egEQXMAUJc1h4mxV2TQjfEJ0ixvxmZWX0zl1mLfoBZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729736048; a=rsa-sha256; cv=none; b=xt6JUpjPoIwx13tolPKxlhAPMn3QdqtgliPeizumJsdwbv+Sbx2lo8s1djxtlGVHtE0pNb RpbfPI7Q6xFGEFjFazFutsOrWmK5NivzOIZXW08vhS03of+GhVf1YEVanYZTjvkMUh1jKV S88Ip+eXvTqywqRc9EcGbMh3SVGSqttqBQOpz6fxbGH2Ijs4rdVbMcECBqeN2Av/2aN0Aj W6WW49vIm1QkDDbSMWZsxaNiWP9NxC/ft9g8HhHmJD3C/KgpUhaeeigGt3dPKgqn1dbzdu lDm8AXfpHlzga5nJ7IFpRlJtuWN7DkXzK0L35bTKzaq43TQAwoAS2GER84yMTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqGm2Xm3zNXb; Thu, 24 Oct 2024 02:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2E8E3029807; Thu, 24 Oct 2024 02:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2E8ss029804; Thu, 24 Oct 2024 02:14:08 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:14:08 GMT Message-Id: <202410240214.49O2E8ss029804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: f9f006df1535 - stable/14 - powerpc: Add nominal support for POWER10 and POWER11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f9f006df1535dfcaa4764c3c4a67f66a05c7db7f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=f9f006df1535dfcaa4764c3c4a67f66a05c7db7f commit f9f006df1535dfcaa4764c3c4a67f66a05c7db7f Author: Justin Hibbits AuthorDate: 2024-10-11 21:03:12 +0000 Commit: Justin Hibbits CommitDate: 2024-10-24 02:07:20 +0000 powerpc: Add nominal support for POWER10 and POWER11 (cherry picked from commit 1e434da3b065ef96b389e5e0b604ae05a51e794e) --- sys/powerpc/include/cpu.h | 2 ++ sys/powerpc/include/spr.h | 2 ++ sys/powerpc/powerpc/cpu.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h index 02ff42877f0e..35b32566484c 100644 --- a/sys/powerpc/include/cpu.h +++ b/sys/powerpc/include/cpu.h @@ -90,6 +90,8 @@ extern u_long cpu_features2; #define PPC_FEATURE2_DARN 0x00200000 #define PPC_FEATURE2_SCV 0x00100000 #define PPC_FEATURE2_HTM_NOSUSPEND 0x00080000 +#define PPC_FEATURE2_ARCH_3_1 0x00040000 +#define PPC_FEATURE2_MMA 0x00020000 #define PPC_FEATURE_BITMASK \ "\20" \ diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h index 751a9e8184b6..5bb3858b0fb5 100644 --- a/sys/powerpc/include/spr.h +++ b/sys/powerpc/include/spr.h @@ -220,7 +220,9 @@ #define IBMPOWER9 0x004e #define MPC860 0x0050 #define IBMCELLBE 0x0070 +#define IBMPOWER10 0x0080 #define MPC8240 0x0081 +#define IBMPOWER11 0x0082 #define PA6T 0x0090 #define IBM405GP 0x4011 #define IBM405L 0x4161 diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index 19907e3973e7..f73ed25c8924 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -192,6 +192,24 @@ static const struct cputab models[] = { PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | PPC_FEATURE2_DARN, cpu_powerx_setup }, + { "IBM POWER10", IBMPOWER10, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU | + PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | PPC_FEATURE_ARCH_2_05 | + PPC_FEATURE_ARCH_2_06 | PPC_FEATURE_HAS_VSX | PPC_FEATURE_TRUE_LE, + PPC_FEATURE2_ARCH_2_07 | PPC_FEATURE2_DSCR | PPC_FEATURE2_EBB | + PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | + PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | + PPC_FEATURE2_DARN | PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_MMA, + cpu_powerx_setup }, + { "IBM POWER11", IBMPOWER11, REVFMT_MAJMIN, + PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU | + PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | PPC_FEATURE_ARCH_2_05 | + PPC_FEATURE_ARCH_2_06 | PPC_FEATURE_HAS_VSX | PPC_FEATURE_TRUE_LE, + PPC_FEATURE2_ARCH_2_07 | PPC_FEATURE2_DSCR | PPC_FEATURE2_EBB | + PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO | + PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 | + PPC_FEATURE2_DARN | PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_MMA, + cpu_powerx_setup }, { "Motorola PowerPC 7400", MPC7400, REVFMT_MAJMIN, PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU, 0, cpu_6xx_setup }, { "Motorola PowerPC 7410", MPC7410, REVFMT_MAJMIN, From nobody Thu Oct 24 02:14: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 4XYqGn6Xqsz5ZwXw; Thu, 24 Oct 2024 02:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqGn3YRNz42dG; Thu, 24 Oct 2024 02:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFdx4ABL7wirMOPvcERKTtCatOg9Hq8QlmoE0Lbx2Hw=; b=UIinYzll0ijQOyQe5rPJgZvoP88oUrdJj5LsknSzQtq+bLJKlTuhu+ek30cJrvBh8OLwXV gPcRIGi1prqMlzadT468qqPM8iXkS9QHCxXQCl/GUoI/e04/kYYrhqNTVf/R9pYEdU4YLM cWpoOn4R0J1dxwkRUj08elBsjRptQIBney1AGxUcGIY3zZ/pEFdObTyZEUR/sZZSzwpIv1 Z4sSrRClZDra8Cl5xzdPbaadh+pq0ZHEObTpPsUgfNIcxubH26/96pyih0vINLU3oiCIQs m/ndLIxZTspyQ6ycxnzKGePhB+T0STqnEVgEB+gZwFwefHjaDxNJx7RH8On6Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729736049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFdx4ABL7wirMOPvcERKTtCatOg9Hq8QlmoE0Lbx2Hw=; b=ggdVv4hoMO8pIH8VA/qfgrUXY5GkUZnXl+zYuaL4+jRacITb/6f5qsiQxvTuh3oViUaZ7D jNJR/Sa5Gno0lZRW07J2nJl0rtDyb2sW3P763TcNkd4eqKRFK1UyKeM5Vm1ECr74TBQLzY 93TBnN/4CHHueIwrUyU+7XOl1+snSeCqRp5a0ZgbegohpIeFAW1fRiDld4UddyZpnbx3Vb Fd4sGmueYxGfuY/zAzhFJEl8a72zzWhlQQfzvYQoXEorCLFgoA69Xfs6CP7Z/fR/FTa3t7 pJdfIJwETvV9Q4jGn7Z2/xdSnxytCp+9pOf6ohfYLudatAUZiZ7We26zrtYP5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729736049; a=rsa-sha256; cv=none; b=SwAX51yP4t8sCH9SI/pINFQLSvV6vWtKkJqf1ZG5fWF0HhJrbXX58JB4dWvIFt7+lPUh/l fD2469xbQR/P3NhrhcBc4jbWTEUBqaY4gTBZfb/p2ZtEsWog+fsd+hxoW+sF2pc7qtilDt h15r40mBaJnZw/rUxbrLtiLJgBq0bag1O2x8L/sBRuAmlhIpVobKnSAjjmB0vMT+u2oIE4 zJUHt2vQ7mNAtNha1PAjCcSya6Hc5sbQhLYnGpqbDPydR/1Tnxo5VNywqxpAk/JrmyFdKf 80+2PPAFYtL/VCqKKujybq2p3CfUn1i4flP+d8TZb+ZbGJFINlgyGO2ftcSY8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqGn38Q8zP1B; Thu, 24 Oct 2024 02:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2E9ku029848; Thu, 24 Oct 2024 02:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2E9e3029845; Thu, 24 Oct 2024 02:14:09 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:14:09 GMT Message-Id: <202410240214.49O2E9e3029845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: 8d455d3d0e9d - stable/14 - ps3: add elfv2 support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d455d3d0e9da2b9df1005a97a6bc94496096380 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=8d455d3d0e9da2b9df1005a97a6bc94496096380 commit 8d455d3d0e9da2b9df1005a97a6bc94496096380 Author: Chattrapat Sangmanee AuthorDate: 2024-09-09 08:38:28 +0000 Commit: Justin Hibbits CommitDate: 2024-10-24 02:08:00 +0000 ps3: add elfv2 support ps3 are broken since we moved to clang/elfv2. Fix this by updating the hypercall glue to the new ABI. Signed-off-by: Chattrapat Sangmanee Reviewed by: jhibbits MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1413 (cherry picked from commit 50a03971d3327f3ca5c2a1a96ec83c77b6a669c8) --- sys/powerpc/ps3/ps3-hv-asm.awk | 18 +- sys/powerpc/ps3/ps3-hvcall.S | 436 ++++++++++++++++++++--------------------- 2 files changed, 230 insertions(+), 224 deletions(-) diff --git a/sys/powerpc/ps3/ps3-hv-asm.awk b/sys/powerpc/ps3/ps3-hv-asm.awk index 91e114ba8e79..d3364a0c2bd7 100644 --- a/sys/powerpc/ps3/ps3-hv-asm.awk +++ b/sys/powerpc/ps3/ps3-hv-asm.awk @@ -12,6 +12,10 @@ BEGIN { } /HVCALL.*/ { + # Parameter save area + # 48 in elfv1, 32 in elfv2 + stack_offset = 32; + code = $2; ins = split($4, a, ",") outs = split($5, a, ",") @@ -19,7 +23,7 @@ BEGIN { printf("ASENTRY(%s)\n",$3); printf("\tmflr %%r0\n"); printf("\tstd %%r0,16(%%r1)\n"); - printf("\tstdu %%r1,-%d(%%r1)\n", 48+8*outs); + printf("\tstdu %%r1,-%d(%%r1)\n", stack_offset+8*outs); if ($4 == "UNUSED") ins = 0 @@ -27,10 +31,10 @@ BEGIN { # Save output reg addresses to the stack for (i = 0; i < outs; i++) { if (ins+i >= 8) { - printf("\tld %%r11,%d(%%r1)\n", 48+8*outs + 48 + 8*(i+ins)); - printf("\tstd %%r11,%d(%%r1)\n", 48+8*i); + printf("\tld %%r11,%d(%%r1)\n", stack_offset+8*outs + stack_offset + 8*(i+ins)); + printf("\tstd %%r11,%d(%%r1)\n", stack_offset+8*i); } else { - printf("\tstd %%r%d,%d(%%r1)\n", 3+ins+i, 48+8*i); + printf("\tstd %%r%d,%d(%%r1)\n", 3+ins+i, stack_offset+8*i); } } @@ -39,12 +43,14 @@ BEGIN { printf("\textsw %%r3,%%r3\n"); for (i = 0; i < outs; i++) { - printf("\tld %%r11,%d(%%r1)\n", 48+8*i); + printf("\tld %%r11,%d(%%r1)\n", stack_offset+8*i); printf("\tstd %%r%d,0(%%r11)\n", 4+i); } printf("\tld %%r1,0(%%r1)\n"); printf("\tld %%r0,16(%%r1)\n"); printf("\tmtlr %%r0\n"); - printf("\tblr\n\n"); + printf("\tblr\n"); + + printf("ASEND(%s)\n\n",$3); } diff --git a/sys/powerpc/ps3/ps3-hvcall.S b/sys/powerpc/ps3/ps3-hvcall.S index 99e503e2dcff..59dfe639ee61 100644 --- a/sys/powerpc/ps3/ps3-hvcall.S +++ b/sys/powerpc/ps3/ps3-hvcall.S @@ -1,4 +1,3 @@ - #include #define hc .long 0x44000022 @@ -6,15 +5,15 @@ ASENTRY(lv1_allocate_memory) mflr %r0 std %r0,16(%r1) - stdu %r1,-64(%r1) - std %r7,48(%r1) - std %r8,56(%r1) + stdu %r1,-48(%r1) + std %r7,32(%r1) + std %r8,40(%r1) li %r11,0 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -25,7 +24,7 @@ ASEND(lv1_allocate_memory) ASENTRY(lv1_write_htab_entry) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,1 hc extsw %r3,%r3 @@ -38,15 +37,15 @@ ASEND(lv1_write_htab_entry) ASENTRY(lv1_construct_virtual_address_space) mflr %r0 std %r0,16(%r1) - stdu %r1,-64(%r1) - std %r6,48(%r1) - std %r7,56(%r1) + stdu %r1,-48(%r1) + std %r6,32(%r1) + std %r7,40(%r1) li %r11,2 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -57,12 +56,12 @@ ASEND(lv1_construct_virtual_address_space) ASENTRY(lv1_get_virtual_address_space_id_of_ppe) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r4,48(%r1) + stdu %r1,-40(%r1) + std %r4,32(%r1) li %r11,4 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -73,24 +72,24 @@ ASEND(lv1_get_virtual_address_space_id_of_ppe) ASENTRY(lv1_query_logical_partition_address_region_info) mflr %r0 std %r0,16(%r1) - stdu %r1,-88(%r1) - std %r4,48(%r1) - std %r5,56(%r1) - std %r6,64(%r1) - std %r7,72(%r1) - std %r8,80(%r1) + stdu %r1,-72(%r1) + std %r4,32(%r1) + std %r5,40(%r1) + std %r6,48(%r1) + std %r7,56(%r1) + std %r8,64(%r1) li %r11,6 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) - ld %r11,64(%r1) + ld %r11,48(%r1) std %r6,0(%r11) - ld %r11,72(%r1) + ld %r11,56(%r1) std %r7,0(%r11) - ld %r11,80(%r1) + ld %r11,64(%r1) std %r8,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -101,7 +100,7 @@ ASEND(lv1_query_logical_partition_address_region_info) ASENTRY(lv1_select_virtual_address_space) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,7 hc extsw %r3,%r3 @@ -114,7 +113,7 @@ ASEND(lv1_select_virtual_address_space) ASENTRY(lv1_pause) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,9 hc extsw %r3,%r3 @@ -127,7 +126,7 @@ ASEND(lv1_pause) ASENTRY(lv1_destruct_virtual_address_space) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,10 hc extsw %r3,%r3 @@ -140,7 +139,7 @@ ASEND(lv1_destruct_virtual_address_space) ASENTRY(lv1_configure_irq_state_bitmap) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,11 hc extsw %r3,%r3 @@ -153,7 +152,7 @@ ASEND(lv1_configure_irq_state_bitmap) ASENTRY(lv1_connect_irq_plug_ext) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,12 hc extsw %r3,%r3 @@ -166,7 +165,7 @@ ASEND(lv1_connect_irq_plug_ext) ASENTRY(lv1_release_memory) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,13 hc extsw %r3,%r3 @@ -179,7 +178,7 @@ ASEND(lv1_release_memory) ASENTRY(lv1_put_iopte) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,15 hc extsw %r3,%r3 @@ -192,7 +191,7 @@ ASEND(lv1_put_iopte) ASENTRY(lv1_disconnect_irq_plug_ext) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,17 hc extsw %r3,%r3 @@ -205,12 +204,12 @@ ASEND(lv1_disconnect_irq_plug_ext) ASENTRY(lv1_construct_event_receive_port) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r3,48(%r1) + stdu %r1,-40(%r1) + std %r3,32(%r1) li %r11,18 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -221,7 +220,7 @@ ASEND(lv1_construct_event_receive_port) ASENTRY(lv1_destruct_event_receive_port) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,19 hc extsw %r3,%r3 @@ -234,7 +233,7 @@ ASEND(lv1_destruct_event_receive_port) ASENTRY(lv1_send_event_locally) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,24 hc extsw %r3,%r3 @@ -247,7 +246,7 @@ ASEND(lv1_send_event_locally) ASENTRY(lv1_end_of_interrupt) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,27 hc extsw %r3,%r3 @@ -260,7 +259,7 @@ ASEND(lv1_end_of_interrupt) ASENTRY(lv1_connect_irq_plug) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,28 hc extsw %r3,%r3 @@ -273,7 +272,7 @@ ASEND(lv1_connect_irq_plug) ASENTRY(lv1_disconnect_irq_plus) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,29 hc extsw %r3,%r3 @@ -286,7 +285,7 @@ ASEND(lv1_disconnect_irq_plus) ASENTRY(lv1_end_of_interrupt_ext) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,30 hc extsw %r3,%r3 @@ -299,7 +298,7 @@ ASEND(lv1_end_of_interrupt_ext) ASENTRY(lv1_did_update_interrupt_mask) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,31 hc extsw %r3,%r3 @@ -312,7 +311,7 @@ ASEND(lv1_did_update_interrupt_mask) ASENTRY(lv1_shutdown_logical_partition) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,44 hc extsw %r3,%r3 @@ -325,7 +324,7 @@ ASEND(lv1_shutdown_logical_partition) ASENTRY(lv1_destruct_logical_spe) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,54 hc extsw %r3,%r3 @@ -338,32 +337,32 @@ ASEND(lv1_destruct_logical_spe) ASENTRY(lv1_construct_logical_spe) mflr %r0 std %r0,16(%r1) - stdu %r1,-96(%r1) - std %r10,48(%r1) - ld %r11,208(%r1) + stdu %r1,-80(%r1) + std %r10,32(%r1) + ld %r11,176(%r1) + std %r11,40(%r1) + ld %r11,184(%r1) + std %r11,48(%r1) + ld %r11,192(%r1) std %r11,56(%r1) - ld %r11,216(%r1) + ld %r11,200(%r1) std %r11,64(%r1) - ld %r11,224(%r1) + ld %r11,208(%r1) std %r11,72(%r1) - ld %r11,232(%r1) - std %r11,80(%r1) - ld %r11,240(%r1) - std %r11,88(%r1) li %r11,57 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) - ld %r11,64(%r1) + ld %r11,48(%r1) std %r6,0(%r11) - ld %r11,72(%r1) + ld %r11,56(%r1) std %r7,0(%r11) - ld %r11,80(%r1) + ld %r11,64(%r1) std %r8,0(%r11) - ld %r11,88(%r1) + ld %r11,72(%r1) std %r9,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -374,7 +373,7 @@ ASEND(lv1_construct_logical_spe) ASENTRY(lv1_set_spe_interrupt_mask) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,61 hc extsw %r3,%r3 @@ -387,7 +386,7 @@ ASEND(lv1_set_spe_interrupt_mask) ASENTRY(lv1_disable_logical_spe) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,65 hc extsw %r3,%r3 @@ -400,7 +399,7 @@ ASEND(lv1_disable_logical_spe) ASENTRY(lv1_clear_spe_interrupt_status) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,66 hc extsw %r3,%r3 @@ -413,12 +412,12 @@ ASEND(lv1_clear_spe_interrupt_status) ASENTRY(lv1_get_spe_interrupt_status) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r5,48(%r1) + stdu %r1,-40(%r1) + std %r5,32(%r1) li %r11,67 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -429,12 +428,12 @@ ASEND(lv1_get_spe_interrupt_status) ASENTRY(lv1_get_logical_ppe_id) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r3,48(%r1) + stdu %r1,-40(%r1) + std %r3,32(%r1) li %r11,69 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -445,12 +444,12 @@ ASEND(lv1_get_logical_ppe_id) ASENTRY(lv1_get_logical_partition_id) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r3,48(%r1) + stdu %r1,-40(%r1) + std %r3,32(%r1) li %r11,74 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -461,12 +460,12 @@ ASEND(lv1_get_logical_partition_id) ASENTRY(lv1_get_spe_irq_outlet) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r5,48(%r1) + stdu %r1,-40(%r1) + std %r5,32(%r1) li %r11,78 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -477,7 +476,7 @@ ASEND(lv1_get_spe_irq_outlet) ASENTRY(lv1_set_spe_privilege_state_area_1_register) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,79 hc extsw %r3,%r3 @@ -490,15 +489,15 @@ ASEND(lv1_set_spe_privilege_state_area_1_register) ASENTRY(lv1_get_repository_node_value) mflr %r0 std %r0,16(%r1) - stdu %r1,-64(%r1) - std %r8,48(%r1) - std %r9,56(%r1) + stdu %r1,-48(%r1) + std %r8,32(%r1) + std %r9,40(%r1) li %r11,91 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -509,24 +508,24 @@ ASEND(lv1_get_repository_node_value) ASENTRY(lv1_read_htab_entries) mflr %r0 std %r0,16(%r1) - stdu %r1,-88(%r1) - std %r5,48(%r1) - std %r6,56(%r1) - std %r7,64(%r1) - std %r8,72(%r1) - std %r9,80(%r1) + stdu %r1,-72(%r1) + std %r5,32(%r1) + std %r6,40(%r1) + std %r7,48(%r1) + std %r8,56(%r1) + std %r9,64(%r1) li %r11,95 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) - ld %r11,64(%r1) + ld %r11,48(%r1) std %r6,0(%r11) - ld %r11,72(%r1) + ld %r11,56(%r1) std %r7,0(%r11) - ld %r11,80(%r1) + ld %r11,64(%r1) std %r8,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -537,7 +536,7 @@ ASEND(lv1_read_htab_entries) ASENTRY(lv1_set_dabr) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,96 hc extsw %r3,%r3 @@ -550,12 +549,12 @@ ASEND(lv1_set_dabr) ASENTRY(lv1_allocate_io_segment) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r6,48(%r1) + stdu %r1,-40(%r1) + std %r6,32(%r1) li %r11,116 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -566,7 +565,7 @@ ASEND(lv1_allocate_io_segment) ASENTRY(lv1_release_io_segment) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,117 hc extsw %r3,%r3 @@ -579,12 +578,12 @@ ASEND(lv1_release_io_segment) ASENTRY(lv1_construct_io_irq_outlet) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r4,48(%r1) + stdu %r1,-40(%r1) + std %r4,32(%r1) li %r11,120 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -595,7 +594,7 @@ ASEND(lv1_construct_io_irq_outlet) ASENTRY(lv1_destruct_io_irq_outlet) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,121 hc extsw %r3,%r3 @@ -608,12 +607,12 @@ ASEND(lv1_destruct_io_irq_outlet) ASENTRY(lv1_map_htab) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r4,48(%r1) + stdu %r1,-40(%r1) + std %r4,32(%r1) li %r11,122 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -624,7 +623,7 @@ ASEND(lv1_map_htab) ASENTRY(lv1_unmap_htab) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,123 hc extsw %r3,%r3 @@ -637,12 +636,12 @@ ASEND(lv1_unmap_htab) ASENTRY(lv1_get_version_info) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r3,48(%r1) + stdu %r1,-40(%r1) + std %r3,32(%r1) li %r11,127 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -653,19 +652,19 @@ ASEND(lv1_get_version_info) ASENTRY(lv1_insert_htab_entry) mflr %r0 std %r0,16(%r1) - stdu %r1,-72(%r1) - std %r9,48(%r1) - std %r10,56(%r1) - ld %r11,184(%r1) - std %r11,64(%r1) + stdu %r1,-56(%r1) + std %r9,32(%r1) + std %r10,40(%r1) + ld %r11,152(%r1) + std %r11,48(%r1) li %r11,158 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) - ld %r11,64(%r1) + ld %r11,48(%r1) std %r6,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -676,12 +675,12 @@ ASEND(lv1_insert_htab_entry) ASENTRY(lv1_read_virtual_uart) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r6,48(%r1) + stdu %r1,-40(%r1) + std %r6,32(%r1) li %r11,162 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -692,12 +691,12 @@ ASEND(lv1_read_virtual_uart) ASENTRY(lv1_write_virtual_uart) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r6,48(%r1) + stdu %r1,-40(%r1) + std %r6,32(%r1) li %r11,163 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -708,7 +707,7 @@ ASEND(lv1_write_virtual_uart) ASENTRY(lv1_set_virtual_uart_param) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,164 hc extsw %r3,%r3 @@ -721,12 +720,12 @@ ASEND(lv1_set_virtual_uart_param) ASENTRY(lv1_get_virtual_uart_param) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r5,48(%r1) + stdu %r1,-40(%r1) + std %r5,32(%r1) li %r11,165 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -737,12 +736,12 @@ ASEND(lv1_get_virtual_uart_param) ASENTRY(lv1_configure_virtual_uart) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r4,48(%r1) + stdu %r1,-40(%r1) + std %r4,32(%r1) li %r11,166 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -753,7 +752,7 @@ ASEND(lv1_configure_virtual_uart) ASENTRY(lv1_open_device) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,170 hc extsw %r3,%r3 @@ -766,7 +765,7 @@ ASEND(lv1_open_device) ASENTRY(lv1_close_device) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,171 hc extsw %r3,%r3 @@ -779,12 +778,12 @@ ASEND(lv1_close_device) ASENTRY(lv1_map_device_mmio_region) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r8,48(%r1) + stdu %r1,-40(%r1) + std %r8,32(%r1) li %r11,172 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -795,7 +794,7 @@ ASEND(lv1_map_device_mmio_region) ASENTRY(lv1_unmap_device_mmio_region) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,173 hc extsw %r3,%r3 @@ -808,12 +807,12 @@ ASEND(lv1_unmap_device_mmio_region) ASENTRY(lv1_allocate_device_dma_region) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r8,48(%r1) + stdu %r1,-40(%r1) + std %r8,32(%r1) li %r11,174 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -824,7 +823,7 @@ ASEND(lv1_allocate_device_dma_region) ASENTRY(lv1_free_device_dma_region) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,175 hc extsw %r3,%r3 @@ -837,7 +836,7 @@ ASEND(lv1_free_device_dma_region) ASENTRY(lv1_map_device_dma_region) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,176 hc extsw %r3,%r3 @@ -850,7 +849,7 @@ ASEND(lv1_map_device_dma_region) ASENTRY(lv1_unmap_device_dma_region) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,177 hc extsw %r3,%r3 @@ -863,12 +862,12 @@ ASEND(lv1_unmap_device_dma_region) ASENTRY(lv1_read_pci_config) mflr %r0 std %r0,16(%r1) - stdu %r1,-56(%r1) - std %r9,48(%r1) + stdu %r1,-40(%r1) + std %r9,32(%r1) li %r11,178 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -879,7 +878,7 @@ ASEND(lv1_read_pci_config) ASENTRY(lv1_write_pci_config) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,179 hc extsw %r3,%r3 @@ -892,7 +891,7 @@ ASEND(lv1_write_pci_config) ASENTRY(lv1_net_add_multicast_address) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,185 hc extsw %r3,%r3 @@ -905,7 +904,7 @@ ASEND(lv1_net_add_multicast_address) ASENTRY(lv1_net_remove_multicast_address) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,186 hc extsw %r3,%r3 @@ -918,7 +917,7 @@ ASEND(lv1_net_remove_multicast_address) ASENTRY(lv1_net_start_tx_dma) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,187 hc extsw %r3,%r3 @@ -931,7 +930,7 @@ ASEND(lv1_net_start_tx_dma) ASENTRY(lv1_net_stop_tx_dma) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,188 hc extsw %r3,%r3 @@ -944,7 +943,7 @@ ASEND(lv1_net_stop_tx_dma) ASENTRY(lv1_net_start_rx_dma) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,189 hc extsw %r3,%r3 @@ -957,7 +956,7 @@ ASEND(lv1_net_start_rx_dma) ASENTRY(lv1_net_stop_rx_dma) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,190 hc extsw %r3,%r3 @@ -970,7 +969,7 @@ ASEND(lv1_net_stop_rx_dma) ASENTRY(lv1_net_set_interrupt_status_indicator) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,191 hc extsw %r3,%r3 @@ -983,7 +982,7 @@ ASEND(lv1_net_set_interrupt_status_indicator) ASENTRY(lv1_net_set_interrupt_mask) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,193 hc extsw %r3,%r3 @@ -996,15 +995,15 @@ ASEND(lv1_net_set_interrupt_mask) ASENTRY(lv1_net_control) mflr %r0 std %r0,16(%r1) - stdu %r1,-64(%r1) - std %r9,48(%r1) - std %r10,56(%r1) + stdu %r1,-48(%r1) + std %r9,32(%r1) + std %r10,40(%r1) li %r11,194 hc extsw %r3,%r3 - ld %r11,48(%r1) + ld %r11,32(%r1) std %r4,0(%r11) - ld %r11,56(%r1) + ld %r11,40(%r1) std %r5,0(%r11) ld %r1,0(%r1) ld %r0,16(%r1) @@ -1015,7 +1014,7 @@ ASEND(lv1_net_control) ASENTRY(lv1_connect_interrupt_event_receive_port) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,197 hc extsw %r3,%r3 @@ -1028,7 +1027,7 @@ ASEND(lv1_connect_interrupt_event_receive_port) ASENTRY(lv1_disconnect_interrupt_event_receive_port) mflr %r0 std %r0,16(%r1) - stdu %r1,-48(%r1) + stdu %r1,-32(%r1) li %r11,198 *** 306 LINES SKIPPED *** From nobody Thu Oct 24 02:33: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 4XYqhc3Ykxz5ZxPN; Thu, 24 Oct 2024 02:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqhc2mvrz44Rk; Thu, 24 Oct 2024 02:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F1UTI2Ub26WSCp69QNLAdT2Z9QVwghmHuwdIxbvdqHQ=; b=le/kXxAFkDw2JthtCIawfP9HjnYiNi94PfJSyWppquJPLt5IEvfUUqG8c6hOSvJWOEqiyl vpYgzaqY4fhK9VqAibmL4uz/t0OSRi+avi108mEnLgTXs0/bo67k97s8EtarYp2t7rJFqC BVlQdL5Mdexg2qtyh9EwQcpAnrOMgikO7NSSGBnv0dpvoZ5FHGor0JLP+2jqDXGM+MIp7q TRRfmPQCiO1/bVGKT4V/bNCsaLRaou+AdlCRe8bmSkQhYOeGgZQtkSGY35yJ3SR2wbVaql lyH9VsoU9Vl2+VPcbl6wU8pyysigw1Ursplbsg0KOkCHcKdwq6fqh20B1y67TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F1UTI2Ub26WSCp69QNLAdT2Z9QVwghmHuwdIxbvdqHQ=; b=Dw0XEnBpQb7FUAlnn7+Cz3FIJAsklgNEuw2lI/PZL37nCiKPmIi6+sxyAAh7ooQ6yySSiB 0Rur1SBmNYFEEz/tHnzIXyCVzRkjyPBYBxc7Wbu9cJV4rY/TZtRxZxXAuOjMHED1WZuHcE 4F2+XSXseDgc9H1cqms/HMMykBmrOG92CAuzrfIzn7pt42SN3JdxR6WZFxZID15uJDFoQo jYDcP4TvBi73Hh3qAk7svBhzPrxlft3F/i2jdCk/7s40/mO1bOhIDSoUht9d+uClZ77Ekl bbirJCWFwqMdRoReaxoj1grM0keaeA9Oac2IBQ7mwzB0u1UGmXUIVoqoqp3QDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737184; a=rsa-sha256; cv=none; b=QDBAhwbxmeStKvxz5uIAQLE2Bxj0iato2PlIi3jPC4s+DEs8G2P1AkHSgczIgqxwgmrwnh YCkoTyDcKOenhGtL9ce7NyGBaCpUDt5sm1GQHR1Ez8Iw6WsOlt4xgY5X62gt1xpAykGOy9 HYQQiwiim4ap+xSN82P58ao+39z9GRJ1ZJ9AiyPhAKvjdha/0vaQysEz6Micc//zyJFi1I PKkk6Obcw/y3W01cMC27yzriSklYwnnwNZ+G+JS7nbdcRqQC5iXF7tPCjcWWbF4BkLksUa O+wEe42JNjvbHoQjma2wk7aBSHs5Iadg04jWNNiJh+dmobVbzh8vbetFFkn6VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqhc2NKJzPTx; Thu, 24 Oct 2024 02:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2X4Qo066364; Thu, 24 Oct 2024 02:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2X4oL066361; Thu, 24 Oct 2024 02:33:04 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:33:04 GMT Message-Id: <202410240233.49O2X4oL066361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 34951b0b9e78 - main - swap_pager: move scan_all_shadowed, use iterators List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34951b0b9e78fe86f62a4a8af696c8b17b9bf61e Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=34951b0b9e78fe86f62a4a8af696c8b17b9bf61e commit 34951b0b9e78fe86f62a4a8af696c8b17b9bf61e Author: Doug Moore AuthorDate: 2024-10-24 02:30:45 +0000 Commit: Doug Moore CommitDate: 2024-10-24 02:30:45 +0000 swap_pager: move scan_all_shadowed, use iterators Move vm_object_scan_all_shadowed from vm_object.c to swap_pager.c, and rename it. In the moved function, use vm_page and swblk iterators to advance through the objects. Avoid checking a backing page for busyness or validity more than once, or when it is beyond the upper bound of the scan. Reviewed by: kib, markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D47150 --- sys/vm/swap_pager.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++----- sys/vm/swap_pager.h | 1 + sys/vm/vm_object.c | 89 +-------------------------------- 3 files changed, 130 insertions(+), 100 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 23b5e1c34b07..5eccc621bdae 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -557,6 +557,13 @@ swblk_is_empty(vm_object_t object) return (pctrie_is_empty(&object->un_pager.swp.swp_blks)); } +static struct swblk * +swblk_iter_lookup_ge(struct pctrie_iter *blks, vm_pindex_t pindex) +{ + return (SWAP_PCTRIE_ITER_LOOKUP_GE(blks, + rounddown(pindex, SWAP_META_PAGES))); +} + static void swblk_iter_init_only(struct pctrie_iter *blks, vm_object_t object) { @@ -571,8 +578,7 @@ swblk_iter_init(struct pctrie_iter *blks, vm_object_t object, vm_pindex_t pindex) { swblk_iter_init_only(blks, object); - return (SWAP_PCTRIE_ITER_LOOKUP_GE(blks, - rounddown(pindex, SWAP_META_PAGES))); + return (swblk_iter_lookup_ge(blks, pindex)); } static struct swblk * @@ -591,8 +597,7 @@ swblk_iter_limit_init(struct pctrie_iter *blks, vm_object_t object, VM_OBJECT_ASSERT_LOCKED(object); MPASS((object->flags & OBJ_SWAP) != 0); pctrie_iter_limit_init(blks, &object->un_pager.swp.swp_blks, limit); - return (SWAP_PCTRIE_ITER_LOOKUP_GE(blks, - rounddown(pindex, SWAP_META_PAGES))); + return (swblk_iter_lookup_ge(blks, pindex)); } static struct swblk * @@ -2441,26 +2446,25 @@ swp_pager_meta_lookup(vm_object_t object, vm_pindex_t pindex) * pindex and for which there is a swap block allocated. Returns OBJ_MAX_SIZE * if are no allocated swap blocks for the object after the requested pindex. */ -vm_pindex_t -swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) +static vm_pindex_t +swap_pager_iter_find_least(struct pctrie_iter *blks, vm_pindex_t pindex) { - struct pctrie_iter blks; struct swblk *sb; int i; - if ((sb = swblk_iter_init(&blks, object, pindex)) == NULL) + if ((sb = swblk_iter_lookup_ge(blks, pindex)) == NULL) return (OBJ_MAX_SIZE); - if (blks.index < pindex) { + if (blks->index < pindex) { for (i = pindex % SWAP_META_PAGES; i < SWAP_META_PAGES; i++) { if (sb->d[i] != SWAPBLK_NONE) - return (blks.index + i); + return (blks->index + i); } - if ((sb = swblk_iter_next(&blks)) == NULL) + if ((sb = swblk_iter_next(blks)) == NULL) return (OBJ_MAX_SIZE); } for (i = 0; i < SWAP_META_PAGES; i++) { if (sb->d[i] != SWAPBLK_NONE) - return (blks.index + i); + return (blks->index + i); } /* @@ -2471,6 +2475,118 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) return (OBJ_MAX_SIZE); } +/* + * Returns the least page index which is greater than or equal to the parameter + * pindex and for which there is a swap block allocated. Returns OBJ_MAX_SIZE + * if are no allocated swap blocks for the object after the requested pindex. + */ +vm_pindex_t +swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) +{ + struct pctrie_iter blks; + + swblk_iter_init_only(&blks, object); + return (swap_pager_iter_find_least(&blks, pindex)); +} + +/* + * Is every page in the backing object or swap shadowed in the parent, and + * unbusy and valid in swap? + */ +bool +swap_pager_scan_all_shadowed(vm_object_t object) +{ + struct pctrie_iter backing_blks, backing_pages, pages; + vm_object_t backing_object; + vm_page_t p, pp; + vm_pindex_t backing_offset_index, new_pindex, pi, pi_ubound, ps, pv; + + VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_WLOCKED(object->backing_object); + + backing_object = object->backing_object; + + if ((backing_object->flags & OBJ_ANON) == 0) + return (false); + + KASSERT((object->flags & OBJ_ANON) != 0, + ("Shadow object is not anonymous")); + backing_offset_index = OFF_TO_IDX(object->backing_object_offset); + pi_ubound = MIN(backing_object->size, + backing_offset_index + object->size); + vm_page_iter_init(&pages, object); + vm_page_iter_init(&backing_pages, backing_object); + swblk_iter_init_only(&backing_blks, backing_object); + + /* + * Only check pages inside the parent object's range and inside the + * parent object's mapping of the backing object. + */ + pv = ps = pi = backing_offset_index - 1; + for (;;) { + if (pi == pv) { + p = vm_page_iter_lookup_ge(&backing_pages, pv + 1); + pv = p != NULL ? p->pindex : backing_object->size; + } + if (pi == ps) + ps = swap_pager_iter_find_least(&backing_blks, ps + 1); + pi = MIN(pv, ps); + if (pi >= pi_ubound) + break; + + if (pi == pv) { + /* + * If the backing object page is busy a grandparent or + * older page may still be undergoing CoW. It is not + * safe to collapse the backing object until it is + * quiesced. + */ + if (vm_page_tryxbusy(p) == 0) + return (false); + + /* + * We raced with the fault handler that left newly + * allocated invalid page on the object queue and + * retried. + */ + if (!vm_page_all_valid(p)) + break; + + /* + * Busy of p disallows fault handler to validate parent + * page (pp, below). + */ + } + + /* + * See if the parent has the page or if the parent's object + * pager has the page. If the parent has the page but the page + * is not valid, the parent's object pager must have the page. + * + * If this fails, the parent does not completely shadow the + * object and we might as well give up now. + */ + new_pindex = pi - backing_offset_index; + pp = vm_page_iter_lookup(&pages, new_pindex); + + /* + * The valid check here is stable due to object lock being + * required to clear valid and initiate paging. + */ + if ((pp == NULL || vm_page_none_valid(pp)) && + !swap_pager_haspage(object, new_pindex, NULL, NULL)) + break; + if (pi == pv) + vm_page_xunbusy(p); + } + if (pi < pi_ubound) { + if (pi == pv) + vm_page_xunbusy(p); + return (false); + } + return (true); +} + /* * System call swapon(name) enables swapping on device name, * which must be in the swdevsw. Return EBUSY diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h index eeddff9073b5..ade94802b963 100644 --- a/sys/vm/swap_pager.h +++ b/sys/vm/swap_pager.h @@ -75,6 +75,7 @@ struct xswdev; int swap_dev_info(int name, struct xswdev *xs, char *devname, size_t len); void swap_pager_copy(vm_object_t, vm_object_t, vm_pindex_t, int); vm_pindex_t swap_pager_find_least(vm_object_t object, vm_pindex_t pindex); +bool swap_pager_scan_all_shadowed(vm_object_t object); void swap_pager_freespace(vm_object_t object, vm_pindex_t start, vm_size_t size, vm_size_t *freed); void swap_pager_swap_init(void); diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 9fbc489a8eed..996f7557ea9b 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1686,93 +1686,6 @@ vm_object_collapse_scan_wait(vm_object_t object, vm_page_t p) return (TAILQ_FIRST(&backing_object->memq)); } -static bool -vm_object_scan_all_shadowed(vm_object_t object) -{ - vm_object_t backing_object; - vm_page_t p, pp; - vm_pindex_t backing_offset_index, new_pindex, pi, ps; - - VM_OBJECT_ASSERT_WLOCKED(object); - VM_OBJECT_ASSERT_WLOCKED(object->backing_object); - - backing_object = object->backing_object; - - if ((backing_object->flags & OBJ_ANON) == 0) - return (false); - - pi = backing_offset_index = OFF_TO_IDX(object->backing_object_offset); - p = vm_page_find_least(backing_object, pi); - ps = swap_pager_find_least(backing_object, pi); - - /* - * Only check pages inside the parent object's range and - * inside the parent object's mapping of the backing object. - */ - for (;; pi++) { - if (p != NULL && p->pindex < pi) - p = TAILQ_NEXT(p, listq); - if (ps < pi) - ps = swap_pager_find_least(backing_object, pi); - if (p == NULL && ps >= backing_object->size) - break; - else if (p == NULL) - pi = ps; - else - pi = MIN(p->pindex, ps); - - new_pindex = pi - backing_offset_index; - if (new_pindex >= object->size) - break; - - if (p != NULL) { - /* - * If the backing object page is busy a - * grandparent or older page may still be - * undergoing CoW. It is not safe to collapse - * the backing object until it is quiesced. - */ - if (vm_page_tryxbusy(p) == 0) - return (false); - - /* - * We raced with the fault handler that left - * newly allocated invalid page on the object - * queue and retried. - */ - if (!vm_page_all_valid(p)) - goto unbusy_ret; - } - - /* - * See if the parent has the page or if the parent's object - * pager has the page. If the parent has the page but the page - * is not valid, the parent's object pager must have the page. - * - * If this fails, the parent does not completely shadow the - * object and we might as well give up now. - */ - pp = vm_page_lookup(object, new_pindex); - - /* - * The valid check here is stable due to object lock - * being required to clear valid and initiate paging. - * Busy of p disallows fault handler to validate pp. - */ - if ((pp == NULL || vm_page_none_valid(pp)) && - !vm_pager_has_page(object, new_pindex, NULL, NULL)) - goto unbusy_ret; - if (p != NULL) - vm_page_xunbusy(p); - } - return (true); - -unbusy_ret: - if (p != NULL) - vm_page_xunbusy(p); - return (false); -} - static void vm_object_collapse_scan(vm_object_t object) { @@ -2001,7 +1914,7 @@ vm_object_collapse(vm_object_t object) * The object lock and backing_object lock must not * be dropped during this sequence. */ - if (!vm_object_scan_all_shadowed(object)) { + if (!swap_pager_scan_all_shadowed(object)) { VM_OBJECT_WUNLOCK(backing_object); break; } From nobody Thu Oct 24 02:41: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 4XYqtY6N0qz5Zy3F; Thu, 24 Oct 2024 02:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqtY5n1dz452t; Thu, 24 Oct 2024 02:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nnr0VrALk2dJpb/X1RhD/IzezB3P49YA83796bOtVhE=; b=WjcnqbcoCWgd4l8Q2Bqy7TmYJf5qDKuE0BDryOIBV0BpzU3pYS5TwkoD0XI9gABImR+Mnb xTQQh+2mvWWI3riqNeEs24nucNSJha1EzAP+2KnUYcF1Xun7hJypSjNikf6dMj8+KX6Rla 6AqkeYpZWjqKl4M3Sim3yIXaj6Nv/I2+fMu9sxwHytAB4gZqmkePxBEk6ooxa++56cyF08 86KGxlwgHyOIxx2o70XG1Vvf1K6SKBd5XpzfAye6WloZ3E1r5TVnQZ53lJQwIsel8zGurP KW5cqVPjdz538uIx3ToSXVJ3zogK+AXmuqp4qulN6tDxmcYKQUweFDuAuN4KgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nnr0VrALk2dJpb/X1RhD/IzezB3P49YA83796bOtVhE=; b=g05qSiWS+5rvmOk9rzHVUt0SN2OHYAVphCedP+T0PCPA5C8r4eN3PP/CZU2MyWvfz/OXye +7KiZN3D1Pe9Hp66BQOsRwVIgrtvlRiRJmo8MqkJb0c5U2rnuYyQnPXe8A/GVdJXHkXJN8 4a076EX77QSMjS4tFlL3Cznf1EaYA3U2HV3vcozgIgzSP/+tYJ4oVlLLaCxswZCF5dsHmg CjnZE8oPHG/e2FdNsvyRzJcxiqjzU/SbwfO0JPCXaBEdSIbD4/2HhR69ynUOeqVkw8XroV x1D9/a106bS2SRSFKoeMn09AqBldVgCO5pTywIQsCKJTAXHyEe9Vz9sWNjzHOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737701; a=rsa-sha256; cv=none; b=KO8iXUrE6ps91UgjPMJivIt8NIlEvOejFQh89BFdarYvHpuq6CtCxxWg13V95Deon0k3PB nS/KpDI+F/gsD7UtzSOeKz+iM4F7LLE8wmgvPlG3TKDoznR+AE8qWfEYRNXnCZAH+b6NoF yTJjfV4f8mA6pfADA0VWnTvboPguLgHEXAVm7/siBRRAGOpTXFk0+CbJ9VJk5wiJ0sd3MS 9cTug0zv11wRQqjCrrkFhHXTNeKggu2x0pyIMaNnx49cYYsszti03vCu0hRyGL6vZmxqNt n243r+FWX1Zu1QIcH+J6/fNX6U5V1KnAQiMPUTZ1Zy51eCLr4bIY9LO1QHvgBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqtY5NgbzPCy; Thu, 24 Oct 2024 02:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2ff2r078511; Thu, 24 Oct 2024 02:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2ffYf078509; Thu, 24 Oct 2024 02:41:41 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:41:41 GMT Message-Id: <202410240241.49O2ffYf078509@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: 2ac21f2c98ed - main - x86 specialreg.h: visually align %cr4 and MSR_EFER bit mask 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2ac21f2c98edf50e22f06a63f3528a99f4f963a0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2ac21f2c98edf50e22f06a63f3528a99f4f963a0 commit 2ac21f2c98edf50e22f06a63f3528a99f4f963a0 Author: Konstantin Belousov AuthorDate: 2024-10-23 23:02:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:41:10 +0000 x86 specialreg.h: visually align %cr4 and MSR_EFER bit mask definitions Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/include/specialreg.h | 64 ++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 3115056ce14c..b88c3e46000a 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -57,39 +57,45 @@ /* * Bits in PPro special registers */ -#define CR4_VME 0x00000001 /* Virtual 8086 mode extensions */ -#define CR4_PVI 0x00000002 /* Protected-mode virtual interrupts */ -#define CR4_TSD 0x00000004 /* Time stamp disable */ -#define CR4_DE 0x00000008 /* Debugging extensions */ -#define CR4_PSE 0x00000010 /* Page size extensions */ -#define CR4_PAE 0x00000020 /* Physical address extension */ -#define CR4_MCE 0x00000040 /* Machine check enable */ -#define CR4_PGE 0x00000080 /* Page global enable */ -#define CR4_PCE 0x00000100 /* Performance monitoring counter enable */ -#define CR4_FXSR 0x00000200 /* Fast FPU save/restore used by OS */ -#define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */ -#define CR4_UMIP 0x00000800 /* User Mode Instruction Prevention */ -#define CR4_LA57 0x00001000 /* Enable 5-level paging */ -#define CR4_VMXE 0x00002000 /* enable VMX operation (Intel-specific) */ -#define CR4_FSGSBASE 0x00010000 /* Enable FS/GS BASE accessing instructions */ -#define CR4_PCIDE 0x00020000 /* Enable Context ID */ -#define CR4_XSAVE 0x00040000 /* XSETBV/XGETBV */ -#define CR4_SMEP 0x00100000 /* Supervisor-Mode Execution Prevention */ -#define CR4_SMAP 0x00200000 /* Supervisor-Mode Access Prevention */ -#define CR4_PKE 0x00400000 /* Protection Keys Enable */ +#define CR4_VME 0x00000001 /* Virtual 8086 mode extensions */ +#define CR4_PVI 0x00000002 /* Protected-mode virtual interrupts */ +#define CR4_TSD 0x00000004 /* Time stamp disable */ +#define CR4_DE 0x00000008 /* Debugging extensions */ +#define CR4_PSE 0x00000010 /* Page size extensions */ +#define CR4_PAE 0x00000020 /* Physical address extension */ +#define CR4_MCE 0x00000040 /* Machine check enable */ +#define CR4_PGE 0x00000080 /* Page global enable */ +#define CR4_PCE 0x00000100 /* Performance monitoring counter + enable */ +#define CR4_FXSR 0x00000200 /* Fast FPU save/restore used by OS */ +#define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */ +#define CR4_UMIP 0x00000800 /* User Mode Instruction Prevention */ +#define CR4_LA57 0x00001000 /* Enable 5-level paging */ +#define CR4_VMXE 0x00002000 /* enable VMX operation + (Intel-specific) */ +#define CR4_FSGSBASE 0x00010000 /* Enable FS/GS BASE access + instructions */ +#define CR4_PCIDE 0x00020000 /* Enable Context ID */ +#define CR4_XSAVE 0x00040000 /* XSETBV/XGETBV */ +#define CR4_SMEP 0x00100000 /* Supervisor-Mode Execution + Prevention */ +#define CR4_SMAP 0x00200000 /* Supervisor-Mode Access + Prevention */ +#define CR4_PKE 0x00400000 /* Protection Keys Enable */ /* * Bits in AMD64 special registers. EFER is 64 bits wide. */ -#define EFER_SCE 0x000000001 /* System Call Extensions (R/W) */ -#define EFER_LME 0x000000100 /* Long mode enable (R/W) */ -#define EFER_LMA 0x000000400 /* Long mode active (R) */ -#define EFER_NXE 0x000000800 /* PTE No-Execute bit enable (R/W) */ -#define EFER_SVM 0x000001000 /* SVM enable bit for AMD, reserved for Intel */ -#define EFER_LMSLE 0x000002000 /* Long Mode Segment Limit Enable */ -#define EFER_FFXSR 0x000004000 /* Fast FXSAVE/FSRSTOR */ -#define EFER_TCE 0x000008000 /* Translation Cache Extension */ -#define EFER_MCOMMIT 0x00020000 /* Enable MCOMMIT (AMD) */ +#define EFER_SCE 0x000000001 /* System Call Extensions (R/W) */ +#define EFER_LME 0x000000100 /* Long mode enable (R/W) */ +#define EFER_LMA 0x000000400 /* Long mode active (R) */ +#define EFER_NXE 0x000000800 /* PTE No-Execute bit enable (R/W) */ +#define EFER_SVM 0x000001000 /* SVM enable bit for AMD, reserved + for Intel */ +#define EFER_LMSLE 0x000002000 /* Long Mode Segment Limit Enable */ +#define EFER_FFXSR 0x000004000 /* Fast FXSAVE/FSRSTOR */ +#define EFER_TCE 0x000008000 /* Translation Cache Extension */ +#define EFER_MCOMMIT 0x000020000 /* Enable MCOMMIT (AMD) */ /* * Intel Extended Features registers From nobody Thu Oct 24 02:41: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 4XYqtb0L7Rz5ZyD2; Thu, 24 Oct 2024 02:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqtZ6Zytz44rb; Thu, 24 Oct 2024 02:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzDjIUqhInAhdUB0OIRYlVOSr/idBZbR7YgwhVTg4gc=; b=vk1PHrFrQ30L100YrjWMyXZ1a/mruyNq07SWOGXmTqPdclrDYO+SN4Hj14R7zGsU7DXIcs ETrCLiXZSOqYrbzEErEPm9JfiHWgNXbq2Iw5whF3bke1FiSeWrLvW4TiBgis0GdWvKLIVe YkPf0esDre6l7E/NoMITejcwrKKgyY4ZLO4Y/30ig6mFcVXWH7zNf3gWVJ+3djmOW5IIhT rcNnWGWeBzRPCi9pqr7OIdcuYhVNI30MQX5rYSmZ4GzAeBLCoCW4eWrlwBxvBk0lRZGyM8 H3uYOzn/jeKDwRPhTwisWfQVRDxrKl7F8D3sOPGMvS68r/iCbdSifMXMerM3QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzDjIUqhInAhdUB0OIRYlVOSr/idBZbR7YgwhVTg4gc=; b=b8m2HZ5f8yEI83MSa7cOGg9gpw98AhnVzzY8eyZan9da4FL6t0DUYB4XYXPcaa6bwDJUbr 2oydj70bR+fWwLBZzFlnqRpSGPRwwaj/CFqrtCQKwWQifFAoiARqYL4+Vzv0ASKrm8GIkN 9dG/9wEdxBQ+uQBlr/0K08cKIdV+muVGZG5QkRw5Fh8KcmImCYWJv8UyWu3Sr4BWkjMr2D 7J088HNDZROv+5fM5lHPoCPmvYAmp+LZCUAHtkTNcFyZfKqfZdQQDQRWr1ifRm5weHTIVW DeaYpWWprQBo9IL70IQAIMJ/M8jrq4mAeqvUsUjRQ3RIWyv6HkQbg3IRvuQM8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737702; a=rsa-sha256; cv=none; b=Vn7R//S1u08+YPfaqPrrdH0h4tlkdCyzjoSreR8HsEWdxT4s3sxWng376zC43ivLJ0y38L Drqg5JiAFCea2CWwJyqXpH27WPd6MRpQxq2En81qMJgt4nfszLskiOtafQANIdY3OsdEmk 1jPsWTnfR0uUCZo42wG3/O7e6Ds08c45ODgXxAYYsIH1S4Wgi2k1ytRzuC1QGC84tMjTPo E4tqnbRCXwNXNIQtEyEh91pkX0Y7wmZdrNwtMDNCZOmwh2i59f73pYG0XJlGZhQlYSV6PV Cwoha21Jjs8nPbQd1x/9an04D8FfEwmW0eoiCyGgrYz3m5/u9wmvl0jfnZw1pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqtZ6BWbzPD0; Thu, 24 Oct 2024 02:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2fgGA078564; Thu, 24 Oct 2024 02:41:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2fgga078561; Thu, 24 Oct 2024 02:41:42 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:41:42 GMT Message-Id: <202410240241.49O2fgga078561@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: cc11bc1150d5 - main - x86 specialreg.h: add all defined bits for %cr4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cc11bc1150d59c3da5c7319c9a23b3e48b069f1f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cc11bc1150d59c3da5c7319c9a23b3e48b069f1f commit cc11bc1150d59c3da5c7319c9a23b3e48b069f1f Author: Konstantin Belousov AuthorDate: 2024-10-23 23:11:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:41:10 +0000 x86 specialreg.h: add all defined bits for %cr4 taken from Intel SDM rev. 085 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/include/specialreg.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index b88c3e46000a..93690b94d2c3 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -82,6 +82,13 @@ #define CR4_SMAP 0x00200000 /* Supervisor-Mode Access Prevention */ #define CR4_PKE 0x00400000 /* Protection Keys Enable */ +#define CR4_CET 0x00800000 /* Control-flow Enforcement + Technology */ +#define CR4_PKS 0x01000000 /* Protection Keys for Supervisor */ +#define CR4_UINTR 0x02000000 /* User Interrupts Enable */ +#define CR4_LASS 0x08000000 /* Linear Address Space Separation */ +#define CR4_LAM_SUP 0x10000000 /* Linear-Address Masking for + Supervisor */ /* * Bits in AMD64 special registers. EFER is 64 bits wide. From nobody Thu Oct 24 02:41: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 4XYqtc5LHdz5ZyD3; Thu, 24 Oct 2024 02:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqtc1Gtzz44kB; Thu, 24 Oct 2024 02:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dqDR3eH3tpQeXEks6O9J8gvTQ8sUPTJ9FvcjVfHcE38=; b=aVjebD1/WO5gEsv82qAbM3GST30PTOcnUSb7eMcEuLVzQ4GNPcMd616+Io5hHq5BWrjc89 vCCQcP2T2Nn1asQaa3ClPIurvJOeasCgbRYo8tfdDMiSCLJvi/e9aP0xSc69fVXhkhh1wc 073q0GfUhTvI/7jhFqvgMVZREkwfBV5GXntDUF6rCA73W9pteBFA32hh1uUbfVFeCbTjX1 jUBG1ipR4h/QRZKoNuzodIHIjjTm9ZuvZQFGOcrNvdlBMe/OKaBr++wg8iO7a1LCeYfWUu RZuNVYEjRkv4DMrcVafEk3WzTy0Il/MJSM491nh9FIIFLy8ol6sj46ifvxXdGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dqDR3eH3tpQeXEks6O9J8gvTQ8sUPTJ9FvcjVfHcE38=; b=ebmeA5mUiQZHQZlqXiVu9Q7p0vr+r3BI3u7aoLX7wzXSgwgbckdQhslwhzfH9KUvLRVsDw PwXiTMTT/zowdTAKKg+MTx6snxyuykzlDm2tjfxu4X2MqEv7vkrTTL4hAKZAK8CkpoEy7o k5ScFFkjBSi5z1YjvbiWR26n8GhqlwMIrYvNOkfdjmklcczMRuFGRu+VGfgpfw33Dhe88Y o+uLbRPlivnrfena/NYr/y+HHx3SPqz/Fd6UJrB3i+NbyEW5kF+mwZua/o/nkrv/tMha24 wyBQRNFfZjYiaLU9jfEomUeDTab39AlV81e7dt5/c3/xMfwYxwCllilntZT31A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737704; a=rsa-sha256; cv=none; b=LNLMssj9mFa/z+j1xoDTRLAFm1go6YWqVhSXmfPW0K82MhjWn3Tv8uwxElwY2Jggn3Jir+ xQH1UN6+rEbk6jTrsRzvmTqI48kTmK3yJ3L9ET0Yze+IxLoh4anKuiMZKkfc1RjSAB73Z1 S1ySm8Hj7DXFYrwaKWw02E9Jnop6k6webw4kDOlU/Njm6UNyD9kbExViZkV4uAUat5mVG9 sMMiy4Xc00aMkXuWvirSx/wn1RNPl8GZfcc1IhODAxAJez8JGrukBHaWfQzvCuqZif6CPD hAsIYXddJbRkR9Uqs8ncFWZhjNtBY4NAahYtp+gg6Fp66B477ZzNE4YWhGJc3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqtc08ftzPkW; Thu, 24 Oct 2024 02:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2fhLx078618; Thu, 24 Oct 2024 02:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2fhsc078615; Thu, 24 Oct 2024 02:41:43 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:41:43 GMT Message-Id: <202410240241.49O2fhsc078615@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: cc4b25f10211 - main - x86 specialreg: reorder %cr3 bits masks definitions by 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cc4b25f10211fdd5a347a5a9fc26b2c86476db7f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cc4b25f10211fdd5a347a5a9fc26b2c86476db7f commit cc4b25f10211fdd5a347a5a9fc26b2c86476db7f Author: Konstantin Belousov AuthorDate: 2024-10-23 23:13:45 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:41:10 +0000 x86 specialreg: reorder %cr3 bits masks definitions by value and align them visually. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/include/specialreg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 93690b94d2c3..cddda2df617d 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -51,8 +51,8 @@ #define CR0_NW 0x20000000 /* Not Write-through */ #define CR0_CD 0x40000000 /* Cache Disable */ -#define CR3_PCID_SAVE 0x8000000000000000 -#define CR3_PCID_MASK 0xfff +#define CR3_PCID_MASK 0x0000000000000fff +#define CR3_PCID_SAVE 0x8000000000000000 /* * Bits in PPro special registers From nobody Thu Oct 24 02:41: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 4XYqtd3xNWz5Zy12; Thu, 24 Oct 2024 02:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqtd1YHqz45BG; Thu, 24 Oct 2024 02:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8iirjKw7o+l9DogDtsyE5xeqv1tM4M0hKiULCkLiZY=; b=fItFORzOX5TbzS93TRgwCkZwZ+OZq2TN+X2qWA/zCEWPMs9qa1ytfSyVRLgiT70B3zSsR/ rTrceYtriKSCmaXh1esw7WdDJG83SAaWZJj3Ie4fMPMLSoFwZJ8DWUbnCSAoH+b5eAHwOi 8NuulPGRHtkFvGckwFDwEBAmkRr8EAK0xzvc7020Ln/oKt71NWnjmQuPZJCxvx6KuA/50W ofd2bM3XqaYzdZYe65TBLhw5Ejl0CYSw2E6Aa4646OiH885Kku5r3vmrTwS0MmyV17vPnE 5HKfdI+hIs0rn55wn2+VijfLUO1rNU19JhKl/sYMLY1qrEtbFGXOgEYwzcdOrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8iirjKw7o+l9DogDtsyE5xeqv1tM4M0hKiULCkLiZY=; b=UBI9rGE3nfiqXLqBdes7cFPCYdjleqaKThDpnHx3CS74unZ4OISSfPbxhEDq1xWr8flTHM m/Yd4oo7DP/Kga4Kki7ipkCC+wnsjBtvzA6QdnPcNV2WKuSXGZscpxB3BLw+jVO7kpRBzI l0kh5khlmzhxEyW6axjsO0KTVzAIMTPohQFFmsN9myiYdvxTb+UIVXOBjY/w44Y+Hfj+cK qOz3n5OtYIb3OGReEAE9jd6Brpn+2Qc6DYckbu9uP4KkiTomTTHvH53iH55TuY2t+GDnpl sqjfNXiiBLfxcP21XAODTFYElEtN/fJY2DMf4h4zTeTL1NuEE+r0zTq+jniayg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737705; a=rsa-sha256; cv=none; b=SVmgR9G3xmjb5cn0RqTuEqGedgeDe9J/KPaQAWkrWdKfgPnK8rbzcTMzjTq3dHJZrHnxCk u3dKhwCB708CQDOAncIXi+ar/bfuC4Umq1DMGZtTIgOgBwGZNMh85QBLkuQ7P9bCfaZP5O ZYhdhjmyaYMohbxNoVdUZZPKSRsqKs2JGjTFeqY5bUXcWCx8zBCz07ow1K12H3Xw6Id+3d WI/fe2ysst5aPrJiastgWHVeeRkeTUYOzWk6PMDZ0aVKgbgqnzCxIK/7QW9xPGz5bQ5Krv yUQTAJ6m/tb8T2D9GsxzsstfAJB3vTP3OJB48wP+NB3r50RO0kWtU0FmnQhWWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqtd18d6zPD1; Thu, 24 Oct 2024 02:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2fjmj078675; Thu, 24 Oct 2024 02:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2fjYf078672; Thu, 24 Oct 2024 02:41:45 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:41:45 GMT Message-Id: <202410240241.49O2fjYf078672@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: 5999b74e9637 - main - x86 specialreg: add bit masks definitions for LAM in %cr3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5999b74e963769cbd12eadbe1cebcd34fb312f01 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5999b74e963769cbd12eadbe1cebcd34fb312f01 commit 5999b74e963769cbd12eadbe1cebcd34fb312f01 Author: Konstantin Belousov AuthorDate: 2024-10-23 23:16:47 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:41:10 +0000 x86 specialreg: add bit masks definitions for LAM in %cr3 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/include/specialreg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index cddda2df617d..197ae4bba7a1 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -52,6 +52,8 @@ #define CR0_CD 0x40000000 /* Cache Disable */ #define CR3_PCID_MASK 0x0000000000000fff +#define CR3_LAM_U57 0x2000000000000000 +#define CR3_LAM_U48 0x4000000000000000 #define CR3_PCID_SAVE 0x8000000000000000 /* From nobody Thu Oct 24 02:41: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 4XYqtf5vfXz5ZyD5; Thu, 24 Oct 2024 02:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqtf2gXmz455s; Thu, 24 Oct 2024 02:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ycP/MDoTVJ+/HUuS8Y9BECQQB1bpS+Tci34IsVTnIf4=; b=nPO2N43ZlpXbzpI7NMt6im13mqC790q2kSATZzY1CAJ3aosbCWMdEj0aUO+84a0oyTi/Pt 0kjElLtMfs/87qJkqqlIyrb5zJ3z4TJoM3Z51s4edurtr4FsiYvuckw5+O9r4yBYPh8Kvj FzcfGgMENRCqdS2y1qCHA/cDtEA7jHUjEJPAuGmY/Mp/lTaOReaWOGZg3Ow0QAU3HU8eCR s2xCC7MgKGwwqhnMYpISqdQwi7De/BUAuu8z22IlfXp7FCdJ94ZtO4QVAYY6l0oc86shkC L5n7R180IEV5KEPeh34YqCFq/vVomPlTlXyVK6VmgXb4Tf0ewOJcA0ThhABGew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ycP/MDoTVJ+/HUuS8Y9BECQQB1bpS+Tci34IsVTnIf4=; b=EC/XnP2qoKgGnX3ZOPVTMr6EzrIpmNt0qtSUZNMlqC4q+rMuajXQ4A+dze1On+ETqPxEvr gJtEoZkNgd5RYu/TjfyLFU8A4hYH8V0uXVcFmLu6iYVJkZix2nGqlqSfo7Q2kFLfwVoIkG JiJqa/3GF+syTxCShfhpFXl/e0ezHOxXrSzJP7ETsZjw9fWkWhkM0ka5KI51myDTJvQXor lgkkqV8SVbKydXPFGDYb0jAwDY1yYvVr/Km+uyfn3bhu7kSt9P0luKOc8yIgjD4zW7sFtL f1ZkIuVkAH2ROB+uxraXe8R34OOfOPihhqQBE9kzHmuKuOrAJR8gyFrHw+4PTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737706; a=rsa-sha256; cv=none; b=PGkDbb9OBeSsmnjS5jaLb1801exjQRFhX2Tpg8iXF+SBuHuYUI7KMexbRqc77QK8bB5OnE A7Q7yOX3RZly8tFT0xa271yisQ3Z3KnfCk/HEFtf03xjdEb8pEelVEZKWTghThLW0ZxV07 nL2XJ7N1BdQ1XAdLJT2oNl86mT9cOIvg8ArAWscTYpACG5NgwAwYr2Vh6wJG/a5n8e7IQc B6W5SVq3pvQinW4ZOMvotaQCSdi5KlSRz3aSz9a80m1I0GRnvwPfkTUnCoeWYnoUNLKRuI b27+9UyAoaOtpHyJeBNa2DVTwjH0DnAxp+5s0lFCkIG1cEIxIu7s4jCTjL8BgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqtf2CrRzPqS; Thu, 24 Oct 2024 02:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2fk8o078733; Thu, 24 Oct 2024 02:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2fkXb078730; Thu, 24 Oct 2024 02:41:46 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:41:46 GMT Message-Id: <202410240241.49O2fkXb078730@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: 6308db659f2a - main - x86 specialreg: add bit masks definitions for EFER features List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 6308db659f2ad45b30bbf1d9c47abdc97d14ebb0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6308db659f2ad45b30bbf1d9c47abdc97d14ebb0 commit 6308db659f2ad45b30bbf1d9c47abdc97d14ebb0 Author: Konstantin Belousov AuthorDate: 2024-10-23 23:21:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:41:10 +0000 x86 specialreg: add bit masks definitions for EFER features listed in AMD64 APM vol.2 rev. 3.42. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/include/specialreg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 197ae4bba7a1..ab172ec54ff6 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -105,6 +105,9 @@ #define EFER_FFXSR 0x000004000 /* Fast FXSAVE/FSRSTOR */ #define EFER_TCE 0x000008000 /* Translation Cache Extension */ #define EFER_MCOMMIT 0x000020000 /* Enable MCOMMIT (AMD) */ +#define EFER_INTWB 0x000040000 /* Interruptible WBINVD */ +#define EFER_UAIE 0x000100000 /* Upper Address Ignore */ +#define EFER_AIBRSE 0x000200000 /* Automatic IBRS */ /* * Intel Extended Features registers From nobody Thu Oct 24 02:41: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 4XYqtg6wxNz5ZyD6; Thu, 24 Oct 2024 02:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqtg3fJyz453c; Thu, 24 Oct 2024 02:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TokU9/A+7J/Q24lVaIAAS2GGjVNNLlxSsk1jkF04gTc=; b=ENsAb8Zy/GifBxKxaFseSLOkh1U8yMDdlInYA8PwCdjuraH0pvKnSQ8iixat9YV4CGEyQH m5rJ+zTDe2ugIHVvhaZoS8RZ88j+/jCS8HQ7jqfp6X2espDtBErDNWA+IOLW0ZmKYZtAIX WMncErEHbP77rPkYCgY+bwIiM2GruX82jUJXjTj86KIKv3GUj9AuakYbNgyMN6dU/E/Grs /z1OGqPQ0wHvLnOWAMt3VGwja7PV6XhgkVyBXtL9VT08AwT5XtaekMukxFP/ltKflw2uwn JWnBGu6gIdU1I9mg/Q7jdQPrkt74Qq42Irr16uekBifyQsRrYoDgVDAtjbRNpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TokU9/A+7J/Q24lVaIAAS2GGjVNNLlxSsk1jkF04gTc=; b=H4mPhPq0osrm3sQFUMGaUG+cS4BBk+wRVneajj7TrNSyVPeT/uYF+qI5T63OhJCYQfXIXh fgP1NGe1+YyGol90Yr5VJWwClmUQe/cGl0d8XW8W2ipucm8B5qjN/f/LiYA+5lxc4NABs0 TTjBKKOdUH++1ySDJbY9TdM+UVaeBHX633Q/wQnqNP75Ls614WUvgSCFipuQOuT5G2fgVO uB15xbI+6Dub9kOOnM+E4Ly8eNh+sGGQgLMQbRqT/atkXdGzIsQuPIaqe+wXEDrPqXVWfg tpc2nDTaWWHQLv1tdK273ghgKzASxUeb0ZbcV1nB1CFFZvJ8azEazIFd0ZbXNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737707; a=rsa-sha256; cv=none; b=TtA4aACz+bHYOSR4ZJGiNsrMzEnwY+ohbhrYSpoIku+EupR9qhk35CR19/81yNXbeMI8o8 B9BOhst6xFyBLMqv4XhNG6CR0XyJIV+zWYGOaaGwavu2cjcFHHk50XgqARQbm0Yp5mIR7b MUI95j26RakhQuFXNTweilRi19dDni2IU53EkHt74hNX15YyEglwSp+WyuN7Zdo585MLbJ vrQmeN1gwsvCcYJRmjbD5rFjbDA9m8PjKfC/uZQbmZfwE9SEqxJKvu1ilzprxmHHPWlvUX 6lULT3HCpRTCMarbop32HipR9RDgj4+SrIToIBbdMVJLNUG06KoHPok8p+ariQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqtg3DMwzPSC; Thu, 24 Oct 2024 02:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2flWI078797; Thu, 24 Oct 2024 02:41:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2flIK078794; Thu, 24 Oct 2024 02:41:47 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:41:47 GMT Message-Id: <202410240241.49O2flIK078794@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: 9f718b57b846 - main - x86 specialreg: add bit masks definitions for LASS and LAM features List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9f718b57b846b8e1fa562584747fdae42ffed8f4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9f718b57b846b8e1fa562584747fdae42ffed8f4 commit 9f718b57b846b8e1fa562584747fdae42ffed8f4 Author: Konstantin Belousov AuthorDate: 2024-10-23 23:40:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:41:11 +0000 x86 specialreg: add bit masks definitions for LASS and LAM features in CPUID Structured Extended Features %eax 0x7 leaf 1 %eax, from Intel SDM vol. 2 rev. 085. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/include/specialreg.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index ab172ec54ff6..51c513b6a5ab 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -534,6 +534,12 @@ #define CPUID_STDEXT3_CORE_CAP 0x40000000 #define CPUID_STDEXT3_SSBD 0x80000000 +/* + * CPUID instruction 7 Structured Extended Features, leaf 1 eax info + */ +#define CPUID_STDEXT4_LASS 0x00000040 +#define CPUID_STDEXT4_LAM 0x04000000 + /* CPUID_HYBRID_ID leaf 0x1a */ #define CPUID_HYBRID_CORE_MASK 0xff000000 #define CPUID_HYBRID_SMALL_CORE 0x20000000 From nobody Thu Oct 24 02:46: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 4XYqzg5rPhz5Zy1v; Thu, 24 Oct 2024 02:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqzg4Hrbz46tS; Thu, 24 Oct 2024 02:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X1G9duCNMvMc5ZI/PwfcBkJResZr8dcpUahteD+FGBA=; b=ZCdAi68ERU11DQJDGc14XuNBORaC2ZMZ6FAg0IaFu62bkqMK1HuaoKJmdR1GVYRoWyGZMv dh2gpBJc0x9b0qh7JE/ucEUgqUHLYh/hFx+TRENBACkUjBKv8cQNp81DCNp0Y2aQSqlU5Q bRnZDieEv7vdAfXYZcxeEYGjayYNp82TIUjqP/qpVlJbzQ/K80SXfzwwv/NLQMvGkR3z9Q tHYO89iZgprhFfBOEDYzP9I9EGFE9XCf0kxA9qm8OIoPra7TJIWdDGt0Eu1twa7ZMp0FKf tZzf4X6iImy9tQ9kCsyOqdeDGxUmibQy7sxLV0zTbBMND5PVOve5A0ufK1CciA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X1G9duCNMvMc5ZI/PwfcBkJResZr8dcpUahteD+FGBA=; b=t1ZziYkxe+5dQJ/NJqcBxCa8gWkpYxjvV2pCm7IxHoeq7YnN1od9hM5Oo2DJCCMD0rWKf6 jp1laSvZVGPjj4I94YYeLzaMgGrpmX6cgA5h+AZxJ/ee0Qif8txhPAWE9fPDd0ag9jwjnu 0ljhJW/vTNU6lDx+wZXLweuM6gTLcM9BCJy1OzGQdyvM4YkRHoBWcOIA8nowiZM+XD5P/6 xL2URJVy/VrkJDOJee6/47Ufn0AasgLznApkG/9hxszYzCLtYORq9cWGfHZoFrS2dZWSBY Wd53Ho9fHIZPOnMBfiJKDdaeJqSWfvrgj6QTB+l14Y581GbY09sZi5cy/dLN9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737967; a=rsa-sha256; cv=none; b=xR0xOH9GRrCRPuUIZc1cAg43tS6K2YPuAokpI0ftPIOiB8TkKLcfmNtuPulQ1jH+jhkJH1 rh006PtZFZ86fxcdNNX1W0GpzB7gnNMGfLIvMIN0bqb/ws8UdxVlw0wRExLIcJLZwYD8mh yYr2VNdNeqrH4ITWbWpZok9i7zeg/3jfGXVTwznCZqWZYYzFNUcFGERiyDmu0/fD9SW1c7 yXZWdAnUqbsFaucZktE/AR3raM0hlF5GDP38tqBn1LX4nnN0qcqHPXwudCE8z9mwKu/rhh P8c6DfM978BX7BGiS0bytxYno/mwoiNLtJb1KrEdjLiqDlmaMCQOppgBZU7ibQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqzg3vN5zPPV; Thu, 24 Oct 2024 02:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2k7Bt086119; Thu, 24 Oct 2024 02:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2k70e086116; Thu, 24 Oct 2024 02:46:07 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:46:07 GMT Message-Id: <202410240246.49O2k70e086116@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: 858397f868c0 - stable/14 - apic: add ioapic_get_dev() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 858397f868c0372a074cd14736dabbb2fd0cb09a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=858397f868c0372a074cd14736dabbb2fd0cb09a commit 858397f868c0372a074cd14736dabbb2fd0cb09a Author: Konstantin Belousov AuthorDate: 2024-10-12 22:52:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:44:40 +0000 apic: add ioapic_get_dev() method (cherry picked from commit ea4e4449b85593025c2eb31bb642732971d96225) --- sys/x86/include/apicvar.h | 1 + sys/x86/x86/io_apic.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index ac6a82659e34..61c726f150df 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -258,6 +258,7 @@ void lapic_handle_intr(int vector, struct trapframe *frame); void lapic_handle_timer(struct trapframe *frame); int ioapic_get_rid(u_int apic_id, uint16_t *ridp); +device_t ioapic_get_dev(u_int apic_id); extern int x2apic_mode; extern int lapic_eoi_suppression; diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 4337d1adc8a9..525547f9482a 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -1081,6 +1081,22 @@ ioapic_get_rid(u_int apic_id, uint16_t *ridp) return (0); } +device_t +ioapic_get_dev(u_int apic_id) +{ + struct ioapic *io; + + mtx_lock_spin(&icu_lock); + STAILQ_FOREACH(io, &ioapic_list, io_next) { + if (io->io_hw_apic_id == apic_id) + break; + } + mtx_unlock_spin(&icu_lock); + if (io != NULL) + return (io->pci_dev); + return (NULL); +} + /* * A new-bus driver to consume the memory resources associated with * the APICs in the system. On some systems ACPI or PnPBIOS system From nobody Thu Oct 24 02:46: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 4XYqzj0XfHz5Zy1w; Thu, 24 Oct 2024 02:46: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqzh5bJHz46qN; Thu, 24 Oct 2024 02:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwnRhVSosyjX+T5ezOsWhJkN3fgSmKM1+QTmPRS8KwM=; b=ka46aYji9nles4qaputEIQ9SRtdc4CmS8SxfXITs9+dGqga7SNwIAUq3nIugnkv0FYrWFd VAdyOSWOYsY2Fou0yd4yYByFuxq6tuOXfQjEDogQH7UZU1gqt3F0zIS3Af5RfgOPvEIrzk eEJ+AvNxEL26kvDP50uyO49J4mfi49jxuvIgz5giXwMnpmNtls8iz6mLVrkQPrnl5PMtXY ygho0q4bqhXwJy1v4wHk1n8SbU4I4KsIJbg3/Ln3rD9oOeYQSts3bswxLq6YQ0hNGeyz3E SWfNNORKnGSQZLYorDn5cWV2i7S8ZTSUOAaK0Ga4ArdNnamcgRBMt9KPeSLLpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwnRhVSosyjX+T5ezOsWhJkN3fgSmKM1+QTmPRS8KwM=; b=ZN6m3AtC0UbA96oaoCWWd1hhh4xI95PgPWDgS8p0qe7B6fdngKnf8PhKBHqjUjKYLJA3+r VFrjgHKJiXXmzsWLlvhECAf2TYPXnUFeIbP/Fj3tk75cWYRP++u6f7dtd29Xt8dAMIEkU0 TOzoQ5TB4OctR7qvp+/sbIVIhi8ZcfVKdawV9zUz9/AqXAhJ1ezc68Kpi9QBN8SewCAe0K 2SW0yOMj/FiH/LhcCDsswBHqTJEJwA+NaCkQ8ZXTm934BLtsXvzMOuKyg5+Hrv2fhaqCYL dp4hT6WChyTzrpvIyAL/SD6bn05vCkDsRajaliDsXYCZyM0V1b7oEIR3hRzvpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737968; a=rsa-sha256; cv=none; b=hb2OokaJdUiVgL5p+TZ6toS465gAh/EMpQvEqNSaO+6SRvlHAjIaQLUngv1uSz4A+BlvzQ BlCHNxPzMIGvT+LgrNqTSkMAin910k/kv6/EMLJ1zfy77Ypv0lsRg79NMjObt2FMxppibk tc9AW4FsrWd2bRszFQR1EPwQREDN/KKa1OpA8xE2WqsFS3D5BZmFY0i1CRBbOVrgb+/V2b U1Y0YPjgamD1xFUYewh/YtI0CRW4sO/8ZGN4iQJDf0R3s1w3uQht3voafedWg27QoJKJyQ Gt9Neg1tclvrMdbDNTHp8X7IrS7EN98aU+AleO2aqGai8k9xWRd9Cb/dW0/Zuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqzh5CLMzPSW; Thu, 24 Oct 2024 02:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2k8uH086165; Thu, 24 Oct 2024 02:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2k8vR086162; Thu, 24 Oct 2024 02:46:08 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:46:08 GMT Message-Id: <202410240246.49O2k8vR086162@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: 2cda5031841f - stable/14 - device: add generic named per-device property List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 2cda5031841fa3745486a0f5c08981d266742569 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2cda5031841fa3745486a0f5c08981d266742569 commit 2cda5031841fa3745486a0f5c08981d266742569 Author: Konstantin Belousov AuthorDate: 2024-09-08 04:40:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:44:40 +0000 device: add generic named per-device property (cherry picked from commit cb83af64f161b228171d6fb4f36d22493cefaa7f) --- sys/kern/subr_bus.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/bus.h | 7 +++ 2 files changed, 127 insertions(+) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 5965b8941b54..9e6973f6174c 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -105,6 +105,16 @@ struct devclass { struct sysctl_oid *sysctl_tree; }; +struct device_prop_elm { + const char *name; + void *val; + void *dtr_ctx; + device_prop_dtr_t dtr; + LIST_ENTRY(device_prop_elm) link; +}; + +static void device_destroy_props(device_t dev); + /** * @brief Implementation of _device. * @@ -141,6 +151,7 @@ struct _device { u_int order; /**< order from device_add_child_ordered() */ void *ivars; /**< instance variables */ void *softc; /**< current driver's variables */ + LIST_HEAD(, device_prop_elm) props; struct sysctl_ctx_list sysctl_ctx; /**< state for sysctl variables */ struct sysctl_oid *sysctl_tree; /**< state for sysctl variables */ @@ -1350,6 +1361,7 @@ make_device(device_t parent, const char *name, int unit) dev->flags |= DF_QUIET | DF_QUIET_CHILDREN; dev->ivars = NULL; dev->softc = NULL; + LIST_INIT(&dev->props); dev->state = DS_NOTPRESENT; @@ -1489,6 +1501,7 @@ device_delete_child(device_t dev, device_t child) return (error); } + device_destroy_props(dev); if (child->devclass) devclass_delete_device(child->devclass, child); if (child->parent) @@ -5990,6 +6003,113 @@ dev_wired_cache_match(device_location_cache_t *dcp, device_t dev, return (strcmp(res->dln_path, cp) == 0); } +static struct device_prop_elm * +device_prop_find(device_t dev, const char *name) +{ + struct device_prop_elm *e; + + bus_topo_assert(); + + LIST_FOREACH(e, &dev->props, link) { + if (strcmp(name, e->name) == 0) + return (e); + } + return (NULL); +} + +int +device_set_prop(device_t dev, const char *name, void *val, + device_prop_dtr_t dtr, void *dtr_ctx) +{ + struct device_prop_elm *e, *e1; + + bus_topo_assert(); + + e = device_prop_find(dev, name); + if (e != NULL) + goto found; + + e1 = malloc(sizeof(*e), M_BUS, M_WAITOK); + e = device_prop_find(dev, name); + if (e != NULL) { + free(e1, M_BUS); + goto found; + } + + e1->name = name; + e1->val = val; + e1->dtr = dtr; + e1->dtr_ctx = dtr_ctx; + LIST_INSERT_HEAD(&dev->props, e1, link); + return (0); + +found: + LIST_REMOVE(e, link); + if (e->dtr != NULL) + e->dtr(dev, name, e->val, e->dtr_ctx); + e->val = val; + e->dtr = dtr; + e->dtr_ctx = dtr_ctx; + LIST_INSERT_HEAD(&dev->props, e, link); + return (EEXIST); +} + +int +device_get_prop(device_t dev, const char *name, void **valp) +{ + struct device_prop_elm *e; + + bus_topo_assert(); + + e = device_prop_find(dev, name); + if (e == NULL) + return (ENOENT); + *valp = e->val; + return (0); +} + +int +device_clear_prop(device_t dev, const char *name) +{ + struct device_prop_elm *e; + + bus_topo_assert(); + + e = device_prop_find(dev, name); + if (e == NULL) + return (ENOENT); + LIST_REMOVE(e, link); + if (e->dtr != NULL) + e->dtr(dev, e->name, e->val, e->dtr_ctx); + free(e, M_BUS); + return (0); +} + +static void +device_destroy_props(device_t dev) +{ + struct device_prop_elm *e; + + bus_topo_assert(); + + while ((e = LIST_FIRST(&dev->props)) != NULL) { + LIST_REMOVE_HEAD(&dev->props, link); + if (e->dtr != NULL) + e->dtr(dev, e->name, e->val, e->dtr_ctx); + free(e, M_BUS); + } +} + +void +device_clear_prop_alldev(const char *name) +{ + device_t dev; + + TAILQ_FOREACH(dev, &bus_data_devices, devlink) { + device_clear_prop(dev, name); + } +} + /* * APIs to manage deprecation and obsolescence. */ diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 581e81352be4..eecff0c7c03e 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -889,6 +889,13 @@ device_location_cache_t *dev_wired_cache_init(void); void dev_wired_cache_fini(device_location_cache_t *dcp); bool dev_wired_cache_match(device_location_cache_t *dcp, device_t dev, const char *at); +typedef void (*device_prop_dtr_t)(device_t dev, const char *name, void *val, + void *dtr_ctx); +int device_set_prop(device_t dev, const char *name, void *val, + device_prop_dtr_t dtr, void *dtr_ctx); +int device_get_prop(device_t dev, const char *name, void **valp); +int device_clear_prop(device_t dev, const char *name); +void device_clear_prop_alldev(const char *name); /** * Shorthand macros, taking resource argument From nobody Thu Oct 24 02:46: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 4XYqzk0Pd2z5ZyFS; Thu, 24 Oct 2024 02:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqzj6hVhz46yP; Thu, 24 Oct 2024 02:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ujPj4JbH13fgplFjJkp4Wu/xtt51fYqBV3qU3TerC3s=; b=f0lZ+muL6bWC31WWeGBoVkOII2g90Pr5WHh6pj9asqcoJTF6+5Swg5ooDkq5MLLsb+MWDs tpIj/XSLr+nbF+BrwCCYuziE42qO0Ua1mMC62mg11jUl0rxlfgxgB0+GNbj5bGIY3IPLPE TrK9wITQVrKJ4iYUABsqvGKmAtZLUaTSIWz3+YoweJHeSMT5dphACgPktJJqvCT03lL1AX 4xWzjisBA3ssCp0Np93JLmme+mlGpV8HaL2pTVq964EQzzto/9SWOJzmWD0LH7wC3ZKl2I rZqQ6Q7duB/wJyNNSRjRRnAEmJQAFSYaBr0hY7NbP+qR6H44gKg4CMf61ZADvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ujPj4JbH13fgplFjJkp4Wu/xtt51fYqBV3qU3TerC3s=; b=QzSySLSIJiwULjskwy666e+NKSEvvW45RkhSa5GL2XJ5ZhmrOMIT7raw07nPKoUXos662k bE0lOWIK63QetDKOzyIyv9Ce3Wf5HfhFAGaYrPUKU5/ctuuc2bSidFJImLxK2y27xyiKjn oY45Z5aU/5WnIobpD9w6hXADjiquF0ERfalhvcEeHcEkd4h7bMCgVlQCBbP0rzdgBLhFRV 2iYVYX6mdBZwyLEci0x5ubWO6HS5lUm54HyJbOSZT06R6Migitl3nwUD6NV4w1MxtUCqOe T1DlPdPB1QE6odBMmoSAJvWofKb/vtyJ1A6ITLke9hCw46kknPyusYnpy2Uc/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737969; a=rsa-sha256; cv=none; b=gXLtqkerJh5s/xQi69e7M3LvI+DTQD48UKDJdSx0z9SMT/ZHqd/mMsMZaEM41mdXCmBgYU +DKdmaKMVhwBJysOR+KIv5MMjQ5FnO47x1H7xflNGui1iuCgUhID3DJutJapOJtyXmR8E3 eSb97gWObtOp/o5siYMHQaMz+xqHat9Wf4dHKBRQQsW0bBpEynyj2W6uco4D+jbUW89Y1G MQmCOHuzq16Lx53f6WEdPcejZBmbTZxVzzDwkOEXL9qXQGtWx5ePWvSjcLKSGsqr61Q/GS JXem+bheNZkTcPbl7XWQdhlyXIMc5btcSVCzxBtzSeLBLiaxqRqpcNh+fZLx0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqzj6Hs5zPSX; Thu, 24 Oct 2024 02:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2k9If086229; Thu, 24 Oct 2024 02:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2k9K4086226; Thu, 24 Oct 2024 02:46:09 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:46:09 GMT Message-Id: <202410240246.49O2k9K4086226@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: ec8d60f0d9b7 - stable/14 - devices: report iommu data for the device in the dev. sysctl tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: ec8d60f0d9b762880482e39f567db552c152d3a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ec8d60f0d9b762880482e39f567db552c152d3a2 commit ec8d60f0d9b762880482e39f567db552c152d3a2 Author: Konstantin Belousov AuthorDate: 2024-10-12 22:54:33 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:44:40 +0000 devices: report iommu data for the device in the dev. sysctl tree (cherry picked from commit b08d332da035e11bfc9373f2d08244cb3e10cda4) --- sys/kern/subr_bus.c | 28 ++++++++++++++++++++++++++++ sys/sys/bus.h | 1 + sys/x86/iommu/intel_drv.c | 19 ++++++++++++++++--- sys/x86/iommu/iommu_utils.c | 13 +++++++++++++ sys/x86/iommu/x86_iommu.h | 1 + 5 files changed, 59 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 9e6973f6174c..b87652fd32e8 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -29,6 +29,7 @@ #include #include "opt_bus.h" #include "opt_ddb.h" +#include "opt_iommu.h" #include #include @@ -60,6 +61,8 @@ #include #include +#include + #include SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, @@ -261,6 +264,7 @@ enum { DEVICE_SYSCTL_LOCATION, DEVICE_SYSCTL_PNPINFO, DEVICE_SYSCTL_PARENT, + DEVICE_SYSCTL_IOMMU, }; static int @@ -268,7 +272,10 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS) { struct sbuf sb; device_t dev = (device_t)arg1; + device_t iommu; int error; + uint16_t rid; + const char *c; sbuf_new_for_sysctl(&sb, NULL, 1024, req); sbuf_clear_flags(&sb, SBUF_INCLUDENUL); @@ -289,6 +296,22 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS) case DEVICE_SYSCTL_PARENT: sbuf_cat(&sb, dev->parent ? dev->parent->nameunit : ""); break; + case DEVICE_SYSCTL_IOMMU: + iommu = NULL; + error = device_get_prop(dev, DEV_PROP_NAME_IOMMU, + (void **)&iommu); + c = ""; + if (error == 0 && iommu != NULL) { + sbuf_printf(&sb, "unit=%s", device_get_nameunit(iommu)); + c = " "; + } + rid = 0; +#ifdef IOMMU + iommu_get_requester(dev, &rid); +#endif + if (rid != 0) + sbuf_printf(&sb, "%srid=%#x", c, rid); + break; default: error = EINVAL; goto out; @@ -338,6 +361,11 @@ device_sysctl_init(device_t dev) CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, DEVICE_SYSCTL_PARENT, device_sysctl_handler, "A", "parent device"); + SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), + OID_AUTO, "%iommu", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, + dev, DEVICE_SYSCTL_IOMMU, device_sysctl_handler, "A", + "iommu unit handling the device requests"); if (bus_get_domain(dev, &domain) == 0) SYSCTL_ADD_INT(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), OID_AUTO, "%domain", diff --git a/sys/sys/bus.h b/sys/sys/bus.h index eecff0c7c03e..5d5336591ea6 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -889,6 +889,7 @@ device_location_cache_t *dev_wired_cache_init(void); void dev_wired_cache_fini(device_location_cache_t *dcp); bool dev_wired_cache_match(device_location_cache_t *dcp, device_t dev, const char *at); +#define DEV_PROP_NAME_IOMMU "iommu-unit" typedef void (*device_prop_dtr_t)(device_t dev, const char *name, void *val, void *dtr_ctx); int device_set_prop(device_t dev, const char *name, void *val, diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index ebc77879480b..f4a1ec06b721 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -757,6 +757,7 @@ dmar_find(device_t dev, bool verbose) dmar_print_path(dev_busno, dev_path_len, dev_path); printf("\n"); } + iommu_device_set_iommu_prop(dev, unit->iommu.dev); return (unit); } @@ -826,16 +827,28 @@ dmar_find_nonpci(u_int id, u_int entry_type, uint16_t *rid) struct dmar_unit * dmar_find_hpet(device_t dev, uint16_t *rid) { + struct dmar_unit *unit; - return (dmar_find_nonpci(hpet_get_uid(dev), ACPI_DMAR_SCOPE_TYPE_HPET, - rid)); + unit = dmar_find_nonpci(hpet_get_uid(dev), ACPI_DMAR_SCOPE_TYPE_HPET, + rid); + if (unit != NULL) + iommu_device_set_iommu_prop(dev, unit->iommu.dev); + return (unit); } struct dmar_unit * dmar_find_ioapic(u_int apic_id, uint16_t *rid) { + struct dmar_unit *unit; + device_t apic_dev; - return (dmar_find_nonpci(apic_id, ACPI_DMAR_SCOPE_TYPE_IOAPIC, rid)); + unit = dmar_find_nonpci(apic_id, ACPI_DMAR_SCOPE_TYPE_IOAPIC, rid); + if (unit != NULL) { + apic_dev = ioapic_get_dev(apic_id); + if (apic_dev != NULL) + iommu_device_set_iommu_prop(apic_dev, unit->iommu.dev); + } + return (unit); } struct rmrr_iter_args { diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c index 259c87403b07..479e8637ee8e 100644 --- a/sys/x86/iommu/iommu_utils.c +++ b/sys/x86/iommu/iommu_utils.c @@ -758,6 +758,19 @@ pglvl_page_size(int total_pglvl, int lvl) return (pg_sz[rlvl]); } +void +iommu_device_set_iommu_prop(device_t dev, device_t iommu) +{ + device_t iommu_dev; + int error; + + bus_topo_lock(); + error = device_get_prop(dev, DEV_PROP_NAME_IOMMU, (void **)&iommu_dev); + if (error == ENOENT) + device_set_prop(dev, DEV_PROP_NAME_IOMMU, iommu, NULL, NULL); + bus_topo_unlock(); +} + #ifdef DDB #include #include diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h index 92ac993e7c9c..eb4a9907a5d6 100644 --- a/sys/x86/iommu/x86_iommu.h +++ b/sys/x86/iommu/x86_iommu.h @@ -188,6 +188,7 @@ int iommu_alloc_irq(struct iommu_unit *unit, int idx); void iommu_release_intr(struct iommu_unit *unit, int idx); void iommu_device_tag_init(struct iommu_ctx *ctx, device_t dev); +void iommu_device_set_iommu_prop(device_t dev, device_t iommu); int pglvl_pgtbl_pte_off(int pglvl, iommu_gaddr_t base, int lvl); vm_pindex_t pglvl_pgtbl_get_pindex(int pglvl, iommu_gaddr_t base, int lvl); From nobody Thu Oct 24 02:46: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 4XYqzl2PT8z5ZyDh; Thu, 24 Oct 2024 02:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYqzl19tpz4749; Thu, 24 Oct 2024 02:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ND0hVDKEpKiXQWswvVZDIv9KpMQVsuGcKuzaMRt+8z4=; b=X2NzCV00SCi/xe/2V2rPMPeQjZ7tLx7B5P4710REw1OQysZ1Qi424KEtfQQ4Ge27GZYve+ 00OsjtHNNEf03Yt0Q76yFdlpPYeiYshY5F/zu+vgFaROPF+g9p2tETpgbnknTkc5NGSDEf Sx3uLZyRpwF5C6CcvbpWZB7QKOdAzRDFQ7avGUET8yShKFHDCGBgNlQPi9ylUsY/yqyDZK DvH8vH1kJO7J3DgZivbvsF6iwns5XP/kDBCgKiZZ0Nni02dXs6aOov6iivRHtN5E0ytDwd rwV/HbeMooXp0SKbsm5QAVU3/Pm3jQ2dZntim/DV20TyxHnRFZSdiIp9F/OacA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ND0hVDKEpKiXQWswvVZDIv9KpMQVsuGcKuzaMRt+8z4=; b=tH0p7ADaD0zuIYxlqmjN0ScbZO9B+RfSVUipyQlS4NOwvNfJsUUcHZ9/aGlZJA6kNXgCGp T4O7C04NvsNaf9ytQQ0AljnbwCYWSBmspGwhkF5jDc3D3Dvh3qY++m4S5ygnNYtftInB9M sd8LeYOSJ68n6zmhFPznrY6aCb9yOFrjwYdP46hUJgpEA1r1IwvwRTdJXS/6tmXeyPrkHm UuKscDY2uz0ESvAheqMQkY/UT1ZQeuG6KZ10b8B4T10FmcVj40zpz6pfw77uCTGCQ9CG7V zZXSQg1MHmCCvWV+IIXn64QzD3EnZ7LuGUXZ699gm8v71IEhi5q5gKIsX+9YzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737971; a=rsa-sha256; cv=none; b=xtD5sj3iATWIRH926xoC6P1gV64x019OzemtW1neQyHCGFaW6eNAET7Q6EseJkMlSbaX6a +qtYs71l9rKeATPtQtFE7q1k8xZG2tkCGOwIYXDwF1RkzIfUgAYES4NYxYzb9HxNxRweNn YKU6C7fSlZ75FDG0eiqUuIej1x11nEFXzZbipH7HEZpDiQnKxUkM17pEhjYIOVUXm3R3Z1 70BM0UsDPE3iAq7O/m9VBeE1gkHcFlQtxLEWGDSJgewu4t07cGKhnCBqMkADOkBubsFC8y T0nX+Gt0q05OV1sRqZ388a0O0L9Fu2knqY0OHh2qTntDjgFyMCdDcSTRi++nFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYqzl0DvDzPSY; Thu, 24 Oct 2024 02:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O2kANF086296; Thu, 24 Oct 2024 02:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2kALm086293; Thu, 24 Oct 2024 02:46:10 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:46:10 GMT Message-Id: <202410240246.49O2kALm086293@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: be2940e90864 - stable/14 - amd64: do not pass -z rodynamic to ld.bfd when building vdso List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: be2940e908642c3019ba8196430c2cb09f1dc532 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be2940e908642c3019ba8196430c2cb09f1dc532 commit be2940e908642c3019ba8196430c2cb09f1dc532 Author: Konstantin Belousov AuthorDate: 2024-10-18 14:09:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:44:40 +0000 amd64: do not pass -z rodynamic to ld.bfd when building vdso (cherry picked from commit 3b2cf9381ef86847603c3c94811f638660c417ae) --- sys/tools/amd64_ia32_vdso.sh | 7 ++++++- sys/tools/amd64_vdso.sh | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh index 59923749042f..85d2299b45d0 100644 --- a/sys/tools/amd64_ia32_vdso.sh +++ b/sys/tools/amd64_ia32_vdso.sh @@ -34,9 +34,14 @@ ${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c -m32 \ -o ia32_sigtramp.pico -I. -I"${S}" -include opt_global.h \ "${S}"/amd64/ia32/ia32_sigtramp.S +if ${LD} --version | ${AWK} '/^GNU ld/{exit 1}' ; then + RODYNAMIC="-z rodynamic" +else + RODYNAMIC="" +fi ${LD} --shared -Bsymbolic -soname="elf-vdso32.so.1" \ -T "${S}"/conf/vdso_amd64_ia32.ldscript \ - --eh-frame-hdr --no-undefined -z rodynamic -z norelro -nmagic \ + --eh-frame-hdr --no-undefined ${RODYNAMIC} -z norelro -nmagic \ --hash-style=sysv --fatal-warnings --strip-all \ -o elf-vdso32.so.1 ia32_sigtramp.pico diff --git a/sys/tools/amd64_vdso.sh b/sys/tools/amd64_vdso.sh index aec0694ebdb1..2a83ae874ab7 100644 --- a/sys/tools/amd64_vdso.sh +++ b/sys/tools/amd64_vdso.sh @@ -40,12 +40,17 @@ ${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ # # -z rodynamic is undocumented lld-specific option, seemingly required # for lld to avoid putting dynamic into dedicated writeable segment, -# despite ldscript placement. It is ignored by ld.bfd but ldscript +# despite ldscript placement. It is omitted for ld.bfd, but ldscript # alone is enough there. # +if ${LD} --version | ${AWK} '/^GNU ld/{exit 1}' ; then + RODYNAMIC="-z rodynamic" +else + RODYNAMIC="" +fi ${LD} --shared -Bsymbolic -soname="elf-vdso.so.1" \ -T "${S}"/conf/vdso_amd64.ldscript \ - --eh-frame-hdr --no-undefined -z rodynamic -z norelro -nmagic \ + --eh-frame-hdr --no-undefined ${RODYNAMIC} -z norelro -nmagic \ --hash-style=sysv --fatal-warnings --strip-all \ -o elf-vdso.so.1 sigtramp.pico From nobody Thu Oct 24 03:16: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 4XYrfJ5qBBz5b0cg; Thu, 24 Oct 2024 03:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYrfJ5KQRz4DNs; Thu, 24 Oct 2024 03:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729739768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WmriVtwdAZnd/QsEL+puQFoqKTeU5tl4iYo8Rl6J1zQ=; b=Coiv5QuRS+IFyXR1q/A1kmrZrJqlrl5SixxrXfB+nAvgG+zO7Lej0usCYOiWWRE1mAy2J9 RTOlRW7IA1odpnrQLOPuClQmG9pGi6NRdgQBZADgezkKEuSp1nlu9WlU/bm+L/d13Rp9Oh TovmpNIPccsfO3Io5TH2c+61gotL/xI1KoanRdbJ2Aah7VLGKo+dkQAmXXNi1+/KT/guHn c84w7PfZrmzGsSmeCvtR++ppR/cVvHIehhjhcBDouXD4RBy0/76B3Sgmy00STaOb2lyHXO VEk9q8wyzggdMEM9GOwYmuPnDUUnvdlJSYdyMBeDW7HUKhwJS7SqM6eTeb2sIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729739768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WmriVtwdAZnd/QsEL+puQFoqKTeU5tl4iYo8Rl6J1zQ=; b=posOKXha2NZ4iCfsIf7RqG9G1QaeO//pRc4zJNP9X9WzjDYBGMc7gYMMpVK818bX/fysrM khRCPTBnxh4APGEh8iwaoPkS1OFIxX+zVB37LYvBQ1FTLrxKJodyXcIrYgIKjRDg82AITo z1g4gwNLApGoupvtYv2vZb00wm9g/uursuIKa/6EESmDfNl9bMhOKoW3IFaaED376LtJA9 NxIkN8ntDnjBJCsRaagIx+TOsV4bJPICPyfWqgbQIjRkKtecLhZTWzYrX145JFjJD5pmoq p+yoJIRfVQxndSwjUnpBzGWvq0idZjnM7J+/bUTZw5kTB7bHmx6mqL67gzXMPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729739768; a=rsa-sha256; cv=none; b=qgdft8X2FwiwiUV2Z01dqj+nvPm3uIRHrcCZoi4FylT/OmlFRd/lmlQHFK4n9WS06YXyKL iBXmCpq3OodlSqwP4bUR/rHHyPRNz8Z4JMARCvrRB0qFoQsDmN2tFXidppkJgCcbc6HNtr GjEAXJS8N9I373k/MirXZpol4fpN6PI1aBcIXN+CF0sALKD9bhGvIQbzVgEXJNsUoXKs08 5y7TcqkUQnh6l7cJlCvUiIr72qyrIMBoS8jhi3JDzcj41UKrC+yubp9D64wjHMB170IcXH jJDWLxmcQobZgZkuEDmaiWVM8wq8rGDUxuOla2ALXGYMbwpKDeUrXK5pzn85mA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYrfJ4b9XzQcV; Thu, 24 Oct 2024 03:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O3G8We043917; Thu, 24 Oct 2024 03:16:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O3G8gQ043914; Thu, 24 Oct 2024 03:16:08 GMT (envelope-from git) Date: Thu, 24 Oct 2024 03:16:08 GMT Message-Id: <202410240316.49O3G8gQ043914@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: 3360a15898ce - main - net: route: convert routing statistics to a 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3360a15898ce6cd06aad5afd9b48c8a5454cf952 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3360a15898ce6cd06aad5afd9b48c8a5454cf952 commit 3360a15898ce6cd06aad5afd9b48c8a5454cf952 Author: Kyle Evans AuthorDate: 2024-10-24 03:15:55 +0000 Commit: Kyle Evans CommitDate: 2024-10-24 03:15:55 +0000 net: route: convert routing statistics to a sysctl Exporting the relevant pcpustat is trivial, so let's do that. We will use it in a near-future change in netstat to avoid having to dig around in mem(4) for live kernel statistics. Differential Revision: https://reviews.freebsd.org/D47231 --- sys/net/route.c | 4 ++++ sys/net/route.h | 1 + 2 files changed, 5 insertions(+) diff --git a/sys/net/route.c b/sys/net/route.c index 650da826d89d..7a50bcc43e06 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -75,6 +75,10 @@ VNET_PCPUSTAT_SYSINIT(rtstat); VNET_PCPUSTAT_SYSUNINIT(rtstat); #endif +SYSCTL_DECL(_net_route); +SYSCTL_VNET_PCPUSTAT(_net_route, OID_AUTO, stats, struct rtstat, + rtstat, "route statistics"); + EVENTHANDLER_LIST_DEFINE(rt_addrmsg); static int rt_ifdelroute(const struct rtentry *rt, const struct nhop_object *, diff --git a/sys/net/route.h b/sys/net/route.h index 6d28f21e9181..603e4fac5354 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -239,6 +239,7 @@ struct rtstat { uint64_t rts_add_retry; /* # of route addition retries */ uint64_t rts_del_failure; /* # of route deletion failure */ uint64_t rts_del_retry; /* # of route deletion retries */ + uint64_t rts_spare[5]; }; /* From nobody Thu Oct 24 03:17: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 4XYrgP0HN0z5b09G; Thu, 24 Oct 2024 03:17:05 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYrgN6ZW3z4Dn2; Thu, 24 Oct 2024 03:17:04 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729739824; h=from:from:reply-to:subject: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=aQ2MaLLvtFkymU0NZxcDP6MHWNk98ddcoLRW+i/mGeU=; b=cIMr+1+7tIztlHtM5+PZdgy4+60JdrlLnVWXqXcrRiH/G3RGm+3SmPIivRR493oFrgIMWh UwH9221d3edMebKKMfLTNzotSLQz/xJytdICD0Uatuei7FRItLwR110d2pa4UN6Q4uFCnQ +V7KUO8En6hqEgdoJwY/VqVARXUuvz5t7B/+YitezPRBhMynBACXete1mE4SrIeEd6iGRS zdd1G8miTTQQoAKVf79PMGMN6n+gImN6674SaFaCRpj0xhCNzAVShBIZN1XK6l5oYFncSC 4zUGsqD1jHARlhUTDJvkNpUxvncpzIrYPM2kWxUlNGHbCmmk3yif1DYRmlhC6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729739824; h=from:from:reply-to:subject: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=aQ2MaLLvtFkymU0NZxcDP6MHWNk98ddcoLRW+i/mGeU=; b=uvrY94RoOLiAZmy4dgG6L0pmqPuCzPMB4jfGkiSOHSPJ3nDxMVEoEotHoavWwK5Fo0loE7 s5niTIxHZmQk2jBg2e8bSAEEtbEP/bfPqhsTQU15s+TRKm6FRsCpRxz0L0r36d++LGsel+ KSXF67YkGFwu5SJI/zhjmOKK+mw0oaRsLtE8jCMVB0QYfnjRZJ65ezgwJbmIqTx9wqQHpm k0ym0ba9fet4f/grz3DXnqO+Bql6sxk05CxDviu4HjjRJ31M7p4ywyrlFxe0zpb3VhUdIM Nm271Nb2Y2kpybqnAVNPdiOf/SkNb+3VLt1goRj+9YIEY/wpKFm4p8NqUniQIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729739824; a=rsa-sha256; cv=none; b=Q7TTSH2KRE0tiMCgmDCSn/ThGDumIYuCi30QPiCeeP+mfeBzd2YUC6Ybmva7kFDgHtWtpl ttzjkYmZLNDzRnoHXvnMCDP3iito33o5xKDV3ff5PjEHWhF0oHpJTX9hgem44dvxQDD3Bi MsMUgOShnlyWgYVRMqJTCt65f28LHBXtXIqdXEnktdAPXFw17WWqz0p+MoKx//EelduZ81 N2WCpyptNdZxSuT91WRqxqm+y/4R36IqMkmn36md2M9PHiN+HnKctarum3kJGoa9v95stD 7cHn28PVR5Zh8D/kEQZ6O/iJqL99pQ6XOAvuLz7gV+rhMXoOQq1lFANvoLmvaA== Received: from [IPV6:2001:470:39df:1:f67b:9ff:fe9c:6c5b] (unknown [IPv6:2001:470:39df:1:f67b:9ff:fe9c:6c5b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XYrgN4V63z1HHw; Thu, 24 Oct 2024 03:17:04 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <505d67af-eca8-4e21-86d2-fee25bdd0687@FreeBSD.org> Date: Wed, 23 Oct 2024 22:17:03 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3360a15898ce - main - net: route: convert routing statistics to a sysctl From: Kyle Evans To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202410240316.49O3G8gQ043914@gitrepo.freebsd.org> Content-Language: en-US In-Reply-To: <202410240316.49O3G8gQ043914@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/23/24 22:16, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3360a15898ce6cd06aad5afd9b48c8a5454cf952 > > commit 3360a15898ce6cd06aad5afd9b48c8a5454cf952 > Author: Kyle Evans > AuthorDate: 2024-10-24 03:15:55 +0000 > Commit: Kyle Evans > CommitDate: 2024-10-24 03:15:55 +0000 > > net: route: convert routing statistics to a sysctl > > Exporting the relevant pcpustat is trivial, so let's do that. We will > use it in a near-future change in netstat to avoid having to dig around > in mem(4) for live kernel statistics. > > Differential Revision: https://reviews.freebsd.org/D47231 Sorry, I failed to ^C it in time. Reviewed by: glebius, markj, zlei Thanks, Kyle Evans > --- > sys/net/route.c | 4 ++++ > sys/net/route.h | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/sys/net/route.c b/sys/net/route.c > index 650da826d89d..7a50bcc43e06 100644 > --- a/sys/net/route.c > +++ b/sys/net/route.c > @@ -75,6 +75,10 @@ VNET_PCPUSTAT_SYSINIT(rtstat); > VNET_PCPUSTAT_SYSUNINIT(rtstat); > #endif > > +SYSCTL_DECL(_net_route); > +SYSCTL_VNET_PCPUSTAT(_net_route, OID_AUTO, stats, struct rtstat, > + rtstat, "route statistics"); > + > EVENTHANDLER_LIST_DEFINE(rt_addrmsg); > > static int rt_ifdelroute(const struct rtentry *rt, const struct nhop_object *, > diff --git a/sys/net/route.h b/sys/net/route.h > index 6d28f21e9181..603e4fac5354 100644 > --- a/sys/net/route.h > +++ b/sys/net/route.h > @@ -239,6 +239,7 @@ struct rtstat { > uint64_t rts_add_retry; /* # of route addition retries */ > uint64_t rts_del_failure; /* # of route deletion failure */ > uint64_t rts_del_retry; /* # of route deletion retries */ > + uint64_t rts_spare[5]; > }; > > /* From nobody Thu Oct 24 03:33: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 4XYs2J1rwVz5b1HL; Thu, 24 Oct 2024 03:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYs2J1KP4z4GR7; Thu, 24 Oct 2024 03:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729740808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EsfsIW1623KQoAogSxBNdfM1b9ISqnajZvhe8bBFgbs=; b=CdY6BPRtPk4cDBb2OFSPnT2ZAHi5aTZloV1s3+Efw7aIrcX6IgH8u2ntF+hI+aTTjnuZzm hNpDDQam4W8LCp0Eg7arB0d+yzhU0cJQRCys+dnJx+ieaC4Ya+O1XBBwAaNd91OQoagT7f iqcnH5LNP8BHDVpE4qLglIdLIYBl7sgYIuN2/aM19aaEEsG6YOj8qK+R0fzA5NP2SSTaRF dlnQg24Qs+iBUame6a+tv2LDa31jsdQd0oPGd7SkI9y8Ulq3HccqLT6Ol4EogORCUaw0/L 3dn7qCGPz34698w49iJWTZWYiSXfh6OGGcimqVP/Df/qpvJdkxQv6PvPh7rZvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729740808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EsfsIW1623KQoAogSxBNdfM1b9ISqnajZvhe8bBFgbs=; b=nFYWuQ2SbQjjlVe7YYrLvfnVTY2m0FwWgw+5QZ4wXXj1GZrkuAWQku/ceuqK+oSWyRQp25 MH1sa/hbX07Gj8wy4Fui4mtKh7iRTNHw7lOrdVPgUvNv3mw0vyEWBRSXEgvzlq/FKH4TFB IPZARHvcWZu5HtUlyOTPB2deMGM3zobW85x4snr2KL3OS9b5toOd9rmzKToyk6+2zBCeCl 3k6LDfhhcQuUEAmOMMESy2oXptaPcIJrTZCweCwCDlYtc9uw3e5O8B1s2mZtKH1QQ10Cqr 2hDQa2pDRkMGnXwYNTbf9teRTXKzISkkixIm9b4C7gd2MZTZwf7H0dVXJwDYjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729740808; a=rsa-sha256; cv=none; b=Dhs25l0CUVUjENNGVe6jHaodF0VnPuSlRgH5OWgwTpeu6ScotEjQ5cqdbphyO9S3XlaEjf W0hjMmwecCypPST2jBWErkGOlgkM+r4m0aJhf4wrcevNlGetRDhe1bjsIiET0yHNY3ZyE6 D83nJBRyZ1iXgCgZFMtsPeIYazKlcs833ye6swE3p8M/8+QB4hlOQf4G4/jOtkY5PupyHY ORzHrXs+4fFMvtyXO27Z4nFOQGL4ObU4x/va49mtBSBZ0OXDx2pp7szyRqBJENL7EA3smQ MOh53C1QsHlttZ0ixDElPHczU0YxdMMi4+AxJWNzpJ107SN7yMnNaBcuv9hseQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYs2J0kW1zQt2; Thu, 24 Oct 2024 03:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O3XSdO079621; Thu, 24 Oct 2024 03:33:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O3XRhx079618; Thu, 24 Oct 2024 03:33:27 GMT (envelope-from git) Date: Thu, 24 Oct 2024 03:33:27 GMT Message-Id: <202410240333.49O3XRhx079618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 77b70ad751df - main - e1000: Move I219 LM19/V19 to ADL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77b70ad751dfe3b115112252a5b96f504fcc2e0a Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=77b70ad751dfe3b115112252a5b96f504fcc2e0a commit 77b70ad751dfe3b115112252a5b96f504fcc2e0a Author: Kevin Bowling AuthorDate: 2024-10-24 03:31:17 +0000 Commit: Kevin Bowling CommitDate: 2024-10-24 03:31:17 +0000 e1000: Move I219 LM19/V19 to ADL This roughly corresponds to Linux 9d9e5347b035412daa844f884b94a05bac94f864 For FreeBSD this is currently not expected to cause any difference in behavior because we do not have the MTP force smbus changes for modern standby. MFC after: 3 days Sponsored by: BBOX.io --- sys/dev/e1000/e1000_api.c | 4 ++-- sys/dev/e1000/e1000_hw.h | 4 ++-- sys/dev/e1000/if_em.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c index cace8e563331..6c6cb999f29f 100644 --- a/sys/dev/e1000/e1000_api.c +++ b/sys/dev/e1000/e1000_api.c @@ -338,6 +338,8 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_ADL_I219_V16: case E1000_DEV_ID_PCH_ADL_I219_LM17: case E1000_DEV_ID_PCH_ADL_I219_V17: + case E1000_DEV_ID_PCH_ADL_I219_LM19: + case E1000_DEV_ID_PCH_ADL_I219_V19: case E1000_DEV_ID_PCH_RPL_I219_LM22: case E1000_DEV_ID_PCH_RPL_I219_V22: case E1000_DEV_ID_PCH_RPL_I219_LM23: @@ -346,8 +348,6 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) break; case E1000_DEV_ID_PCH_MTP_I219_LM18: case E1000_DEV_ID_PCH_MTP_I219_V18: - case E1000_DEV_ID_PCH_MTP_I219_LM19: - case E1000_DEV_ID_PCH_MTP_I219_V19: case E1000_DEV_ID_PCH_LNL_I219_LM20: case E1000_DEV_ID_PCH_LNL_I219_V20: case E1000_DEV_ID_PCH_LNL_I219_LM21: diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h index f17877f3e463..b4a9592cd89b 100644 --- a/sys/dev/e1000/e1000_hw.h +++ b/sys/dev/e1000/e1000_hw.h @@ -172,8 +172,8 @@ struct e1000_hw; #define E1000_DEV_ID_PCH_ADL_I219_V17 0x1A1D #define E1000_DEV_ID_PCH_MTP_I219_LM18 0x550A #define E1000_DEV_ID_PCH_MTP_I219_V18 0x550B -#define E1000_DEV_ID_PCH_MTP_I219_LM19 0x550C -#define E1000_DEV_ID_PCH_MTP_I219_V19 0x550D +#define E1000_DEV_ID_PCH_ADL_I219_LM19 0x550C +#define E1000_DEV_ID_PCH_ADL_I219_V19 0x550D #define E1000_DEV_ID_PCH_LNL_I219_LM20 0x550E #define E1000_DEV_ID_PCH_LNL_I219_V20 0x550F #define E1000_DEV_ID_PCH_LNL_I219_LM21 0x5510 diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 22578a3d8655..0b99f1b06130 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -193,8 +193,8 @@ static const pci_vendor_info_t em_vendor_info_array[] = PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V17, "Intel(R) I219-V ADL(17)"), PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM18, "Intel(R) I219-LM MTP(18)"), PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V18, "Intel(R) I219-V MTP(18)"), - PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM19, "Intel(R) I219-LM MTP(19)"), - PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V19, "Intel(R) I219-V MTP(19)"), + PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_LM19, "Intel(R) I219-LM ADL(19)"), + PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V19, "Intel(R) I219-V ADL(19)"), PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM20, "Intel(R) I219-LM LNL(20)"), PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_V20, "Intel(R) I219-V LNL(20)"), PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM21, "Intel(R) I219-LM LNL(21)"), From nobody Thu Oct 24 03:58: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 4XYsZz41Ctz5b2G5; Thu, 24 Oct 2024 03:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYsZz3Jf8z4HkM; Thu, 24 Oct 2024 03:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESOmHc6F+7UxnZkIXzbN08fqFsZIgqyO+7KwAgO1ZHM=; b=MS8kaHsfkoGaBXpx5q4ZfH2TsyZ66LeYibQSTh6ZxnhjkAdT3MlRinBamwxBgzZUDgZg43 gHBCt6ohb+AqV/P8nP5g/usgPlrciDrrhNwzndNaKt7CmDQNgy9CGGzyMn72dN8ElcUqZX VOgVtx0A8ow1Ov2hWnIqOd8Juyg3+DdE+XSTQTA6Mn1wVVOq/0YG3Yi18T//N+ydufkmog wODSdjmnZYRBkn+Xv4x4t5AcKG4MvQvjZLRonV53T4AKZKjWeKSpJcLzeOfoqJhyymDces jMQpjQ0jkjxgIex+Rji80boMaQtT64B5LxZ5K02dZmtvJTMbY0mJpF+f4CFmYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESOmHc6F+7UxnZkIXzbN08fqFsZIgqyO+7KwAgO1ZHM=; b=J2J6jwAJ/NZeAe5hTm6w88jIlDCsgPTuKfLwSurO4S8h6l7jb/ht5mWgyIshX6vZZWJO53 iOYLOeVFXua2wweMLT9/vOJsSOUtRvrS+zUrKXoBZRDyeJePQkZoy9HfLXC9R4N6ZyaB2f /dVkfqFGbxZnTZ9PmbyJ0BD9/HWJAaNZjC24YT7Qzbnt+ftszj0+eGD6twNyLcJ8xc935a jwYLlvYxUwMNo2CcAaT0gm12noUeMqUoIEAOaHKviKJR6jocUiiZMpm7XKDdWBVKGUD6J/ sR6M9KWHttWIBwNNTgWWixbkQA9eke5aAQXQj+YjZO0m5DS3quNYJjCycT1rrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729742299; a=rsa-sha256; cv=none; b=K6qj3Mpe4jzDrO4G6DdldVTo2v1cupDIzyunEC9CpmolyN669M9YAKeQz7UqkJA/aJ/lev 0ec5JJGP2+dihPDFr9pXnNJX+mjkV8xZ623oc1vw6wUIFFMTVdTvwCpQjgbgybnhW1gFNR hDpjyr4jKBwS9s99EYL9rIzVdvXOFVGTRBuJpsOR2DXHYw9NlvmxvzxlLBEmNY+bcji+nI 1xUTejnehVUuHMOl0mv3xeQJ+oBlpZffRK32J3DPBLiTTj5TvyUwVfD1I+xbviN1fSjXha 90tJ2PSUU3lh/4/eiVu4V1YCj15DMPx6HQtsv1mOyy+7+WGdzXT7eNdaZ0G7Sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYsZz2WY9zRQ9; Thu, 24 Oct 2024 03:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O3wJBn018249; Thu, 24 Oct 2024 03:58:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O3wJs0018246; Thu, 24 Oct 2024 03:58:19 GMT (envelope-from git) Date: Thu, 24 Oct 2024 03:58:19 GMT Message-Id: <202410240358.49O3wJs0018246@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: d64442a89896 - main - arm{,64}: use genassym for INTR_ROOT_* values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d64442a89896d616eb1225eea43ed64dc736f74d Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d64442a89896d616eb1225eea43ed64dc736f74d commit d64442a89896d616eb1225eea43ed64dc736f74d Author: Elliott Mitchell AuthorDate: 2024-10-24 03:55:21 +0000 Commit: Kyle Evans CommitDate: 2024-10-24 03:55:21 +0000 arm{,64}: use genassym for INTR_ROOT_* values Rather than keeping the entire machine interrupt header assembly-safe, switch to use of the existing genassym.c program to generate them. This will be handier in the long-term, most of the header never needs to be exposed to assembly-language. --- sys/arm/arm/exception.S | 3 +-- sys/arm/arm/genassym.c | 2 ++ sys/arm64/arm64/exception.S | 3 +-- sys/arm64/arm64/genassym.c | 5 +++++ sys/arm64/include/intr.h | 3 --- sys/sys/intr.h | 4 ---- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index a17898a53d49..3df91d6e3c1e 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -48,12 +48,11 @@ #include "assym.inc" -#include - #include #include #include #include + #ifdef KDTRACE_HOOKS .bss .align 4 diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c index b7c3512dcb16..2cf1861b1178 100644 --- a/sys/arm/arm/genassym.c +++ b/sys/arm/arm/genassym.c @@ -131,6 +131,8 @@ ASSYM(DCACHE_LINE_MASK, offsetof(struct cpuinfo, dcache_line_mask)); ASSYM(ICACHE_LINE_SIZE, offsetof(struct cpuinfo, icache_line_size)); ASSYM(ICACHE_LINE_MASK, offsetof(struct cpuinfo, icache_line_mask)); +ASSYM(INTR_ROOT_IRQ, INTR_ROOT_IRQ); + /* * Emit the LOCORE_MAP_MB option as a #define only if the option was set. */ diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index b3f2a3931e08..d8c024d01921 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -26,11 +26,10 @@ */ #include -#include #include #include -#include + #include "assym.inc" .text diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index 8cbafba45a7d..db076e1ebf48 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -28,10 +28,12 @@ #include #include +#include #include #include #include +#include #include #include @@ -77,3 +79,6 @@ ASSYM(TF_ELR, offsetof(struct trapframe, tf_elr)); ASSYM(TF_SPSR, offsetof(struct trapframe, tf_spsr)); ASSYM(TF_ESR, offsetof(struct trapframe, tf_esr)); ASSYM(TF_X, offsetof(struct trapframe, tf_x)); + +ASSYM(INTR_ROOT_IRQ, INTR_ROOT_IRQ); +ASSYM(INTR_ROOT_FIQ, INTR_ROOT_FIQ); diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h index f7aa2de0ee00..99b4d15ccc1c 100644 --- a/sys/arm64/include/intr.h +++ b/sys/arm64/include/intr.h @@ -27,7 +27,6 @@ #ifndef _MACHINE_INTR_H_ #define _MACHINE_INTR_H_ -#ifndef LOCORE #ifdef FDT #include #endif @@ -49,8 +48,6 @@ arm_irq_memory_barrier(uintptr_t irq) #define ACPI_GPIO_XREF 3 #endif -#endif /* !LOCORE */ - #define INTR_ROOT_FIQ 1 #define INTR_ROOT_NUM 2 diff --git a/sys/sys/intr.h b/sys/sys/intr.h index 54e838e5015a..c1e440a9fa93 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -33,15 +33,12 @@ #error Need INTRNG for this file #endif -#ifndef LOCORE #include -#endif #define INTR_IRQ_INVALID 0xFFFFFFFF #define INTR_ROOT_IRQ 0 -#ifndef LOCORE enum intr_map_data_type { INTR_MAP_DATA_ACPI = 0, INTR_MAP_DATA_FDT, @@ -172,5 +169,4 @@ void intr_ipi_dispatch(u_int ipi); /* Main interrupt handler called from asm on most archs except riscv. */ void intr_irq_handler(struct trapframe *tf, uint32_t rootnum); -#endif /* !LOCORE */ #endif /* _SYS_INTR_H */ From nobody Thu Oct 24 03:58: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 4XYsb05tZsz5b2G7; Thu, 24 Oct 2024 03:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYsb046Lcz4Hxr; Thu, 24 Oct 2024 03:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPxLcNaE52AYpj+VsFu53nmp+ETpgP11ifAcspwp51U=; b=JZNbUG9wefW9Vml9Ziy+xKtkMGHRSW38/zO36v4C0i3FEdduOniiMxwNqScz4zg2ranPiP 5qqauL5IlT1m7BgGbJvXxYtnVuO5eOqtDY9ZujPfzkKxvUXJvGkaq8BrpQuFPX/d3eeZOB XTbnArAXKg/iiKGmxWTNeU5eKyJ6wnEOMlaECbuPZ6UhLFAoM898ruhbxNBNZQdcSYIBeK ZrjkJPudgIPFw5VFK0mUml8rXGncd8pbejOilhAzdL3+eZSXA4U1YyP5GkbT8bETpqv6L2 3mFDjpJQvjKqrz2iS2kvoPhE0sqIP+pHSGeO0zj7Y3hnouMyqJlJJgO2TFjq0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPxLcNaE52AYpj+VsFu53nmp+ETpgP11ifAcspwp51U=; b=RLbhBZMAY/IbLlp2u0zzXdGsXYRgQaHFCdG9L1OcOfmMgvauc0xcH/maXY5LT1UJJXidis YpUwOhJl+O7lQMCeH+/EKzzA6/tXJ1nIH2CjNT+CG+8jg2Inwj3CXygAnywzFZsuW74PgQ GwF+Nh6X4Ude+bYmLDfrqTdYZtnmpj0PFsFjJIAPiGSER5T/vO3E+FwN6GNHdYNqp7UKLC /sF5jOXnx7D8GFUhhxS9zEzTcGfOOu4dd490SpWsHZQa0gOu5Aklikbm0oRsM1QskZ4HXY 89I2iZzKQKFAX7VnYGW0mQUTRWpZtB8uOuR+5GIfEmsrBDGyIE48hnA4seFHQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729742300; a=rsa-sha256; cv=none; b=fG3ue1Tf7U1hYQmhJoAWO6rYrZ+7J8KOT1dcMJNxks8jweuGX2QJLpm7aazUS8fy/ht2oo IuafT+WR2g3prZwfrIXPngBZaoqKSJQxbygwR/Fbm0ltV1N8isbyaMGliWrlgHLhrNOUu4 M0wF8N8UUrle/y0SFfVtGONlJWEti0CAHd5w02i4dinSoJzcAzIP2J+vvC5BHIg7BFuYmr D5aKlLlYh+riL/Yog7ag87GbokrQ5z5Tx17alTttVYcSzUQDYFyPekffWNSRnF8hhLOhli b/xV/6E7SlytHGnYJB5VUsl6uKTR48kf7F1YDlk7rTUtBw8ry9lt0KYpQ8aPWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYsb03KrSzRKP; Thu, 24 Oct 2024 03:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O3wK2L018300; Thu, 24 Oct 2024 03:58:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O3wKVY018297; Thu, 24 Oct 2024 03:58:20 GMT (envelope-from git) Date: Thu, 24 Oct 2024 03:58:20 GMT Message-Id: <202410240358.49O3wKVY018297@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: 536c8d948e85 - main - intrng: change multi-interrupt root support type to enum List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 536c8d948e8563141356fd41fb8bfe65be289385 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=536c8d948e8563141356fd41fb8bfe65be289385 commit 536c8d948e8563141356fd41fb8bfe65be289385 Author: Elliott Mitchell AuthorDate: 2024-10-24 03:55:21 +0000 Commit: Kyle Evans CommitDate: 2024-10-24 03:55:21 +0000 intrng: change multi-interrupt root support type to enum uint32_t is handy for directly interfacing with assembly-language. For the C portion, enum is much handier. In particular there is no need to count the number of roots by hand. This also works better for being able to build kernels with varying numbers of roots. Switch to INTR_ROOT_COUNT as this better matches the purpose of the value. Switch to root_type, rather than rootnum for similar reasons. Remove the default from the core. Better to require the architectures to declare the type since they will routinely deviate and a default chosen now will likely be suboptimal. Leave intr_irq_handler() taking a register type as that better matches for interfacing with assembly-language. --- sys/arm/arm/gic.c | 2 +- sys/arm/broadcom/bcm2835/bcm2836.c | 2 +- sys/arm/include/intr.h | 6 ++++++ sys/arm64/arm64/gic_v3.c | 4 ++-- sys/arm64/arm64/gicv3_its.c | 2 +- sys/arm64/include/intr.h | 10 ++++++--- sys/kern/pic_if.m | 4 ++-- sys/kern/subr_intr.c | 43 +++++++++++++++----------------------- sys/riscv/include/intr.h | 6 ++++++ sys/riscv/riscv/intc.c | 2 +- sys/sys/intr.h | 10 ++++----- 11 files changed, 48 insertions(+), 43 deletions(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index b1b7aacd63ab..ffce86e62128 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -200,7 +200,7 @@ gic_cpu_mask(struct arm_gic_softc *sc) #ifdef SMP static void -arm_gic_init_secondary(device_t dev, uint32_t rootnum) +arm_gic_init_secondary(device_t dev, enum root_type root_type) { struct arm_gic_softc *sc = device_get_softc(dev); u_int irq, cpu; diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c index 7ed9dedaa77e..fd34ff8818ad 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.c +++ b/sys/arm/broadcom/bcm2835/bcm2836.c @@ -538,7 +538,7 @@ bcm_lintc_init_pmu_on_ap(struct bcm_lintc_softc *sc, u_int cpu) } static void -bcm_lintc_init_secondary(device_t dev, uint32_t rootnum) +bcm_lintc_init_secondary(device_t dev, enum root_type root_type) { u_int cpu; struct bcm_lintc_softc *sc; diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index d0d0ff9fc32a..e74be3ac548e 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -43,6 +43,12 @@ #include #endif +enum root_type { + INTR_ROOT_IRQ = 0, + + INTR_ROOT_COUNT /* MUST BE LAST */ +}; + #ifndef NIRQ #define NIRQ 1024 /* XXX - It should be an option. */ #endif diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 964a129111e2..750f734a7757 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -1093,7 +1093,7 @@ gic_v3_bind_intr(device_t dev, struct intr_irqsrc *isrc) #ifdef SMP static void -gic_v3_init_secondary(device_t dev, uint32_t rootnum) +gic_v3_init_secondary(device_t dev, enum root_type root_type) { struct gic_v3_setup_periph_args pargs; device_t child; @@ -1140,7 +1140,7 @@ gic_v3_init_secondary(device_t dev, uint32_t rootnum) for (i = 0; i < sc->gic_nchildren; i++) { child = sc->gic_children[i]; - PIC_INIT_SECONDARY(child, rootnum); + PIC_INIT_SECONDARY(child, root_type); } } diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 5ecd9b8c0e94..31e23fc01224 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -1293,7 +1293,7 @@ gicv3_its_setup_intr(device_t dev, struct intr_irqsrc *isrc, #ifdef SMP static void -gicv3_its_init_secondary(device_t dev, uint32_t rootnum) +gicv3_its_init_secondary(device_t dev, enum root_type root_type) { struct gicv3_its_softc *sc; diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h index 99b4d15ccc1c..008c377b7a16 100644 --- a/sys/arm64/include/intr.h +++ b/sys/arm64/include/intr.h @@ -31,6 +31,13 @@ #include #endif +enum root_type { + INTR_ROOT_IRQ = 0, + INTR_ROOT_FIQ = 1, + + INTR_ROOT_COUNT /* MUST BE LAST */ +}; + #include #ifndef NIRQ @@ -48,7 +55,4 @@ arm_irq_memory_barrier(uintptr_t irq) #define ACPI_GPIO_XREF 3 #endif -#define INTR_ROOT_FIQ 1 -#define INTR_ROOT_NUM 2 - #endif /* _MACHINE_INTR_H */ diff --git a/sys/kern/pic_if.m b/sys/kern/pic_if.m index f78e787594c5..2d938520b106 100644 --- a/sys/kern/pic_if.m +++ b/sys/kern/pic_if.m @@ -74,7 +74,7 @@ CODE { } static void - null_pic_init_secondary(device_t dev, uint32_t rootnum) + null_pic_init_secondary(device_t dev, enum root_type root_type) { } @@ -157,7 +157,7 @@ METHOD void pre_ithread { METHOD void init_secondary { device_t dev; - uint32_t rootnum; + enum root_type root_type; } DEFAULT null_pic_init_secondary; METHOD void ipi_send { diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index a6052f28b04c..6b4ebd16675c 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -89,15 +89,6 @@ #define INTRNAME_LEN (2*MAXCOMLEN + 1) -/* - * Archs may define multiple roots with INTR_ROOT_NUM to support different kinds - * of interrupts (e.g. arm64 FIQs which use a different exception vector than - * IRQs). - */ -#if !defined(INTR_ROOT_NUM) -#define INTR_ROOT_NUM 1 -#endif - #ifdef DEBUG #define debugf(fmt, args...) do { printf("%s(): ", __func__); \ printf(fmt,##args); } while (0) @@ -115,7 +106,7 @@ struct intr_irq_root { void *arg; }; -static struct intr_irq_root intr_irq_roots[INTR_ROOT_NUM]; +static struct intr_irq_root intr_irq_roots[INTR_ROOT_COUNT]; struct intr_pic_child { SLIST_ENTRY(intr_pic_child) pc_next; @@ -337,16 +328,16 @@ isrc_release_counters(struct intr_irqsrc *isrc) * from the assembler, where CPU interrupt is served. */ void -intr_irq_handler(struct trapframe *tf, uint32_t rootnum) +intr_irq_handler(struct trapframe *tf, u_register_t root_type) { struct trapframe * oldframe; struct thread * td; struct intr_irq_root *root; - KASSERT(rootnum < INTR_ROOT_NUM, - ("%s: invalid interrupt root %d", __func__, rootnum)); + KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, + ("%s: invalid interrupt root %ju", __func__, (uintmax_t)root_type)); - root = &intr_irq_roots[rootnum]; + root = &intr_irq_roots[root_type]; KASSERT(root->filter != NULL, ("%s: no filter", __func__)); kasan_mark(tf, sizeof(*tf), sizeof(*tf), 0); @@ -495,11 +486,11 @@ isrc_free_irq(struct intr_irqsrc *isrc) } device_t -intr_irq_root_device(uint32_t rootnum) +intr_irq_root_device(enum root_type root_type) { - KASSERT(rootnum < INTR_ROOT_NUM, - ("%s: invalid interrupt root %d", __func__, rootnum)); - return (intr_irq_roots[rootnum].dev); + KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, + ("%s: invalid interrupt root %ju", __func__, (uintmax_t)root_type)); + return (intr_irq_roots[root_type].dev); } /* @@ -900,7 +891,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, uint32_t rootnum) + void *arg, enum root_type root_type) { struct intr_pic *pic; struct intr_irq_root *root; @@ -925,9 +916,9 @@ intr_pic_claim_root(device_t dev, intptr_t xref, intr_irq_filter_t *filter, * Note that we further suppose that there is not threaded interrupt * routine (handler) on the root. See intr_irq_handler(). */ - KASSERT(rootnum < INTR_ROOT_NUM, - ("%s: invalid interrupt root %d", __func__, rootnum)); - root = &intr_irq_roots[rootnum]; + KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, + ("%s: invalid interrupt root %ju", __func__, (uintmax_t)root_type)); + root = &intr_irq_roots[root_type]; if (root->dev != NULL) { device_printf(dev, "another root already set\n"); return (EBUSY); @@ -1580,16 +1571,16 @@ void intr_pic_init_secondary(void) { device_t dev; - uint32_t rootnum; + enum root_type root_type; /* * QQQ: Only root PICs are aware of other CPUs ??? */ //mtx_lock(&isrc_table_lock); - for (rootnum = 0; rootnum < INTR_ROOT_NUM; rootnum++) { - dev = intr_irq_roots[rootnum].dev; + for (root_type = 0; root_type < INTR_ROOT_COUNT; root_type++) { + dev = intr_irq_roots[root_type].dev; if (dev != NULL) { - PIC_INIT_SECONDARY(dev, rootnum); + PIC_INIT_SECONDARY(dev, root_type); } } //mtx_unlock(&isrc_table_lock); diff --git a/sys/riscv/include/intr.h b/sys/riscv/include/intr.h index ad811dcbc449..8cbb07c6be24 100644 --- a/sys/riscv/include/intr.h +++ b/sys/riscv/include/intr.h @@ -35,6 +35,12 @@ #ifndef _MACHINE_INTR_MACHDEP_H_ #define _MACHINE_INTR_MACHDEP_H_ +enum root_type { + INTR_ROOT_IRQ = 0, + + INTR_ROOT_COUNT /* MUST BE LAST */ +}; + #ifndef NIRQ #define NIRQ 1024 #endif diff --git a/sys/riscv/riscv/intc.c b/sys/riscv/riscv/intc.c index 248175e8bea3..fcfc0c826fb9 100644 --- a/sys/riscv/riscv/intc.c +++ b/sys/riscv/riscv/intc.c @@ -241,7 +241,7 @@ intc_setup_intr(device_t dev, struct intr_irqsrc *isrc, #ifdef SMP static void -intc_init_secondary(device_t dev, uint32_t rootnum) +intc_init_secondary(device_t dev, enum root_type root_type) { struct intc_softc *sc; struct intr_irqsrc *isrc; diff --git a/sys/sys/intr.h b/sys/sys/intr.h index c1e440a9fa93..0208844e90c8 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -37,8 +37,6 @@ #define INTR_IRQ_INVALID 0xFFFFFFFF -#define INTR_ROOT_IRQ 0 - enum intr_map_data_type { INTR_MAP_DATA_ACPI = 0, INTR_MAP_DATA_FDT, @@ -113,12 +111,12 @@ 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 *, - uint32_t); + enum root_type); 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 *); -device_t intr_irq_root_device(uint32_t); +device_t intr_irq_root_device(enum root_type); /* Intr interface for BUS. */ @@ -166,7 +164,7 @@ void intr_ipi_send(cpuset_t cpus, u_int ipi); void intr_ipi_dispatch(u_int ipi); #endif -/* Main interrupt handler called from asm on most archs except riscv. */ -void intr_irq_handler(struct trapframe *tf, uint32_t rootnum); +/* Main interrupt handler called from asm on many archs. */ +void intr_irq_handler(struct trapframe *tf, u_register_t root_type); #endif /* _SYS_INTR_H */ From nobody Thu Oct 24 03:58: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 4XYsb21pXpz5b1kN; Thu, 24 Oct 2024 03:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYsb20DV8z4HsZ; Thu, 24 Oct 2024 03:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+/UYRCbhUq3/8yxGfGRSjjmscA5+Ti8vbVFcflE+j4=; b=YUHgYhO0HZJNLJgHWBN1olxrvAt09cjRnq5zmifkrQjEa3W7a7rYnSujmmXfag/hxtWbV2 vGhhKasdjaElNSs+ZYW+na0CPjjEvzBAHWYYKRSxFjlCPjTKa2TMU1iJHcXbIp/nxP4wHZ ob4xYpypn+8rQzRMoNcfAhSTNBdF2YMKobacny5fxcPjV83wQDFCG3Yq1jVDw/w+iC96Sc tk2JUoTvDh0Kc09oSZVVMxRjGlAcunZVrlWdf0sl+cpmFiVXEVn2GtvBHu8NGfztVX2rIJ 7iJXmBoV/EwAR5Cp0vSNcOm6iFU35fn3DmTwe6nAWe0dx1fWiKvSiTW9EZD/Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729742302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+/UYRCbhUq3/8yxGfGRSjjmscA5+Ti8vbVFcflE+j4=; b=gkvGa0byr1HiNvWLJ/g8zuzFuAejzsTnGKxC4C0o52cTqq/TPW4xuZbzz7k2DdWlvOtpbY 5Rx0biznKcU5o+/UnbWsoQMwq6sok2ackM4ZEh2UV6teafFqSeQaBF5bvoWzKEF5/tvViG gcz5hcpR2d66S/ixDY7j50VMB4K82ShbHrd7qdqkiytt2lrjGK5UsC3qBMMckUnAKiEla9 Pn1xNCVBMLuC1RaifKOCiDaxQQlyCAiQbIfjxMgVsUe+o1TNIIQKPF/Lvsi6Y7ZDntekvY XfPLsVXDRkYqCWTBEQahzT0Q9Nb5xZLXgK9LfjdWmPHiDEa7UdtHQ8ozN5IBAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729742302; a=rsa-sha256; cv=none; b=vEXJZ+ECHTR0vybPVJWQ+xahFcinme0JNEsXotwaeXuR2NNm2lSGlpHKDl8XbHUHYsoePe gO9tE5aldy7qx2bCTK3SDFdBnC5SaiukzN6jiuvi3tK0HAb2o5XTKa+wO1ClUUsirVdDm4 Py1lR3JgSnEvEqSOXcpYcd6VW9t+JjWxsweXaEpNvy/JaWqiU4MXMgkJS3s/xjtdbf4US0 fGxSCAnYX3drnxsRkzyPCWfrq2R2iGwXQPUd48PuawdY3EEmfFB32hClex9N6rHKtCwOdV yloNcby9V8aDzDq0KJ36wr8Lvi/lGixGKu3SjmPUscTi1SW9rtYmZJaiR7DG0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYsb15852zR8t; Thu, 24 Oct 2024 03:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O3wLlL018342; Thu, 24 Oct 2024 03:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O3wLa7018339; Thu, 24 Oct 2024 03:58:21 GMT (envelope-from git) Date: Thu, 24 Oct 2024 03:58:21 GMT Message-Id: <202410240358.49O3wLa7018339@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: 4f12b529f404 - main - sys/intr.h: formally depend on machine/intr.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4f12b529f40422589404fc939ed4a92710412a61 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4f12b529f40422589404fc939ed4a92710412a61 commit 4f12b529f40422589404fc939ed4a92710412a61 Author: Kyle Evans AuthorDate: 2024-10-24 03:55:22 +0000 Commit: Kyle Evans CommitDate: 2024-10-24 03:55:29 +0000 sys/intr.h: formally depend on machine/intr.h sys/intr.h originally started life as an extract of arm's intr.h, and this include was dropped in its place. Changes in flight want to add some MD definitions that we'll use in the more MI parts of INTRNG. Let's formally reverse the dependency now since this is way more common in general. All of the includes switched in this change that I spot-checked were in-fact wanting declarations historically included in sys/intr.h anyways. Reviewed by: andrew, imp, jrtc27, mhorne, mmel, olce Differential Revision: https://reviews.freebsd.org/D47002 --- sys/arm/arm/mp_machdep.c | 2 +- sys/arm/include/intr.h | 2 -- sys/arm64/include/intr.h | 2 -- sys/kern/subr_intr.c | 2 +- sys/riscv/include/intr.h | 2 -- sys/riscv/riscv/mp_machdep.c | 2 +- sys/riscv/riscv/timer.c | 2 +- sys/riscv/riscv/trap.c | 4 ++-- sys/sys/intr.h | 2 ++ 9 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c index ce9a83042d4a..9a4dc4e503e1 100644 --- a/sys/arm/arm/mp_machdep.c +++ b/sys/arm/arm/mp_machdep.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #include #ifdef VFP #include diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index e74be3ac548e..32297f656392 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -53,8 +53,6 @@ enum root_type { #define NIRQ 1024 /* XXX - It should be an option. */ #endif -#include - void arm_irq_memory_barrier(uintptr_t); #endif /* _MACHINE_INTR_H */ diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h index 008c377b7a16..c3fe5edc8a6c 100644 --- a/sys/arm64/include/intr.h +++ b/sys/arm64/include/intr.h @@ -38,8 +38,6 @@ enum root_type { INTR_ROOT_COUNT /* MUST BE LAST */ }; -#include - #ifndef NIRQ #define NIRQ 16384 /* XXX - It should be an option. */ #endif diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index 6b4ebd16675c..b8c085367dd6 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -72,7 +73,6 @@ #include #include -#include #include #include diff --git a/sys/riscv/include/intr.h b/sys/riscv/include/intr.h index 8cbb07c6be24..100f1ba40ff3 100644 --- a/sys/riscv/include/intr.h +++ b/sys/riscv/include/intr.h @@ -45,8 +45,6 @@ enum root_type { #define NIRQ 1024 #endif -#include - enum { IRQ_SOFTWARE_USER, IRQ_SOFTWARE_SUPERVISOR, diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c index 0e4d18ce47fb..235bee15ca29 100644 --- a/sys/riscv/riscv/mp_machdep.c +++ b/sys/riscv/riscv/mp_machdep.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,6 @@ #include #include -#include #include #include diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index 7ff8a84f3769..dc909082edae 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include #include -#include #include #include diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index 89eb6a1a378b..3bb1fc7f1010 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -37,11 +37,12 @@ #include #include +#include +#include #include #include #include #include -#include #include #include #include @@ -63,7 +64,6 @@ #include #include -#include #ifdef KDTRACE_HOOKS #include diff --git a/sys/sys/intr.h b/sys/sys/intr.h index 0208844e90c8..f612fc2744f1 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -35,6 +35,8 @@ #include +#include + #define INTR_IRQ_INVALID 0xFFFFFFFF enum intr_map_data_type { From nobody Thu Oct 24 07:03: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 4XYxhT5GmJz5b9K6; Thu, 24 Oct 2024 07:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYxhT4fz7z4WYv; Thu, 24 Oct 2024 07:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729753401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2fnZWFulEvT4Qx8QlGCM2SGaHMNbzKwsmVUWOmnWbk=; b=GPtRF+TbkajFNeCGwRpwz4y5KuQCwGfHV1Cs+n4QRtuG3V0qmEPbkfeh2RCQn8Hxvs8n+R YD32qclCse2oeTV7VDElXKsIPdg9AIZaOHHniOl+zDjw0utoK5Moj/ymeEFJpIlR52VZu/ m42Lzb5+kPAA6z5emQpfsFKh7JMbJ3XHW+7vScaxYnD3ONlqwqBQD3WoQF+i9QdFPY1icv pOrhQ6p236wUcg/BKgNwb1KcQVoeHeXy3xSOas1ikeCz7NRFnrTN33dO/7q6FjMMil2i5i 9IVCyejWz7P4Ee0B36iw5/e1RtAfrz6rkDltdQU1snqsrj35mwhseRhhXES1Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729753401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2fnZWFulEvT4Qx8QlGCM2SGaHMNbzKwsmVUWOmnWbk=; b=IVqbxBN7WhQZlPhGBbD6cvDKkYjeN4jnBjQ7Q9c9HflYN4JbwsdKaZ6VDIA/fKb0fjCI5y q85HhRrQRRkz+c7qBnLyUZsGmnaDWON9VScsg3ZwUNt90+Yhl9lQq4auXgjooIfeF7YEI2 g5w46JgrsNKep9Ce2fUfe14qfwCTKBjLMe5KlhhOlWDu5Q8ktzOZFQCp1/32Vt5UwespWc K9Cvm+SKXUwH5kcypYiB7ZDP4XPwsYGlmV9lhtWUxrdg2aLHmcdzXPxlfDZOUtbLzCWZ2a Op+/1tKaF6QbbyLEXsilPTUdIQJnfu1kxBHI7kasX0N9u4Slo4GJV9rAEiJXJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729753401; a=rsa-sha256; cv=none; b=ygVYYAQhfM9j/gq13V/xcsMl1bKwTceM2oyDOuUqaBB1mWUTFucsFS3aBCX3jhZ/apGQP+ 71y7KXayWSnfjJV7PoiMq1m3qqHyRa4U7Td7K0QQ1U/XAGZfINIj8l51zJ8rQgKiUnkPLc lcAX2M3MqJp71TLNZ6vbmQ95WgVeo582DLjJ5UJP+OZTmmj84visIQUDaEwdKfJfnP4n8r xsz6zGKaG+tM2nHoTXyKRl9F5I+1yX3OrQ8AlAFwKo6wYr3GjF0qN2/StiDKse7phBsZV5 Z6s5dKxB0aCWT2f056XaHuO1NtZXlgzO6xHCveQjcEx3/S8NGix3O8a1U2w6Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYxhT48pFzYQV; Thu, 24 Oct 2024 07:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O73L9u069597; Thu, 24 Oct 2024 07:03:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O73Ldv069594; Thu, 24 Oct 2024 07:03:21 GMT (envelope-from git) Date: Thu, 24 Oct 2024 07:03:21 GMT Message-Id: <202410240703.49O73Ldv069594@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: a5b1eecbed07 - main - Apply workaround for building llvm-project with WITHOUT_LLVM_ASSERTIONS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a5b1eecbed07519c637095e3291b9cbd9748e823 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a5b1eecbed07519c637095e3291b9cbd9748e823 commit a5b1eecbed07519c637095e3291b9cbd9748e823 Author: Dimitry Andric AuthorDate: 2024-10-24 07:02:54 +0000 Commit: Dimitry Andric CommitDate: 2024-10-24 07:03:02 +0000 Apply workaround for building llvm-project with WITHOUT_LLVM_ASSERTIONS Some internal checking functions should only be declared when both NDEBUG and LLVM_ENABLE_ABI_BREAKING_CHECKS are undefined, otherwise you would get compile errors similar to: /usr/src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' 921 | CurDAG->VerifyDAGDivergence(); | ~~~~~~ ^ Adjust the conditions for declaring and using these functions. This has also been reported upstream. Reported by: cy PR: 280562 MFC after: 1 month --- .../llvm/include/llvm/CodeGen/SelectionDAG.h | 2 +- .../llvm/include/llvm/CodeGen/SelectionDAGISel.h | 2 +- .../llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 2 +- .../llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h index 16ec65f2e7da..9c0220055f38 100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h @@ -582,7 +582,7 @@ public: return Root; } -#ifndef NDEBUG +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS void VerifyDAGDivergence(); #endif diff --git a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAGISel.h b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAGISel.h index aa0efa5d9bf5..0c23e80a0ac5 100644 --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAGISel.h +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAGISel.h @@ -55,7 +55,7 @@ public: AssumptionCache *AC = nullptr; GCFunctionInfo *GFI = nullptr; SSPLayoutInfo *SP = nullptr; -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS TargetTransformInfo *TTI = nullptr; #endif CodeGenOptLevel OptLevel; diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 02d44cd36ae5..63213e276d22 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -11623,7 +11623,7 @@ void SelectionDAG::CreateTopologicalOrder(std::vector &Order) { } } -#ifndef NDEBUG +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS void SelectionDAG::VerifyDAGDivergence() { std::vector TopoOrder; CreateTopologicalOrder(TopoOrder); diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index b961d3bb1fec..74bd1fdb887c 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -916,7 +916,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -936,7 +936,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -958,7 +958,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -982,7 +982,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -1000,7 +1000,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -1016,7 +1016,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -1036,7 +1036,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -1056,7 +1056,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif @@ -1076,7 +1076,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() { << "'\n"; CurDAG->dump()); -#if LLVM_ENABLE_ABI_BREAKING_CHECKS +#if !defined(NDEBUG) && LLVM_ENABLE_ABI_BREAKING_CHECKS if (TTI->hasBranchDivergence()) CurDAG->VerifyDAGDivergence(); #endif From nobody Thu Oct 24 07:25: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 4XYy9q0YwKz5bB3D; Thu, 24 Oct 2024 07:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYy9p6Yndz4Y05; Thu, 24 Oct 2024 07:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729754718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVt1vYvXGnRMZNnMERzTgxaW85VfgFNzNlErIcqysBc=; b=ULpWtVfTqYtd6cI409+h85MIQ8mgMvmYst66wR9d0RGQglZbeRnPzLMDEOE3y7/9LxlkAP /RnlmhiHRhFQTrl/FpRhDjgIJcujVoYDya2HXy0+E9OuoCPM71MqdmJYZxShp+0TsWsqp/ 27kJL8bzndPza5ZJvnAwMiL673iK1lHatBW1X1xy/3r4cTzvKnkqocugnExwJhQWXBG/7d gzjgeZD1pb3oO8sgBBwE6fI1ql5MIamP8KuYWs0TCBITsGolyYLaDA2Q2NbdoVDbSYsJAM 8aCQXBv2t2QUckhXVxamRMZAuVEU2OGsgMV+lIw6bmcLcXJod20dvORZM3YLsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729754718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVt1vYvXGnRMZNnMERzTgxaW85VfgFNzNlErIcqysBc=; b=JlHxa+iLsdUqsBLld0Wc6W1xl6M3ToVbOS26wEyn0OEOFVaIbHjIQ1x7r1NsyeQ239BUQ6 H6phhfH4ZymXeoC0faykjfxLxnHhGE1MIsP5Nrbunr4UORMLt2Z9eT7+WfOaCWl5Uq/oWG YDu9hIXsbDw0L/jx19n2j0GMtHHVvFb833U4MBirXWctF7HUjIHUH9dFvFP9Ap7rnSVNOf vMyceqKSY6IGGUeIhu6DN/Ks4OzLoV9iEewgypaQwSdWQrtt90+2VMpZd6k3Ddd0tepJKP 6UCe6ExZmkrrUnQF17Feoag2Zjzz4NBYqrxp7MuwNHL17RgoXzgTb2+/yeNRHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729754718; a=rsa-sha256; cv=none; b=w5nED1sWIr3vHmBnC5gDDzMs1Df6EE9FdKXDzMfHLh1d8QyX4K3tZtGSu8hCqk8elFOllw JdiZVJvZK3c4EsZvheDAtdZRouKP2nt7j+M2hvg8fpqHKR0vU8Jbq9t9DAWjZJ/Ss79Rro UNTbUQOCDwKwb6iVwqMUvhL08/h4MR9WDw/z1ukWyy6rCVkM9DQr6HoNQRLGYbJDy3VxTa 7m1h+YJkpv6cymHsvS020XQ2+JAli+E1gSSbrEfcbWx7AhL/W20h4e0y21hoR4HaDQ/yOC O4a4exgb46H3OIXeWNaPHjunImniHLoVNuZxFetdcwFk2iOPDWnmq4lD+5esqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYy9p62RDzYJ8; Thu, 24 Oct 2024 07:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O7PI6h006683; Thu, 24 Oct 2024 07:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O7PI0t006680; Thu, 24 Oct 2024 07:25:18 GMT (envelope-from git) Date: Thu, 24 Oct 2024 07:25:18 GMT Message-Id: <202410240725.49O7PI0t006680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 089664a8db2e - stable/14 - linuxkpi: chase spinlock_t in DECLARE_WAIT_QUEUE_HEAD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 089664a8db2e16493a4e976939c2237d43f81ada Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=089664a8db2e16493a4e976939c2237d43f81ada commit 089664a8db2e16493a4e976939c2237d43f81ada Author: Evgenii Khramtsov <2khramtsov@gmail.com> AuthorDate: 2024-08-27 11:21:39 +0000 Commit: Emmanuel Vadot CommitDate: 2024-10-24 07:24:52 +0000 linuxkpi: chase spinlock_t in DECLARE_WAIT_QUEUE_HEAD Remove member m to unbreak consumers, e.g. drm-kmod 5.10-lts branch. [...] /tmp/drm-kmod/drivers/gpu/drm/ttm/ttm_module.c:38:8: error: no member named 'm' in 'struct mtx' 38 | static DECLARE_WAIT_QUEUE_HEAD(exit_q); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /tmp/src/sys/compat/linuxkpi/common/include/linux/wait.h:113:33: note: expanded from macro 'DECLARE_WAIT_QUEUE_HEAD' 113 | MTX_SYSINIT(name, &(name).lock.m, spin_lock_name("wqhead"), MTX_DEF) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /tmp/src/sys/sys/mutex.h:528:4: note: expanded from macro 'MTX_SYSINIT' 528 | (mtx), \ | ^~~ /tmp/drm-kmod/drivers/gpu/drm/ttm/ttm_module.c:38:8: error: no member named 'm' in 'struct mtx' 38 | static DECLARE_WAIT_QUEUE_HEAD(exit_q); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /tmp/src/sys/compat/linuxkpi/common/include/linux/wait.h:113:33: note: expanded from macro 'DECLARE_WAIT_QUEUE_HEAD' 113 | MTX_SYSINIT(name, &(name).lock.m, spin_lock_name("wqhead"), MTX_DEF) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [...] Fixes: ae38a1a1bfdf ("linuxkpi: spinlock: Simplify code") MFC after: ? (cherry picked from commit 84f46335ab5da086c74032579799c0a74aa27447) --- sys/compat/linuxkpi/common/include/linux/wait.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/wait.h b/sys/compat/linuxkpi/common/include/linux/wait.h index b815050b6faa..309c7816aa7b 100644 --- a/sys/compat/linuxkpi/common/include/linux/wait.h +++ b/sys/compat/linuxkpi/common/include/linux/wait.h @@ -110,7 +110,7 @@ extern wait_queue_func_t default_wake_function; wait_queue_head_t name = { \ .task_list = LINUX_LIST_HEAD_INIT(name.task_list), \ }; \ - MTX_SYSINIT(name, &(name).lock.m, spin_lock_name("wqhead"), MTX_DEF) + MTX_SYSINIT(name, &(name).lock, spin_lock_name("wqhead"), MTX_DEF) #define init_waitqueue_head(wqh) do { \ mtx_init(&(wqh)->lock, spin_lock_name("wqhead"), \ From nobody Thu Oct 24 09:53: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 4XZ1T11h2qz5bJ96; Thu, 24 Oct 2024 09:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ1T10jHrz4m3L; Thu, 24 Oct 2024 09:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729763621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RCuZoNFOm9fK//5NDf4ZojN1pC2S2oJKw6B1xuFhGnA=; b=dmOkV350ap4DJEBao2upWnHqzKvUHh4moADQeAPGqfuXVtZEbqG5FnFNnyHyDuuyrg23eI UKBClRS9XVtSglsY9qm2qkDrKMhdKFc7vIH8R79BaWem+iJo3RqHvrhAmyoWEOVZOSLLBo sPk0RRCzA0SLJpT6j5jIEaUxEaXULNyfVjigkoMR1XEAZRdz9UCarW8qE9X83Ade5x0Zbl K9YEOiDisEmV06fwGxojgEVuAxfZcGMjPVCMH6hLpdO4yNU1ms/UE0K2bJ+YiSxSMAzJOJ 6qlKs0Z1z2Ek9nHEKf3p/QAMZ7hT1jpDeu5CsN8vUWv/GJeh2mfotdtLfifjGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729763621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RCuZoNFOm9fK//5NDf4ZojN1pC2S2oJKw6B1xuFhGnA=; b=aw9/LZKVY4qkOtH7c2IdK/PALFyV9fH0SZ11Bn1lU7nOJTKRfuYnid1gvgZ6mD1mZ2WArd TTlNBEqp3tN4HpJRjQU48Pywm7e03dlwE7XuoWDRNGsi7nd36eVSpT1K3RT1ZtE8mSe1th qAmMcra25zcIBHAgLnqt0wbWNpSuUhqOkUhZITc3dVKy/QL+PmnHkdFqxWh/TYHlneO5vC u3YYQKO9cCJLtFeNG5CIMVWltouzMLBAKqTH74RGYjWO5ayHardv7sv/hpJeL5ivecTZlk dYN7QCnz4ErntXZMPt1ecLKi4u8L79/fVRcFNMu3v2n3Oy+QTKWv55YjAVBY6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729763621; a=rsa-sha256; cv=none; b=Mq6xvczg9QJMa5j50VxZkD3HjMoAnYDat+aDGvUyWeZa86V1fE3iRJozlkIL9+4s8TwQYq 0lhE5qC9kMyDki6RCFS4zFi0ultYj9VNPtZMLqnKmfCNOzXg0X0rczjnQ1Tl3nZhemIaeh D06owfnqpFmTB6vT554Ruu+oYE0yd6rsPnmWKRrS+doG1MKLeijvIvSgZihD001bcTKDVC 4MAiRjDAiBC8+236/oqKZRzOP1owSFNm0bd8CE69SLUz7IYAwo+DgeuFmOyfASfJpkNFdD RMr07WD1rc6rip7tVYG2C/UT5JOu2mkeYaSl+0drPhb4mEO32Fnnr25wxUsT4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ1T10JNVzdQt; Thu, 24 Oct 2024 09:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49O9rexb083744; Thu, 24 Oct 2024 09:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O9re2H083741; Thu, 24 Oct 2024 09:53:40 GMT (envelope-from git) Date: Thu, 24 Oct 2024 09:53:40 GMT Message-Id: <202410240953.49O9re2H083741@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: 1c83996beda7 - main - Adjust LLVM_ENABLE_ABI_BREAKING_CHECKS depending on NDEBUG List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1c83996beda7b6a382857c318f46daefcb6bd84c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1c83996beda7b6a382857c318f46daefcb6bd84c commit 1c83996beda7b6a382857c318f46daefcb6bd84c Author: Dimitry Andric AuthorDate: 2024-10-24 09:53:19 +0000 Commit: Dimitry Andric CommitDate: 2024-10-24 09:53:19 +0000 Adjust LLVM_ENABLE_ABI_BREAKING_CHECKS depending on NDEBUG When assertions are disabled, the upstream build system disables LLVM_ENABLE_ABI_BREAKING_CHECKS by default. Though the upstream build system allows it to be force-enabled, it looks like that is not a well-tested build-time configuration. Therefore, always disable LLVM_ENABLE_ABI_BREAKING_CHECKS when assertions are disabled, which will also save some more runtime cost when people use WITHOUT_LLVM_ASSERTIONS. PR: 280562 MFC after: 1 month --- lib/clang/include/llvm/Config/abi-breaking.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/clang/include/llvm/Config/abi-breaking.h b/lib/clang/include/llvm/Config/abi-breaking.h index eb90be1fe37b..55e67e2ebad7 100644 --- a/lib/clang/include/llvm/Config/abi-breaking.h +++ b/lib/clang/include/llvm/Config/abi-breaking.h @@ -13,7 +13,11 @@ #define LLVM_ABI_BREAKING_CHECKS_H /* Define to enable checks that alter the LLVM C++ ABI */ +#ifdef NDEBUG +#define LLVM_ENABLE_ABI_BREAKING_CHECKS 0 +#else #define LLVM_ENABLE_ABI_BREAKING_CHECKS 1 +#endif /* Define to enable reverse iteration of unordered llvm containers */ #define LLVM_ENABLE_REVERSE_ITERATION 0 From nobody Thu Oct 24 10:36: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 4XZ2QW5VKtz5bKq5; Thu, 24 Oct 2024 10:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ2QW4f8kz4pcJ; Thu, 24 Oct 2024 10:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXqdKjwyFLrmR3TmqgGEijebcJJcrarygmWyWcc76SU=; b=DEynS3Nv5csIfX8bGpZTIb4ikmBovP5szX58TfMwgpLQXi3OEO9q4jVPbs5WQRl9LYWefA dbqgay0G0fY2gn1pgAc93A65XITVsZUMIMGDToGsgJr+z0rnwwObQdMMVbf9724Yvf0VDW lJKaypCN0VUisajptn48Ke9f1UqwE9x/eRrny9kJrku3T1xGNzBYOwTtnV4YYSkVg5Uz0H APZnspyQFgGQvRwyo6m7X9POEjY4NvTUjPoaDihxs5abkTuH62qyh9Vo5+/d4m3eCYWalD yHm+UNK0UE8Qzi8bVDqMsYuF8XULoUl+GTAW9e7VenMbskivqe2I6OS/jPcsIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aXqdKjwyFLrmR3TmqgGEijebcJJcrarygmWyWcc76SU=; b=CueKo7/JegObAehF1NVLi8n27eWmsMGBzjn+EeHpkXLzhKZtxwW77JC7PwsNdsoiedxaNp AVtdJh8TmoKTDdWRNsj9qCxLKJCv+h2GU2aSPOCQZv8YXifbDtR6E2n3zdqejHuevYBRZB 1lqeyvPHJxjvw/PlkWO4n8cNoQcAeA/UC4R1RClnVGVuXXCktY0CCxV0EUmCr+BAUq6ByI Qtbzun3iujzlBzBHCsQ+tGPb9TSJoKObyFBYaxJn4PXZk9XS3oJAbv86M+W2kIxF1IEdkq KBMOiCz+UoCKziUt1z3tsoAiMSglQ91TpX7ZzO5ySkQ07tifRm4y032SMbp/PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766195; a=rsa-sha256; cv=none; b=ebuY8A19G+UjKfHkt67MnAaM3GSZoq/lCAJ2i2xmfvav16T7MyRdPKkTj8l1VJOFZYhAcQ Ia21Ppz0f7Wp0C/DwyWy/TkrnmMyi398rqQ/7ZcT+BVepqB3w5tUU0aXzLXNBKfdv1R6Lm iHMcxWGDL5KsVEZwamZ2n07ZuoOxt6dMk71d5fNXKMR9rRDBSUenfdLt9UG4zS63b5olab PwYlTdjqRHZdyspm3xDpJZiH3snOBY3hIBacwtUHtmHCtJwiqD77qu5qQGVE9a95RX0K5M iII1GKMizXxHKU9D7RMWTw2kzeK2ph+4u/exliy7zSTxpKvATy9hjvxRiphbqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ2QW4CxnzfXP; Thu, 24 Oct 2024 10:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OAaZGK058959; Thu, 24 Oct 2024 10:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAaZYs058956; Thu, 24 Oct 2024 10:36:35 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:36:35 GMT Message-Id: <202410241036.49OAaZYs058956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b2dd4970c7b5 - main - dev/gpio: Mask all pl011 interrupts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2dd4970c7b5c20bef35a8924cc2a5f54ea4cb30 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b2dd4970c7b5c20bef35a8924cc2a5f54ea4cb30 commit b2dd4970c7b5c20bef35a8924cc2a5f54ea4cb30 Author: Andrew Turner AuthorDate: 2024-10-23 16:57:31 +0000 Commit: Andrew Turner CommitDate: 2024-10-24 10:20:48 +0000 dev/gpio: Mask all pl011 interrupts The firmware may have unmasked pl011 interrupts. If we don't have a device to handle one the kernel will print a spurious interrupt warning. Rather than print the warning mask all interrupts until we are ready to handle them. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46863 --- sys/dev/gpio/pl061.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/gpio/pl061.c b/sys/dev/gpio/pl061.c index 76754fead635..cc39790322b6 100644 --- a/sys/dev/gpio/pl061.c +++ b/sys/dev/gpio/pl061.c @@ -460,6 +460,9 @@ pl061_attach(device_t dev) goto free_mem; } + /* Mask all interrupts. They will be unmasked as needed later */ + bus_write_1(sc->sc_mem_res, PL061_INTMASK, 0); + ret = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, pl061_intr, NULL, sc, &sc->sc_irq_hdlr); if (ret) { From nobody Thu Oct 24 10:36: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 4XZ2QX6Cf9z5bK8d; Thu, 24 Oct 2024 10:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ2QX5ZkMz4pl3; Thu, 24 Oct 2024 10:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=np8P4xvLgrOoorYwwEp88z9ZdKcr99aM7+mt5r1Jzyo=; b=ZIr3nuFkMYSvnZc640LTE7PIoEoBNDNNMm5uCQbv56cHx4vA9sSsnFyRDjQZ1Hzd32U9A+ QoZNfbV+nzsHyzagP2j8pFEewIgGK3f45h+zTbGYVW35I1mYCzeIjFV0lNjiXgKyeMFcts 7nAYYvEby6lkJemieUCl3FnOCYbARgFoBfwnAET2vuIzNC6azNcF3AL2bQztCgD0ihoY6l aUGO1KUpiacNZMqFZBCH3FH9zcv1l+N8vJg8Mvu6iYnG7P8QI2PdSllUWFhPlJH+Jdslx2 r93dUkBdYcCS4N10B3wmf+9NxsQtgSw5qfM03DnLbryBtYdxOltfjRPRHfysWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=np8P4xvLgrOoorYwwEp88z9ZdKcr99aM7+mt5r1Jzyo=; b=lZhCEeUi621FCXFC7tu7OCoeIq6h7wi6nVHsJF3LtNghlCIxAzHWla5X3FO1pF+qKxd2ok B5tN2NsWsds+YCB1JNAxRu2oMso7Hucxzc5jiU4Uhm7qvxpgKAhUzJJA1YU6Fqg5LSZsAu sPCrtpMCAuGrtrFAEq78ukrmvoZcgQ7P8BpPiT1su+32vQbYwhmFfOayHIV0p4ccKZx0DS rXQXXAFVOhOWnTk3GtfOLQEpjSpB2P1qox7OqbHyZZuV+fzdlVJLuXnfX0GANDtjS7AZjz Yi4e0Ofy8brTeeq3Wwcl7JFr0lyVRFxgIxSDbxCI8NbeCm4hvDCBOQ0IYrvJKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766196; a=rsa-sha256; cv=none; b=pRoV3qpsbNSrzxIq76vZkspYIc5RagJu4q3OoqCNg1S+sX8zU8lPj3/1YCG91GkOF6lbjk EAbkG2HX+zli5ljhryVMHGvVbOUAGGISAcYMIWFE4EOYfdkKm4ru2sW9+ZicNrhdTT8P1K d9FBu83/PmhhDb/vlPq8o4dklmb2E0dZroB+x+ZASX+xy6PUnEGVW+OwB/CKisSDiA/lHa Zc70XEkFg/glC79WwWnDvKGxgU4Wqo2bax1KdxLKToCuVinDU8NX2sTxD6L9TLRaA5luY/ pHSPv3mjjLG+nrEDCKvyzzleFxRxJElhJALX00mA7F29BnfVWcyRmA1eCBWP+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 4XZ2QX59SNzfGV; Thu, 24 Oct 2024 10:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OAaair059001; Thu, 24 Oct 2024 10:36:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAaaRx058998; Thu, 24 Oct 2024 10:36:36 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:36:36 GMT Message-Id: <202410241036.49OAaaRx058998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3b03e1bb8615 - main - intrng: Store the IPI priority List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b03e1bb86157cc235563fc6e86c33b6bd9baea8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3b03e1bb86157cc235563fc6e86c33b6bd9baea8 commit 3b03e1bb86157cc235563fc6e86c33b6bd9baea8 Author: Andrew Turner AuthorDate: 2024-10-23 16:57:53 +0000 Commit: Andrew Turner CommitDate: 2024-10-24 10:20:48 +0000 intrng: Store the IPI priority When registering an interrupt controller we take a priority to compare. We never store the priority so any later calls may act incorrectly. Store the priority so later calls act as expected. Reviewed by: jrtc27 Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47235 --- sys/kern/subr_intr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index b8c085367dd6..e88018e58729 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -1854,8 +1854,10 @@ intr_ipi_pic_register(device_t dev, u_int priority) return (EBUSY); } - if (intr_ipi_dev == NULL || priority > intr_ipi_dev_priority) + if (intr_ipi_dev == NULL || priority > intr_ipi_dev_priority) { + intr_ipi_dev_priority = priority; intr_ipi_dev = dev; + } return (0); } From nobody Thu Oct 24 10:36: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 4XZ2QZ1r9pz5bKls; Thu, 24 Oct 2024 10:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ2QY6FVhz4plC; Thu, 24 Oct 2024 10:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JygcN5nMcdkdle9apUQEUCDzFsyfiS8FX0T3m6gW4Ms=; b=V4dSK+L/LNxF5cEUgIF9ToyFxiqYHPnUnnnlvdE0mBcI4VtLX/SzzUvL/uMHDuyPSnErZH Qr8TE4szeWcpHOdJvJNPcVfiw1It5OQy2yZmW5hK730lGjxI/H/7e1QLzDhMDZG/kY7L75 Sj+ay/VWHPgbiV6PptIK0Ovzpeijf+R52EGAFkjUhDFpUOP2UxD9wafKnw+Mv6q81K+Pjo TCuQsOBdomuVDysKy1nOq0EY6yMFoCgPK3K8EAGigg4zKBBENi7+xpQrgMSTWn2Tc5bF4s w0rGtsLq1eWq3q8OmJPGFZYgXMtaWkrkVEcvoiZHc3STjCyEptOP3tiphCB8Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JygcN5nMcdkdle9apUQEUCDzFsyfiS8FX0T3m6gW4Ms=; b=uvNAjgNHDCCddb/OrXPJEZH6Jy9mPR3e5Z/+fFbrJc3a86WbSCK1wuEQv/VFjRALL2HfRe Y4FeibQ/Sq4bwfGHDOOcZaQaTzOkcwtmocxRfe/xedt6yqs0Z8A3quqgDRSdZy+f2R5EUP 071lYToFWgFqOaMoiP5NTY2iRF8pCVUXbsSMp/fMgexleD/ifmXGbnojiBr26BA/xTEXPx D5we8gFp0Dhb1cq/tTIH+yqFvKwYCpo2GrV7Go6qWOZNGT54ajmdQgO9Q+mYaqW3Fw5DTw ZalCrgSsmbw5XKKXOmimGaLN9GGWU8rJjDLsHq+4n8Q5CQ/WrJ7LkscZO0Czcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766197; a=rsa-sha256; cv=none; b=Y/WrjcuzsrNZpRVUrkmNUOe/skblMhsTEku/jJQzLZKv3PP2VAmKcBDMyOF7WpNaeU/43D tYq3vbi+efLtqYqKhpbrTgEU7gAFMHanWXvXr7pS17eWeUlDGPgv9jS73h8sblQzc7O1Rt J3fbF922Yoc9clt4AddBLBq/++dQaHVdXH1G6d+yWi27PTyYQgGLmxumfVuriZ87pltO3b ruMrchrKN81EZ4KmAAAqWghGkIZNpxsse9zOPUggzQ3jCo6Ex8+ghiHTflE2p9QSYj3mEz kz6F307rKQVOfBgtSZEhl4caEE1YRTYJGxJWhzR4rBgOVOpBb+R29Vk4sc1aBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ2QY5r2nzfGW; Thu, 24 Oct 2024 10:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OAabMW059056; Thu, 24 Oct 2024 10:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAabtV059053; Thu, 24 Oct 2024 10:36:37 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:36:37 GMT Message-Id: <202410241036.49OAabtV059053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 6204391e99ca - main - arm64: Check TDP_NOFAULTING in a data abort List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6204391e99ca4da6a3cbce6b36b02f47da40802c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6204391e99ca4da6a3cbce6b36b02f47da40802c commit 6204391e99ca4da6a3cbce6b36b02f47da40802c Author: Andrew Turner AuthorDate: 2024-10-24 09:49:02 +0000 Commit: Andrew Turner CommitDate: 2024-10-24 10:20:48 +0000 arm64: Check TDP_NOFAULTING in a data abort As with other architectures when the TDP_NOFAULTING flag is set we shouldn't panic when td_critnest is non-zero or if the witness check fails. The EFI runtime service functions will soon set this flag to handle exceptions in the services. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46815 --- sys/arm64/arm64/trap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index fa1132305067..d6e316e7ae0a 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -338,8 +338,9 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, td->td_md.md_spinlock_count); } #endif - if (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | - WARN_GIANTOK, NULL, "Kernel page fault") != 0) { + if ((td->td_pflags & TDP_NOFAULTING) == 0 && + (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | + WARN_GIANTOK, NULL, "Kernel page fault") != 0)) { print_registers(frame); print_gp_register("far", far); printf(" esr: 0x%.16lx\n", esr); From nobody Thu Oct 24 10:36: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 4XZ2Qb52xsz5bKjw; Thu, 24 Oct 2024 10:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ2Qb0Qf3z4pWy; Thu, 24 Oct 2024 10:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wU7bUADimgBxtKPSz7jWItm86P1f7r87U0X+RPsyqFc=; b=Eml2PhJVrWVNKBkqsHclWKzCa9v9L/eWb5fVN+6OFLTroqqdf1cyLHGfRBPcul86esdP7t sYZy8XNOGUUkuuV7mA4zuVBt0ROkQF3KtAbv2HTP4UeAs8mhQzidxgofjKEPc93V0KJKEu 8pYuMMn6Swguvx5qCfdgYRzTGjq4ZfdPqcBPNthy4HMw/jNfhJ9PG0Uud/TDzmXX0dLqyf s4J4S7KpX43O3XyeQrmtUYIpuJBTbrGOvRw8nXtrIe0kqMMKb1f46MG/WodUrHqjl5sgbw MbhtbQyX3bfH4Rm7GIGmj+uVSAbQeQZE4V0HNk0pxVjnvVbq9fTaEpTY9kl9RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wU7bUADimgBxtKPSz7jWItm86P1f7r87U0X+RPsyqFc=; b=GA5vcHSvYjOMz4x2QyjJEvbteAsUvaq4AuovBgypr+uzsT9ncegof984CtZo45w22DC0Yn hcquKThP6c/b4OWBcoK2T0Z87KECMOadbtnJpk7eI7N7TsLVvc3sigeA5+/jHC8mnxaWtT IsEknI/r1Bt8fstNscnEyGX9uv6uMtAGWYkXgpT1cpGXYskddBXcs1OSG5MPyu1UIA5IqE +NBjWlTpJVQBIenhdf0UFKZp9FYLbwn7qynEa5l4ETjTi5TGh2lpXkotRby/yJ/2zFAQG3 j1BSz+FARa8ilLji+VTD9lvd10LyU+4ORePUZkM0DWJxy1Sw6IwTHyJx+fjouQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766199; a=rsa-sha256; cv=none; b=s4RvFC+FJMIEpc+VlhsmTuUIuELUxVwXBMcxv1gonWqCxI2wRcBsTACqf4B3cbdCblwqu5 IGD4ZtSZIPBxF9paafZpCY/PVnxsrW2D1BZ74uxpmHpKToD5IR/nMRHo3hcxXoDc2cSFcS IBKO7LIXIaqOvHuB7qIYuFQYDqYmspNFcD7P3qeNvKWmvz7MYsYwGM1DcIYryBSMv5za3d g4CwpV2uR+jvH5uZP+468D/F+HlgkIUoIvq4ECpcufESoSVn65lCS+lpsVXI/I88dTDaL2 x1Rsi/EQVxR+BbruN/MlZEBIdJoLAVVm6f7JRew8oIoVTKWNbyQlS9/voPvK9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ2Qb037bzfGX; Thu, 24 Oct 2024 10:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OAacno059107; Thu, 24 Oct 2024 10:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAacub059104; Thu, 24 Oct 2024 10:36:38 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:36:38 GMT Message-Id: <202410241036.49OAacub059104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a84653c5db25 - main - arm64: Don't enable interrupts when in a spinlock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a84653c5db255bf28c19b64dd6ac20009ebcbce3 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a84653c5db255bf28c19b64dd6ac20009ebcbce3 commit a84653c5db255bf28c19b64dd6ac20009ebcbce3 Author: Andrew Turner AuthorDate: 2024-10-24 09:52:37 +0000 Commit: Andrew Turner CommitDate: 2024-10-24 10:20:48 +0000 arm64: Don't enable interrupts when in a spinlock When we receive an exception while in a spinlock we shouldn't enable interrupts. When entering a spinlock we disable interrupts so enabling them here could cause surprising results. The three cases that could cause this are: 1. A break-before-make sequence 2. Accessing possibly unmapped code with a fault handler 3. Buggy code 1 and 2 are supported later in the data abort handler, and 3 should be fixed when found. Reviewed by: mmel, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46816 --- sys/arm64/arm64/trap.c | 12 ++++++++++-- sys/arm64/include/armreg.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index d6e316e7ae0a..544189964ef0 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -308,10 +308,18 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, break; } } - intr_enable(); + if (td->td_md.md_spinlock_count == 0 && + (frame->tf_spsr & PSR_DAIF_INTR) != PSR_DAIF_INTR) { + MPASS((frame->tf_spsr & PSR_DAIF_INTR) == 0); + intr_enable(); + } map = kernel_map; } else { - intr_enable(); + if (td->td_md.md_spinlock_count == 0 && + (frame->tf_spsr & PSR_DAIF_INTR) != PSR_DAIF_INTR) { + MPASS((frame->tf_spsr & PSR_DAIF_INTR) == 0); + intr_enable(); + } map = &td->td_proc->p_vmspace->vm_map; if (map == NULL) map = kernel_map; diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index e26f9859947e..5e87fafbec31 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2569,6 +2569,7 @@ #define PSR_DAIF (PSR_D | PSR_A | PSR_I | PSR_F) /* The default DAIF mask. These bits are valid in spsr_el1 and daif */ #define PSR_DAIF_DEFAULT (0) +#define PSR_DAIF_INTR (PSR_I | PSR_F) #define PSR_BTYPE 0x00000c00UL #define PSR_SSBS 0x00001000UL #define PSR_ALLINT 0x00002000UL From nobody Thu Oct 24 10:36: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 4XZ2Qc39s4z5bL7x; Thu, 24 Oct 2024 10:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ2Qc1Pbkz4pcw; Thu, 24 Oct 2024 10:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ToYonaBsTrMXZizR2SO8/qhQkPJpTbffOn6xY970WTo=; b=gm5nM+nVMSXmTiIwbYSlShidT2Vx80Z7ckoP83aNnhdLWNcZHzDxhHN//mMin3Np5AF9sG 6imhg4uNj8oLj+rMjXyAMPWQPuNUQXlg7AgJhDGsIYu50sTMWqyc4cPCBqbusJeueyof7l 965o2uEDg5Yt3IvfOQ1cWyomqXjxCt0uKc+Wyco+v52lKbraJKXKeKv2X0pyYZLpQCJLhe khl70hCtpEXmvqAn8r4xmADxj+6trFIFRLqJlIYsqsYFYgef9zH2Z5kRLfN59gC0nAZPyq qX2pvMasyGJfZqn8Hb+3GlK+QHSSNgOZAPSVNiPqxOHl2wM/pRoB/3zk8K+JXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ToYonaBsTrMXZizR2SO8/qhQkPJpTbffOn6xY970WTo=; b=v+YiPMfRRUJDqCGfRqTi1y5L9aA0f9aQSDZTvHQaRL8lihsYWfR8q9pJAMK+AG0PPpLIKK u+84R/IhUyfqX++mkPWSDTjX5t1riP2/4tPg99WDVPhmdXgALxFrLFBZbvsfSCy4lmsyxE oXZnAEY70xVVdY8HYR3SMV6FKbMmIF6Y4Om0LBPX+cyTpSpqsv5yCXzr8BjuzS1ilxtqGX z+QM+5oVuMDML/Pnn/Q22aEcoioW72u2Wu2W3/G3T+QjxhtGHMhbs14CKs9NzAda2V9+Y7 3YOA/Hqt1ifeYiE0LMbfqWp7cBoJ1sT7R9S83TNZWu025YJyt1Uw1l6xPw3qIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766200; a=rsa-sha256; cv=none; b=HT+Zqhvz4d4d3lY2xaeJOdw/rVwW3NMI7N95m0kdU4raer/3udYL9D2M+BXp04sC/n67F8 IK1iDmrZJ85w+v3WxsobqhOJJz7jH38iYS8euE9DhQ4HqWPnauMraaMSarXG7EBIicWdBt HpAshnBbByqigGpxfJnsmMXC+URvfhGRNYN9k7dTe3tudrMzOPxZIpHh6L6nRKhbGv5ReH k6Kzh3jwGYc5ro8DAQVuTGcvsjXdVdjwBOUYMU8yuWAa13lDD4TEvMOnvnwDR1nvNNrDhy VrM2ppYmj/H+hgOuWGJ0jw+cVWQIWwHuF+G/ieKJUVD9C/rL9hzOjGM3Z6qZaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ2Qc10f9zfGY; Thu, 24 Oct 2024 10:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OAaekH059146; Thu, 24 Oct 2024 10:36:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAaeGD059143; Thu, 24 Oct 2024 10:36:40 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:36:40 GMT Message-Id: <202410241036.49OAaeGD059143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d7f930b80e89 - main - arm64: Implement efi_rt_arch_call List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7f930b80e8928efd9f0bdc0fd48585f8b0b7061 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d7f930b80e8928efd9f0bdc0fd48585f8b0b7061 commit d7f930b80e8928efd9f0bdc0fd48585f8b0b7061 Author: Andrew Turner AuthorDate: 2024-10-24 09:52:46 +0000 Commit: Andrew Turner CommitDate: 2024-10-24 10:20:48 +0000 arm64: Implement efi_rt_arch_call This is a function that calls into the EFI Runtime Services, but can handle a fault. To support this add a handler in assembly that can restore the kernel state on an exception and return a failure to the caller. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46817 --- sys/arm64/arm64/efirt_machdep.c | 9 ++-- sys/arm64/arm64/efirt_support.S | 101 ++++++++++++++++++++++++++++++++++++++++ sys/arm64/arm64/genassym.c | 6 +++ sys/arm64/include/proc.h | 6 ++- sys/conf/files.arm64 | 1 + 5 files changed, 116 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index 47e0a209d8b1..aad3761844e1 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -239,6 +240,7 @@ efi_arch_enter(void) { CRITICAL_ASSERT(curthread); + curthread->td_md.md_efirt_dis_pf = vm_fault_disable_pagefaults(); /* * Temporarily switch to EFI's page table. However, we leave curpmap @@ -269,11 +271,6 @@ efi_arch_leave(void) set_ttbr0(pmap_to_ttbr0(PCPU_GET(curpmap))); if (PCPU_GET(bcast_tlbi_workaround) != 0) invalidate_local_icache(); + vm_fault_enable_pagefaults(curthread->td_md.md_efirt_dis_pf); } -int -efi_rt_arch_call(struct efirt_callinfo *ec) -{ - - panic("not implemented"); -} diff --git a/sys/arm64/arm64/efirt_support.S b/sys/arm64/arm64/efirt_support.S new file mode 100644 index 000000000000..b7bef7500ee4 --- /dev/null +++ b/sys/arm64/arm64/efirt_support.S @@ -0,0 +1,101 @@ +/*- + * Copyright (c) 2024 Arm Ltd + * + * 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 "assym.inc" + +/* + * int efi_rt_arch_call(struct efirt_callinfo *); + */ +ENTRY(efi_rt_arch_call) + sub sp, sp, #(14 * 8) + stp x19, x20, [sp, #(2 * 8)] + stp x21, x22, [sp, #(4 * 8)] + stp x23, x24, [sp, #(6 * 8)] + stp x25, x26, [sp, #(8 * 8)] + stp x27, x28, [sp, #(10 * 8)] + stp x29, x30, [sp, #(12 * 8)] + add x29, sp, #(12 * 8) + + /* Save the stack pointer so we can find it later */ + ldr x23, [x18, #PC_CURTHREAD] + mov x24, sp + str x24, [x23, #TD_MD_EFIRT_TMP] + + mov x22, x0 + + /* Load the function to branch to */ + ldr x9, [x22, #(EC_FPTR)] + + /* Load the arguments */ + ldr x4, [x22, #(EC_ARG1 + (4 * 8))] + ldr x3, [x22, #(EC_ARG1 + (3 * 8))] + ldr x2, [x22, #(EC_ARG1 + (2 * 8))] + ldr x1, [x22, #(EC_ARG1 + (1 * 8))] + ldr x0, [x22, #(EC_ARG1 + (0 * 8))] + + /* Set the fault handler */ + adr x10, efi_rt_fault + SET_FAULT_HANDLER(x10, x11) + + blr x9 + + /* Clear the fault handler */ + SET_FAULT_HANDLER(xzr, x11) + + /* Store the result */ + str x0, [x22, #(EC_EFI_STATUS)] + mov x0, #0 + +.Lefi_rt_arch_call_exit: + ldp x19, x20, [sp, #(2 * 8)] + ldp x21, x22, [sp, #(4 * 8)] + ldp x23, x24, [sp, #(6 * 8)] + ldp x25, x26, [sp, #(8 * 8)] + ldp x27, x28, [sp, #(10 * 8)] + ldp x29, x30, [sp, #(12 * 8)] + add sp, sp, #(14 * 8) + + ret +END(efi_rt_arch_call) + +ENTRY(efi_rt_fault) + /* Clear pcb_onfault */ + SET_FAULT_HANDLER(xzr, x11) + /* Load curthread */ + ldr x1, [x18, #PC_CURTHREAD] + /* Restore the stack pointer */ + ldr x2, [x1, #TD_MD_EFIRT_TMP] + mov sp, x2 + /* Normal exit returning an error */ + ldr x0, =EFAULT + b .Lefi_rt_arch_call_exit +END(efi_rt_fault) + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index db076e1ebf48..8612d2eda309 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -45,6 +46,10 @@ ASSYM(BP_KERN_STACK, offsetof(struct arm64_bootparams, kern_stack)); ASSYM(BP_KERN_TTBR0, offsetof(struct arm64_bootparams, kern_ttbr0)); ASSYM(BP_BOOT_EL, offsetof(struct arm64_bootparams, boot_el)); +ASSYM(EC_EFI_STATUS, offsetof(struct efirt_callinfo, ec_efi_status)); +ASSYM(EC_FPTR, offsetof(struct efirt_callinfo, ec_fptr)); +ASSYM(EC_ARG1, offsetof(struct efirt_callinfo, ec_arg1)); + ASSYM(PCPU_SIZE, sizeof(struct pcpu)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); @@ -71,6 +76,7 @@ ASSYM(TD_AST, offsetof(struct thread, td_ast)); ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_MD_CANARY, offsetof(struct thread, td_md.md_canary)); +ASSYM(TD_MD_EFIRT_TMP, offsetof(struct thread, td_md.md_efirt_tmp)); ASSYM(TF_SIZE, sizeof(struct trapframe)); ASSYM(TF_SP, offsetof(struct trapframe, tf_sp)); diff --git a/sys/arm64/include/proc.h b/sys/arm64/include/proc.h index dfd39faadd46..dc2fa2df654d 100644 --- a/sys/arm64/include/proc.h +++ b/sys/arm64/include/proc.h @@ -65,7 +65,11 @@ struct mdthread { struct ptrauth_key apia; } md_ptrauth_kern; - uint64_t md_reserved[4]; + uint64_t md_efirt_tmp; + int md_efirt_dis_pf; + + int md_reserved0; + uint64_t md_reserved[2]; }; struct mdproc { diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 16d70e1addb6..1ed7b57627b4 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -40,6 +40,7 @@ arm64/arm64/debug_monitor.c standard arm64/arm64/disassem.c optional ddb arm64/arm64/dump_machdep.c standard arm64/arm64/efirt_machdep.c optional efirt +arm64/arm64/efirt_support.S optional efirt arm64/arm64/elf32_machdep.c optional compat_freebsd32 arm64/arm64/elf_machdep.c standard arm64/arm64/exception.S standard From nobody Thu Oct 24 10:36: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 4XZ2Qd4f6Mz5bKsg; Thu, 24 Oct 2024 10:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ2Qd2R0mz4pyr; Thu, 24 Oct 2024 10:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=McwvJFm0c6Whm1WShc7E6B3RJx9uuRCo0S5tLFaiuw4=; b=cEri1rj2eUVbcyQGFVt+h9KC6LNJhSHv4FBxXoBL/R2tg1c1Tg45F8lPv0rLRlcUJEldfz vafclTANd6+xWCXjyPvi4AI2va9VbMAXg8N7F16uNv5IKy72UdI9qqSoo4qrG27lnR4RVo 6/RKf9VKylsM2DzME30ycBRD1+/eq4Wa5FmTtod9S1zmrBU1BKIfoAv6gqxxLtJjBoxiry WvviYF2tX9NYglLdrifaUeHAere7sJpSjm46N/MgKliMXL86d+HvAVoKXXaqNwz5Wxmeep PIfImgdD09Rz9a7PC+gItrSbEEk1PjXSIsa3DNBcHbv1O8/7hj6OoRrKn+E2/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=McwvJFm0c6Whm1WShc7E6B3RJx9uuRCo0S5tLFaiuw4=; b=e1CniwigPOJ/O/16Wf7iCMdy9hK3gAzb8f7FgnytuvbSO9JLWBxg06hWBzsSY/vXL0qQj/ qYHO/2tG+RVXBrZi2qWMgZOjQYaBeWNn53d7mQPsEZJk0OlvkV5Dk35OWKHX5rqj1Knxm/ 8GLyzNtm0NA89J1s1HtYmLXd/9Ij4iuEr333oosz8WJABem0G3ON/eHCGkVScAVNB66Vov h61JrgTltM3LxglgWv7nEekTyz3Lpi3zPedJ0YNV9GV2DJXPdE7dbj02mIsMnrXDGD5aUs tpnxWbNVbAufFmQIfggOgCrnOy8cy65ILXv+OqmNOrplhsaFhTaWGMnyX+ue3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766201; a=rsa-sha256; cv=none; b=NHJu67ojzisUGC5tZyhtSBloqaX79esEhqUgY8ZNbsE5N7Kd3ijwZ2YyUCJhRKr97WAJuI kdAKSIOHrSpegkMCe1WvIYoOqJ6FG8x5pde61eyFHzzoxL9dWPymXvAlpCRfCzRCTC06jF TDm6VAeOPgujuUES72eGo+FhbFm2J6E4YIRqHrXncPS0+Phjep0gcC2hQzUtEirdf82fEY S6GErFfp06rADmi0Qa2jNY6M5qWqCE1rfl0+yL7jvq/zyJficRNjbnm80ji5vRmY2/wvtb aQPH/bJypwQ2oqRx4UMspEobrwK4UCg7x5hFrbSDJ6SWnXt6T9tBxQOpWkqeqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ2Qd21F5zfXQ; Thu, 24 Oct 2024 10:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OAafmN059197; Thu, 24 Oct 2024 10:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAafrG059194; Thu, 24 Oct 2024 10:36:41 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:36:41 GMT Message-Id: <202410241036.49OAafrG059194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8efb1500d4f1 - main - arm64: Enable handling EFI runtime service faults List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8efb1500d4f17d397048ed3e56e4af9b855bccb6 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8efb1500d4f17d397048ed3e56e4af9b855bccb6 commit 8efb1500d4f17d397048ed3e56e4af9b855bccb6 Author: Andrew Turner AuthorDate: 2024-10-24 09:52:53 +0000 Commit: Andrew Turner CommitDate: 2024-10-24 10:20:48 +0000 arm64: Enable handling EFI runtime service faults Now we can handle EFI runtime service faults on arm64 do so. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46818 --- sys/arm64/include/efi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/efi.h b/sys/arm64/include/efi.h index ed9e8d86b7bc..d5cb44f740b0 100644 --- a/sys/arm64/include/efi.h +++ b/sys/arm64/include/efi.h @@ -44,7 +44,7 @@ #define EFI_TIME_UNLOCK() #define EFI_TIME_OWNED() -#define EFI_RT_HANDLE_FAULTS_DEFAULT 0 +#define EFI_RT_HANDLE_FAULTS_DEFAULT 1 #endif struct efirt_callinfo { From nobody Thu Oct 24 11:37: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 4XZ3mp4mllz5bNDs; Thu, 24 Oct 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ3mp409sz3x9m; Thu, 24 Oct 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVpAjHJIpqX9AIXtnym1u4rUS3qlW1nFq/R8wOFo2EA=; b=PMpsOFw9hUlo/Weudiq1y9d79B7LvDEPDI8rU+LgiatD/myZpUHEVoxg6xvvF+dB9FRMwi RS1d/s1+f+Bj+EGNLnQhwedJ1CB0QiXg7Nj0oWEFo3FVhVGZq1xJP9NnNCgqp0RXm7f8jr oMVA0XPB0FMgbBOdmlwjFcSOg4rt/iUwImCR2lA/Wpo/C00arOdR1K9OZ61qQ/zS8MhOjD YwxGoCL2M3Z9rZocI0OQ+yFbk2nz9+d6swo65mL2m7Gp4cvwqCyAQbUnGg/fxRE/FygDd7 YnGyaEbHLzvXecB+VNQ59NMEj6QQkkuH3P6xkCcVS5dUjnhYu/kJolZZVQxtnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVpAjHJIpqX9AIXtnym1u4rUS3qlW1nFq/R8wOFo2EA=; b=djXU6CNhrY9ZkV5qtcNEK3myPCkFK0dffDdHXIn0c2e58lwAfX/ykVkkBLJWlHnW+WL6Rt W5F1oeWYuY6KcclNX6gH2Exq2yDgD9XRkDTfhPPHREeZEEGALQrUzGQlyDeDBO82XTOlv0 hGl0bbMcrY0XnMr4GBqs4Qt3PxAjyaXyRSBLXSbiRznlOhGcik88R3wPhVdZw/35ldEQVM yyPtUFibotrgCzE2rUXU/lvEY9AQnIifuz4osAz2UZwlbCQiDDYHLRnMrsXDYtzEbI6RR5 4HpOCh63pPUXaY2MrTYGc/s5SZ0399OeoxPED2DxLQ51p9DVkqcZU8xmAHpVRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729769850; a=rsa-sha256; cv=none; b=KmiJnkoKynAdXrQFkDuiUKL/vHCd/dWmXtbAusVjCVQ85wxG7QD5rpHt+a+n55CojMAXys MYajSCmP+2nMokQ2s0UAGUUoXzrbqzchOhJgdqlhSLjTX8WX/unR2gWeCjFi0hjjb88xRP /lKpf7jxQbV0z+GganBBIEQyMMa19uC3IvSobv2wRDEoJpRsOfUUEj8OEvUhhzOwEf6gQX DosCpNKIWtxhgVAyL/hJanCpjWujGh7cYE2/ZeEj6Whl/j+MkjfKW5d42jZ6NGLQfl3skW ab7Dy0RByqk4qMfuOLaJU6f4OLyb2ATe9u5WSP2IW2+PCroTgsp5qKdhhTMosg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ3mp38ftzgpm; Thu, 24 Oct 2024 11:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OBbUFw071578; Thu, 24 Oct 2024 11:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OBbU1m071575; Thu, 24 Oct 2024 11:37:30 GMT (envelope-from git) Date: Thu, 24 Oct 2024 11:37:30 GMT Message-Id: <202410241137.49OBbU1m071575@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: 9693241188aa - main - sound: Call DSP_REGISTERED before PCM_DETACHING List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9693241188aa6882166b091d9006f9d0affeda7e Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9693241188aa6882166b091d9006f9d0affeda7e commit 9693241188aa6882166b091d9006f9d0affeda7e Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:01 +0000 Commit: Christos Margiolis CommitDate: 2024-10-24 11:37:01 +0000 sound: Call DSP_REGISTERED before PCM_DETACHING DSP_REGISTERED first checks if the softc is not null, through PCM_REGISTERED, which in turn calls PCM_ALIVE, whereas PCM_DETACHING accesses the softc flags directly. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj, emaste Differential Revision: https://reviews.freebsd.org/D47195 --- sys/dev/sound/pcm/dsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d4f7e3d6e63f..6573dfaabf2f 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -196,7 +196,7 @@ dsp_close(void *data) d = priv->sc; /* At this point pcm_unregister() will destroy all channels anyway. */ - if (PCM_DETACHING(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) goto skip; PCM_GIANT_ENTER(d); @@ -301,7 +301,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) return (ENODEV); d = i_dev->si_drv1; - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); priv = malloc(sizeof(*priv), M_DEVBUF, M_WAITOK | M_ZERO); @@ -485,7 +485,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) ("%s(): io train wreck!", __func__)); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -704,7 +704,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -1823,7 +1823,7 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) { + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) { /* XXX many clients don't understand POLLNVAL */ return (events & (POLLHUP | POLLPRI | POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM)); @@ -1905,7 +1905,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EINVAL); PCM_GIANT_ENTER(d); From nobody Thu Oct 24 11:37: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 4XZ3mq5s3pz5bNXv; Thu, 24 Oct 2024 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ3mq5H9qz3x2D; Thu, 24 Oct 2024 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sOjp6ORryfknM43WVZmF4Cg/w9lEQsDHXbml2JhYmc=; b=sIICroydZgEjVf0VL00M1qkk+AEgtAlsJjcU8zsk0qwP93TeFI6q2zTfr9RSwxHrbBftjj B2ytudQLGSvsjt0TVZbSeNBOzPumqkc/SDSVywOxtbH+M/STr8R7DtEO4PJMs+duvIoBdC ZNWSH7f1QKpkm1SNliqyy885qjCQdf87O0Gd3moewdKptdK5nhxwrbcpwAEyfNxLrGUkjO o3MvCbx/3STUmkbJeKo+htw8oVYOJG6eF92mleKY/7tllDvWJmAyGszu+hVJmYy6/BZC7B sjiXaMRdxEngLhhd7OEauUttsEzSUnMxq9X63fsuPXXDEZVxR9jah62FoPSiCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sOjp6ORryfknM43WVZmF4Cg/w9lEQsDHXbml2JhYmc=; b=url6m/TjMKxiXmoe8Uh1ISVID5HxjzzROZYSjUdk4rndwHQcWH26zpV8QiateEFTxFBB5v 7oqSjs7L/fGCO5uMpzdxi914TGlMESI34lzxtSHQiBcFPYAYjP7AOEdZE64XpChwni79AV NhEJF/bajmgXLyDebsbcxZHfr/nEwtuyBCT6kgVvaup5NjuUmaAs3rJa7g5lvEv9LZm6rB doC8vjMtkRMs+HlZwx6ciAhbLpDr0edTWgCEHcQwAfMT83RGACjCLAmD3viNpvuafXXr34 dXlvS+itc4Qa2L6i/P25fpFYNQpKoa+TobDIy9VuEGUBi2R+3hng231STx7w+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729769851; a=rsa-sha256; cv=none; b=CXf7U1akNxU+NYx6RZSxa3RbP2lzGbFXZ8MpG5Nm5mZ/BAp1f6mrYJiXDRldLPe6lZkdHj Z+r9woR2k82s1F07qtIVlRIJD028YhFTho6nuU1RWP9cYWdZy9Yb8P9smO7k0y7n+VTjcT V7NXf4t5wUA14Fw1UZBfYzcSiH+Hu3mcdMvXWgXJ8a+o51TkQRkdDWJQdfOkqn0znMApPi xqhX1kV+0P++8cg2bbhhSOYALX6i3Blt/8XJMhZthG+fe+5HEa8cg8qn/XNm44uTw3Ganu Ged3eiyWlI7/pvB21lv9ocNElbhi0bIjZRPuviQ8hslriaMJF6FETxKmz/g9cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ3mq40DXzgnG; Thu, 24 Oct 2024 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OBbVti071625; Thu, 24 Oct 2024 11:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OBbVtB071622; Thu, 24 Oct 2024 11:37:31 GMT (envelope-from git) Date: Thu, 24 Oct 2024 11:37:31 GMT Message-Id: <202410241137.49OBbVtB071622@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: bb5e3ac1a7b7 - main - sound: Use DSP_REGISTERED in dsp_clone() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bb5e3ac1a7b71480a50fc0c813c916a3d058336c Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bb5e3ac1a7b71480a50fc0c813c916a3d058336c commit bb5e3ac1a7b71480a50fc0c813c916a3d058336c Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:10 +0000 Commit: Christos Margiolis CommitDate: 2024-10-24 11:37:10 +0000 sound: Use DSP_REGISTERED in dsp_clone() DSP_REGISTERED calls PCM_REGISTERED, and already contains all the checks we are doing. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47196 --- sys/dev/sound/pcm/dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 6573dfaabf2f..92bfb4d58b86 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1967,7 +1967,7 @@ found: * have returned already, meaning it will have set snd_unit to -1, and * thus devclass_get_softc() will return NULL here. */ - if (d != NULL && PCM_REGISTERED(d) && d->dsp_dev != NULL) { + if (DSP_REGISTERED(d)) { *dev = d->dsp_dev; dev_ref(*dev); } From nobody Thu Oct 24 11:37: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 4XZ3ms290Kz5bNVZ; Thu, 24 Oct 2024 11:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ3mr64Kyz3xJb; Thu, 24 Oct 2024 11:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pB2fMYjtDpEtlVsVb03Aqy7NxxTqmnTK8LQu/Sby+1Q=; b=atVTeqadPer1sEXmI/fsm3bZ+ia1Kyir1fpNTBfFuOLy+cAJId4owpc4AwUNQLPA8OKTJc 2FSpGDwPsZo/cemBIUNZyfR7bAvmRBP8Y5C+NNcs1CIkPk9W9z329EHorPy+G9+Wm8cD/r ui8dpP9qHJNHtpGBPIOT4sF4q4/TAD0VMKjHjFp0Cg8gEKXrsLuFvFLz72DQ6Wv3YQ4nFA /WCNhBpiDVA1p7QHYjmHUKMgkl8bcIiXv4jpWEYVNaDV4rWgzJ0v/evPFmSxqVvMShsv7K T0EXqfGSvbGoZ2spqWsqIrUggKroZXoKnILXOANFH11oXaM0+zAXERn+jl0g4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pB2fMYjtDpEtlVsVb03Aqy7NxxTqmnTK8LQu/Sby+1Q=; b=GlKASp5qL78FRDFtIPgihmjSi7vpxfdrvxr4uahcMcuU8tM0z6nZpBDUxboOAE2qQHpohr 7anvyUuUaUrb9vRQixlDzS5F17g8dvRQKgQR3d+2becj8KwYDh8lvms0ww+ccgHnaP80Nu rO1W1qk0WFMWF8f5FbFYxzXa6uDIhfAUkGO+nYuO4TMp6/2JFw4x1tfQhh+Q8uDzmkstVx mxvX3JhVLuvUXGA6Gs3SjwbfF1bgHa/DPvetm/Igw3YEPyRPztvbCQP7PSsVNYsH4D/vVF 7NYh0eK9xsDOluzyLZUlKL57xLeH92aB5es44u88wmAta2TwUx4TnJbiy8F5Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729769852; a=rsa-sha256; cv=none; b=CSpg5O0XhLyGjkRsOYPOpNEcr4axzKwDWoVPkVAgsezw4D0cWqCSL1XJObXAzx4P5PlRFi Qb2h9+9NJcvk8i86L45d06FqN61uzru60jClUO2hRujiddfeSnR/EyB3dh41Z0EuJzsRSd WCDQhfGXVlcIYaOIfW2TOty6usmydVGXUwl479L2S6s//JXbQ1g0zllSn8iUX4rshSgXsb rnrw3/Mqg5b4wiODQo3cVCFSma2aGOJ60M84Zy4mq71E7p0DpI+4y50w7ShkXqsyQSgOI9 7e71RxqMXArq0KuKhEdoOf1WhmKKiB0u6g/oKaZmHXll7Om1957e4NkOyxtJmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ3mr4cvhzh48; Thu, 24 Oct 2024 11:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OBbWA5071677; Thu, 24 Oct 2024 11:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OBbWup071674; Thu, 24 Oct 2024 11:37:32 GMT (envelope-from git) Date: Thu, 24 Oct 2024 11:37:32 GMT Message-Id: <202410241137.49OBbWup071674@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: a4111e9dc722 - main - sound: Change PCMDIR_* numbering List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a4111e9dc7225618fa8d2af64d866cf0b0aebd56 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a4111e9dc7225618fa8d2af64d866cf0b0aebd56 commit a4111e9dc7225618fa8d2af64d866cf0b0aebd56 Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:17 +0000 Commit: Christos Margiolis CommitDate: 2024-10-24 11:37:17 +0000 sound: Change PCMDIR_* numbering Needed by a follow-up patch, so that channels can be sorted properly. This change does not affect the behavior of any subsystem. While here, change to an enum. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47198 --- sys/dev/sound/pcm/channel.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index d146f51120d8..13efbef15d8b 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -335,10 +335,12 @@ extern int chn_latency_profile; extern int report_soft_formats; extern int report_soft_matrix; -#define PCMDIR_PLAY 1 -#define PCMDIR_PLAY_VIRTUAL 2 -#define PCMDIR_REC -1 -#define PCMDIR_REC_VIRTUAL -2 +enum { + PCMDIR_PLAY = 1, + PCMDIR_PLAY_VIRTUAL, + PCMDIR_REC, + PCMDIR_REC_VIRTUAL, +}; #define PCMTRIG_START 1 #define PCMTRIG_EMLDMAWR 2 From nobody Thu Oct 24 11:37: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 4XZ3mt23hZz5bMqw; Thu, 24 Oct 2024 11:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ3ms68kyz3x2c; Thu, 24 Oct 2024 11:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYp8D4jql1PaREtdAEucq7SiKmRpXYposAtYp/1qcrg=; b=q6GDDKJ8S8FK5f1LvKZKrHt0FTH11iWESpi4pwHFBegR4CqZHoWK2hu1Qd/gU6LXr6N2fp dbjFB7LgzqbC+U6gF7fnR6PJeQITzlnadJjE8TRO7GK32D4+fPwszeLO3iuWNZxkda+pHP Gil7UZHUvst6VIBeWyLLUayE03iZW1EYNYFajPvX4WFlenXHExNsmOxnCbycoTjJRrt0TB bFpd40QtIRL0TeSJ9FewwdTZeVo3iq6BEXgqOdbkm0ujsX3GnuBHuIoe+J6q42BYQq8L+Q BNg6Lu5b6eB+D0FhQFi0JDUaN5fFihWmymvr7TEDUL3pSwcT5N5JWJNY/bjQog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729769853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYp8D4jql1PaREtdAEucq7SiKmRpXYposAtYp/1qcrg=; b=E9bRKl6N204kQZi9k4JsYham9hAioj2PgQFcDt0rfShW+VaYhLTssOEwfXHKXcu9TdeiuX 6lmDp++aEZeHsmEXlbYcTUuKaxsVJibDT2di43MUW+raCxrixS4zI+0HRZmedAvYr1ZP+m G32++430xqBLxRSP2StZQlDVtdYZqTZUgXENXD7RgmsAxl3X0x+/nmk40UvupEHsEdBDFv Q/IddTPKTCyHmuygp8stFwHGSrdIzfEQSbGBeo3/9x+SAj+c7jHBM/4SrnxCVOj08xl0K7 /pEz3EizBJrMPh4iRB8kibIwfn4mwgn0G2pQ13ZHnexJ6KpL3H1kIA8ebGvuyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729769853; a=rsa-sha256; cv=none; b=kP0N7kWn03hcLeNKEAB0m3eus9xEUVQtaRfx7sNe+k3QYhVg9YMuvn2qzg0qYqVaFj2jLZ SHlLmdViTb6XwTcgdp/4qKUMuZps319rAEhzu8umHFnIyYRGY/nT4Gl5/w7OPhBM0UN0zA 5r8sDBGojVpU+CbFxLedgm2f5TP+GPaySF2mDIm/KWdkrSZNa6INMemnl6yYb2865bGTaU 7aMOidO2OjnJh/6H4AoEyxUUhybD4sr2m/D8NbLFBs8guKGfr2pxFOpYJ5awTjY0Oeph4j qIIoc2oXm6awPp4vnR7z9xjpiyYLgp0G1ZzUUZibsDLzKKotX1bPEwhnvl2elg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ3ms5MbZzgpn; Thu, 24 Oct 2024 11:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OBbX9t071722; Thu, 24 Oct 2024 11:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OBbXc6071719; Thu, 24 Oct 2024 11:37:33 GMT (envelope-from git) Date: Thu, 24 Oct 2024 11:37:33 GMT Message-Id: <202410241137.49OBbXc6071719@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: 802c78f5194e - main - sound: Untangle dsp_cdevs[] and dsp_unit2name() confusion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 802c78f5194e4524faa30ea57adbf00f28fc72c6 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=802c78f5194e4524faa30ea57adbf00f28fc72c6 commit 802c78f5194e4524faa30ea57adbf00f28fc72c6 Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:23 +0000 Commit: Christos Margiolis CommitDate: 2024-10-24 11:37:23 +0000 sound: Untangle dsp_cdevs[] and dsp_unit2name() confusion Before de8c0d15a64fa ("sound: Get rid of snd_clone and use DEVFS_CDEVPRIV(9)"), sound(4) would create one device for each allocated channel. The device names would be chosen from dsp_cdevs[], and created with dsp_unit2name(). Additionally, dsp_cdevs[] was also used to match these devices names, as well as OSSv4 aliases in dsp_clone(). Since sound(4) does not create separate devices for each channel anymore, the meaning and use dsp_cdevs[] has changed. Part of it no longer corresponds to devices at all, but instead is used to create channel names, and another part is used to match only OSSv4 aliases in dsp_clone(). To address this confusion, separate dsp_cdevs[] into a dsp_aliases[] array, and move dsp_unit2name() to pcm/channel.c and rename it to chn_mkname(). While here, get rid of the SND_DEV_DSPHW_* channel types, and simply use the existing PCMDIR_* constants as the channel types. There is no need to duplicate the same meaning twice. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47199 --- sys/dev/sound/pcm/channel.c | 70 +++++++---- sys/dev/sound/pcm/channel.h | 1 + sys/dev/sound/pcm/dsp.c | 290 +++++++++++++++++++------------------------- sys/dev/sound/pcm/dsp.h | 1 - sys/dev/sound/pcm/sound.h | 4 - sys/dev/sound/pcm/vchan.c | 11 +- 6 files changed, 175 insertions(+), 202 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 6b8f00f9aa83..b1d3ebc0d0f7 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1161,13 +1161,13 @@ static struct unrhdr * chn_getunr(struct snddev_info *d, int type) { switch (type) { - case SND_DEV_DSPHW_PLAY: + case PCMDIR_PLAY: return (d->p_unr); - case SND_DEV_DSPHW_VPLAY: + case PCMDIR_PLAY_VIRTUAL: return (d->vp_unr); - case SND_DEV_DSPHW_REC: + case PCMDIR_REC: return (d->r_unr); - case SND_DEV_DSPHW_VREC: + case PCMDIR_REC_VIRTUAL: return (d->vr_unr); default: __assert_unreachable(); @@ -1175,6 +1175,37 @@ chn_getunr(struct snddev_info *d, int type) } +char * +chn_mkname(char *buf, size_t len, struct pcm_channel *c) +{ + const char *str; + + KASSERT(buf != NULL && len != 0, + ("%s(): bogus buf=%p len=%lu", __func__, buf, len)); + + switch (c->type) { + case PCMDIR_PLAY: + str = "play"; + break; + case PCMDIR_PLAY_VIRTUAL: + str = "virtual_play"; + break; + case PCMDIR_REC: + str = "record"; + break; + case PCMDIR_REC_VIRTUAL: + str = "virtual_record"; + break; + default: + __assert_unreachable(); + } + + snprintf(buf, len, "dsp%d.%s.%d", + device_get_unit(c->dev), str, c->unit); + + return (buf); +} + struct pcm_channel * chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, void *devinfo) @@ -1183,27 +1214,19 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, struct feeder_class *fc; struct snd_dbuf *b, *bs; char buf[CHN_NAMELEN]; - int i, direction, type; + int i, direction; PCM_BUSYASSERT(d); PCM_LOCKASSERT(d); switch (dir) { case PCMDIR_PLAY: - direction = PCMDIR_PLAY; - type = SND_DEV_DSPHW_PLAY; - break; case PCMDIR_PLAY_VIRTUAL: direction = PCMDIR_PLAY; - type = SND_DEV_DSPHW_VPLAY; break; case PCMDIR_REC: - direction = PCMDIR_REC; - type = SND_DEV_DSPHW_REC; - break; case PCMDIR_REC_VIRTUAL: direction = PCMDIR_REC; - type = SND_DEV_DSPHW_VREC; break; default: device_printf(d->dev, @@ -1222,7 +1245,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, CHN_INIT(c, children); CHN_INIT(c, children.busy); c->direction = direction; - c->type = type; + c->type = dir; c->unit = alloc_unr(chn_getunr(d, c->type)); c->format = SND_FORMAT(AFMT_U8, 1, 0); c->speed = DSP_DEFAULT_SPEED; @@ -1234,8 +1257,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, c->parentchannel = parent; c->dev = d->dev; c->trigger = PCMTRIG_STOP; - - strlcpy(c->name, dsp_unit2name(buf, sizeof(buf), c), sizeof(c->name)); + strlcpy(c->name, chn_mkname(buf, sizeof(buf), c), sizeof(c->name)); c->matrix = *feeder_matrix_id_map(SND_CHN_MATRIX_1_0); c->matrix.id = SND_CHN_MATRIX_PCMCHANNEL; @@ -1303,16 +1325,16 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, CHN_INSERT_SORT_ASCEND(d, c, channels.pcm); switch (c->type) { - case SND_DEV_DSPHW_PLAY: + case PCMDIR_PLAY: d->playcount++; break; - case SND_DEV_DSPHW_VPLAY: + case PCMDIR_PLAY_VIRTUAL: d->pvchancount++; break; - case SND_DEV_DSPHW_REC: + case PCMDIR_REC: d->reccount++; break; - case SND_DEV_DSPHW_VREC: + case PCMDIR_REC_VIRTUAL: d->rvchancount++; break; default: @@ -1354,16 +1376,16 @@ chn_kill(struct pcm_channel *c) CHN_REMOVE(d, c, channels.pcm); switch (c->type) { - case SND_DEV_DSPHW_PLAY: + case PCMDIR_PLAY: d->playcount--; break; - case SND_DEV_DSPHW_VPLAY: + case PCMDIR_PLAY_VIRTUAL: d->pvchancount--; break; - case SND_DEV_DSPHW_REC: + case PCMDIR_REC: d->reccount--; break; - case SND_DEV_DSPHW_VREC: + case PCMDIR_REC_VIRTUAL: d->rvchancount--; break; default: diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 13efbef15d8b..6c6692fa8bc2 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -260,6 +260,7 @@ int chn_sync(struct pcm_channel *c, int threshold); int chn_flush(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); +char *chn_mkname(char *buf, size_t len, struct pcm_channel *c); struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, void *devinfo); void chn_kill(struct pcm_channel *c); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 92bfb4d58b86..7d80a82d31c8 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -164,25 +164,6 @@ dsp_unlock_chans(struct dsp_cdevpriv *priv, uint32_t prio) #define DSP_F_READ(x) ((x) & FREAD) #define DSP_F_WRITE(x) ((x) & FWRITE) -static const struct { - int type; - char *name; - char *sep; - char *alias; -} dsp_cdevs[] = { - { SND_DEV_DSP, "dsp", ".", NULL }, - { SND_DEV_DSPHW_PLAY, "dsp", ".play.", NULL }, - { SND_DEV_DSPHW_VPLAY, "dsp", ".virtual_play.", NULL }, - { SND_DEV_DSPHW_REC, "dsp", ".record.", NULL }, - { SND_DEV_DSPHW_VREC, "dsp", ".virtual_record.", NULL }, - /* Low priority, OSSv4 aliases. */ - { SND_DEV_DSP, "dsp_ac3", ".", "dsp" }, - { SND_DEV_DSP, "dsp_mmap", ".", "dsp" }, - { SND_DEV_DSP, "dsp_multich", ".", "dsp" }, - { SND_DEV_DSP, "dsp_spdifout", ".", "dsp" }, - { SND_DEV_DSP, "dsp_spdifin", ".", "dsp" }, -}; - static void dsp_close(void *data) { @@ -1941,6 +1922,14 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, return (0); } +static const char *dsp_aliases[] = { + "dsp_ac3", + "dsp_mmap", + "dsp_multich", + "dsp_spdifout", + "dsp_spdifin", +}; + static void dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev) @@ -1952,9 +1941,8 @@ dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, return; if (strcmp(name, "dsp") == 0 && dsp_basename_clone) goto found; - for (i = 0; i < nitems(dsp_cdevs); i++) { - if (dsp_cdevs[i].alias != NULL && - strcmp(name, dsp_cdevs[i].name) == 0) + for (i = 0; i < nitems(dsp_aliases); i++) { + if (strcmp(name, dsp_aliases[i]) == 0) goto found; } return; @@ -1994,26 +1982,6 @@ dsp_sysuninit(void *p) SYSINIT(dsp_sysinit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysinit, NULL); SYSUNINIT(dsp_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysuninit, NULL); -char * -dsp_unit2name(char *buf, size_t len, struct pcm_channel *ch) -{ - size_t i; - - KASSERT(buf != NULL && len != 0, - ("bogus buf=%p len=%ju", buf, (uintmax_t)len)); - - for (i = 0; i < nitems(dsp_cdevs); i++) { - if (ch->type != dsp_cdevs[i].type || dsp_cdevs[i].alias != NULL) - continue; - snprintf(buf, len, "%s%d%s%d", - dsp_cdevs[i].name, device_get_unit(ch->dev), - dsp_cdevs[i].sep, ch->unit); - return (buf); - } - - return (NULL); -} - static void dsp_oss_audioinfo_unavail(oss_audioinfo *ai, int unit) { @@ -2233,7 +2201,6 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) struct snddev_info *d; uint32_t fmts; int i, nchan, *rates, minch, maxch, unit; - char *devname, buf[CHN_NAMELEN]; /* * If probing the device that received the ioctl, make sure it's a @@ -2244,9 +2211,7 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) return (EINVAL); ch = NULL; - devname = NULL; nchan = 0; - bzero(buf, sizeof(buf)); /* * Search for the requested audio device (channel). Start by @@ -2267,147 +2232,142 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) CHN_FOREACH(ch, d, channels.pcm) { CHN_UNLOCKASSERT(ch); CHN_LOCK(ch); - if (ai->dev == -1) { - if (devfs_foreach_cdevpriv(i_dev, - dsp_oss_engineinfo_cb, ch) != 0) { - devname = dsp_unit2name(buf, - sizeof(buf), ch); - } - } else if (ai->dev == nchan) - devname = dsp_unit2name(buf, sizeof(buf), ch); - if (devname != NULL) + if ((ai->dev == -1 && devfs_foreach_cdevpriv( + i_dev, dsp_oss_engineinfo_cb, ch) != 0) || + ai->dev == nchan) break; CHN_UNLOCK(ch); ++nchan; } - if (devname != NULL) { - /* - * At this point, the following synchronization stuff - * has happened: - * - a specific PCM device is locked. - * - a specific audio channel has been locked, so be - * sure to unlock when exiting; - */ + if (ch == NULL) { + PCM_UNLOCK(d); + continue; + } - caps = chn_getcaps(ch); + /* + * At this point, the following synchronization stuff + * has happened: + * - a specific PCM device is locked. + * - a specific audio channel has been locked, so be + * sure to unlock when exiting; + */ - /* - * With all handles collected, zero out the user's - * container and begin filling in its fields. - */ - bzero((void *)ai, sizeof(oss_audioinfo)); + caps = chn_getcaps(ch); - ai->dev = nchan; - strlcpy(ai->name, ch->name, sizeof(ai->name)); + /* + * With all handles collected, zero out the user's + * container and begin filling in its fields. + */ + bzero((void *)ai, sizeof(oss_audioinfo)); - if ((ch->flags & CHN_F_BUSY) == 0) - ai->busy = 0; - else - ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ; + ai->dev = nchan; + strlcpy(ai->name, ch->name, sizeof(ai->name)); - ai->pid = ch->pid; - strlcpy(ai->cmd, ch->comm, sizeof(ai->cmd)); + if ((ch->flags & CHN_F_BUSY) == 0) + ai->busy = 0; + else + ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ; - /* - * These flags stolen from SNDCTL_DSP_GETCAPS handler. - * Note, however, that a single channel operates in - * only one direction, so PCM_CAP_DUPLEX is out. - */ - /** - * @todo @c SNDCTL_AUDIOINFO::caps - Make drivers keep - * these in pcmchan::caps? - */ - ai->caps = PCM_CAP_REALTIME | PCM_CAP_MMAP | PCM_CAP_TRIGGER | - ((ch->flags & CHN_F_VIRTUAL) ? PCM_CAP_VIRTUAL : 0) | - ((ch->direction == PCMDIR_PLAY) ? PCM_CAP_OUTPUT : PCM_CAP_INPUT); + ai->pid = ch->pid; + strlcpy(ai->cmd, ch->comm, sizeof(ai->cmd)); - /* - * Collect formats supported @b natively by the - * device. Also determine min/max channels. - */ - minch = INT_MAX; - maxch = 0; - fmts = 0; - for (i = 0; caps->fmtlist[i]; i++) { - fmts |= AFMT_ENCODING(caps->fmtlist[i]); - minch = min(AFMT_CHANNEL(caps->fmtlist[i]), minch); - maxch = max(AFMT_CHANNEL(caps->fmtlist[i]), maxch); - } + /* + * These flags stolen from SNDCTL_DSP_GETCAPS handler. + * Note, however, that a single channel operates in + * only one direction, so PCM_CAP_DUPLEX is out. + */ + /** + * @todo @c SNDCTL_AUDIOINFO::caps - Make drivers keep + * these in pcmchan::caps? + */ + ai->caps = PCM_CAP_REALTIME | PCM_CAP_MMAP | PCM_CAP_TRIGGER | + ((ch->flags & CHN_F_VIRTUAL) ? PCM_CAP_VIRTUAL : 0) | + ((ch->direction == PCMDIR_PLAY) ? PCM_CAP_OUTPUT : PCM_CAP_INPUT); - if (ch->direction == PCMDIR_PLAY) - ai->oformats = fmts; - else - ai->iformats = fmts; - - /** - * @note - * @c magic - OSSv4 docs: "Reserved for internal use - * by OSS." - * - * @par - * @c card_number - OSSv4 docs: "Number of the sound - * card where this device belongs or -1 if this - * information is not available. Applications - * should normally not use this field for any - * purpose." - */ - ai->card_number = unit; - /** - * @todo @c song_name - depends first on - * SNDCTL_[GS]ETSONG @todo @c label - depends - * on SNDCTL_[GS]ETLABEL - * @todo @c port_number - routing information? - */ - ai->port_number = unit; - ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; - /** - * @note - * @c legacy_device - OSSv4 docs: "Obsolete." - */ - ai->legacy_device = unit; - snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); - ai->enabled = device_is_attached(d->dev) ? 1 : 0; - /** - * @note - * @c flags - OSSv4 docs: "Reserved for future use." - * - * @note - * @c binding - OSSv4 docs: "Reserved for future use." - * - * @todo @c handle - haven't decided how to generate - * this yet; bus, vendor, device IDs? - */ + /* + * Collect formats supported @b natively by the + * device. Also determine min/max channels. + */ + minch = INT_MAX; + maxch = 0; + fmts = 0; + for (i = 0; caps->fmtlist[i]; i++) { + fmts |= AFMT_ENCODING(caps->fmtlist[i]); + minch = min(AFMT_CHANNEL(caps->fmtlist[i]), minch); + maxch = max(AFMT_CHANNEL(caps->fmtlist[i]), maxch); + } - if ((ch->flags & CHN_F_EXCLUSIVE) || - (pcm_getflags(d->dev) & SD_F_BITPERFECT)) { - ai->min_rate = caps->minspeed; - ai->max_rate = caps->maxspeed; - } else { - ai->min_rate = feeder_rate_min; - ai->max_rate = feeder_rate_max; - } + if (ch->direction == PCMDIR_PLAY) + ai->oformats = fmts; + else + ai->iformats = fmts; + + /** + * @note + * @c magic - OSSv4 docs: "Reserved for internal use + * by OSS." + * + * @par + * @c card_number - OSSv4 docs: "Number of the sound + * card where this device belongs or -1 if this + * information is not available. Applications + * should normally not use this field for any + * purpose." + */ + ai->card_number = unit; + /** + * @todo @c song_name - depends first on + * SNDCTL_[GS]ETSONG @todo @c label - depends + * on SNDCTL_[GS]ETLABEL + * @todo @c port_number - routing information? + */ + ai->port_number = unit; + ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; + /** + * @note + * @c legacy_device - OSSv4 docs: "Obsolete." + */ + ai->legacy_device = unit; + snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); + ai->enabled = device_is_attached(d->dev) ? 1 : 0; + /** + * @note + * @c flags - OSSv4 docs: "Reserved for future use." + * + * @note + * @c binding - OSSv4 docs: "Reserved for future use." + * + * @todo @c handle - haven't decided how to generate + * this yet; bus, vendor, device IDs? + */ - ai->min_channels = minch; - ai->max_channels = maxch; + if ((ch->flags & CHN_F_EXCLUSIVE) || + (pcm_getflags(d->dev) & SD_F_BITPERFECT)) { + ai->min_rate = caps->minspeed; + ai->max_rate = caps->maxspeed; + } else { + ai->min_rate = feeder_rate_min; + ai->max_rate = feeder_rate_max; + } - ai->nrates = chn_getrates(ch, &rates); - if (ai->nrates > OSS_MAX_SAMPLE_RATES) - ai->nrates = OSS_MAX_SAMPLE_RATES; + ai->min_channels = minch; + ai->max_channels = maxch; - for (i = 0; i < ai->nrates; i++) - ai->rates[i] = rates[i]; - - ai->next_play_engine = 0; - ai->next_rec_engine = 0; + ai->nrates = chn_getrates(ch, &rates); + if (ai->nrates > OSS_MAX_SAMPLE_RATES) + ai->nrates = OSS_MAX_SAMPLE_RATES; - CHN_UNLOCK(ch); - } + for (i = 0; i < ai->nrates; i++) + ai->rates[i] = rates[i]; + + ai->next_play_engine = 0; + ai->next_rec_engine = 0; + CHN_UNLOCK(ch); PCM_UNLOCK(d); - if (devname != NULL) - return (0); + return (0); } /* Exhausted the search -- nothing is locked, so return. */ diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h index 7559e855d4e1..1eab42ca91c8 100644 --- a/sys/dev/sound/pcm/dsp.h +++ b/sys/dev/sound/pcm/dsp.h @@ -35,7 +35,6 @@ extern struct cdevsw dsp_cdevsw; int dsp_make_dev(device_t); void dsp_destroy_dev(device_t); -char *dsp_unit2name(char *, size_t, struct pcm_channel *); int dsp_oss_audioinfo(struct cdev *, oss_audioinfo *, bool); int dsp_oss_engineinfo(struct cdev *, oss_audioinfo *); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index f96638081cb9..126b3411b035 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -225,10 +225,6 @@ enum { SND_DEV_MIDIN, /* Raw midi access */ SND_DEV_DSP, /* Digitized voice /dev/dsp */ SND_DEV_STATUS, /* /dev/sndstat */ - SND_DEV_DSPHW_PLAY, /* specific playback channel */ - SND_DEV_DSPHW_VPLAY, /* specific virtual playback channel */ - SND_DEV_DSPHW_REC, /* specific record channel */ - SND_DEV_DSPHW_VREC, /* specific virtual record channel */ }; #define DSP_DEFAULT_SPEED 8000 diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 4da6f83dc0a2..c9db9d79847b 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -886,14 +886,9 @@ vchan_sync(struct pcm_channel *c) c->flags |= CHN_F_DIRTY; #ifdef SND_DEBUG - if (snd_passthrough_verbose != 0) { - char *devname, buf[CHN_NAMELEN]; - - devname = dsp_unit2name(buf, sizeof(buf), c); - device_printf(c->dev, - "%s(%s/%s) %s() -> re-sync err=%d\n", - __func__, (devname != NULL) ? devname : "dspX", c->comm, - caller, ret); + if (snd_passthrough_verbose) { + device_printf(c->dev, "%s(%s/%s) %s() -> re-sync err=%d\n", + __func__, c->name, c->comm, caller, ret); } #endif From nobody Thu Oct 24 12:57: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 4XZ5Y052D0z5bQkq; Thu, 24 Oct 2024 12:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ5Y04Wgfz46vL; Thu, 24 Oct 2024 12:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729774644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hpoxx1mi2SM4/r/O4k07gbyraNXnCCVDeyHmV/vX0g=; b=v3LEXRUzChrVJQ/i9pcilvOjihtuDE1r21cvOWJHC6zOCM0WAU5UFBtaZm4alv43k1yniN uZ1IjlGQBUZ3m+x+yFNPgY50hqbD02c2f0dqG7UsiSrOs3u0arh4z0JwBYRFR28Icfy2BD hyzgbYfz0/AJVP+5AACe3XhMEgY2wK8m0A5sjrdakKCIFcgc+6PBuTFUF3eJdo13D6dHgo 76L9JT7rIAq1Azs1q+oRxHnSDdH11M5Jt/aOC3Jg3zPJ2ExZ60TsSOMXn5NeRQaLE5RMf3 FbL7Rk50jWUnTTgN3FyQvymkUDBVruaKzXcCh0PAI7sWmFrtYH0bBO8RruOI4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729774644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hpoxx1mi2SM4/r/O4k07gbyraNXnCCVDeyHmV/vX0g=; b=Cka4frfwlg/C9/MqPvGrQ5IvQP641XnOeUZqCikcsOOp/aVLDKEEVqmdr3XIS45o55ISG0 yd1haJm8NaE1CzBvguxzEmy7RCIQRelPq75P2TrXCi6ujFw9hOP8RyXQFITLGTBLuzNd35 aOXJZVWcCmPbyCNmkrYUv9fsNz2Cea+G78h2FJ0/EGAp7rU03cYCZ69jfjK+vLiFhebEmx LinEvzmVJYgxAX5sYW1DaQUB564svLJW6QFScXU1dKTbfFiy4nssTbZIzzrL8wK3VZb3Ja r69jrMiDaBiEkQU9h6k9KxyfVu6DvBpwigwrCO/18iWI2PU/+FL0fs1QfStmYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729774644; a=rsa-sha256; cv=none; b=rwyDqH2d7YHf/H8Q28LKflnL19PCr+rkxWzYyMs5bpvH/iPgeD6OYRfN55ySls2R3zKOKZ 1eshF1rNy1rZMag19ITrtfBSjJIIM2/FKEWRmwOozQ5fuh5Vfcl1G1A1WqnLpyBCCxufZd R7iNFKXP41goXHPJvjGQy2JuVDQnW/v7to3f8jknjg699kwzer91ezoLqHUnOpbU1BlO5Z kf4BHomJ5xHxTvO+dd5Y77CLa0sVJmx47vFhpdweg27dv8jeuzeyVXA9qMVe1pD5oTYZF4 cKIEkEECs/3w/IlRjPMHIlJTF+btDNMpjExDhP2ZrQGTwxY7CL2rHhLAYA3YXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ5Y046yTzkD6; Thu, 24 Oct 2024 12:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OCvOmH019947; Thu, 24 Oct 2024 12:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OCvOkB019944; Thu, 24 Oct 2024 12:57:24 GMT (envelope-from git) Date: Thu, 24 Oct 2024 12:57:24 GMT Message-Id: <202410241257.49OCvOkB019944@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: b1bb6934bb87 - main - sound: Fix build error in chm_mkname() KASSERT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b1bb6934bb8774dd96be76d88e6824e49b613549 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b1bb6934bb8774dd96be76d88e6824e49b613549 commit b1bb6934bb8774dd96be76d88e6824e49b613549 Author: Christos Margiolis AuthorDate: 2024-10-24 12:57:19 +0000 Commit: Christos Margiolis CommitDate: 2024-10-24 12:57:19 +0000 sound: Fix build error in chm_mkname() KASSERT Sponsored by: The FreeBSD Foundation MFC after: 2 days --- sys/dev/sound/pcm/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index b1d3ebc0d0f7..7bcd841d541f 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1181,7 +1181,7 @@ chn_mkname(char *buf, size_t len, struct pcm_channel *c) const char *str; KASSERT(buf != NULL && len != 0, - ("%s(): bogus buf=%p len=%lu", __func__, buf, len)); + ("%s(): bogus buf=%p len=%zu", __func__, buf, len)); switch (c->type) { case PCMDIR_PLAY: From nobody Thu Oct 24 12:57: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 4XZ5Yb1yQxz5bR0w; Thu, 24 Oct 2024 12:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ5Yb1PVWz472r; Thu, 24 Oct 2024 12:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729774675; h=from:from:reply-to:subject:subject: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+AXwLNFiDg8Dh9uNo4gPoIJh1lLGouiK1qgUri63CM=; b=WYN8/knXjaiLdYqL73zipgy94t9pHKqfKDJ8Z4QPhkF3RvxiqIo+xXjvYCpgr+p2QYzCD7 LAXScA4hZTBMV+MaULTmUbELpPOoDD5Bf9UQ5P9N0Rru8JmKZjYYZU3dzOFRbuC1/rsXIY n7NnOkk4rmwEwMAn/Mq9RgB81GhBT0ygSBFntMyHplx4506s/LKS4bDwzHBgMoBdrrpsf8 Bu9hpB2I+B03Xp81SdASRLkc/JD0doe0133CJEaO2MPlBwMykbz1gtJJYRRaKwa+EwfbeZ TrUGZajBYdIigDMTNZdzDHxx25ILePFwXp69AYeNIPurTEOfRyLpiBol2EXUCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729774675; h=from:from:reply-to:subject:subject: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+AXwLNFiDg8Dh9uNo4gPoIJh1lLGouiK1qgUri63CM=; b=fbRHHSLsYw1aifiuw0xcE6cOhAFwKEnbWapSQFV0xxjVJY5GhQpWVdEqPqhEMTQHuuKkE9 Efrnrqqcxm3kwhE8I1RcWj2Tpki9xXsmdUkY975x53IJ3MD9LDv0anNW1/V7YsQlCB/Dr+ R/lFcOIIvtIU/B1dUvU+IqsF/48OA5tZIYG1vz0/uINPawbLh3NYaOBMTtxp0FWWNMqmZD YDbwXIbKAXThPJsmBznaVf82Oeu2qqD9D3h1zRW0ece1Wo+T7mg8PRdFDcr491tgSPIB98 YuR4K/vGyzlOhaQHdf7q6YFK2tYiaMDrgHlom6h84O1xHmA1ChbbynkH3wDESA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729774675; a=rsa-sha256; cv=none; b=PN4Xw/NEdjHiG1DAzguP+2zw/KoOaw2sI68GQbWMFwAs1q24o+Cbgu7ca66F80sCuNrn+p UkwotmpJDSKjsIE3sNKiRVvJze2pS11tUZyTx5r4MNkZvilGpR3wCSjSjd1TErtdrQLRXo nNqNEqqfVpTFkdNBEW7V4F4giETYHhlQUFBWNcK6xTpbO6TpkUt/nJ49phkf5+n3lK6gid kyD5+pn9dI/WpUUYfSlKPYfCUiHr/O097V9HrK3wik5uPe4t9lMfsjc9GFkLHQzobY3CXa Q270ky08taPlGoQW7AYRvJJxfvXL0L8E3bVnjkZYIxiiNL+K1Xts6QKElqiw2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ5Yb10k0zkCG; Thu, 24 Oct 2024 12:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OCvtMI020264; Thu, 24 Oct 2024 12:57:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OCvtRR020261; Thu, 24 Oct 2024 12:57:55 GMT (envelope-from git) Date: Thu, 24 Oct 2024 12:57:55 GMT Message-Id: <202410241257.49OCvtRR020261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: ce20b48a60fb - main - sctp: improve debug 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce20b48a60fbae275085237dd48075d426f00d37 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ce20b48a60fbae275085237dd48075d426f00d37 commit ce20b48a60fbae275085237dd48075d426f00d37 Author: Michael Tuexen AuthorDate: 2024-10-24 11:18:22 +0000 Commit: Michael Tuexen CommitDate: 2024-10-24 11:19:14 +0000 sctp: improve debug output MFC after: 3 days --- sys/netinet/sctp_asconf.c | 6 +++--- sys/netinet/sctp_output.c | 8 ++++---- sys/netinet/sctp_pcb.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c index 3a30b0ba3740..6b98557c45a6 100644 --- a/sys/netinet/sctp_asconf.c +++ b/sys/netinet/sctp_asconf.c @@ -1313,13 +1313,13 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *stcb, struct sctp_ifa *ifa, #ifdef SCTP_DEBUG if (SCTP_BASE_SYSCTL(sctp_debug_on) & SCTP_DEBUG_ASCONF2) { if (type == SCTP_ADD_IP_ADDRESS) { - SCTP_PRINTF("asconf_queue_mgmt: inserted asconf ADD_IP_ADDRESS: "); + SCTPDBG(SCTP_DEBUG_ASCONF2, "asconf_queue_mgmt: inserted asconf ADD_IP_ADDRESS: "); SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa); } else if (type == SCTP_DEL_IP_ADDRESS) { - SCTP_PRINTF("asconf_queue_mgmt: appended asconf DEL_IP_ADDRESS: "); + SCTPDBG(SCTP_DEBUG_ASCONF2, "asconf_queue_mgmt: appended asconf DEL_IP_ADDRESS: "); SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa); } else { - SCTP_PRINTF("asconf_queue_mgmt: appended asconf SET_PRIM_ADDR: "); + SCTPDBG(SCTP_DEBUG_ASCONF2, "asconf_queue_mgmt: appended asconf SET_PRIM_ADDR: "); SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa); } } diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index cc8d017aba16..2a3c0248be60 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -13913,15 +13913,15 @@ sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t *ro) mask = (struct sockaddr_in *)(ifa->ifa_netmask); sin = &sifa->address.sin; srcnetaddr.s_addr = (sin->sin_addr.s_addr & mask->sin_addr.s_addr); - SCTPDBG(SCTP_DEBUG_OUTPUT1, "match_nexthop4: src address is "); + SCTPDBG(SCTP_DEBUG_OUTPUT2, "match_nexthop4: src address is "); SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &sifa->address.sa); - SCTPDBG(SCTP_DEBUG_OUTPUT1, "network address is %x\n", srcnetaddr.s_addr); + SCTPDBG(SCTP_DEBUG_OUTPUT2, "network address is %x\n", srcnetaddr.s_addr); sin = &ro->ro_nh->gw4_sa; gwnetaddr.s_addr = (sin->sin_addr.s_addr & mask->sin_addr.s_addr); - SCTPDBG(SCTP_DEBUG_OUTPUT1, "match_nexthop4: nexthop is "); + SCTPDBG(SCTP_DEBUG_OUTPUT2, "match_nexthop4: nexthop is "); SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &ro->ro_nh->gw_sa); - SCTPDBG(SCTP_DEBUG_OUTPUT1, "network address is %x\n", gwnetaddr.s_addr); + SCTPDBG(SCTP_DEBUG_OUTPUT2, "network address is %x\n", gwnetaddr.s_addr); if (srcnetaddr.s_addr == gwnetaddr.s_addr) { return (1); } diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index a1509229f593..92f08717c001 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -769,7 +769,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, else { SCTPDBG(SCTP_DEBUG_PCB4, "Del Addr-ifn:%d Could not find address:", ifn_index); - SCTPDBG_ADDR(SCTP_DEBUG_PCB1, addr); + SCTPDBG_ADDR(SCTP_DEBUG_PCB4, addr); } #endif From nobody Thu Oct 24 13: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 4XZ5hp0Cbdz5bRKm; Thu, 24 Oct 2024 13: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ5hn6nrCz47rt; Thu, 24 Oct 2024 13: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=1729775050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoUG7MK0ajVQeLVjmuDLxJoJNNk82HTYmDTx2nQu61g=; b=hwFmOVKdbZ4lhE0vFJrf5QNYICZ9tLV9fAdiNjZ0U6jElj8lSqeaYrGLJLjM129Drhs1SZ nA82vHdLBHIpABs6+KDCynkgh3MbrkNnLZALSDCZUA202AVihJ6xs0P76W7upl0vVnzuEF UDCmVBt6qX/vbv9LbcD27RzM3VB/NO6LAH2mip/KreV9FL/P6PLSuIE/rVhCTG/fEJFcdJ lGwfPlCFhuEPJYJqmrHz/bHe6TpYQArtcFqoMR/CSm//gavvmcnMVunhFhx6C4iCx850d/ XQosPogv/Qo4DNY1YI4fBl5iJpVOOnn0dJ+suuZGji3ytNV2BxNlxNNC5AF0FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729775050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoUG7MK0ajVQeLVjmuDLxJoJNNk82HTYmDTx2nQu61g=; b=P7KQwfeVIxPLqIoX3NwlWIo33dY6ATPTw0JmJYg9D5A0VgdUFWJYJ8BN/3K/2832VunxYl FBHwNJs4qP2ImkEMpLFmaq6jXy8oXSiuzHvZlnz/d68GGbqtQGu673ivGyj/vykCN5fzOO dIPsYvl78WPnRJUc+RbvUks9nMeVAeGFacUX/xpK+HWHhWRZEOnI0+n1X8LJvsLO8X7EWg WG3hZO3J+e5aUz7JtDfouQlqZ4Yg3R2/2SbxWHzTbtN8HJkaT1BV/qwt4TfU0Sf2N13ymJ kEAOsDTNLcerSk5m8zcmauxRfnH9WWo9zmHIAm0jaawKymsw9bdcqEBPQurSRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729775050; a=rsa-sha256; cv=none; b=i7m4h/7o1lkVUj3keYfBE7DGLkcRSp7G3O4Ae8Db91wZX+XtC4JZOuJKmqjcy8oDoSHcUe CqKnZ2kLb8XybEU82quH2ATTMi7KmCocl32YVr8lP9c4CD5IPl7aDB+7OFJhOoynM/q22p uePwUJdKE0JQdI0Yg0tAASqlzdjO17EM4/dazOo7ReNwIQu2iSLnWQ/rLTbnVbCC/GaUII ol0/+doaRURScc9j0xOdIvKv02tVTcd6bW8Crtzo8KOHLe7r4VfZw46/z26xt2pnn8WcH6 OHdrcEJ5PWyshlLdxeeLLFsvRmOPE0JJw9qSeSYW5UgV4xwafdDvH3/e5/GMvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ5hn6NtMzk1K; Thu, 24 Oct 2024 13:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OD49IP038701; Thu, 24 Oct 2024 13:04:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OD49xk038698; Thu, 24 Oct 2024 13:04:09 GMT (envelope-from git) Date: Thu, 24 Oct 2024 13:04:09 GMT Message-Id: <202410241304.49OD49xk038698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e4ac0183a1a8 - main - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4ac0183a1a846ef6556c9876dab76c06f5fea9c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e4ac0183a1a846ef6556c9876dab76c06f5fea9c commit e4ac0183a1a846ef6556c9876dab76c06f5fea9c Author: Michael Tuexen AuthorDate: 2024-10-24 11:24:49 +0000 Commit: Michael Tuexen CommitDate: 2024-10-24 11:24:49 +0000 sctp: cleanup No functional change intended. MFC after: 3 days --- sys/netinet/sctp_pcb.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 92f08717c001..f25668b5756c 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -192,21 +192,17 @@ sctp_find_ifn(void *ifn, uint32_t ifn_index) struct sctp_ifn *sctp_ifnp; struct sctp_ifnlist *hash_ifn_head; - /* - * We assume the lock is held for the addresses if that's wrong - * problems could occur :-) - */ SCTP_IPI_ADDR_LOCK_ASSERT(); hash_ifn_head = &SCTP_BASE_INFO(vrf_ifn_hash)[(ifn_index & SCTP_BASE_INFO(vrf_ifn_hashmark))]; LIST_FOREACH(sctp_ifnp, hash_ifn_head, next_bucket) { if (sctp_ifnp->ifn_index == ifn_index) { - return (sctp_ifnp); + break; } - if (sctp_ifnp->ifn_p && ifn && (sctp_ifnp->ifn_p == ifn)) { - return (sctp_ifnp); + if (ifn != NULL && sctp_ifnp->ifn_p == ifn) { + break; } } - return (NULL); + return (sctp_ifnp); } struct sctp_vrf * From nobody Thu Oct 24 14:18: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 4XZ7Lh61TLz5bVJF; Thu, 24 Oct 2024 14:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ7Lh5Wmcz4F6B; Thu, 24 Oct 2024 14:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729779516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fIYMr/4w+5v9ma8DSUQ0j9KS6iIcxx3+7oChGQSaaWE=; b=ui+foTusTmfY2ZHmLk/IVFFuEheLsOW2gMqiztBB3wrC8q0Uw29IcTsiRD2NvBzI8u4an8 RhUH9PmhnzzdHWSIK2hVahH7R1Y8SYfercFPAGjtq8DcM2AhUMcSnZovwGT28iLX1G86Tb WTLetnH2ooUJwdRzDGHylTJmP9ldoUQO99lWf0+dPg984xSKRFbYXE6TjW+lFnU9dWKACr ejLU73foeKACdtoLkWMXnJJgeCfLEbfXKrSk1ZSG4nh4wuSOM+n/mwKLiJQoqT8m9VVzPZ UU6YsL/L/C1G98qINdqYpIFIjrRYR+TOhXpiiC8YQFL455kAjdG+7rOqmS/wkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729779516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fIYMr/4w+5v9ma8DSUQ0j9KS6iIcxx3+7oChGQSaaWE=; b=OYyTBzXWGks1U27SA0zgmRIX5I+UsHJG8Tu8SMpN+AVogwl45BAso08lgPZ6ttczQ+2Egr /qHRBLmZ+ADCep1jHBbHnGjB5v3AHvJIa8oU2BAT3Dkp9XephmR2MKJ8+9u6UFP0ODWzAj VQvoL/xMEo02m+3pOvnMkRHSJERn144rKxdABZAf07/dFLrHZQC4uxkr7sSuYlOmxctLjI 02NbE7rNa92QM9Hq/BYg800gX34Iu6530wL+FeinQ31ARW+BRA1lRjYg8aNL1Nd5pWfJEF w+L+S04TBQ0imGJXah1VcZ8wDP018DlqtKco78tPnnodpGUTLoJF1GpjMlwfnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729779516; a=rsa-sha256; cv=none; b=Wfv/KUqFTFSjhi+h//OPrb47DJygliW3jt4nKkvtUYN9FziyPv78JIdFvGLCBXNDiRRMlI CcZGQfR4zZpt8wdM9c3ygwNTAx/+jhUwnY+SekvU99GFvjN6BSrjlIU7mgRxOrALwtnixE tghl6BGYTCq5MEVMi6dVqyqwETEmWl0Ff4aPenWffia0uYXXyFs27//T8aedjAmcD2cNBJ /T9T2ErOdN2IEwelBzV9b7Mas7tv9o/r5OaBvA5h5aU/Q9lig6X/lratgi1zJzLbMEHVui yc6JKiFwtc3g8UV6ejNXSBq4V+oGgG2aUY2dn9+p+oFKAorqb/bUXrJnHXTiGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ7Lh56n9zm0P; Thu, 24 Oct 2024 14:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OEIado068443; Thu, 24 Oct 2024 14:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OEIa5i068440; Thu, 24 Oct 2024 14:18:36 GMT (envelope-from git) Date: Thu, 24 Oct 2024 14:18:36 GMT Message-Id: <202410241418.49OEIa5i068440@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: 8c8ebbb04518 - main - bhyve ahci: Improve robustness of TRIM 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 8c8ebbb045185396083cd3e4d333fe1851930ee7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8c8ebbb045185396083cd3e4d333fe1851930ee7 commit 8c8ebbb045185396083cd3e4d333fe1851930ee7 Author: John Baldwin AuthorDate: 2024-10-24 14:18:09 +0000 Commit: John Baldwin CommitDate: 2024-10-24 14:18:09 +0000 bhyve ahci: Improve robustness of TRIM handling The previous fix for a stack buffer leak in the ahci device model actually broke the handling of TRIM as one of the checks it added caused TRIM commands to never be completed. This resulted in command timeouts if a guest OS did a 'newfs -E' of an AHCI disk, for example. Also, for the invalid case the previous check was handling, the device model should be failing with an error rather than claiming success. To resolve this, validate the length of a TRIM request and fail with an error if it exceeds the maximum number of supported blocks advertised via IDENTIFY. In addition, if the PRDT does not provide enough data, fail the command with an error rather than performing a partial completion. This is somewhat complicated by the implementation of TRIM in the ahci device model. A single TRIM request can specify multiple LBA ranges. The device model handles this by dispatching blockif_delete() requests one at a time. When a blockif_delete() request completes, the device model locates the TRIM buffer and searches for the next LBA range to handle. Previously, the device model would re-read the trim buffer from guest memory each time. However, this was subject to some unpleasant races if the guest changed the PRDT entries or CFIS while a command was in flight. Instead, read the buffer of trim ranges once and cache it across multipe internal blockif requests. Reviewed by: mav Fixes: 71fa171c6480 bhyve: Initialize stack buffer in pci_ahci Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47224 --- usr.sbin/bhyve/pci_ahci.c | 145 ++++++++++++++++++++++++++++++---------------- 1 file changed, 95 insertions(+), 50 deletions(-) diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index 87a8212b9fb7..07042908a958 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -126,6 +126,7 @@ struct ahci_ioreq { STAILQ_ENTRY(ahci_ioreq) io_flist; TAILQ_ENTRY(ahci_ioreq) io_blist; uint8_t *cfis; + uint8_t *dsm; uint32_t len; uint32_t done; int slot; @@ -213,6 +214,8 @@ struct pci_ahci_softc { }; #define ahci_ctx(sc) ((sc)->asc_pi->pi_vmctx) +static void ahci_handle_next_trim(struct ahci_port *p, int slot, uint8_t *cfis, + uint8_t *buf, uint32_t len, uint32_t done); static void ahci_handle_port(struct ahci_port *p); static inline void lba_to_msf(uint8_t *buf, int lba) @@ -812,18 +815,14 @@ read_prdt(struct ahci_port *p, int slot, uint8_t *cfis, void *buf, } static void -ahci_handle_dsm_trim(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t done) +ahci_handle_dsm_trim(struct ahci_port *p, int slot, uint8_t *cfis) { - struct ahci_ioreq *aior; - struct blockif_req *breq; - uint8_t *entry; - uint64_t elba; - uint32_t len, elen; - int err, first, ncq; - uint8_t buf[512]; - unsigned int written; + uint32_t len; + int ncq; + uint8_t *buf; + unsigned int nread; - first = (done == 0); + buf = NULL; if (cfis[2] == ATA_DATA_SET_MANAGEMENT) { len = (uint16_t)cfis[13] << 8 | cfis[12]; len *= 512; @@ -833,39 +832,84 @@ ahci_handle_dsm_trim(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t done len *= 512; ncq = 1; } - written = read_prdt(p, slot, cfis, buf, sizeof(buf)); - memset(buf + written, 0, sizeof(buf) - written); -next: - if (done >= sizeof(buf) - 8) - return; - entry = &buf[done]; - elba = ((uint64_t)entry[5] << 40) | - ((uint64_t)entry[4] << 32) | - ((uint64_t)entry[3] << 24) | - ((uint64_t)entry[2] << 16) | - ((uint64_t)entry[1] << 8) | - entry[0]; - elen = (uint16_t)entry[7] << 8 | entry[6]; - done += 8; - if (elen == 0) { - if (done >= len) { - if (ncq) { - if (first) - ahci_write_fis_d2h_ncq(p, slot); - ahci_write_fis_sdb(p, slot, cfis, - ATA_S_READY | ATA_S_DSC); - } else { - ahci_write_fis_d2h(p, slot, cfis, - ATA_S_READY | ATA_S_DSC); - } + /* Support for only a single block is advertised via IDENTIFY. */ + if (len > 512) { + goto invalid_command; + } + + buf = malloc(len); + nread = read_prdt(p, slot, cfis, buf, len); + if (nread != len) { + goto invalid_command; + } + ahci_handle_next_trim(p, slot, cfis, buf, len, 0); + return; + +invalid_command: + free(buf); + if (ncq) { + ahci_write_fis_d2h_ncq(p, slot); + ahci_write_fis_sdb(p, slot, cfis, + (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR); + } else { + ahci_write_fis_d2h(p, slot, cfis, + (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR); + } +} + +static void +ahci_handle_next_trim(struct ahci_port *p, int slot, uint8_t *cfis, + uint8_t *buf, uint32_t len, uint32_t done) +{ + struct ahci_ioreq *aior; + struct blockif_req *breq; + uint8_t *entry; + uint64_t elba; + uint32_t elen; + int err; + bool first, ncq; + + first = (done == 0); + if (cfis[2] == ATA_DATA_SET_MANAGEMENT) { + ncq = false; + } else { /* ATA_SEND_FPDMA_QUEUED */ + ncq = true; + } + + /* Find the next range to TRIM. */ + while (done < len) { + entry = &buf[done]; + elba = ((uint64_t)entry[5] << 40) | + ((uint64_t)entry[4] << 32) | + ((uint64_t)entry[3] << 24) | + ((uint64_t)entry[2] << 16) | + ((uint64_t)entry[1] << 8) | + entry[0]; + elen = (uint16_t)entry[7] << 8 | entry[6]; + done += 8; + if (elen != 0) + break; + } + + /* All remaining ranges were empty. */ + if (done == len) { + free(buf); + if (ncq) { + if (first) + ahci_write_fis_d2h_ncq(p, slot); + ahci_write_fis_sdb(p, slot, cfis, + ATA_S_READY | ATA_S_DSC); + } else { + ahci_write_fis_d2h(p, slot, cfis, + ATA_S_READY | ATA_S_DSC); + } + if (!first) { p->pending &= ~(1 << slot); ahci_check_stopped(p); - if (!first) - ahci_handle_port(p); - return; + ahci_handle_port(p); } - goto next; + return; } /* @@ -878,6 +922,7 @@ next: aior->slot = slot; aior->len = len; aior->done = done; + aior->dsm = buf; aior->more = (len != done); breq = &aior->io_req; @@ -1755,7 +1800,7 @@ ahci_handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis) case ATA_DATA_SET_MANAGEMENT: if (cfis[11] == 0 && cfis[3] == ATA_DSM_TRIM && cfis[13] == 0 && cfis[12] == 1) { - ahci_handle_dsm_trim(p, slot, cfis, 0); + ahci_handle_dsm_trim(p, slot, cfis); break; } ahci_write_fis_d2h(p, slot, cfis, @@ -1765,7 +1810,7 @@ ahci_handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis) if ((cfis[13] & 0x1f) == ATA_SFPDMA_DSM && cfis[17] == 0 && cfis[16] == ATA_DSM_TRIM && cfis[11] == 0 && cfis[3] == 1) { - ahci_handle_dsm_trim(p, slot, cfis, 0); + ahci_handle_dsm_trim(p, slot, cfis); break; } ahci_write_fis_d2h(p, slot, cfis, @@ -1903,12 +1948,12 @@ ata_ioreq_cb(struct blockif_req *br, int err) struct ahci_port *p; struct pci_ahci_softc *sc; uint32_t tfd; - uint8_t *cfis; - int slot, ncq, dsm; + uint8_t *cfis, *dsm; + int slot, ncq; DPRINTF("%s %d", __func__, err); - ncq = dsm = 0; + ncq = 0; aior = br->br_param; p = aior->io_pr; cfis = aior->cfis; @@ -1920,10 +1965,8 @@ ata_ioreq_cb(struct blockif_req *br, int err) cfis[2] == ATA_READ_FPDMA_QUEUED || cfis[2] == ATA_SEND_FPDMA_QUEUED) ncq = 1; - if (cfis[2] == ATA_DATA_SET_MANAGEMENT || - (cfis[2] == ATA_SEND_FPDMA_QUEUED && - (cfis[13] & 0x1f) == ATA_SFPDMA_DSM)) - dsm = 1; + dsm = aior->dsm; + aior->dsm = NULL; pthread_mutex_lock(&sc->mtx); @@ -1941,8 +1984,9 @@ ata_ioreq_cb(struct blockif_req *br, int err) hdr->prdbc = aior->done; if (!err && aior->more) { - if (dsm) - ahci_handle_dsm_trim(p, slot, cfis, aior->done); + if (dsm != NULL) + ahci_handle_next_trim(p, slot, cfis, dsm, + aior->len, aior->done); else ahci_handle_rw(p, slot, cfis, aior->done); goto out; @@ -1964,6 +2008,7 @@ ata_ioreq_cb(struct blockif_req *br, int err) ahci_check_stopped(p); ahci_handle_port(p); + free(dsm); out: pthread_mutex_unlock(&sc->mtx); DPRINTF("%s exit", __func__); From nobody Thu Oct 24 14:24: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 4XZ7TK5gF1z5bVMy; Thu, 24 Oct 2024 14:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ7TK4z0mz4GG5; Thu, 24 Oct 2024 14:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729779861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0E3yJUCgh0xzBSdL+GNOSSdpatQfTRlkbB3XlFWjA0=; b=chOkbFiYJHS4n1CpzNhc2Fn1vTxmjitdDSJBYs6zNShVnEHcmbcZlZ5EfKJXVJKk8CCXPU QoKYJ9tWAeJQ+RxpfBnn9PHZ4lsnHLSo1g1JjOQzrTnSoM8J2VUYUtKud/a+PKC17/XSBi /IyDTaspZ4d5UI4Rh7/vQRNXCjL5aa2qOI3UHeq1dqY64bhxtfVM7BdRNz9qHAx3/w7SPH PwSSXH54fNxaseXlX+i1YPlGWga0SAL4HX45Iu4JiXaQxu2NWHZXlfqHgwIcIol85p4YGV 4KbnOxgEq3pC3Z/4sgiafGKNp6dkBa2nae6GfWoVcvysYLEiogvm9ng/YZo9Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729779861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0E3yJUCgh0xzBSdL+GNOSSdpatQfTRlkbB3XlFWjA0=; b=jWrDtwCnNW6YsCXVYSZZ4NKR7/pDMKhZQ25V/iZCWLe/BgroKlhiGu1VCFDu9YP/QQ1vr/ 9ZoWfwpoehkSJf++2f/Z+2uIqLclNtgCV/TfNmX59dE9cMbOiA/cYJ2sXu6/B5x39Wmfre m8YA+Macqv8MiHuyq1jvfZBRZ0EF5KwuGkM7jYRC+6j+gtfi79d9X+GAhLrgpXR58rhzuN EGkUv2EMyYsbeMjQJx0NAYmA7e1qMUKEIlkbiEPkSqrzGOYFs42LHJQ8wZdAppF8uK1cm0 L8YVELLhpfgko0DL/vTTNqyQSh5zEBbVN/0YiT5J2bygM1KXIuDglp4gl8VyNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729779861; a=rsa-sha256; cv=none; b=VV0dZ7JVTnUPTKaDdQ50PTnvvR5FxtylnjPA8BQ3DwAlXEY0/UPiAWLBoDV9+bpbABGpUw 2T+nBp67Qa/J/K1aSVm4y44H2s9GlI/rGPlk3OxM6n1tmLWGS/uNg9qyfqsSIz0xfxP01h bmClUtm8m2F4tUzNr8ksY0DTHtKl8R9l2oDdL9lLnZFgfe494KPLMNktmMT/LV3F8RB4UD n0lGXSFEWtR7VwVkGKL3pbzu9z38q1fq8h8ZQTkhIwmu18C/0D/vWqTuFj1dyxpq3Z+9Yh IZo23FjnbVz6rWoe5c3fgoTXezWby80bZA2mAczOnLqLcNSMG5ll7FW7vred+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 4XZ7TK48d2zmCJ; Thu, 24 Oct 2024 14:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OEOLJ0085580; Thu, 24 Oct 2024 14:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OEOLfV085577; Thu, 24 Oct 2024 14:24:21 GMT (envelope-from git) Date: Thu, 24 Oct 2024 14:24:21 GMT Message-Id: <202410241424.49OEOLfV085577@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: f0bc751d6fb4 - main - csa: Use pci_find_device to simplify clkrun_hack List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f0bc751d6fb4f7fe46fdaa1486b0ae20b04bb544 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bc751d6fb4f7fe46fdaa1486b0ae20b04bb544 commit f0bc751d6fb4f7fe46fdaa1486b0ae20b04bb544 Author: John Baldwin AuthorDate: 2024-10-24 14:18:53 +0000 Commit: John Baldwin CommitDate: 2024-10-24 14:24:06 +0000 csa: Use pci_find_device to simplify clkrun_hack Reviewed by: christos, imp Differential Revision: https://reviews.freebsd.org/D47222 --- sys/dev/sound/pci/csa.c | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index b1e513928487..6440b73f6341 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -108,46 +108,25 @@ static int clkrun_hack(int run) { #ifdef __i386__ - devclass_t pci_devclass; - device_t *pci_devices, *pci_children, *busp, *childp; - int pci_count = 0, pci_childcount = 0; - int i, j, port; + device_t child; + int port; u_int16_t control; bus_space_tag_t btag; - if ((pci_devclass = devclass_find("pci")) == NULL) { - return ENXIO; - } + child = pci_find_device(0x8086, 0x7113); + if (child == NULL) + return (ENXIO); - devclass_get_devices(pci_devclass, &pci_devices, &pci_count); - - for (i = 0, busp = pci_devices; i < pci_count; i++, busp++) { - pci_childcount = 0; - if (device_get_children(*busp, &pci_children, &pci_childcount)) - continue; - for (j = 0, childp = pci_children; j < pci_childcount; j++, childp++) { - if (pci_get_vendor(*childp) == 0x8086 && pci_get_device(*childp) == 0x7113) { - port = (pci_read_config(*childp, 0x41, 1) << 8) + 0x10; - /* XXX */ - btag = X86_BUS_SPACE_IO; - - control = bus_space_read_2(btag, 0x0, port); - control &= ~0x2000; - control |= run? 0 : 0x2000; - bus_space_write_2(btag, 0x0, port, control); - free(pci_devices, M_TEMP); - free(pci_children, M_TEMP); - return 0; - } - } - free(pci_children, M_TEMP); - } + port = (pci_read_config(child, 0x41, 1) << 8) + 0x10; + /* XXX */ + btag = X86_BUS_SPACE_IO; - free(pci_devices, M_TEMP); - return ENXIO; -#else - return 0; + control = bus_space_read_2(btag, 0x0, port); + control &= ~0x2000; + control |= run? 0 : 0x2000; + bus_space_write_2(btag, 0x0, port, control); #endif + return (0); } static struct csa_card cards_4610[] = { From nobody Thu Oct 24 15:06: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 4XZ8Q86NlZz5ZY1v; Thu, 24 Oct 2024 15:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8Q85shHz4Lcq; Thu, 24 Oct 2024 15:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Voi6sS2nTCUc4Dcuu/Pp3uWS9C86juB6BSq1ObbrcIg=; b=uOP5F46CTvGFgdSh8W3WacYPVZGVBSDSsXJPHRHMleg0VJ89OONgVL0muliiTW6DfFKZTX IqxJm7kA2pz7BigcorvJ5/wq80RJ3qU7EC+kWyViVpLKbTfeS5V+QcPL+J2HddGXtGBoYT 7TWphDC4L9A2o3v68ty9bys9zY6ACwGTByiDDf5/fCr7pbvbHR+pmGPPbrBBPatI0BOEFh p/wBV3WWP4FSfmDLBKd6wx9zjsyXdZieXQVtY+t2gUQgt8qTklHXxhL60wr3GpfXCiT/c4 pEG5u/U8LeOtSuV7y05g3oDIOJLhjoTVP6YLulJk+YXfzChHW3MiGcgBzBRA9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Voi6sS2nTCUc4Dcuu/Pp3uWS9C86juB6BSq1ObbrcIg=; b=QIxqKvTO7pFNF+1m3f45xnyzYBemwd82m0bt7GZjggp40wi3uRWz0T/NnBlvTwwSrNU2oY dnBxqtmAyBDpiGLbkpaVPZ+p25ls8xkZpt8dB+dzAFU7QbK0LllLIbjDYCIzBNRRfneap2 +JZhp9T9VuYv+8DnJ2rAfyJ4AEJKBfi0Sto4gaw3A28bHebj9NRyIw1hODnQgMMf/oguxx ZrJnhf5s0GkAv/jBE0Tj2n12vVATBv0pbcteiRequE2ldFBsR1D6SjyeJzOyAokiefSV54 oLFF0dBAHGFev4lEr46fC7immyRxP7WUf2ROz6nKbhGwjwjEg+NPND9M8AURag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782400; a=rsa-sha256; cv=none; b=Bf7ylL1YroOVF9KeD6h+Mwa6P+iuQnhnghS+7S0MeGmlinNBGLAPPEziQAQ5ABPGon0EgC ztbjcN6aN7ots0LEagh0r7DAuopnG/6rfXYpkkXisMKECWg9dZF0JfP/qJSTJOO/qUKms5 kGkxtLX3cGrH2y7XwHsn8bRtACdVsoKNa0ednloj7658zig2W5Jf84mkhTHo31hdgRzSmo M0M5KzfuiykKNwGJSvBJXmFqoD2sJ0Nf+afZRvbz8ut56+NGn/N8ULmVaQ9gNTf9M6osw0 gmHJurtwrIg2S/virvLkx1lfAjK9WRpNaLqx/zqxGqJnUT7vpJJHzYW+tsQMIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8Q85LSBzmln; Thu, 24 Oct 2024 15:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6ewG061002; Thu, 24 Oct 2024 15:06:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6eM1060999; Thu, 24 Oct 2024 15:06:40 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:40 GMT Message-Id: <202410241506.49OF6eM1060999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d96ba5a62365 - main - config: Remove a stray semicolon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d96ba5a6236566afba05ce542296c589503a8b17 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d96ba5a6236566afba05ce542296c589503a8b17 commit d96ba5a6236566afba05ce542296c589503a8b17 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:48 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:48 +0000 config: Remove a stray semicolon MFC after: 1 week --- usr.sbin/config/mkmakefile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/config/mkmakefile.cc b/usr.sbin/config/mkmakefile.cc index a102b2b59767..6cffb64a5569 100644 --- a/usr.sbin/config/mkmakefile.cc +++ b/usr.sbin/config/mkmakefile.cc @@ -577,7 +577,7 @@ next: goto nextparam; } match &= negate; -nextparam:; +nextparam: negate = 0; } compile += match; From nobody Thu Oct 24 15:06: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 4XZ8QB0CD6z5ZY34; Thu, 24 Oct 2024 15:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8Q96HW9z4LTb; Thu, 24 Oct 2024 15:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lpoxwem6DL9NXyg0DANEIYUZzeH41o7yNhZlENg7sVc=; b=MMkcF/izC2r75fvz9kwfNPHm91bs3vVQvw4vbPoEPOOOhsm76btL7jI10AgWm16qr/C6oP p/NyeVRfAzdkZEuwH7/W6iKOJOD9gutt2ioI5ZBI8LytmSFwqZDH/AGU59dH9QyfEU03Li Pz9evF9gWCzn4zkl1B6vl/kC0KX7bdEUmYpw6rGCajceQQ41rLwGKbozKO0R+YHmJ+TOFo /Fd+42Iz+cbZzAIKq551gN9kWZgDKz1XAp7xRMz0+8XmTr684AAfz//ASoS/4jqs1eQgs6 g/9lLYz3bQjcn5EPgt7JfErvkSIO7ZIPKKIg6IfLDJrRmRF77QJRNHRkMcEhkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lpoxwem6DL9NXyg0DANEIYUZzeH41o7yNhZlENg7sVc=; b=JTkbHqkqJRf0Mal9qhCOtk+BnKRKIbKMJTiq9dLwXOzlewNDW7IGwBuYgT7D+2hJ//sxCO CpiriFfZB6pdF6Ptvv1BBUgD4xLNKueUery9wuiTFI2W5pJNT8ssSbXnfswRYfBJ/bcrba i/bG/UMlhU2CXqEHEtCKd+Tgt7OAS4iAoT6unbqbDaeEt6MQlsToc7bUSFU97K05qPlOjd 2jsmgtpo0a1aXb315quE22G0HoS0p0uTPyv6a9KtDonk6u+kH/0IBqaYSEE0p+Lch2YDXr WkxPGruwPW79jy1JY5wknFZyGwB8sn4clU835Fu4HFPyrjX1OegPvOPvqent1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782401; a=rsa-sha256; cv=none; b=diTHC127fomXed3Yij3yDQ39PTdfXgsgAnHotHGMnYRKpoEexBqERZdk7FU/MltATQngUW 54/HXlEuHwSQ1pGepn3n1so5inNkRBxOdH5e8upot98Ya4S9giWO/gB6jWVybgf7qAvfYj nsQtYxa9M4roM0vMff8QV2U/+FnajqUraBgU++ixxby1S4dxKSmSBkpsaa8bXAp50Yc8Lp DV0u8tEw6+C8CMqpynrYjMtTsxpLk1uKV35a6RZDDSRq02kJdGtP8hJFLaR1LDQAkV/dRS LvPANvSRsXRzJIVshm9rk9qqDXWFR/huWwzleEeryaJYVTRN8pudamh/Co/tHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8Q95v1Zzn5r; Thu, 24 Oct 2024 15:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6f91061051; Thu, 24 Oct 2024 15:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6fQF061048; Thu, 24 Oct 2024 15:06:41 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:41 GMT Message-Id: <202410241506.49OF6fQF061048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 56b17de1e836 - main - makefs: Remove a stray semicolon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56b17de1e8360fe131d425de20b5e75ff3ea897c Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=56b17de1e8360fe131d425de20b5e75ff3ea897c commit 56b17de1e8360fe131d425de20b5e75ff3ea897c Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:48 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:48 +0000 makefs: Remove a stray semicolon MFC after: 1 week --- usr.sbin/makefs/msdos/msdosfs_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c index e00ce9ef7b97..16e2ce44084d 100644 --- a/usr.sbin/makefs/msdos/msdosfs_fat.c +++ b/usr.sbin/makefs/msdos/msdosfs_fat.c @@ -245,7 +245,7 @@ pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int *sp) return (0); } -hiteof:; +hiteof: if (cnp) *cnp = i; if (bp) From nobody Thu Oct 24 15:06: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 4XZ8QC2wk2z5ZY38; Thu, 24 Oct 2024 15:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8QC09JMz4LTg; Thu, 24 Oct 2024 15:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2erH7RiKCR+xVDNOb5DGnk0SdsVvHJEYiDWxCvsXEHQ=; b=xKhnTd7wDR+RCU9hEf9cEOPP8TCT9iiiorsSF62M6GFEvP9WkK7intdOOL/0xNwL1mTy/O xsst/o91Zw2skvVX3Kvjw9BfoQ0rMXBXJRuQV+rd7CBR1cKpBdGd9Wu+gvCA+B51DMRwLi doo8DKNAxsm7nFrg9HkZYteyhuHQ3gWQjxRwySH8J42BGgAtUHKYoa+DbXYiyWh1fjfM61 0YAOML8eSyrjHkw2ZFlM9ZPkl7R3Ga1qgafMI2PtusO54H0CxR3poDWNWa3A/TY1xuv316 ZJy4C+u96cu+g329PWnEk3QFPVzbrkhUZHtE6Vt4T+3gRVcCQYJOCbcq2yt72w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2erH7RiKCR+xVDNOb5DGnk0SdsVvHJEYiDWxCvsXEHQ=; b=T1cFteCiRqURPLz09UJYGH5hNnbT/i9t+4SPtgBOGM2Le1gWGkbrc5YD4ztuuo+hoxOOoi GybiW50KQmJ/VrqdAciun+yZlYdJV6LW42xSc8pXtk7zpzYXc58Tn+oEEaVe9iPmVKYLGA uuDDUdDYybJkL2u7wWe8MsAUk8/PXzjAVqyva/Suqj3WFlRlYDUALa7d7pzxAAoSut2AHI VLAR32mAFa45eUgTG20lPKc8XBSR9vZOH1bNaPO9seMK1eBqLGykhmCgSfVRydyrRv+l29 QrAPEGA1VeVDi7Iu5mkgwwUQSjcIbK3GEtxd7kMyqW9YIrUIdTRtH/GP9G6dCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782403; a=rsa-sha256; cv=none; b=YwyOLENdRMz336SSDMJn5N/1OrMThVaQgAcLJHdc6UpaAsTti4/YUUVVOtqxeTLcfPksng JTEGoL8xtA2ATk0GA5d1XA3z7IS2Bs9wJJnRG0b87s+ouowVupO3BFkrTYbl/p9tyo9Txp fRSFmOjiMcPj2l+11gHDaZKdVtAvwCUAQ61tioUz0J73CXYq3yn/jV1eTqGrEIDTjs00+m kjR3szyItqGtwEYZilvn6VXrvpPrkEQX6CJXKQKF9nysMt+pJhVh5R8GAz7eKCGGnQ9UAt 8s69lQmSpL8Ud6v4ODYmE+xc5PVdMMfJ799pq8f8Or5IMfOa7CUfFcD+b/disQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8QB6tsHzn10; Thu, 24 Oct 2024 15:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6g64061104; Thu, 24 Oct 2024 15:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6gfa061101; Thu, 24 Oct 2024 15:06:42 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:42 GMT Message-Id: <202410241506.49OF6gfa061101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 88b71d1fe054 - main - arm64: rockchip: Remove a stray semicolon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88b71d1fe054f9baace237494d22288256a7fca1 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=88b71d1fe054f9baace237494d22288256a7fca1 commit 88b71d1fe054f9baace237494d22288256a7fca1 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:48 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:48 +0000 arm64: rockchip: Remove a stray semicolon MFC after: 1 week --- sys/arm64/rockchip/rk_pinctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c index 6137f7f0d50a..4cf266df3cbf 100644 --- a/sys/arm64/rockchip/rk_pinctrl.c +++ b/sys/arm64/rockchip/rk_pinctrl.c @@ -1191,7 +1191,7 @@ rk_pinctrl_configure_pin(struct rk_pinctrl_softc *sc, uint32_t *pindata) drive = ((1 << (value + 1)) - 1) << (pin % 2); - mask = 0x3f << (pin % 2);; + mask = 0x3f << (pin % 2); SYSCON_WRITE_4(syscon, reg, drive | (mask << 16)); } From nobody Thu Oct 24 15:06: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 4XZ8QD5tknz5ZY3B; Thu, 24 Oct 2024 15:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8QD18Xcz4LJd; Thu, 24 Oct 2024 15:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrBqmsboYNG9/3oVeJBDALszMdcuKToXdYpUj7pWS7A=; b=eClueDg1Z4+s8OL28Wy/92xhs4qFNF0xHvOO7XiJVmIbTXSrUY8uym1FHY9u78X7z1Z4NJ mAk63V64bvmokRzhDfNoT7K400x5cfXuanSagjYkBWl8fwos527GNwiQb0cwhpPwAs437Y fxgy2wt+DvQusF49R9UTCthCqp6PJ3u2Hb8F3vLNVllDNM2vex0OAavkr/+1Td8kKZwGM7 O6Y+znyIdZZ123NdhzVKPvAZw0SOyjrnSQEuRTT131s2MLWzagbRi7mcGAUIEkGoFgcOsM ebKE2UjlDyX5dG9AY0uYrZ2+byLqi2hUFePdBJF/r0BdUDvcflQT6pcjLQ+Xvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrBqmsboYNG9/3oVeJBDALszMdcuKToXdYpUj7pWS7A=; b=k5HNx4MNz68Aj8O37PYf+YDl9NVJda8u/tGI8QdS8NF6wqXnjV2STayfdyZxzNHfz4p4Ih /yQqTIl0QVjf0sKZQ1zVkz3bzXx+IN5I/Db0/eatzfg33lKbwpqnqKJUM68pNfyhzzxwMm q+dRVgVJqwaTrhdi77v73IzyRYzevXQwcmjptFPjQ4WaDssI12mPhIZ4ieLOGTfC5Qr77c 1DQSLxRiIhKhH2tXsObG5i9y22UYh4pXHf00l0V7xczE1t2kaK0RUECCHvYi3hNDeLsSD6 j9VWPC92tZXACs8kNpkzK4VId/VVdf2+gq7CsJkBTyhd7Oh/OC3QUHqiCR/+8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782404; a=rsa-sha256; cv=none; b=cGuCrm991kFKIVCiMnyuRZOynGOqxB8sgtrW+5UdBoKJLZs2TVOGnViw/+hIQJ9a/S3rEo DNaj1S0v4ZX/LiDhsRgDyrdnf+xRewZezgjC81aZyVMVVG9+yph80LkWCxgC+Hn5WIFWfh 3GgafwqyaQug5LwdqhQgwbjv7QGgbskGYPOJ8LjF2P6Z4aBDCgTMwTOD2U3X7VshoyjoQE O/Ovj72t8R1G0Er90S0BRA9PQ1PfcgJLSpDc3jnLDE0JY1Lg+7+nYcCO0w/SWk4Rf9/lZO /l6EeneNpJdo6Kb0VTWBNfCMOWFUtBmoJGAj554wNctucoWi5kYWHa7qq4Bv3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8QD0lhLzn3K; Thu, 24 Oct 2024 15:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6iUm061143; Thu, 24 Oct 2024 15:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6icu061140; Thu, 24 Oct 2024 15:06:44 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:44 GMT Message-Id: <202410241506.49OF6icu061140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: b4856b8e9d87 - main - LinuxKPI: Remove stray semicolons List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4856b8e9d872ca6ee0c4ef43e7047693ef7645b Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b4856b8e9d872ca6ee0c4ef43e7047693ef7645b commit b4856b8e9d872ca6ee0c4ef43e7047693ef7645b Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:48 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:48 +0000 LinuxKPI: Remove stray semicolons MFC after: 1 week --- sys/compat/linuxkpi/common/include/linux/kernel.h | 2 +- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 43938cdf73de..11a13cbd49b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -341,7 +341,7 @@ static inline bool mac_pton(const char *macin, uint8_t *macout) { const char *s, *d; - uint8_t mac[6], hx, lx;; + uint8_t mac[6], hx, lx; int i; if (strlen(macin) < (3 * 6 - 1)) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index d3839820d3d5..341ed33ddfcd 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -614,7 +614,7 @@ static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *head) { SKB_TRACE2(skb, head); - struct sk_buff *p, *n;; + struct sk_buff *p, *n; head->qlen--; p = skb->prev; From nobody Thu Oct 24 15:06: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 4XZ8QF3Cyqz5ZYNg; Thu, 24 Oct 2024 15:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8QF1yWgz4LPJ; Thu, 24 Oct 2024 15:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4t86Td2C04uERvQO3bQtGqsp3KLVPyBTD3zmRyC1fE=; b=KnphKkvxXP6H/CO+qbEoHa0k5maaeFAqrvepgVVLaWa9swBHQLa2kUCPYT+tBMcHrCGrwo 15NzifwQVRwVHFz2gS6bqA142YFEJW2cS0La0+3QpRC0DqmqsT4/s1wklERXHlwKJSW39a 96m4KS7L5zf9D7d1Yqs9FskbtIn1R7EpOxf1d4pnf8cIw/29OPAWC5DgmGgTx9Em/z6U48 0/Qz+SM+IJQhc8XqBUP/GwW8ROkOvHvYCljNvzDjAOBWsRUahUC4OG5X8yiAfG/eii7mjd /bAnn6HBToukIOAn6dyRB50/nB+7jm/JxmTB1LcPvuJVdhOFUnwPm6BA4LdhoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4t86Td2C04uERvQO3bQtGqsp3KLVPyBTD3zmRyC1fE=; b=RbOMYvjIOe3qbBnwSQewPDesyqKSkrbAvTtBHY51WIrDVSD3QQcOBikDCuhHPCRuRHmF+L 3Vpm7BEh/BeLD0nsyA9/0bhF80ebpAOaq5kiJym8/YUCg2qhQ92pQ/RH1eGLpYStQOrwRd vvNHNh/KVyIXC8g6ZmeiS5fu8OJlhtlZ28vjW0jps093HKz7irR2hutim4gJEojxJCp9Tg oaEfz7AbP5OqUu8bf7n5uZP99uJxanpvUU/z2Bxt1b3S+kLTDWKxS4jmbywBe5VGDmfa4B bm2UWr2EQBemEBoK514VS5fkY0P9HlG1THAJV+6EWqpY2TiZawvR9c/YZovhOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782405; a=rsa-sha256; cv=none; b=V3OcNTTilFlgfjROHQeWDukq8gXF5CS1cM91jrh/f2ti+5RnzzpWLXRSoFAna51Sw5RlPt E4r1OH8ZwNbmdzBq/74sMpQA5kJDHwIaEikQxCQ16+Tvts/NpRd6HuRtPKFougB7LJ1JBf 9a2UvhKcS+C3qgFdWwI9eYPPZEPzvQhoAJQ5wF+r5MZMCq32aBGux3VcWUdCnSyGo0BE/K DlLSt82fOWE1YFg1Dug168ktW43KH4jauf6XUTzJTt6PUymVbFnsmx360mZ+Los7T+LplS 51t4VoY3g04kSmn3KeObV4iLhu87ebdJkz8ak6YUnuaRcsk6TYEpIasoYw/wvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8QF1JxYznT7; Thu, 24 Oct 2024 15:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6j41061192; Thu, 24 Oct 2024 15:06:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6jcs061189; Thu, 24 Oct 2024 15:06:45 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:45 GMT Message-Id: <202410241506.49OF6jcs061189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 75ff90814aec - main - enic: Remove a stray semicolon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75ff90814aec7a68e719d326f8dd0a7e1d0fc66d Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=75ff90814aec7a68e719d326f8dd0a7e1d0fc66d commit 75ff90814aec7a68e719d326f8dd0a7e1d0fc66d Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:49 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:49 +0000 enic: Remove a stray semicolon MFC after: 1 week --- sys/dev/enic/enic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/enic/enic.h b/sys/dev/enic/enic.h index 6d0eb8563efd..8c2212726548 100644 --- a/sys/dev/enic/enic.h +++ b/sys/dev/enic/enic.h @@ -228,7 +228,7 @@ struct enic { /* interrupt vectors (len = conf_intr_count) */ struct vnic_intr *intr; - struct intr_queue *intr_queues;; + struct intr_queue *intr_queues; unsigned int intr_count; /* equals enabled interrupts (lsc + rxqs) */ From nobody Thu Oct 24 15:06: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 4XZ8QG5RKSz5ZYLw; Thu, 24 Oct 2024 15:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8QG2h8xz4LgF; Thu, 24 Oct 2024 15:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5wmGTi/q2Z25676RnHl5eEZXvoGAGDKdDlRQeOl/kzk=; b=iYF+n/it0sd6MAspclosnG/5SpcP2LJg1Y2kxxvnGXf8S+tZ4z/A4L+N4TilBaPZkKoI/s tR9XMJl9Xx6QWWEXxFLcSVQGOEfSNshqXNc9nyKY8MM+4UHKbP+0ZzK0K28nNOH1GXRqs7 JfLeCAJCS4pBE30b//mEBDkFFgeobgdBUdh5HTRLtGmjEDZSdfp017pjCKI92bk2p5TsCO MRIFOcaWp8h9xajPo7/N27ahkNf3gq5v0ZyMXxQ6Q2fxiIK8uWwWPe7DmCR7/x23EfdkoD e8h/5ADzPpZOYPLLl+n0Uc/Olk2mIT7x0Cn8/2SNa6usqZ15RoIYWkIghRghVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5wmGTi/q2Z25676RnHl5eEZXvoGAGDKdDlRQeOl/kzk=; b=ll4dLnvhSRjoKrDx0nj0T4XnMu0AdyaHcfwNuwkiCFiGkGrgcBJjBrkRwhhVUjNV3XUxdL 6/Xi0eb2b/b05MPYJYCtm8H6zcNnKCDZ14NxSOtAVt690QPz9SI0xuIHe3L1o+VMaDYyFw DKn7EdvvhRizwecbaLhWTK+wYXA5O2fa6As1UyqDy/kE/8AXqKHq+bi8oPi+cl4ToFRQVa Ei+lymf0o0hZjDiJtQ9LbYQuK4uIEYVUzCuioVRMoEuBeOa+ectyxO68AAVomQSOwcKG7X WWC7OtTtcs3vA/np25LNGp5f0yR2opPKEwDSiTEvb0RJXUgfF6RJRI3aa+97Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782406; a=rsa-sha256; cv=none; b=VO5hoN+71E1Zig904rlp52bJ3n/SLSG20fq6/uH89n3lbtukeniqEsu1x6SqfO4mzViUEx la3cV7roY9pltFToS/IEsFmPwGaNWkhLkuYJ6wSiYxTIwRHZVo8tC14cS8CJjp2wFhrW2n E63qlLUDkW5f3hScF+hfW0v9qg+R2UMDRrfWu4q7sNDGMIliwucnSHvYV+xAEPTF+OpoYh 2Nl+ec7AnR41PbCSmayM4de35Xk4gaCS5kvaixKS+r77QKO8FMD/0l/Nw/hpqD0Ronk0Mc 27lc6n+J+eVkI9tTz1s7t/hGv2Req52DCnR/poNvexcJ+sRgn/jyXRECslvVhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8QG2H7yzn82; Thu, 24 Oct 2024 15:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6kMf061231; Thu, 24 Oct 2024 15:06:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6kRI061228; Thu, 24 Oct 2024 15:06:46 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:46 GMT Message-Id: <202410241506.49OF6kRI061228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 6ccf4f4071c5 - main - mana: Remove stray semicolons List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ccf4f4071c5bf85a9aad593e92d1623e949c039 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6ccf4f4071c5bf85a9aad593e92d1623e949c039 commit 6ccf4f4071c5bf85a9aad593e92d1623e949c039 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:49 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:49 +0000 mana: Remove stray semicolons MFC after: 1 week --- sys/dev/mana/mana_en.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 90db036ff59b..735b94bba6cd 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -1426,7 +1426,7 @@ mana_poll_tx_cq(struct mana_cq *cq) uint16_t next_to_complete; if_t ndev; int comp_read; - int txq_idx = txq->idx;; + int txq_idx = txq->idx; int i; int sa_drop = 0; @@ -2114,7 +2114,7 @@ mana_create_txq(struct mana_port_context *apc, if_t net) mana_dbg(NULL, "txq %d, txq gdma id %d, txq cq gdma id %d\n", - i, txq->gdma_txq_id, cq->gdma_id);; + i, txq->gdma_txq_id, cq->gdma_id); if (cq->gdma_id >= gc->max_num_cqs) { if_printf(net, "CQ id %u too large.\n", cq->gdma_id); From nobody Thu Oct 24 15:06: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 4XZ8QJ09m4z5ZYNh; Thu, 24 Oct 2024 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8QH3TWsz4Ldm; Thu, 24 Oct 2024 15:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDNm+cfoKcV6Kvm2q23pYHzgcVIxYDhGZP77DdcGYdg=; b=b2HEgHFCy2tsV4qclUzC6B2eH7xPcws6sTE/a5ohmKCwXh5AVdwt52f5bg8/cb7lGDOzPS 9Qx1eOcwhm2xjxmitIrIhZjxP7dXGr/t8GrHWoNWLM4vuvukzyXwQBF0MQ9Yi6TM8x61/X hIlQpqZlgRmqFLi/3tqxOuPJ7w4UkmTDHN6g0jnIniPvMFRiawABJCWIEi8/6HuWLRAgdI QSqd8DdRPbczSERobv6sOSTKc2RfS9C7v1wFq3EMs3X37DSm/MrbA85r5JwRg0qYobaEko HKiHPa83xDfWPZeebpfYGbaH/SwJ5LUwvf1442unrezbgBCXpphesyNv6Ebksw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDNm+cfoKcV6Kvm2q23pYHzgcVIxYDhGZP77DdcGYdg=; b=iwKNVMpSsu+vRPI94fXQn8EPormm0KD9VMS8QvJha4o6OB67/CyJ2Pzbel6bhPc0MC/x2r gsOHpRlw1D5FgpwYs7eiMO4aeHECl/zt1Vqt1n4Xlg0T1DMZvoGG0Mu8MAKiJlDW2V0m0P XLYnucVKfdOPjSW94BIAxXldde1lmsGo/p4X5PWZCtz2ZJ16mi8nYg5Vfupa2R32IUewX4 hDw5hpnX5gevVHh/xNwwuqT7tJNOi7Ff7ksZlQ+bd3K1+d4TU8PJnWThtz+ZZG95m/aKwI Ep95EYB/dILedsYClhBKjTLnIVDknhmNY7SkzdbOnEDt0/0JV2fHVgiR4ECZOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782407; a=rsa-sha256; cv=none; b=WPa3nQN/t+a6jTuIrpm7nOagdyoHIOIVe7PRtCpDPBMbx5T6jeHKpWZqfEEDfjdfujOTK0 0jts+mJmUu5XKlWmLo0agMpxaf2CArkTc+7D6mPs96pT7enMpUnmzrbNHUlVv2lt9ufVDP SHJTWcBzTV2ILeqaZPCtO7kN56gywu9WhYRl9wyi0CIUklRQZvcHBnbelVyVyU1uQiWCLT +eriBMF/G3i/OCk2RtZnNSMTCelaH86n3aW2g7DPZmVwPHjuComseBfFrg8V7mJkaiFAy9 mZNnmWH9S4UrdKPMU1R46JER+gsFYwG5iEWI3A6/2g0d0vPHtLDjMQb+DCBPRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8QH35jkzn83; Thu, 24 Oct 2024 15:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6lmq061283; Thu, 24 Oct 2024 15:06:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6lTJ061280; Thu, 24 Oct 2024 15:06:47 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:47 GMT Message-Id: <202410241506.49OF6lTJ061280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 86a2c910c05c - main - mpi3mr: Remove a stray semicolon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86a2c910c05c65d1318aef81ddbde8ac7eab79b9 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=86a2c910c05c65d1318aef81ddbde8ac7eab79b9 commit 86a2c910c05c65d1318aef81ddbde8ac7eab79b9 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:50 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:50 +0000 mpi3mr: Remove a stray semicolon MFC after: 1 week --- sys/dev/mpi3mr/mpi3mr_app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index 79da04a74218..7cd3f13e4117 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -2079,7 +2079,7 @@ mpi3mr_get_adpinfo(struct mpi3mr_softc *sc, adpinfo.pci_dev_hw_rev = pci_read_config(sc->mpi3mr_dev, PCIR_REVID, 1); adpinfo.pci_subsys_dev_id = pci_get_subdevice(sc->mpi3mr_dev); adpinfo.pci_subsys_ven_id = pci_get_subvendor(sc->mpi3mr_dev); - adpinfo.pci_bus = pci_get_bus(sc->mpi3mr_dev);; + adpinfo.pci_bus = pci_get_bus(sc->mpi3mr_dev); adpinfo.pci_dev = pci_get_slot(sc->mpi3mr_dev); adpinfo.pci_func = pci_get_function(sc->mpi3mr_dev); adpinfo.pci_seg_id = pci_get_domain(sc->mpi3mr_dev); From nobody Thu Oct 24 15:06: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 4XZ8QJ724hz5ZYNk; Thu, 24 Oct 2024 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8QJ4NYLz4LXj; Thu, 24 Oct 2024 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFPG8ZF5rdHBk89SCCpDXjheOfIrA81K6Ri6eevuPys=; b=xWLe7JKLk0TtmoESvztZgOLEBCBQ9ljoB5MvjySBPHRkBlNYV9FH2hcIloOOvnEd3VBD3L K+RY8RSjwNmMO6c5j3DODL1o6Imb9S7jmtmYxlL+YIuCGdPi/8jULqFegVYJZios/dSxe9 lGMRqDRHWd3gxwK1qlig/+0yd85Fsv+KYWhzhy8YgbpcgnyWcxLj9LI+ujHIerfBtW0bvU gE0f3ugXrVO5yn3PPggaF8gHSk88tSRlR0LGx2Go9C8LF5+CawCD2xrcPkthk66G2Sl8Wr OLpR6HbIOXddilJ+XMDxRopRB5cnLBVvyU5y/ly4fy24X8bv0KDUGegzDFaEmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFPG8ZF5rdHBk89SCCpDXjheOfIrA81K6Ri6eevuPys=; b=XSvlj+9mY9lQAZhi7Y+8kgOT9Qpi8diVHH+Rj9B2Ime1XmsSvxczO//ylnnzO2VHX8f8d1 tcXJzbh0BftH/rrP3SzG60S3R/MlfZ37SGvOw0ynbRFTTuDyxpwKHcrCmne7ljo8MKmCN4 vVngxIx7xLF+X4LTq5lnCJsq2gZOAzCRyGrorwAIUZIfTtbP/jfQzTrRO3Up7nXr4ycKA4 dBySp+7I36JLPrqBOJPeW7QtHWhov3kztsbkGIFWc6jDsLDC8t5wXB7i9pVyYAp4xmjDWV oB0NeQV4Nbr82dFl+gPMewGqVouS9YCUoH+wNnbl8oTmJogB4/rsfnz4/XrhcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782408; a=rsa-sha256; cv=none; b=tnFhOshX1eA38Plb+XX/1hP47BX/qYbKc576EQtHPdplUJXrlEFzsbDlCclC4nAGAJ9evA Mof8IC5AUWZeWNBb5YFHmm1vWD8nvSDyJU/Lx8k5HbS/wvqsEQhGv6f6MHG0wJg7GJ4osG abEqUHlA36gvrNQjLXgrQbPIIstbwqlOHC/GAClzvHk5nHC1BXsxyuqqqHAiFtJuQ9vSZB vnL/IS4gJ8cSHhVkOPiG4wHPJX7TJm6C1VSrC1KOyYlsLQ1nU04kEpwXkxzDM3p9RZBb6t dk+jEJ5MNWua/kGbxSKMHHz3vA2Ov4Riiwcg/mSUJlDQ70l6tqe8n0i2t6gVjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8QJ40jYzn11; Thu, 24 Oct 2024 15:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6mcA061326; Thu, 24 Oct 2024 15:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6ml4061323; Thu, 24 Oct 2024 15:06:48 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:48 GMT Message-Id: <202410241506.49OF6ml4061323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 36756195a342 - main - ocs_fc: Remove a stray semicolon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36756195a342dbfb8fcfc7561b1d656fc6310d05 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=36756195a342dbfb8fcfc7561b1d656fc6310d05 commit 36756195a342dbfb8fcfc7561b1d656fc6310d05 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:50 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:50 +0000 ocs_fc: Remove a stray semicolon MFC after: 1 week --- sys/dev/ocs_fc/ocs_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ocs_fc/ocs_hw.c b/sys/dev/ocs_fc/ocs_hw.c index c368e09aef8c..62ef3cd49be3 100644 --- a/sys/dev/ocs_fc/ocs_hw.c +++ b/sys/dev/ocs_fc/ocs_hw.c @@ -12192,7 +12192,7 @@ ocs_hw_set_persistent_topology(ocs_hw_t *hw, uint32_t topology, uint32_t opts) param.persistent_topo = SLI4_INIT_LINK_F_P2P_FAIL_OVER; param.topo_failover = 1; } else { - param.persistent_topo = SLI4_INIT_LINK_F_P2P_ONLY;; + param.persistent_topo = SLI4_INIT_LINK_F_P2P_ONLY; param.topo_failover = 0; } break; From nobody Thu Oct 24 15:06: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 4XZ8QL1MFpz5ZXtv; Thu, 24 Oct 2024 15:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZ8QK5T0Hz4LQD; Thu, 24 Oct 2024 15:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ed0BQdpX/NaV2/do4HocHXpJ9xjFAu9sDIcCV6tpV7Y=; b=jFNJmp8oy0Q8EtfEqYGuDdd+9Kz48wI+tOIKyHNLJSOV2kUnQCEX84pk+2ObSZq4tTXf4W Tlk7csIuEbNCf26hjcXj2cLzNdjfZLYBz3HbRiK9rUYa7RarFkNByWzLsR2RK3HvoE1/ZP XjnngLeXkR/f5xq4Agq73eMgNEG3zEXf+5dyr52orw/uupd7jLoqUYyt3XN2lG8ymxrKJO 0wEGGrs/zn8JlZv04um1/lSliMS4yIO5ZXKQSIwWP05lM1dU7rk5OOMQfNGNLAdRrTNoV2 8Lx10guzK7YJg+SCpjC0Yy4TyQnJArMMnEJywzFKiPfLHkzUmpL1sD3AXZ84jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729782409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ed0BQdpX/NaV2/do4HocHXpJ9xjFAu9sDIcCV6tpV7Y=; b=LZXM8oamRqcksD1zzlmOxvDgzKSMn/UXJtjvSgbBlYOEmuPxhNoCYG2ELWBINzy813EMlC 4B07KW6DZZuPj1ewTPG79jTKhExAGT7Y2bbp38ZEnMy3J8U6u/nYXUHpi0X1XBzXlUobIU jDx55n+V2UvHC9UIGqhb19vIFROFF3QhVuduzPuR3KLbmYYJB6zER/tlT+v3DQX6GMyemF Sw82UmjLeXGETQuApOewQQ0o/WLDnza7WRG9QgjVW/gzQgTVmnyaVd17AKblHZmHP0e+nc M120nkAR+uycskAya45kQgUV19lJJ+30bOwFwpZsRF4wc4qIuo7jsfku+OkWXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729782409; a=rsa-sha256; cv=none; b=pKikPZfHxolCvQYpwfwkJMDXDrSIZwAmEHVtQ+qL9RoGBpnjku0v5Y46OH2JD8GOXR+67i B7Zvapn0xkWmBgWR2k7f2TkIntBX4dblSOwGSMNMxjuV42rDfQPoFmngn/D3eU/FKPZ4T9 QkNytwXCNrHR2jAPmpxkwSQ5DR/sdH8mSbTKRT7845dNZLcYh/BzzSdCKvqf5nU11xMmLg eeLatu3kIAq8kgg4WHjoLe7Y26FwvLSmCX4QVDDGDIDanIbi3kkzNiEA/BYacTQxtpkQEK j7YfQlMRpRPTQStsh6FiBmFZi5OnRKO2344pZIEmfkLePnV16OGuFy4xjoDGEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZ8QK55HfzmHH; Thu, 24 Oct 2024 15:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OF6nj0061372; Thu, 24 Oct 2024 15:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OF6nE0061369; Thu, 24 Oct 2024 15:06:49 GMT (envelope-from git) Date: Thu, 24 Oct 2024 15:06:49 GMT Message-Id: <202410241506.49OF6nE0061369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 2f395cfda8b5 - main - tcp cc: Remove a stray semicolon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f395cfda8b5c1dc267e9cd4d99d7d0862fb4fca Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2f395cfda8b5c1dc267e9cd4d99d7d0862fb4fca commit 2f395cfda8b5c1dc267e9cd4d99d7d0862fb4fca Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:50 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-24 15:04:50 +0000 tcp cc: Remove a stray semicolon MFC after: 1 week --- sys/netinet/cc/cc_newreno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 56adb2d17601..4515ac133c19 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -371,7 +371,7 @@ newreno_cong_signal(struct cc_var *ccv, ccsignal_t type) cwin = CCV(ccv, snd_cwnd); mss = tcp_fixed_maxseg(ccv->tp); nreno = ccv->cc_data; - beta = (nreno == NULL) ? V_newreno_beta : nreno->beta;; + beta = (nreno == NULL) ? V_newreno_beta : nreno->beta; beta_ecn = (nreno == NULL) ? V_newreno_beta_ecn : nreno->beta_ecn; /* * Note that we only change the backoff for ECN if the From nobody Thu Oct 24 16:54: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 4XZBq21ZRVz5ZfSY; Thu, 24 Oct 2024 16:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZBq216hsz4Z9d; Thu, 24 Oct 2024 16:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729788894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymTr2jXVXapd5Au5qqHumu6agXAn1tRMfzoc6Y3HJWs=; b=qkbIvIBIzmhlZOYQ66yK4tpdpTcUBnAU7u2Pf3n9os/EvRdtgitxoJQOb85Bj8kbWucTMb BHaPBCHQPjjKjvhHfV9wwyXzNnJQOUokPSk6WSTpidWEN6MmumISaWDxXRRLSaW/9F+5PN BkLG1L8i3+LyExAoR1fjfjmAaqtaBZQUqGdPJGytegoxMDNz+Ty6v0zohjx+MZ+vBnPGUZ ewhV0vgLzP0YcIYeGsW9pFZgnydut5ty5XDBHWgCmxi0pqY4xOHmCZpwRfJpj0ic08FvRW tGMJvLwq4iOXJcN6+DG8Tk9PUxVZw/2rinljRcGPZAtZCt5Dmc+aRnLXun3U2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729788894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymTr2jXVXapd5Au5qqHumu6agXAn1tRMfzoc6Y3HJWs=; b=M1xBAnbhcR+2L3rTdlZG5D/m67eC4u7yQ7KceGKylrqpsUHrDdl+Xq9yTXXFWQfIwCrQRf L3JQxAJRVW4yIGcosjTwRswXNww586qdpi5uXkPpE9bYzQaw4xpsGR9zSy8oA584IrC3Ym xJYNXB/U8lxvN60pVpiPHyXHGqyolme2fQjKIw3aRdqd/4FaEuxuH5nt3I2S/sg0qOE9WJ xtOsBELPh841BQQVOe/JmkUh29kTQx3T6VHhMUaZK5GQg/lSZsO9FIOVU6SHc3S1YV/ZEi AZhsf1gAWG6Rpg7H//K5metzFx9OVYCjNi6aElYtkfhsx1C9/Kzn9sai6VoyZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729788894; a=rsa-sha256; cv=none; b=wjVP0gbEmA7g/N06X86uuz1mDZl7pfsg1qI/1ZjlnpDMLFWBqegqPjFDPkhgYAdXkw14Kq 9zP3QR/UtE5x2NEfVoVLiQJErE/E3zjdb+eq/4P+fGMgFvHCAszu4QBnFBddfVm26JcHIx Pl2GMHpkME9qlOrE4Y7/r2lo2xK4QTO5naHRI5FSUnolI9j9LDHf4FFkSwKnPaA8STvdaC 8yNlUcfnyGuCXmiNvMcIflFPFYB9gBGd7T0jk+Ys0cS+XH1oJzwGGlFhFSjZJRVa6DhaO/ h6SpU1owVGyWEmkkZnxrLEgC6047U/ajnw196/unwwLytYPhY1nwZiOLhlJxfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZBq20bXLzrC8; Thu, 24 Oct 2024 16:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OGsr8s062926; Thu, 24 Oct 2024 16:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OGsrk3062923; Thu, 24 Oct 2024 16:54:53 GMT (envelope-from git) Date: Thu, 24 Oct 2024 16:54:53 GMT Message-Id: <202410241654.49OGsrk3062923@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: f3a097d0312c - main - netstat: switch to using the sysctl-exported stats for live stats List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f3a097d0312cbadefa9bbb00cf3c6af784f9fbb9 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f3a097d0312cbadefa9bbb00cf3c6af784f9fbb9 commit f3a097d0312cbadefa9bbb00cf3c6af784f9fbb9 Author: Kyle Evans AuthorDate: 2024-10-24 16:53:59 +0000 Commit: Kyle Evans CommitDate: 2024-10-24 16:54:21 +0000 netstat: switch to using the sysctl-exported stats for live stats Now that we export the relevant stats via the net.route.stats sysctl, switch to using that to avoid having to dig around in mem(4) for live kernel statistics. Based on callers of kresolve_list(), this is the last live path using mem(4) that could be functional today. Tested both with `netstat -rs` and `netstat -rs -M`. Note that this will not be able to extract stats from a running kernel that predates 3360a15898 / 1500026, but this can be worked around by specifying `-M /dev/mem` explicitly in the interim to fallback to libkvm against /dev/mem. Reviewed by: glebius, markj, zlei Differential Revision: https://reviews.freebsd.org/D47231 --- usr.bin/netstat/main.c | 7 ++----- usr.bin/netstat/route.c | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index eaca38365ed8..97509ea6798b 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -523,12 +523,9 @@ main(int argc, char *argv[]) if (rflag) { xo_open_container("statistics"); xo_set_version(NETSTAT_XO_VERSION); - if (sflag) { - if (live) { - kresolve_list(nl); - } + if (sflag) rt_stats(); - } else + else routepr(fib, af); xo_close_container("statistics"); if (xo_finish() < 0) diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index f32ddee8403f..74797e2addb8 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -699,13 +699,11 @@ void rt_stats(void) { struct rtstat rtstat; - u_long rtsaddr; - if ((rtsaddr = nl[N_RTSTAT].n_value) == 0) { - xo_emit("{W:rtstat: symbol not in namelist}\n"); + if (fetch_stats("net.route.stats", nl[N_RTSTAT].n_value, &rtstat, + sizeof(rtstat), kread_counters) != 0) return; - } - kread_counters(rtsaddr, (char *)&rtstat, sizeof (rtstat)); + xo_emit("{T:routing}:\n"); #define p(f, m) if (rtstat.f || sflag <= 1) \ From nobody Thu Oct 24 17:14: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 4XZCFn0Cj7z5ZgSf; Thu, 24 Oct 2024 17:14:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZCFm6q0vz4c2L; Thu, 24 Oct 2024 17:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nnrBTRqajwjutm5d+ElfU/6eInmwRV7RiGyZMLI098=; b=fgocgEqHjan9zghhJr3tf5auehtWYDkcDIQZZwE/uLo2FaaPSCepmTus/wDkQWVMJlvFhf epvvBAW43AlyESlV67th2gp/d4MTt1PZ7AMGasTs7bgW/J6pMx8JWXddgC3o+D3CjbPaLz tJF1G+xexE21jdaMSP0YjdtRAmue3HQofUyejt9AZDOarxtGKDfenfTN7pnwNTE1KIZ/3l CSE0vBp+MvT6Cz3I8r3JckYyhFJnDUJZWztTCzPlzm9e3U1EsBvUSjf7S28olba+JdMIbL WgXX+Mm/FYlqNojPX1TWrZBZMrpZos6f5YbFjFoWi4V4Y3qfKqGroZVP8xWBlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nnrBTRqajwjutm5d+ElfU/6eInmwRV7RiGyZMLI098=; b=K5x9druCFC1vh6KQoLEFP/8eJpbEHzLNrUww1U7wXr2DhoimsSWy3VxKaYCySc0LolsmhF IXyoSmNo5YOpbRsNupgYs9uWge4R0Ac+PXz1nN9d8halVaUvnua2p4LqjIrRSWtqPdBrEa BphHTgmCknFXJ/FMW9WzUNpVaunRxLJnTRRXmMCkKcAL0s5LEVBmbsLYusAGkDGC4FjYRm LQqQhVdws/IKEzfr2EaPQDcS0T0nvJh1s3VhLPg/eJrGESmHBqphrqHQxbEAgozy8aLOpi 0OCUYWqXqweHjCR9QiC+urVRknQr+ivt04oM2/glGNsvIqiEPvEnTeMhZbkX+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729790077; a=rsa-sha256; cv=none; b=cCJmH/ec6670Cy2X42jsJd+M5Y9FM9OgDamjpU25bpwcwYBdiKHzbJLr0J4Fx1MG+Xe8oh DbqEDjiEsHj9nYgzphmEjZ2SeUb5QH+ItE+uU2HEyjVYa+a+MMNsO6tquHf2WWIXp6jteT 2rmFkB80tImR2TYaoEjScZF6x08aSRS4MwB01MWHj+3bVFzy59lU6JnspfQw/SMR9Aoq/2 DRo32y+2H4j7St5o8OYbGRaKYKwO1oSh1NTn7OH/FlbDXAxD60YCXW39G1ARj2G7KGnDJP iz/fLSDsQkmgVWTYLmgdBRYtC1QyYqRegErQIzMrj7g7An3MBn7hqP2hOVXt8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZCFm6PwFzr3g; Thu, 24 Oct 2024 17:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OHEaVZ000280; Thu, 24 Oct 2024 17:14:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OHEaiP000277; Thu, 24 Oct 2024 17:14:36 GMT (envelope-from git) Date: Thu, 24 Oct 2024 17:14:36 GMT Message-Id: <202410241714.49OHEaiP000277@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: 656991b0c629 - main - locks: augment lock_class with lc_trylock 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 656991b0c629038beddf1847a6c20318d3ac4181 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=656991b0c629038beddf1847a6c20318d3ac4181 commit 656991b0c629038beddf1847a6c20318d3ac4181 Author: Gleb Smirnoff AuthorDate: 2024-10-24 16:57:57 +0000 Commit: Gleb Smirnoff CommitDate: 2024-10-24 17:14:03 +0000 locks: augment lock_class with lc_trylock method Implement for mutex(9) and rwlock(9). Reviewed by: jtl Differential Revision: https://reviews.freebsd.org/D45745 --- sys/kern/kern_mutex.c | 18 ++++++++++++++++++ sys/kern/kern_rwlock.c | 14 ++++++++++++++ sys/sys/lock.h | 1 + 3 files changed, 33 insertions(+) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 0fa624cc4bb1..fa043fa7e124 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -100,6 +100,8 @@ static void db_show_mtx(const struct lock_object *lock); #endif static void lock_mtx(struct lock_object *lock, uintptr_t how); static void lock_spin(struct lock_object *lock, uintptr_t how); +static int trylock_mtx(struct lock_object *lock, uintptr_t how); +static int trylock_spin(struct lock_object *lock, uintptr_t how); #ifdef KDTRACE_HOOKS static int owner_mtx(const struct lock_object *lock, struct thread **owner); @@ -118,6 +120,7 @@ struct lock_class lock_class_mtx_sleep = { .lc_ddb_show = db_show_mtx, #endif .lc_lock = lock_mtx, + .lc_trylock = trylock_mtx, .lc_unlock = unlock_mtx, #ifdef KDTRACE_HOOKS .lc_owner = owner_mtx, @@ -131,6 +134,7 @@ struct lock_class lock_class_mtx_spin = { .lc_ddb_show = db_show_mtx, #endif .lc_lock = lock_spin, + .lc_trylock = trylock_spin, .lc_unlock = unlock_spin, #ifdef KDTRACE_HOOKS .lc_owner = owner_mtx, @@ -216,6 +220,20 @@ lock_spin(struct lock_object *lock, uintptr_t how) mtx_lock_spin((struct mtx *)lock); } +static int +trylock_mtx(struct lock_object *lock, uintptr_t how) +{ + + return (mtx_trylock((struct mtx *)lock)); +} + +static int +trylock_spin(struct lock_object *lock, uintptr_t how) +{ + + return (mtx_trylock_spin((struct mtx *)lock)); +} + static uintptr_t unlock_mtx(struct lock_object *lock) { diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 31ff8a7213fd..c7e377c8f77a 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -72,6 +72,7 @@ static void db_show_rwlock(const struct lock_object *lock); #endif static void assert_rw(const struct lock_object *lock, int what); static void lock_rw(struct lock_object *lock, uintptr_t how); +static int trylock_rw(struct lock_object *lock, uintptr_t how); #ifdef KDTRACE_HOOKS static int owner_rw(const struct lock_object *lock, struct thread **owner); #endif @@ -85,6 +86,7 @@ struct lock_class lock_class_rw = { .lc_ddb_show = db_show_rwlock, #endif .lc_lock = lock_rw, + .lc_trylock = trylock_rw, .lc_unlock = unlock_rw, #ifdef KDTRACE_HOOKS .lc_owner = owner_rw, @@ -176,6 +178,18 @@ lock_rw(struct lock_object *lock, uintptr_t how) rw_wlock(rw); } +static int +trylock_rw(struct lock_object *lock, uintptr_t how) +{ + struct rwlock *rw; + + rw = (struct rwlock *)lock; + if (how) + return (rw_try_rlock(rw)); + else + return (rw_try_wlock(rw)); +} + static uintptr_t unlock_rw(struct lock_object *lock) { diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 65064aad5aa8..9d81a49ab52a 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -66,6 +66,7 @@ struct lock_class { int (*lc_owner)(const struct lock_object *lock, struct thread **owner); uintptr_t (*lc_unlock)(struct lock_object *lock); + int (*lc_trylock)(struct lock_object *lock, uintptr_t how); }; #define LC_SLEEPLOCK 0x00000001 /* Sleep lock. */ From nobody Thu Oct 24 17:14: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 4XZCFp1Ckrz5Zg1y; Thu, 24 Oct 2024 17:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZCFp0j31z4cD0; Thu, 24 Oct 2024 17:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6C9XKKtXrGhXJhvNcp8OVOcYIf1X78OU12iwTG86N08=; b=cwJwZr7fAANrRlKHOJXnLwTLbsvWNnv/b7EFTJ1CU3wHiiqrSGQ5EvTUCXYZdL+J9LeIf0 9ditq7t/Hjo9IIUVLfkgIt7Fuk0Kewq7VlNY5LP8OicsCuA8L7CUMTHUnmHORTcKHwin8U 5QwgLxIcC7bP5ujuwXF0zoLtiS6+oUcjj7Al/gSiCcfAkwtl37zt40PxxIccq+VK6diCpp yiow7iZVth0uhcmY78MDGYjdU8epJwol3o3uxDtgC49s5UKgmFlbHIn0jsskwxw7WQ+vPi u0PJhYOLVPCxlHHAsBRO6HYS9pDLXKcZPnlw9YKKOi9YUBSXgtNy9ccYfOT5wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6C9XKKtXrGhXJhvNcp8OVOcYIf1X78OU12iwTG86N08=; b=NvKJlZuHNjKPxEi9oi1QH6JgOrN7hA4L0dZzAYNCJ+nyPVhURf1hoFyzhHvq9HPKPJTnSQ gXdXMCggMTYj+/Fw929+saA2L4pT856OP3pV4+DV0ylz5MHQW1W7+3FOqgNkC6/EYDgWOV lus+IQlMy5fbKuoqgr1cayRlKlcI932UFhINt7hoYJMp5V0MHVlbRAaKdWsvqgrHpEWkQm 1XTFB4SIIloqs8dOBu0ngYlAdrWL6mbZuv0Vq9b76FtcZj8SUB2gX7l5NHFAfETBXP9jYW qp6Q1v5UlgAYPmxEdlXnI0vMdMQb1O9QdV3uS1kHDzdB24TfVpH99x4o7gKiMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729790078; a=rsa-sha256; cv=none; b=yUkUEdM2H4jlOL7Ug51jYL54mHpgPguDpbJrXeGuY7tlNbLVEARGcSKudOC8Mb1H1E8OEG /IARru5v7DEwP5NnvWuhGrT2TYwQye3QkWPmwWC01Nsh62zhJM19HbE8sXUdcGfPismONm cG+97nuOhpVL9FdGFJdmIfO/C8no3zPYfIEeuPTb2dG9iMjvdBt874J6C+1zJE9EeIorqJ /8fKqZOkHynIPVDQpTUFq5gEdmoIC7qIBejilRUvgUJD0wjJjC+yKhRYXaZP4V5dPE3WKV JYoR3+rTfZDQTmCdUV0T2BaBYnCjPx0jO0mn1L0IdVxhzIBavp91qffUi/HbHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZCFp0HlHzr3h; Thu, 24 Oct 2024 17:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OHEbiO000321; Thu, 24 Oct 2024 17:14:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OHEbC9000318; Thu, 24 Oct 2024 17:14:37 GMT (envelope-from git) Date: Thu, 24 Oct 2024 17:14:37 GMT Message-Id: <202410241714.49OHEbC9000318@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: efcb2ec8cb81 - main - callout: provide CALLOUT_TRYLOCK 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: efcb2ec8cb81ea44c58e41082c6d965f9493099f Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=efcb2ec8cb81ea44c58e41082c6d965f9493099f commit efcb2ec8cb81ea44c58e41082c6d965f9493099f Author: Gleb Smirnoff AuthorDate: 2024-10-24 16:58:05 +0000 Commit: Gleb Smirnoff CommitDate: 2024-10-24 17:14:03 +0000 callout: provide CALLOUT_TRYLOCK flag If a callout was initialized with the flag, then the callout(9) system will not drop the callwheel lock in softclock_call_cc() to obtain the callout lock. Instead it will use try-lock semantic to obtain the callout's lock. In case of a failure the callout will be rescheduled to the 50% of the precision value. The main benefit of such behavior is not the avoidance of the lock contention in the callout thread, but the fact that callout with such flag can be actually stopped in a safe manner, because the race window in the beginning of softclock_call_cc() is closed. Call of callout_stop() on such a callout would guarantee that nothing will be executed after callout_stop() returns, neither callout lock will be dereferenced. A callout marked as CALLOUT_TRYLOCK | CALLOUT_RETURNUNLOCKED can call callout_stop() from the callout function itself (0, a failure to stop, will be returned), then unlock the lock and then free the memory containing the callout structure. Caveat: when calling callout_stop() from outside the callout function, the return value from callout_stop() is still inconsistent. A race window at the end of softclock_call_cc() still exists, so callout_stop() may report failure to stop, which would not be true. Reviewed by: jtl, kib Differential Revision: https://reviews.freebsd.org/D45746 --- sys/kern/kern_timeout.c | 40 ++++++++++++++++++++++++++++++---------- sys/sys/callout.h | 2 +- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 699a57d51f0e..0fa1af6ef5a7 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -649,6 +649,7 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc, static callout_func_t *lastfunc; #endif + CC_LOCK_ASSERT(cc); KASSERT((c->c_iflags & CALLOUT_PENDING) == CALLOUT_PENDING, ("softclock_call_cc: pend %p %x", c, c->c_iflags)); KASSERT((c->c_flags & CALLOUT_ACTIVE) == CALLOUT_ACTIVE, @@ -671,16 +672,29 @@ 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_UNLOCK(cc); if (c_lock != NULL) { - class->lc_lock(c_lock, lock_status); - /* - * The callout may have been cancelled - * while we switched locks. - */ - if (cc_exec_cancel(cc, direct)) { - class->lc_unlock(c_lock); - goto skip; + if (c_iflags & CALLOUT_TRYLOCK) { + if (__predict_false(class->lc_trylock(c_lock, + lock_status) == 0)) { + cc_exec_curr(cc, direct) = NULL; + callout_cc_add(c, cc, + cc->cc_lastscan + c->c_precision / 2, + qmax(c->c_precision / 2, 1), c_func, c_arg, + (direct) ? C_DIRECT_EXEC : 0); + return; + } + CC_UNLOCK(cc); + } else { + CC_UNLOCK(cc); + class->lc_lock(c_lock, lock_status); + /* + * The callout may have been cancelled + * while we switched locks. + */ + if (cc_exec_cancel(cc, direct)) { + class->lc_unlock(c_lock); + goto skip; + } } /* The callout cannot be stopped now. */ cc_exec_cancel(cc, direct) = true; @@ -698,6 +712,7 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc, c, c_func, c_arg); } } else { + CC_UNLOCK(cc); #ifdef CALLOUT_PROFILING (*mpcalls)++; #endif @@ -1332,10 +1347,15 @@ void _callout_init_lock(struct callout *c, struct lock_object *lock, int flags) { KASSERT(lock != NULL, ("%s: no lock", __func__)); - KASSERT((flags & ~(CALLOUT_RETURNUNLOCKED | CALLOUT_SHAREDLOCK)) == 0, + KASSERT((flags & ~(CALLOUT_RETURNUNLOCKED | CALLOUT_SHAREDLOCK | + CALLOUT_TRYLOCK)) == 0, ("%s: bad flags %d", __func__, flags)); KASSERT(!(LOCK_CLASS(lock)->lc_flags & LC_SLEEPABLE), ("%s: callout %p has sleepable lock", __func__, c)); + KASSERT(!(flags & CALLOUT_TRYLOCK) || + (LOCK_CLASS(lock)->lc_trylock != NULL), + ("%s: CALLOUT_TRYLOCK requested for %s", + __func__, LOCK_CLASS(lock)->lc_name)); *c = (struct callout ){ .c_lock = lock, diff --git a/sys/sys/callout.h b/sys/sys/callout.h index 5d0d896b5d3b..c3350b324296 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -39,7 +39,7 @@ #include -#define CALLOUT_LOCAL_ALLOC 0x0001 /* was allocated from callfree */ +#define CALLOUT_TRYLOCK 0x0001 /* try semantic in softclock_call_cc */ #define CALLOUT_ACTIVE 0x0002 /* callout is currently active */ #define CALLOUT_PENDING 0x0004 /* callout is waiting for timeout */ #define CALLOUT_MPSAFE 0x0008 /* deprecated */ From nobody Thu Oct 24 17:14: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 4XZCFq2VQTz5ZgBs; Thu, 24 Oct 2024 17:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZCFq1nwRz4cVY; Thu, 24 Oct 2024 17:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fTdezkn95zKkjXlkTYqMQt4tncAFLcQgMEXb0cYPN0=; b=amhk3R+1lMLhh6UZ7yafIlOm8d84TzuiOnbSJbLWByzKnsiNtpTzTPf4+GeKXsKLLXy8tF fQfrQL5nPci28t0EKvoVZb+xx9ROWXlylKsJXk37fsmBzGVD0huDku+GQHxqHP5SP0UT5L A1RXe4q2aeD70fLP3RjoNCiwlFRuwgZNOQeEmGqC9SoCeITimRtaSNeVbAXfEF8p77Oryx EbDy8jL97HRUj5H3xMi7jPA+HKKyDdyllI11GJ9rHTKaHETggre5ZfhRuefAWt3vgIYTUN KkMIJqheqzJr+Mlterfevwc3vInyI/Gdg/eLJJvvhK6rCkUEy5bXJFN4oCbgYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fTdezkn95zKkjXlkTYqMQt4tncAFLcQgMEXb0cYPN0=; b=OT3xdH5CYc3r8rOEACtJONqEqUOxAWml51TxugnE5cyZOQMXv4DuqYMPE/kYbFIy+0Gbgk WKEuePhffqNJB6SxgQ9m3VrDZNfhzERVR0ceZ/scReg++y0e567pcMIJ1DHyPg/FV3zO6b nvCw/KpQhakbtbIUMyUtrcgLGQ7WtgNXWUBOmEFcscdp/x1CIvo33hWSo8BmR83fowl4IQ agNqEBK40SZfcHuH5ixNRMInMSX68eMbUUqv4zuIt7gBddOZWl5S6jRruuH56KL0mEEUBb 4O0x1w0R1UFttqgfmz/uqy75UEmNhAqeShDnHh9WjUQE4in0shPe3+95dwrCCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729790079; a=rsa-sha256; cv=none; b=nKWVrv1GfuuG3dfdbySBwW2wv40nwJViKkxR37ptut29Ut0fLLS3aS87HeSxaH2uJ4uesa qkV5FQJhL6r/OxHpnPOlx0RDj8DhLkGV+7z8lAmmIvTjNIr78gQEM7z4hKeXkFsQMRskrk UHlrUw9ehyGqe4jWuj9mg8z6/i4LfSrRtAGr5jv3JAmTttP4eZ9Av4L/ih/X4jZintKLtF n7B1chOj3/dV/GDgERJHcY88Cg+ErIk+6fsoVwKW/A41c2RnzRFyBj57oql4cWN8zf0i/z 0F0tqm517qOUhsvXN6P0bcGylgK4BE4j6a8W6qiZvMgoXL6XbTEUAxZwtAmKWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZCFq19lczrJT; Thu, 24 Oct 2024 17:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OHEdlW000377; Thu, 24 Oct 2024 17:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OHEdL2000374; Thu, 24 Oct 2024 17:14:39 GMT (envelope-from git) Date: Thu, 24 Oct 2024 17:14:39 GMT Message-Id: <202410241714.49OHEdL2000374@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: bffebc336f4e - main - tcp: use CALLOUT_TRYLOCK for the TCP callout List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bffebc336f4ece4d18774c1ab8f555802cebf961 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bffebc336f4ece4d18774c1ab8f555802cebf961 commit bffebc336f4ece4d18774c1ab8f555802cebf961 Author: Gleb Smirnoff AuthorDate: 2024-10-24 16:58:37 +0000 Commit: Gleb Smirnoff CommitDate: 2024-10-24 17:14:03 +0000 tcp: use CALLOUT_TRYLOCK for the TCP callout This allows to remove the drop of the lock tcp_timer_enter(), which closes a sophisticated but possible race that involves three threads. In case we got a callout executing and two threads trying to close the connection, e.g. and interrupt and a syscall, then lock yielding in tcp_timer_enter() may transfer lock from one closing thread to the other closing thread, instead of the callout. Reviewed by: jtl Differential Revision: https://reviews.freebsd.org/D45747 --- sys/netinet/tcp_subr.c | 3 ++- sys/netinet/tcp_timer.c | 39 +++++++++++++++------------------------ 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 9b5f2651fb35..668d218b34a8 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2309,7 +2309,8 @@ tcp_newtcpcb(struct inpcb *inp, struct tcpcb *listening_tcb) tp->t_hpts_cpu = HPTS_CPU_NONE; tp->t_lro_cpu = HPTS_CPU_NONE; - callout_init_rw(&tp->t_callout, &inp->inp_lock, CALLOUT_RETURNUNLOCKED); + callout_init_rw(&tp->t_callout, &inp->inp_lock, + CALLOUT_TRYLOCK | CALLOUT_RETURNUNLOCKED); for (int i = 0; i < TT_N; i++) tp->t_timers[i] = SBT_MAX; diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index ae6b97c09cdf..ae4753b2523f 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -949,35 +949,26 @@ tcp_timer_active(struct tcpcb *tp, tt_which which) /* * Stop all timers associated with tcpcb. - * * Called when tcpcb moves to TCPS_CLOSED. - * - * XXXGL: unfortunately our callout(9) is not able to fully stop a locked - * callout even when only two threads are involved: the callout itself and the - * thread that does callout_stop(). See where softclock_call_cc() swaps the - * callwheel lock to callout lock and then checks cc_exec_cancel(). This is - * the race window. If it happens, the tcp_timer_enter() won't be executed, - * however pcb lock will be locked and released, hence we can't free memory. - * Until callout(9) is improved, just keep retrying. In my profiling I've seen - * such event happening less than 1 time per hour with 20-30 Gbit/s of traffic. */ void tcp_timer_stop(struct tcpcb *tp) { - struct inpcb *inp = tptoinpcb(tp); - INP_WLOCK_ASSERT(inp); - - if (curthread->td_pflags & TDP_INTCPCALLOUT) { - int stopped __diagused; + INP_WLOCK_ASSERT(tptoinpcb(tp)); - stopped = callout_stop(&tp->t_callout); - MPASS(stopped == 0); - for (tt_which i = 0; i < TT_N; i++) - tp->t_timers[i] = SBT_MAX; - } else while(__predict_false(callout_stop(&tp->t_callout) == 0)) { - INP_WUNLOCK(inp); - kern_yield(PRI_UNCHANGED); - INP_WLOCK(inp); - } + /* + * We don't check return value from callout_stop(). There are two + * reasons why it can return 0. First, a legitimate one: we could have + * been called from the callout itself. Second, callout(9) has a bug. + * It can race internally in softclock_call_cc(), when callout has + * already completed, but cc_exec_curr still points at the callout. + */ + (void )callout_stop(&tp->t_callout); + /* + * In case of being called from callout itself, we must make sure that + * we don't reschedule. + */ + for (tt_which i = 0; i < TT_N; i++) + tp->t_timers[i] = SBT_MAX; } From nobody Thu Oct 24 17:14: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 4XZCFr3sl0z5Zg3R; Thu, 24 Oct 2024 17:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZCFr38pxz4c9x; Thu, 24 Oct 2024 17:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lThoNc3BvTWVfl6mle0V8XTWrjGHvEpcNfAauJGUhfI=; b=RFOErHHYSJoteM+0c7bwk1nyn1K25XsUM78iSkoeO9f2auJYRFAGyDY3nulwAtnND4Zyxq 5eneLmH/8E+2nzs8nCVb8Lda4IESTYZF6qk1YOzP8woeW8tVZ2QwRicMadsDAd6tOy4zxK e5oQkIVLvjjPbedi1XtotybLKsQEwh5TO7MHQ6Pe8aHY/8hfw6ODTDf9P3I/GhNWxtrEf4 W9RTIIo3jGiqRksCD3j18+faGJ45J8EVsXhWg0b86U5chD6Hemlu5tyZjTdP1iTn8Vysr8 VTDtDGRsbUPEE6EeFI8CVGyoKAGR1F4EaahzGnhhBNS0AVcY7+Q6OYPdiy8hrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lThoNc3BvTWVfl6mle0V8XTWrjGHvEpcNfAauJGUhfI=; b=kzlDJ1kqgwxObkG++BSskv1Ch87XzqLGHiFiHHJ54VJDW6SAcItNc9Ah0Y+t+UY1tgLNui w3sLHl1iOKtPN9wnlRGK+lVZqXXxEftv303x72WPjw69jU46XcJB0o3yAWNEI4mcQi+pDy Wou/NX7L8KMurC1ofGULJG+kjU3kl8YwITYFRze9A1GxhJISYPIpUBaj41VtUKhX9B/1aH PEHG/h50vGiOTngN5WofcFDEwnaJdXXqEdivox3Vs4kwA8oa0hqaspGfBTr8Guq9f3ReO+ t4+ktwzoTVdTggOE894NKjU+tY1xlKmciKRmV8B7tKI7yQkse3taPIk3Gaiw8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729790080; a=rsa-sha256; cv=none; b=XX2O5ejKVZ1PvYZMFuEyytFjAivaYedWL/BZ+dcWS3E2y0iRtF4vYBCZqz6yIZ8ul3XcgA UEOYadV3QB1ebn/7E7GJrx1HQCrWzxJ1AdVVQSHJdelCCF/hDa9RGr/Zy6+dW3G1/a6a26 r6Wi8sp5Z65icN4hKtfLlVa+o8Mf6KLW2jFYSX9lB60DjSBEt0aTEVo3iYDFj4IiRJ3Yzb brIOMt3Br3RMu8bXXNs4jB89gf6haUjti3E1Tl4jbqJc0DY77FIBQ4h5iTq22JN95hL+tC Xnq7cpwN9PqoijGtZIzLUXfPkg8PIX+vVVdcVOnE0mNAtcJjj5ufaerw2o/3Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZCFr1rfQzr1P; Thu, 24 Oct 2024 17:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OHEeGZ000419; Thu, 24 Oct 2024 17:14:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OHEe4e000416; Thu, 24 Oct 2024 17:14:40 GMT (envelope-from git) Date: Thu, 24 Oct 2024 17:14:40 GMT Message-Id: <202410241714.49OHEe4e000416@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: d021d3b3c675 - main - tcp: get rid of TDP_INTCPCALLOUT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d021d3b3c67573822b01d27cb05ca937fc966843 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d021d3b3c67573822b01d27cb05ca937fc966843 commit d021d3b3c67573822b01d27cb05ca937fc966843 Author: Gleb Smirnoff AuthorDate: 2024-10-24 16:58:49 +0000 Commit: Gleb Smirnoff CommitDate: 2024-10-24 17:14:03 +0000 tcp: get rid of TDP_INTCPCALLOUT With CALLOUT_TRYLOCK we don't need this special flag. Reviewed by: jtl Differential Revision: https://reviews.freebsd.org/D45748 --- sys/netinet/tcp_timer.c | 9 +-------- sys/sys/proc.h | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index ae4753b2523f..c5c65dda5b1a 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -874,12 +874,8 @@ tcp_timer_enter(void *xtp) struct inpcb *inp = tptoinpcb(tp); sbintime_t precision; tt_which which; - bool tp_valid; INP_WLOCK_ASSERT(inp); - MPASS((curthread->td_pflags & TDP_INTCPCALLOUT) == 0); - - curthread->td_pflags |= TDP_INTCPCALLOUT; which = tcp_timer_next(tp, NULL); MPASS(which < TT_N); @@ -887,8 +883,7 @@ tcp_timer_enter(void *xtp) tp->t_precisions[which] = 0; tcp_bblog_timer(tp, which, TT_PROCESSING, 0); - tp_valid = tcp_timersw[which](tp); - if (tp_valid) { + if (tcp_timersw[which](tp)) { tcp_bblog_timer(tp, which, TT_PROCESSED, 0); if ((which = tcp_timer_next(tp, &precision)) != TT_N) { MPASS(tp->t_state > TCPS_CLOSED); @@ -898,8 +893,6 @@ tcp_timer_enter(void *xtp) } INP_WUNLOCK(inp); } - - curthread->td_pflags &= ~TDP_INTCPCALLOUT; } /* diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 1e98cc84a60a..466fb3c0cd41 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -560,7 +560,7 @@ enum { #define TDP_RESETSPUR 0x04000000 /* Reset spurious page fault history. */ #define TDP_NERRNO 0x08000000 /* Last errno is already in td_errno */ #define TDP_UIOHELD 0x10000000 /* Current uio has pages held in td_ma */ -#define TDP_INTCPCALLOUT 0x20000000 /* used by netinet/tcp_timer.c */ +#define TDP_UNUSED0 0x20000000 /* UNUSED */ #define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */ #define TDP_SIGFASTPENDING 0x80000000 /* Pending signal due to sigfastblock */ From nobody Thu Oct 24 18:35: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 4XZF3W00k8z5Zkdw for ; Thu, 24 Oct 2024 18:35:50 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZF3V3Dm2z4kMn for ; Thu, 24 Oct 2024 18:35:50 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5c9709c9b0cso1627020a12.1 for ; Thu, 24 Oct 2024 11:35:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729794949; x=1730399749; 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=g30avWxoLGH9f+nr+KtIxvR6qgx1yh47UaZigo5V7Ng=; b=i+NzQot9evGQjNtlSM/OBfuxXIkbh1GDS8j0TR6pcXxgM/G6nV/dhwtw5TdjbJl4HM aYRfGFu8veKXfLsQ/WeXNCQ8VMeGld0h/28P8rDo2cb/2Sj3ZDlqUDkabqL7rc9FXP23 8fpc2TBnEKsK6z37ffWwNBrkbFOdHqvkgQINkgPAm45MkyrUonIidvxHP+1ZflowML9J jSVo7eRdpD7f2Uyj/PEwylHoMXGf0QcaaTixTsujAW/UUv9nuRGEhTr9TOazMX2rtMha nAl6uWtI2Yivw+tn1jjNMkLaCfyeWuBv2DUpGCeYdVf//1ZsjLSEX1mOuoG3qor1uAal rGEA== X-Forwarded-Encrypted: i=1; AJvYcCUlDzc4R9yl8XTlzhJCPkukNXK0epNZB53eY98O+FcBewnpLdBBqYhmQRO1uw79G+dlPmo/TJn61iPXH9eAizWAqCmQ@freebsd.org X-Gm-Message-State: AOJu0YwAjh16jA7MBvFFiKHm2TKWD4ByRe9kdN4+xJxQl9KmmEoPcSrQ vz5T0NafbCvuL8XTvs/C6ql02m8OxWQUBHMUIrxK30Fr8vJVqBLfeMW60oLJ7ls= X-Google-Smtp-Source: AGHT+IGXoxETyBW4KQcQ/iNdE2FosWcNC4dicHHjo3PDHzW96qNvU3XhoXAfwMe++O0m76Ow0J5+NQ== X-Received: by 2002:a05:6402:278c:b0:5c9:709c:247f with SMTP id 4fb4d7f45d1cf-5cb8ac380damr5504059a12.2.1729794948520; Thu, 24 Oct 2024 11:35:48 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c6b9d1sm6219157a12.70.2024.10.24.11.35.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2024 11:35:47 -0700 (PDT) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: 536c8d948e85 - main - intrng: change multi-interrupt root support type to enum From: Jessica Clarke In-Reply-To: <202410240358.49O3wKVY018297@gitrepo.freebsd.org> Date: Thu, 24 Oct 2024 19:35:36 +0100 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: <202410240358.49O3wKVY018297@gitrepo.freebsd.org> To: Kyle Evans X-Mailer: Apple Mail (2.3818.100.11.1.3) 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] X-Rspamd-Queue-Id: 4XZF3V3Dm2z4kMn X-Spamd-Bar: ---- On 24 Oct 2024, at 04:58, Kyle Evans wrote: >=20 > The branch main has been updated by kevans: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D536c8d948e8563141356fd41fb8bfe65= be289385 >=20 > commit 536c8d948e8563141356fd41fb8bfe65be289385 > Author: Elliott Mitchell > AuthorDate: 2024-10-24 03:55:21 +0000 > Commit: Kyle Evans > CommitDate: 2024-10-24 03:55:21 +0000 >=20 > intrng: change multi-interrupt root support type to enum >=20 > uint32_t is handy for directly interfacing with assembly-language. = For > the C portion, enum is much handier. In particular there is no = need to > count the number of roots by hand. This also works better for = being > able to build kernels with varying numbers of roots. >=20 > Switch to INTR_ROOT_COUNT as this better matches the purpose of the > value. Switch to root_type, rather than rootnum for similar = reasons. >=20 > Remove the default from the core. Better to require the = architectures > to declare the type since they will routinely deviate and a default > chosen now will likely be suboptimal. >=20 > Leave intr_irq_handler() taking a register type as that better = matches > for interfacing with assembly-language. Hi Kyle, A few comments, since I didn=E2=80=99t realise we were going ahead with = this change, otherwise I would have left them on a review somewhere. > --- > sys/arm/arm/gic.c | 2 +- > sys/arm/broadcom/bcm2835/bcm2836.c | 2 +- > sys/arm/include/intr.h | 6 ++++++ > sys/arm64/arm64/gic_v3.c | 4 ++-- > sys/arm64/arm64/gicv3_its.c | 2 +- > sys/arm64/include/intr.h | 10 ++++++--- > sys/kern/pic_if.m | 4 ++-- > sys/kern/subr_intr.c | 43 = +++++++++++++++----------------------- > sys/riscv/include/intr.h | 6 ++++++ > sys/riscv/riscv/intc.c | 2 +- > sys/sys/intr.h | 10 ++++----- > 11 files changed, 48 insertions(+), 43 deletions(-) >=20 > diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c > index b1b7aacd63ab..ffce86e62128 100644 > --- a/sys/arm/arm/gic.c > +++ b/sys/arm/arm/gic.c > @@ -200,7 +200,7 @@ gic_cpu_mask(struct arm_gic_softc *sc) >=20 > #ifdef SMP > static void > -arm_gic_init_secondary(device_t dev, uint32_t rootnum) > +arm_gic_init_secondary(device_t dev, enum root_type root_type) > { > struct arm_gic_softc *sc =3D device_get_softc(dev); > u_int irq, cpu; > diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c = b/sys/arm/broadcom/bcm2835/bcm2836.c > index 7ed9dedaa77e..fd34ff8818ad 100644 > --- a/sys/arm/broadcom/bcm2835/bcm2836.c > +++ b/sys/arm/broadcom/bcm2835/bcm2836.c > @@ -538,7 +538,7 @@ bcm_lintc_init_pmu_on_ap(struct bcm_lintc_softc = *sc, u_int cpu) > } >=20 > static void > -bcm_lintc_init_secondary(device_t dev, uint32_t rootnum) > +bcm_lintc_init_secondary(device_t dev, enum root_type root_type) > { > u_int cpu; > struct bcm_lintc_softc *sc; > diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h > index d0d0ff9fc32a..e74be3ac548e 100644 > --- a/sys/arm/include/intr.h > +++ b/sys/arm/include/intr.h > @@ -43,6 +43,12 @@ > #include > #endif >=20 > +enum root_type { Should this not have intr in the name? It=E2=80=99s quite generic. > + INTR_ROOT_IRQ =3D 0, > + > + INTR_ROOT_COUNT /* MUST BE LAST */ These comments don=E2=80=99t seem particularly useful? Anyone who knows = what they=E2=80=99re doing knows that=E2=80=99s clearly true. It definitely = doesn=E2=80=99t need to be shouted at the reader, at least. Jess > +}; > + > #ifndef NIRQ > #define NIRQ 1024 /* XXX - It should be an option. */ > #endif > diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c > index 964a129111e2..750f734a7757 100644 > --- a/sys/arm64/arm64/gic_v3.c > +++ b/sys/arm64/arm64/gic_v3.c > @@ -1093,7 +1093,7 @@ gic_v3_bind_intr(device_t dev, struct = intr_irqsrc *isrc) >=20 > #ifdef SMP > static void > -gic_v3_init_secondary(device_t dev, uint32_t rootnum) > +gic_v3_init_secondary(device_t dev, enum root_type root_type) > { > struct gic_v3_setup_periph_args pargs; > device_t child; > @@ -1140,7 +1140,7 @@ gic_v3_init_secondary(device_t dev, uint32_t = rootnum) >=20 > for (i =3D 0; i < sc->gic_nchildren; i++) { > child =3D sc->gic_children[i]; > - PIC_INIT_SECONDARY(child, rootnum); > + PIC_INIT_SECONDARY(child, root_type); > } > } >=20 > diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c > index 5ecd9b8c0e94..31e23fc01224 100644 > --- a/sys/arm64/arm64/gicv3_its.c > +++ b/sys/arm64/arm64/gicv3_its.c > @@ -1293,7 +1293,7 @@ gicv3_its_setup_intr(device_t dev, struct = intr_irqsrc *isrc, >=20 > #ifdef SMP > static void > -gicv3_its_init_secondary(device_t dev, uint32_t rootnum) > +gicv3_its_init_secondary(device_t dev, enum root_type root_type) > { > struct gicv3_its_softc *sc; >=20 > diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h > index 99b4d15ccc1c..008c377b7a16 100644 > --- a/sys/arm64/include/intr.h > +++ b/sys/arm64/include/intr.h > @@ -31,6 +31,13 @@ > #include > #endif >=20 > +enum root_type { > + INTR_ROOT_IRQ =3D 0, > + INTR_ROOT_FIQ =3D 1, Is there a reason to be manually assigning each value rather than letting the compiler do it for us? > + > + INTR_ROOT_COUNT /* MUST BE LAST */ > +}; > + > #include >=20 > #ifndef NIRQ > @@ -48,7 +55,4 @@ arm_irq_memory_barrier(uintptr_t irq) > #define ACPI_GPIO_XREF 3 > #endif >=20 > -#define INTR_ROOT_FIQ 1 > -#define INTR_ROOT_NUM 2 > - > #endif /* _MACHINE_INTR_H */ > diff --git a/sys/kern/pic_if.m b/sys/kern/pic_if.m > index f78e787594c5..2d938520b106 100644 > --- a/sys/kern/pic_if.m > +++ b/sys/kern/pic_if.m > @@ -74,7 +74,7 @@ CODE { > } >=20 > static void > - null_pic_init_secondary(device_t dev, uint32_t rootnum) > + null_pic_init_secondary(device_t dev, enum root_type root_type) > { > } >=20 > @@ -157,7 +157,7 @@ METHOD void pre_ithread { >=20 > METHOD void init_secondary { > device_t dev; > - uint32_t rootnum; > + enum root_type root_type; > } DEFAULT null_pic_init_secondary; >=20 > METHOD void ipi_send { > diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c > index a6052f28b04c..6b4ebd16675c 100644 > --- a/sys/kern/subr_intr.c > +++ b/sys/kern/subr_intr.c > @@ -89,15 +89,6 @@ >=20 > #define INTRNAME_LEN (2*MAXCOMLEN + 1) >=20 > -/* > - * Archs may define multiple roots with INTR_ROOT_NUM to support = different kinds > - * of interrupts (e.g. arm64 FIQs which use a different exception = vector than > - * IRQs). > - */ > -#if !defined(INTR_ROOT_NUM) > -#define INTR_ROOT_NUM 1 > -#endif > - > #ifdef DEBUG > #define debugf(fmt, args...) do { printf("%s(): ", __func__); \ > printf(fmt,##args); } while (0) > @@ -115,7 +106,7 @@ struct intr_irq_root { > void *arg; > }; >=20 > -static struct intr_irq_root intr_irq_roots[INTR_ROOT_NUM]; > +static struct intr_irq_root intr_irq_roots[INTR_ROOT_COUNT]; >=20 > struct intr_pic_child { > SLIST_ENTRY(intr_pic_child) pc_next; > @@ -337,16 +328,16 @@ isrc_release_counters(struct intr_irqsrc *isrc) > * from the assembler, where CPU interrupt is served. > */ > void > -intr_irq_handler(struct trapframe *tf, uint32_t rootnum) > +intr_irq_handler(struct trapframe *tf, u_register_t root_type) Why u_register_t? If you make it int then it=E2=80=99s the same = underlying type as the enum values so no casting is needed below. Or just make it be the enum itself. Assembly can pass those as easily as a uint32_t. > { > struct trapframe * oldframe; > struct thread * td; > struct intr_irq_root *root; >=20 > - KASSERT(rootnum < INTR_ROOT_NUM, > - ("%s: invalid interrupt root %d", __func__, rootnum)); > + KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, > + ("%s: invalid interrupt root %ju", __func__, = (uintmax_t)root_type)); >=20 > - root =3D &intr_irq_roots[rootnum]; > + root =3D &intr_irq_roots[root_type]; > KASSERT(root->filter !=3D NULL, ("%s: no filter", __func__)); >=20 > kasan_mark(tf, sizeof(*tf), sizeof(*tf), 0); > @@ -495,11 +486,11 @@ isrc_free_irq(struct intr_irqsrc *isrc) > } >=20 > device_t > -intr_irq_root_device(uint32_t rootnum) > +intr_irq_root_device(enum root_type root_type) > { > - KASSERT(rootnum < INTR_ROOT_NUM, > - ("%s: invalid interrupt root %d", __func__, rootnum)); > - return (intr_irq_roots[rootnum].dev); > + KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, > + ("%s: invalid interrupt root %ju", __func__, = (uintmax_t)root_type)); Why are we casting? It=E2=80=99s an enum so it=E2=80=99s an int unless = you define your enum in ways that intrng doesn=E2=80=99t have to support. Just check 0 = <=3D root_type < INTR_ROOT_COUNT and be done with it, printing with %d? Repeated below too. > + return (intr_irq_roots[root_type].dev); > } >=20 > /* > @@ -900,7 +891,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, uint32_t rootnum) > + void *arg, enum root_type root_type) > { > struct intr_pic *pic; > struct intr_irq_root *root; > @@ -925,9 +916,9 @@ intr_pic_claim_root(device_t dev, intptr_t xref, = intr_irq_filter_t *filter, > * Note that we further suppose that there is not threaded interrupt > * routine (handler) on the root. See intr_irq_handler(). > */ > - KASSERT(rootnum < INTR_ROOT_NUM, > - ("%s: invalid interrupt root %d", __func__, rootnum)); > - root =3D &intr_irq_roots[rootnum]; > + KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, > + ("%s: invalid interrupt root %ju", __func__, = (uintmax_t)root_type)); > + root =3D &intr_irq_roots[root_type]; > if (root->dev !=3D NULL) { > device_printf(dev, "another root already set\n"); > return (EBUSY); > @@ -1580,16 +1571,16 @@ void > intr_pic_init_secondary(void) > { > device_t dev; > - uint32_t rootnum; > + enum root_type root_type; >=20 > /* > * QQQ: Only root PICs are aware of other CPUs ??? > */ > //mtx_lock(&isrc_table_lock); > - for (rootnum =3D 0; rootnum < INTR_ROOT_NUM; rootnum++) { > - dev =3D intr_irq_roots[rootnum].dev; > + for (root_type =3D 0; root_type < INTR_ROOT_COUNT; root_type++) { > + dev =3D intr_irq_roots[root_type].dev; > if (dev !=3D NULL) { > - PIC_INIT_SECONDARY(dev, rootnum); > + PIC_INIT_SECONDARY(dev, root_type); > } > } > //mtx_unlock(&isrc_table_lock); > diff --git a/sys/riscv/include/intr.h b/sys/riscv/include/intr.h > index ad811dcbc449..8cbb07c6be24 100644 > --- a/sys/riscv/include/intr.h > +++ b/sys/riscv/include/intr.h > @@ -35,6 +35,12 @@ > #ifndef _MACHINE_INTR_MACHDEP_H_ > #define _MACHINE_INTR_MACHDEP_H_ >=20 > +enum root_type { > + INTR_ROOT_IRQ =3D 0, > + > + INTR_ROOT_COUNT /* MUST BE LAST */ > +}; > + > #ifndef NIRQ > #define NIRQ 1024 > #endif > diff --git a/sys/riscv/riscv/intc.c b/sys/riscv/riscv/intc.c > index 248175e8bea3..fcfc0c826fb9 100644 > --- a/sys/riscv/riscv/intc.c > +++ b/sys/riscv/riscv/intc.c > @@ -241,7 +241,7 @@ intc_setup_intr(device_t dev, struct intr_irqsrc = *isrc, >=20 > #ifdef SMP > static void > -intc_init_secondary(device_t dev, uint32_t rootnum) > +intc_init_secondary(device_t dev, enum root_type root_type) > { > struct intc_softc *sc; > struct intr_irqsrc *isrc; > diff --git a/sys/sys/intr.h b/sys/sys/intr.h > index c1e440a9fa93..0208844e90c8 100644 > --- a/sys/sys/intr.h > +++ b/sys/sys/intr.h > @@ -37,8 +37,6 @@ >=20 > #define INTR_IRQ_INVALID 0xFFFFFFFF >=20 > -#define INTR_ROOT_IRQ 0 > - > enum intr_map_data_type { > INTR_MAP_DATA_ACPI =3D 0, > INTR_MAP_DATA_FDT, > @@ -113,12 +111,12 @@ 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 = *, > - uint32_t); > + enum root_type); > 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 *); >=20 > -device_t intr_irq_root_device(uint32_t); > +device_t intr_irq_root_device(enum root_type); >=20 > /* Intr interface for BUS. */ >=20 > @@ -166,7 +164,7 @@ void intr_ipi_send(cpuset_t cpus, u_int ipi); > void intr_ipi_dispatch(u_int ipi); > #endif >=20 > -/* Main interrupt handler called from asm on most archs except riscv. = */ > -void intr_irq_handler(struct trapframe *tf, uint32_t rootnum); > +/* Main interrupt handler called from asm on many archs. */ > +void intr_irq_handler(struct trapframe *tf, u_register_t root_type); >=20 > #endif /* _SYS_INTR_H */ From nobody Thu Oct 24 19:26: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 4XZG9T56cqz5Zmrc; Thu, 24 Oct 2024 19:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZG9T4ZxSz4pmJ; Thu, 24 Oct 2024 19:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729797965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lB2sDF+KoXHpdoQI0+Wptr838/DR6nSDgfv8BPTFO10=; b=aU0Gtq+0wkKlrjOIKjFG2LgN+xXUmQOsuQYfzPiTwzw/0qW23autewhG9rMF/4x7PXOJMe eYKl9YrN+vrmA2JHCUhzYTcWd2+Cx4Rp93tkYzMT2JH8ljYXpCShEkf5nheoEIlcDs8o+m cUlJkoE1YzgXEcqxb0OPgLd6d8NfNm8Zn8dg98L6PYFTcJ56X5HIEzdTS33yQ7mi2x2/e7 t7GYsd7rUcHQg9PBsDc9NlyZHC5wm9geswBgEER8ZzRjHpZ6W/oOgKgOuegPRAOTrUkWC8 vLfZvA2SvCOKqvWcWcEjEHaFg32HIlIt9kKlH1F2HGoralgNDWHe3V+wNUm8ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729797965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lB2sDF+KoXHpdoQI0+Wptr838/DR6nSDgfv8BPTFO10=; b=QxTs37Xc4C7yygs8nI0s+KW5aOVpqt+8e4CS13PG+PZI4RomOqZXFT9ZXFXvfRxw1L7UEI EBi/l3BgFfflAvdCkBtuH2bd4lHCd69xKFtPocXQw+xE9BkM1It+Q68TVkv5ACPNPAXY7A krFYNo3pJuYq39bEc5G/dyHBaoMbakj63kY3CmHmdlIjj+qr+LsdJ60TSUb0GqWrfwSCaW 07FEQX7SnhyZl3FOxoTjidTck1KYJmz35GRMVJKAMbCETGPKIhl81oHAhXtLqoPUsNMOuw y+pvu0ipVvt9MsBM+NcTDKCtv4BW4/cVhvcd4lnbRE2o/cqLu5HZQ/3EdX9eoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729797965; a=rsa-sha256; cv=none; b=s75LCLayxeeh/6eBELz6mIdPudz1LvWTd8NzzA9XUZTW7zhmI90HkiAtBlakiEj25JDWFO VQMrzUAI9TJFccwVLWt4RQz1ZrhiNDK2qdabmPPagmrxm4L8gP7EOMrNywTB37Mb9eiFCw e5uWo1MYtTl7hTyGCrJMWdtZQivYeFTdu8nGWp46BzboFN3JhOHvpu+fc1vaEy8SK2qybj McfRdKO0aznZxucqyTuyVQkF+EygeQRJQ7MSb45TdZYFpY9AdbJQBQfoPeSFWCCj166CR7 KIzoT005i8MSWdo/ekH/yJeZQIPYpurS0O4by0cV7nUBMWM6Cx25pKQ91aDGRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZG9T4B5GzvxD; Thu, 24 Oct 2024 19:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OJQ5uq040575; Thu, 24 Oct 2024 19:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OJQ5SW040572; Thu, 24 Oct 2024 19:26:05 GMT (envelope-from git) Date: Thu, 24 Oct 2024 19:26:05 GMT Message-Id: <202410241926.49OJQ5SW040572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: db08b0b04dec - main - tmpfs_vnops: move swap work to swap_pager List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db08b0b04deced766c3b5f07bcfb82333666226c Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=db08b0b04deced766c3b5f07bcfb82333666226c commit db08b0b04deced766c3b5f07bcfb82333666226c Author: Doug Moore AuthorDate: 2024-10-24 19:24:49 +0000 Commit: Doug Moore CommitDate: 2024-10-24 19:24:49 +0000 tmpfs_vnops: move swap work to swap_pager Two functions in tmpfs_vnops.c use an interface provided by swap_pager.c. Move most of the implementation of those functions to swap_pager.c so that they can be implemented more effectively, with access to implementation details of the swap pager. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47212 --- sys/fs/tmpfs/tmpfs_vnops.c | 60 ++++------------------------------------------ sys/vm/swap_pager.c | 58 +++++++++++++++++++++++++++++++++++++++----- sys/vm/swap_pager.h | 3 ++- 3 files changed, 58 insertions(+), 63 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index c2559a61fe37..428c31f3c59a 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -2092,40 +2092,10 @@ tmpfs_setextattr(struct vop_setextattr_args *ap) static off_t tmpfs_seek_data_locked(vm_object_t obj, off_t noff) { - vm_page_t m; - vm_pindex_t p, p_swp; + vm_pindex_t p; - p = OFF_TO_IDX(noff); - m = vm_page_find_least(obj, p); - - /* - * Microoptimize the most common case for SEEK_DATA, where - * there is no hole and the page is resident. - */ - if (m != NULL && m->pindex == p && vm_page_any_valid(m)) - return (noff); - - p_swp = swap_pager_find_least(obj, p); - if (p_swp == p) - return (noff); - - /* - * Find the first resident page after p, before p_swp. - */ - while (m != NULL && m->pindex < p_swp) { - if (vm_page_any_valid(m)) - return (IDX_TO_OFF(m->pindex)); - m = TAILQ_NEXT(m, listq); - } - if (p_swp == OBJ_MAX_SIZE) - p_swp = obj->size; - return (IDX_TO_OFF(p_swp)); -} - -static off_t -tmpfs_seek_next(off_t noff) -{ - return (noff + PAGE_SIZE - (noff & PAGE_MASK)); + p = swap_pager_seek_data(obj, OFF_TO_IDX(noff)); + return (p == OFF_TO_IDX(noff) ? noff : IDX_TO_OFF(p)); } static int @@ -2142,30 +2112,8 @@ tmpfs_seek_clamp(struct tmpfs_node *tn, off_t *noff, bool seekdata) static off_t tmpfs_seek_hole_locked(vm_object_t obj, off_t noff) { - vm_page_t m; - vm_pindex_t p, p_swp; - - for (;; noff = tmpfs_seek_next(noff)) { - /* - * Walk over the largest sequential run of the valid pages. - */ - for (m = vm_page_lookup(obj, OFF_TO_IDX(noff)); - m != NULL && vm_page_any_valid(m); - m = vm_page_next(m), noff = tmpfs_seek_next(noff)) - ; - /* - * Found a hole in the object's page queue. Check if - * there is a hole in the swap at the same place. - */ - p = OFF_TO_IDX(noff); - p_swp = swap_pager_find_least(obj, p); - if (p_swp != p) { - noff = IDX_TO_OFF(p); - break; - } - } - return (noff); + return (IDX_TO_OFF(swap_pager_seek_hole(obj, OFF_TO_IDX(noff)))); } static int diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 5eccc621bdae..90d44d3e7402 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -111,6 +111,7 @@ #include #include #include +#include #include #include #include @@ -2476,17 +2477,62 @@ swap_pager_iter_find_least(struct pctrie_iter *blks, vm_pindex_t pindex) } /* - * Returns the least page index which is greater than or equal to the parameter - * pindex and for which there is a swap block allocated. Returns OBJ_MAX_SIZE - * if are no allocated swap blocks for the object after the requested pindex. + * Find the first index >= pindex that has either a valid page or a swap + * block. */ vm_pindex_t -swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) +swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) { - struct pctrie_iter blks; + struct pctrie_iter blks, pages; + vm_page_t m; + vm_pindex_t swap_index; + + VM_OBJECT_ASSERT_WLOCKED(object); + vm_page_iter_init(&pages, object); + m = vm_page_iter_lookup_ge(&pages, pindex); + if (m != NULL) { + if (!vm_page_any_valid(m)) + m = NULL; + else if (pages.index == pindex) + return (pages.index); + } + swblk_iter_init_only(&blks, object); + swap_index = swap_pager_iter_find_least(&blks, pindex); + if (swap_index == pindex) + return (swap_index); + if (swap_index == OBJ_MAX_SIZE) + swap_index = object->size; + if (m == NULL) + return (swap_index); + + while ((m = vm_radix_iter_step(&pages)) != NULL && + pages.index < swap_index) { + if (vm_page_any_valid(m)) + return (pages.index); + } + return (swap_index); +} + +/* + * Find the first index >= pindex that has neither a valid page nor a swap + * block. + */ +vm_pindex_t +swap_pager_seek_hole(vm_object_t object, vm_pindex_t pindex) +{ + struct pctrie_iter blks, pages; + struct swblk *sb; + vm_page_t m; + VM_OBJECT_ASSERT_WLOCKED(object); + vm_page_iter_init(&pages, object); swblk_iter_init_only(&blks, object); - return (swap_pager_iter_find_least(&blks, pindex)); + while (((m = vm_page_iter_lookup(&pages, pindex)) != NULL && + vm_page_any_valid(m)) || + ((sb = swblk_iter_lookup(&blks, pindex)) != NULL && + sb->d[pindex % SWAP_META_PAGES] != SWAPBLK_NONE)) + pindex++; + return (pindex); } /* diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h index ade94802b963..3287886026f7 100644 --- a/sys/vm/swap_pager.h +++ b/sys/vm/swap_pager.h @@ -74,8 +74,9 @@ extern int nsw_cluster_max; struct xswdev; int swap_dev_info(int name, struct xswdev *xs, char *devname, size_t len); void swap_pager_copy(vm_object_t, vm_object_t, vm_pindex_t, int); -vm_pindex_t swap_pager_find_least(vm_object_t object, vm_pindex_t pindex); bool swap_pager_scan_all_shadowed(vm_object_t object); +vm_pindex_t swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex); +vm_pindex_t swap_pager_seek_hole(vm_object_t object, vm_pindex_t pindex); void swap_pager_freespace(vm_object_t object, vm_pindex_t start, vm_size_t size, vm_size_t *freed); void swap_pager_swap_init(void); From nobody Thu Oct 24 20:01: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 4XZGyb4cH4z5ZncS; Thu, 24 Oct 2024 20:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZGyb3br6z4v15; Thu, 24 Oct 2024 20:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729800103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5zzSgIDpy1JkCfMOqsFVbGacfQErtvQVQH+gkGKAww=; b=fPJav14gC5YOc2Ldbu9Ca7hF7p2AS5PtmpsjGFnSxgiO2ofinuVb42Aqn8xIKqDnCuyK2m uARoqEIWNLW28CN0RmJrl7NUtY5SJOShlV61OvoPhA99/dqwO0Oy39/0Rqa6VHmPLBrj0f m/F0JWtYKlCp8SBpvJQum9zPDtbMdLkATkBNza+20OECfKE/fAKuTn4ecdw4JjU421nO5/ dvL5p7a3Mp/xqWkupOaj1LP8Z6ZUJSKSJCE9eNW3UhKToUVbIQt0wN4kJYdlEdAL0My0bq kXQF2pmidiq6J9/gCXkSkbV+5TNcC6uCQ2JLY7DrNraJ8bdHgn9UZOnmuzRIOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729800103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5zzSgIDpy1JkCfMOqsFVbGacfQErtvQVQH+gkGKAww=; b=KSDyAYbs6nKl6RLx1KhcsT5cqKba4KBSFmqgBY2UeyyF5iFCmDenZZ8ofTKo/TqvcgeJSk inSLK8PRmL0QBjv63ujVjwRdEqSB/7EaISkc4IDAAJ6KDe1J4ZeQPzKwN9wIQ8G1s294Im Raj+rtOFVHq8BReh29a30nQEf5cLHvXWXGtlq1KJfk4dXIrkhAojNAyxkLd/vmQuuwGkpC MtQAR26GdJNCE2Bof4O0WUodVoVaOc4jGHcm+XCf2e5uXNjZx1S0mSc7FMQpPDjuIVAXds utFhAFw0FOO/oHDdGSja5RVUDabt+raoQLVdzrkW9yLxNt0lXO/QF3SNfYi9RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729800103; a=rsa-sha256; cv=none; b=EjrZWHInH8G0mpHd1iSPp1cWq1ZdTiYq+j4+oqfxVrFdK1eFEbVI+rsfry4PsSsSZyrCxS bnB3kB86ETpZwErB4gFDWdwU9Ku87xFBcOPVRwYFURx8HBDF1e6DFRh+jdXGYOr1OPAPu8 lSm1S8NEJcRpM8mVmpPtMn5tzaSdMqlHiZejXC6etu/omcD7i+YcBN5KQ5dVEhRpfgraFQ 1CDHffIRtDt78cwhkuWQDICmNqZhZFoVPapIm7DuwoxpwBq2bLtdgl97BhepQmBkLvsvDZ 742HYXTZSOorEwNcnQrI4N3vUICxglXmXCFGtkfWc9OWWixdRxU1WNSLI3vCow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZGyb3CPXzwt9; Thu, 24 Oct 2024 20:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OK1hH6010855; Thu, 24 Oct 2024 20:01:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OK1hdZ010852; Thu, 24 Oct 2024 20:01:43 GMT (envelope-from git) Date: Thu, 24 Oct 2024 20:01:43 GMT Message-Id: <202410242001.49OK1hdZ010852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: ce5b5361d4d1 - main - sctp garbage collect sctp_update_ifn_mtu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce5b5361d4d1b3868631baa6870ba6e1e6ec8330 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ce5b5361d4d1b3868631baa6870ba6e1e6ec8330 commit ce5b5361d4d1b3868631baa6870ba6e1e6ec8330 Author: Michael Tuexen AuthorDate: 2024-10-24 20:00:59 +0000 Commit: Michael Tuexen CommitDate: 2024-10-24 20:00:59 +0000 sctp garbage collect sctp_update_ifn_mtu MFC after: 3 days --- sys/netinet/sctp_pcb.c | 11 ----------- sys/netinet/sctp_pcb.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index f25668b5756c..3b59a72e1f1a 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -248,17 +248,6 @@ sctp_free_ifn(struct sctp_ifn *sctp_ifnp) } } -void -sctp_update_ifn_mtu(uint32_t ifn_index, uint32_t mtu) -{ - struct sctp_ifn *sctp_ifnp; - - sctp_ifnp = sctp_find_ifn((void *)NULL, ifn_index); - if (sctp_ifnp != NULL) { - sctp_ifnp->ifn_mtu = mtu; - } -} - void sctp_free_ifa(struct sctp_ifa *sctp_ifap) { diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index ed6a1c34ccf7..86c244c71544 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -506,8 +506,6 @@ sctp_add_addr_to_vrf(uint32_t vrfid, void *ifa, struct sockaddr *addr, uint32_t ifa_flags, int dynamic_add); -void sctp_update_ifn_mtu(uint32_t ifn_index, uint32_t mtu); - void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void From nobody Thu Oct 24 22:09: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 4XZKpS506Yz5Zvyd; Thu, 24 Oct 2024 22:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZKpS4T2Gz4Crf; Thu, 24 Oct 2024 22:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729807792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EDAIE3S36S9IvulEa24L6/uc6gOovQPzqoqV3sxhLzM=; b=BsEw1DC8OJSareKhQZyTAX7K285M54vWgPC0lk31mrqF3kzZfmulzthrmeas+ToO0aBU7M euRScmUnWP15DNkb8rTgMOcmOFFGNJrJgPn/W0rB0Du9ET+ALo6XIDubgwTlGXT9g/QX9M aA4sn0iMUgOqkWxUtc5F678hScTzHXW3T0XoR/evx6oQods8s4VV6c9dvVzizuVSwU13c3 gwBx2TG6xu81RlsG8Dzjumw2SGTz3QIuwwVxSL5UE00IfZCvCS637Wd8QDfUEZmntwA2EY piiw/b+vOzTdQ8Xr2v01bJxY3YRdsxbOVDttOEy7GDL8L2iXZt/KHDMnS40YWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729807792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EDAIE3S36S9IvulEa24L6/uc6gOovQPzqoqV3sxhLzM=; b=wDj0Wmi7pNvLaM+sywreaMhqRllmYKgrx7ZG+3+gEOT4Cugnq//OHUfzysXjnPHQ2q0xYo 3C2x0zPKk2hsNlWDGCM9Im/gzzmalikp4DdG9RpWJnKUPoSlN7o27YWbjIA8lBx0vxtDrx 9hbzmh5C+boQFuV08mhO8KMdU1EBr1m2t2HkQ33GtdjQtFG3RATSbe4e/QIBHVgtCrjACZ Wo1Bf0FKQ0DI3uO0Zq3AuYy4byi0K0PxL32978C6EirMyytNXO0QJNNmRXrtnzjekfMbFe FST6YUdGFTUTTheKvjdfKFwVx8VUOz/5/E4OI8H+CYYuOSnoRxCF3D/F7D8jfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729807792; a=rsa-sha256; cv=none; b=C+j50vWvqaa4En+ZG1nFaqQSpc96UEY+Bj3HsEsUI3Wa3zbN4Rfq8sMlhMwmb9yZorQ1Xe KS1ENvpw5WaAZXpHzkItTvUvVtGBj9TSYQBChAvtdUzji4/zpWhrcvkLeGogLQb+6GC297 BgicM5YGli5EEtvPVud3S9bT8mSh0Ck5E033+/otE6GkydycLWDUCbHort1EJoAMtINe61 kkqYT1D2RGEO+/KPzMzyuYDEsVz1+WabB6oq+csa50PSKXLuVuuMYhCVMa8vGpVGJcHdaA JJhrOvnplBHyPUk54xdj1y6e7WJDeRUinNECYKDoipNILq7QWqNKF5dcnJjo4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZKpS44Qxz10nt; Thu, 24 Oct 2024 22:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49OM9qJ4038121; Thu, 24 Oct 2024 22:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OM9qsH038118; Thu, 24 Oct 2024 22:09:52 GMT (envelope-from git) Date: Thu, 24 Oct 2024 22:09:52 GMT Message-Id: <202410242209.49OM9qsH038118@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: a3a88aa13260 - main - Fix buildworld with gcc 13 after llvm-19 import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: a3a88aa132605c5d42153a419c0e129296dec467 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a3a88aa132605c5d42153a419c0e129296dec467 commit a3a88aa132605c5d42153a419c0e129296dec467 Author: Dimitry Andric AuthorDate: 2024-10-24 21:42:36 +0000 Commit: Dimitry Andric CommitDate: 2024-10-24 22:09:33 +0000 Fix buildworld with gcc 13 after llvm-19 import It turns out the new libc++ 19 headers result in a -Werror warning from gcc 13: In file included from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/shared_ptr.h:31: /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/uninitialized_algorithms.h: In instantiation of 'constexpr void std::__1::__uninitialized_allocator_relocate(_Alloc&, _Tp*, _Tp*, _Tp*) [with _Alloc = allocator >; _Tp = basic_string]': /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/vector:1052:42: required from 'void std::__1::vector<_Tp, _Alloc>::__swap_out_circular_buffer(std::__1::__split_buffer<_Tp, _Allocator&>&) [with _Tp = std::__1::basic_string; _Allocator = std::__1::allocator >]' /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/vector:1469:31: required from 'void std::__1::vector<_Tp, _Alloc>::reserve(size_type) [with _Tp = std::__1::basic_string; _Allocator = std::__1::allocator >; size_type = long unsigned int]' /usr/src/freebsd/src/contrib/googletest/googletest/src/gtest.cc:795:27: required from here /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/uninitialized_algorithms.h:645:21: error: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing to an object of type 'std::__1::__remove_const_t >' {aka 'class std::__1::basic_string'} with no trivial copy-assignment; use copy-assignment or copy-initialization instead o[-Werror=class-memaccess] 645 | __builtin_memcpy(const_cast<__remove_const_t<_Tp>*>(__result), __first, sizeof(_Tp) * (__last - __first)); | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__system_error/error_category.h:15, from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__system_error/error_code.h:18, from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:16: /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/string:752:7: note: 'std::__1::__remove_const_t >' {aka 'class std::__1::basic_string'} declared here 752 | class basic_string { | ^~~~~~~~~~~~ Since this is all benign, turn off errors for -Wclass-memaccess. PR: 280562 MFC after: 3 days --- share/mk/bsd.sys.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 1934a79a5427..63774e857167 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -221,6 +221,7 @@ CWARNFLAGS+= -Wno-error=aggressive-loop-optimizations \ -Wno-error=restrict \ -Wno-error=sizeof-pointer-memaccess \ -Wno-error=stringop-truncation +CXXWARNFLAGS+= -Wno-error=class-memaccess .endif # GCC 9.2.0 From nobody Thu Oct 24 23:04: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 4XZM1d0dnYz5Zyh8; Thu, 24 Oct 2024 23:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZM1d08TJz4H8J; Thu, 24 Oct 2024 23:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JBQ6BaMYZsZFEqk8mBhriFxcyaC3D1fype6tqmH2S0c=; b=eXJF8j35PUiLOPDBvxTDXl5T/sitM03DkeLCc4Pw9Q/7eCQfq00ENKZw+5zelfYGBfBKM3 KRr4jQH3atPrPAKeGjEJzeAGPLD5xJL0LmG0tZAx4VFPf7hHi+zsPW93f437DqXDHVkaSr 2ajAcxLIugmOmsq5RY1HuDgOXkhFq0PcKzQiznSqpJpI8H3iLZ36CRGX0KZZWqwGPCpNCK G22e+32vYnBICX5VBVZAHVF8Rz3gdaiOTAoiGATxWSWxn+ZWgf/ZyfFyE+sjGFbPjkTPXM UJVWgY+/xRnTo46ynhpBrHPcYq/KVv/UUzSda5IbblwaWz3fe+fN8ljirCjQBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JBQ6BaMYZsZFEqk8mBhriFxcyaC3D1fype6tqmH2S0c=; b=mzjIrxEPnx/Zqr8tEWWp+uqyYLwcJKnennHDkXVGvusnr7fAm3M2eiRTJ8scJIYqCtBOBc sHdiB9ySc2sQGVSTLmKUIXCEhqMl9wRhJDnWqe/jfunk2ckL+x2YNBl5aKObxjvAZyB9aV 7nLQjXmkB7Kjv0fZXY9Bf8RqqQczRhaAE9mvtWgQm9JtbNhuIQymCFykoW46N6zLUBORXR 2L/2zhVC7K6dxtqE26PBlCwCvuUf6sN/yyd+B4+eb/lqTiZtbTKT1+8Fum0ydfYAWB4ICG KXd1txoqvJuO/WeQr27aQ+uzKH6/WxdnR72gyPQ5GxJj7X0oACsv6DrGrpXAMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729811077; a=rsa-sha256; cv=none; b=lDCgu5Ox6iWAC36xRNAmx6Jc7SvKZH6FVkjlvv1S5gLVd7tA7OcCPYG343WB3A8qcGWeli OCppPEZjK6V7RrcV8K57mhqXhC2ChWCmhCudPbEN+Uy390oM1PFWrs3+DFOjWN2rlCNEAX Y0vdPKLjPXRHLNF+FT+pJb75nymzdKObOQgY++EWif7MtyvQOTDPDysjgZZcRQ2SWZ42sT raGFlCMwggaVtVUCfY9MIEYnJqrAFckkRomNGqWbRFaRVl3cBloBK1JClbpMfQWykje8uz FmADAB1lqXs0jSDjahr8H0cezTMJUbSUliJgRoXYkr3DhxCXOwfiOYjUwGUuEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZM1c6rRVz121R; Thu, 24 Oct 2024 23:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ON4aew047919; Thu, 24 Oct 2024 23:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ON4aD7047916; Thu, 24 Oct 2024 23:04:36 GMT (envelope-from git) Date: Thu, 24 Oct 2024 23:04:36 GMT Message-Id: <202410242304.49ON4aD7047916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 02e85d1c8a41 - main - swap_pager: fix assert in seek_data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02e85d1c8a41cbf6de1899318b25626e62144363 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=02e85d1c8a41cbf6de1899318b25626e62144363 commit 02e85d1c8a41cbf6de1899318b25626e62144363 Author: Doug Moore AuthorDate: 2024-10-24 23:00:47 +0000 Commit: Doug Moore CommitDate: 2024-10-24 23:04:19 +0000 swap_pager: fix assert in seek_data An assertion that an object was write-locked should be instead an assertion that the object is read locked. Reported by: Jenkins Fixes: db08b0b04deced tmpfs_vnops: move swap work to swap_pager Differential Revision: https://reviews.freebsd.org/D47278 --- sys/vm/swap_pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 90d44d3e7402..3d21d42da6c3 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2487,7 +2487,7 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) vm_page_t m; vm_pindex_t swap_index; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_RLOCKED(object); vm_page_iter_init(&pages, object); m = vm_page_iter_lookup_ge(&pages, pindex); if (m != NULL) { From nobody Thu Oct 24 23:08: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 4XZM6K50nRz5Zyjd; Thu, 24 Oct 2024 23:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZM6K38JXz4HW0; Thu, 24 Oct 2024 23:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9pQabshHbSuhzH+wVa1hn4uGG4pVIkr5aV1RGTqfSk=; b=PSSBbcG8dUwv8Gf50YwtF6rAQAw46IasKXtN6qrpNS8akUSAYfe1TFmXhharpqoe4VLI/x V1cuBk6hNbk821rM1wbAHpfWsZ7Nkd8yfKUjsSdnCtOuqsVAFGB87/8Z100kzYOfIdRrJe 2Xy13xOP0vpFych2KmnPZd9u/07llfgL/ibzfGeLsNFSXhgKbZfiLsNMOKSnWyuDeItF1v NQAJwSevOFT/20fw5OVdv34i/DG946Ru7Rrg7R9+rpCuhYCpXqVt5nB2oFWKCU4ASqV4ym kP/baeJ34IZytcYV3RQMUzaOZUQQQVg4s1AdCKRlGEoMuK9zGTkJFVr3lcA3XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729811321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9pQabshHbSuhzH+wVa1hn4uGG4pVIkr5aV1RGTqfSk=; b=KLILL0ppqu+I7F/+XS/8yM8Z8lffQmlTo65g+2uWXfvhSBOe4JBQq9pi8Hnv3rZ/o+cMBi NCr5DCebm6nm+HuU+c9yPrXtaDbngCKR17fIwH4rAFVWZyd49z1yIyyAeb+yyiI0DvWL2p M/9E92ZHcl02JkjrkfbeC+NEbz2bPKqsj9ZyiAtyq09WLT7+4iBHe0toLocaSxrPX5Fmie gtk0Fo2/qOs32uJnQdeiZw7Rf4XOppbHD6U3ncOr1kTNNvkZlQ965+yyJmR2DSkn6sB4xp d2s9CugW8igYjg+JjoQ7A6o8250UDUwaHDxj3+QoVvVzWoTmE/wFLe5xWdsv9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729811321; a=rsa-sha256; cv=none; b=GYQfJukbM4B+joVIgjNJd7yzkB9BkSu/7/gsm0s2pFIE29YeZ+RsGXxMUBJxaiFjgrFQ4c MSuo/NnCVCP97lhGlbt1S6sCXQveEoP+ikOekEljU6IDFxUgILIACqgzh42299zxtNoNcq RC6RpOV3iigbdmp/CMZs58VIHPV7vR2qMf1FL3mAcYSlvGDMKFrWp+IGgH8uYXOuh5ow3p jVcoRGj+aY45XeSo2i/+5jvhmHBkaa07E/T3P+XUMByf9JcItRciCU0mWTpOuECp98Xep3 uswWvaNCVazEbZtFCyudijINAZsAj8zdu1lBq7V1mvWjMjzgXpPh4jafO26Cng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZM6K2GQpz12Kd; Thu, 24 Oct 2024 23:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49ON8fvQ049202; Thu, 24 Oct 2024 23:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ON8fuA049199; Thu, 24 Oct 2024 23:08:41 GMT (envelope-from git) Date: Thu, 24 Oct 2024 23:08:41 GMT Message-Id: <202410242308.49ON8fuA049199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: faa9356f97d2 - main - swap_pager: fix seek_hole assert List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faa9356f97d23655b801f77201692e6de9ae7caa Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=faa9356f97d23655b801f77201692e6de9ae7caa commit faa9356f97d23655b801f77201692e6de9ae7caa Author: Doug Moore AuthorDate: 2024-10-24 23:06:59 +0000 Commit: Doug Moore CommitDate: 2024-10-24 23:08:32 +0000 swap_pager: fix seek_hole assert Moving code from tmpfs to swap_pager introduced another WLOCKED object assert that should have been an RLOCKED object assert. Fix it. --- sys/vm/swap_pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3d21d42da6c3..e1795e8fd3ae 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2524,7 +2524,7 @@ swap_pager_seek_hole(vm_object_t object, vm_pindex_t pindex) struct swblk *sb; vm_page_t m; - VM_OBJECT_ASSERT_WLOCKED(object); + VM_OBJECT_ASSERT_RLOCKED(object); vm_page_iter_init(&pages, object); swblk_iter_init_only(&blks, object); while (((m = vm_page_iter_lookup(&pages, pindex)) != NULL && From nobody Fri Oct 25 03:12: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 4XZSWB5vTMz5bBhh; Fri, 25 Oct 2024 03:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZSWB5Dz5z4XfJ; Fri, 25 Oct 2024 03:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729825926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ZqMYvo9GX/+A5AqMxeqWrWS1pZ2OEW3mFc59XqvZAQ=; b=cHgGHZwJucX4m/Pm3TCq9VXb1y8D82YtLQ/R2lItwnTHpvpvZg+S6/4G6BcaYhZ2BI2tl5 NXxsmTWzCkUQUtsMIO+/PbfkSZpGUg6cg+t6KrTm9cws40XraFlefeNlezrqe39XEla5Pp EQbJyeJKEesTCvLU+JpXnTav4+8LuwLmEweE2HsG9DjngXqxNTG+zDhzk6l1yzCP2t2TvJ yodBDk5g9O7gLbhEtlZsuww1kx73McJTiCYSQFhIAdpKoDQtWUnQKrt5hksC/kUmPWaSsB Yi/jKpkAgcsVdFNqKDQZXn83xNwAodJawQ0jNxtjj7O78c4tFkkfHx2DZR3g+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729825926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ZqMYvo9GX/+A5AqMxeqWrWS1pZ2OEW3mFc59XqvZAQ=; b=glpGsvdkocZ1wZEbraKr8Gz0bliCk4oexEnHFD+czge7AYKupw2cDpncyJOT2u71I5+x/v FqJp5jxmc9hKMFA9CBAQsqipL4fLmg91iHJ0wqy8gNfqsJ+fvQu/w6XWN4UYzm6eRGmf8U PGCX+1GmYL4co3MsvkIyAP0FqK4VyOOJy//OD1EtSwl0LtDoOzEJtk09gaXSV1fei0HJY3 oRu2OG4rBPC/ZdPKZqUFpc9KOWvvxNsROGxUEV/ELhXouDJmenp9DgzwmeDqI4MQEQ5uGY 6j9oXnGsaCAMLqwszqC/FtJBUwVygc3OWFE04M1CRZscvvWGvJG31i12Y3AP3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729825926; a=rsa-sha256; cv=none; b=U+qoPCAcFQiY7XGPT7tu0Ja2jKvXbXh07RPf6llLhXAqIIl3oLXckm0V7jbXMbew++izMM DEtbl2oNLoXP5cgb9T6YXmLnpySNXHae+l0wUSFJL1UHjhE/6wiaiuL/41BR01fMmsXxdJ Ed+u5O/Gl/p+/xNI7bv5xauSArMeE5S5Qw7gHri85eZdib24R4sX+lQj1F6/UNRTlU0f3E xjL0cFd3SSHfgkAzbUeFJBVVjvBB3m5E7zNrEo2IENeXdcBTMu7shc3536KBl7RCQi0JnM AqfBZqMRJM7EK1Pm+Ju40zPS9RbYyTmcYfFY1lKCDW0erpO8+FWhDKEB2Uq9nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZSWB4rPXz17d5; Fri, 25 Oct 2024 03:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3C64n005003; Fri, 25 Oct 2024 03:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3C6AH005000; Fri, 25 Oct 2024 03:12:06 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:12:06 GMT Message-Id: <202410250312.49P3C6AH005000@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: 23dee252daf2 - main - loader: Change this BIOS tradeoff: Add back zip and use text only List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 23dee252daf2ff60e521c9c019e64134b63ce90f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=23dee252daf2ff60e521c9c019e64134b63ce90f commit 23dee252daf2ff60e521c9c019e64134b63ce90f Author: Warner Losh AuthorDate: 2024-10-25 02:22:25 +0000 Commit: Warner Losh CommitDate: 2024-10-25 02:26:25 +0000 loader: Change this BIOS tradeoff: Add back zip and use text only After talking with a number of people about the removal of some things to make the loader fit, readjust things a little. Add back GZIP and BZIP2 compression support. Many of the downstream MFC packaging systems depend on this. This adds back 20k to the size of the loader. Make the boot loader text-only by default. This saves 40k in size. Net, we're 20k smaller. The graphics loader for BIOS is less useful than the zip functionality: You can still boot w/a text only one it and you can build a custom one if you really want it. It's also the default we use for dual console. This should be merged back into stable/14 and stable/13 so it's in the next release for each of these. That way we have only one release (13.4) with the other defaults. MFC After: 3 days Sponsored by: Netflix Reviewed by: olce, rgrimes, emaste Differential Revision: https://reviews.freebsd.org/D47203 --- share/mk/src.opts.mk | 2 +- stand/i386/loader/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 95801cdeecc5..f8877153f17f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -127,6 +127,7 @@ __DEFAULT_YES_OPTIONS = \ LLVM_ASSERTIONS \ LLVM_COV \ LLVM_CXXFILT \ + LOADER_BIOS_TEXTONLY \ LOADER_GELI \ LOADER_KBOOT \ LOADER_LUA \ @@ -206,7 +207,6 @@ __DEFAULT_NO_OPTIONS = \ DTRACE_TESTS \ EXPERIMENTAL \ HESIOD \ - LOADER_BIOS_TEXTONLY \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ LLVM_BINUTILS \ diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index 8385131a8849..857944dcd010 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -7,8 +7,8 @@ LOADER_CD9660_SUPPORT?= yes LOADER_EXT2FS_SUPPORT?= no LOADER_MSDOS_SUPPORT?= no LOADER_UFS_SUPPORT?= yes -LOADER_GZIP_SUPPORT?= no -LOADER_BZIP2_SUPPORT?= no +LOADER_GZIP_SUPPORT?= yes +LOADER_BZIP2_SUPPORT?= yes .include From nobody Fri Oct 25 03:12: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 4XZSWD10jTz5b9vl; Fri, 25 Oct 2024 03:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZSWC6QBBz4XkD; Fri, 25 Oct 2024 03:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729825927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szSXApe3vKYzoqzogB5bbGEzDGiB92MivGKXchgaomg=; b=bxWLFiCzxdLdfTJCPLPTgL2JZp8FTjKEUs9RbKAeyloY3xbGe1ziUsuJ3Xcz4Bzx4TnhP+ bPv+8s9nbNZfONAerqI4WvoBcfvZRktSlRTXduVo/DQ8nn7cq6hgmiUn2tj1Niy7zFimxu Ju3gEBDN33W01rwj8FQ9tJ/wXc7GX2/R/TFWUJj47jd5ukBl2EUzlVVU4+McpN9OKlxWKI gumeH/6JZwg1toNlhAoMMlS2GouQ0KJLSRg09+rJZZ8564FmogCMK/MYgugUYmQAYgBqmu l0WW38MyoSjfwxWlUFl/w7VMHJy5QGaazpQSzQFisOYmFdP8O3zCqXs8tQ7psA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729825927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szSXApe3vKYzoqzogB5bbGEzDGiB92MivGKXchgaomg=; b=FOqzXD6MSYW9uSuwzfzNyUJ2BnBo+vWbdbPHDY7hkNYH2x7ZwHEoYj9e5dViluwWG/70PF BfHfN8HZXLnDWW3SMmdUq8RZid17UKyyX/x3ZKCH/jJV7n/+wD2PEJ6YGfF7atOFr6fE8w 3sUVLv2YcaMZ4zyhcalzdU1yiPqd7Eyk9sMVdPjG+BwRCoNkAvT+rCeLxWmZUmG3gb002b zJbpWsPxMiCYaNpodx+mUiZFLkg0Z9ux7kfiCQd7tYEx172TG2We6Fx6iPdVPWTIKbjV6a +I5jPtuk2Xr1uCEQooFYybTMeIHXV6QQqN5M8L+q5Lbm0o6vyiVa9JZmOWOVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729825927; a=rsa-sha256; cv=none; b=JDocapT5QMO0pmpN90eCmSPOk5iXX6rgqUcI5vmae9cIbJODhdSpKja1eq5FTxlJI9POEL 6YbLYlEioz6VDq1/uK4RFVJ9g+gikdhQ0eWv0SnlAs1IH4eOVzZy0PkCanQ4vUzo25PhZ7 aqeKrIVge0e4TutAwoTnyrjsx/udPaRDd59WOoL8DDVC40caLNO27NrrHHIGzz9cSlQgTb 0RJ7hIidZ3uU7k/txr+0FbHheBQ3wb0ukiRw2K3WlDIY2106N6xAgabVaLtu0Ifuw9OYrP 3vHE8YjRKoBbSGiKqPh6KSASpeK5Ihr8WID+TNPFA6l4z1PMpWbTIzN84kyvZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZSWC5kqFz18D3; Fri, 25 Oct 2024 03:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3C70o005049; Fri, 25 Oct 2024 03:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3C73n005046; Fri, 25 Oct 2024 03:12:07 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:12:07 GMT Message-Id: <202410250312.49P3C73n005046@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: 358752abdf1c - main - loader/loader.mk: add docs for LOADER_*_SUPPORT variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 358752abdf1c44d15e99bc2709b0256a358fd2a9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=358752abdf1c44d15e99bc2709b0256a358fd2a9 commit 358752abdf1c44d15e99bc2709b0256a358fd2a9 Author: Warner Losh AuthorDate: 2024-10-25 02:22:51 +0000 Commit: Warner Losh CommitDate: 2024-10-25 02:26:26 +0000 loader/loader.mk: add docs for LOADER_*_SUPPORT variables These are internal to the loader and generally can only be set in a makefile that's compiling some variation of loader. Add caveats since these aren't really user-serviceable parts, though some downstreams will tweak individual makefiles for their own purposes. Sponsored by: Netflix --- stand/loader.mk | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/stand/loader.mk b/stand/loader.mk index de717ce7b18b..0f2ff31a5343 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -1,4 +1,3 @@ - .PATH: ${LDRSRC} ${BOOTSRC}/libsa CFLAGS+=-I${LDRSRC} @@ -30,6 +29,33 @@ SRCS+= load_elf64.c reloc_elf64.c SRCS+= metadata.c .endif +# +# LOADER_*_SUPPORT variables are used to subset the boot loader in the various +# configurations each platform supports. These are typically used to omit broken +# options, or to size optimize for space constrained instances. These are set in +# loader Makefiles (which include loader.mk) to control which subset of features +# are enabled. These cannot generally be set in src.conf since that would affect +# all loaders, but also not all loaders are setup for overrides like that and +# not all combinations of the following have been tested or even work. Sometimes +# non-default values won't work due to buggy support for that component being +# optional. +# +# LOADER_BZIP2_SUPPORT Add support for bzip2 compressed files +# LOADER_CD9660_SUPPORT Add support for iso9660 filesystems +# LOADER_DISK_SUPPORT Adds support for disks and mounting filesystems on it +# LOADER_EXT2FS_SUPPORT Add support for ext2 Linux filesystems +# LOADER_GPT_SUPPORT Add support for GPT partitions +# LOADER_GZIP_SUPPORT Add support for gzip compressed files +# LOADER_INSTALL_SUPPORT Add support for booting off of installl ISOs +# LOADER_MBR_SUPPORT Add support for MBR partitions +# LOADER_MSDOS_SUPPORT Add support for FAT filesystems +# LOADER_NET_SUPPORT Adds networking support (useless w/o net drivers sometimes) +# LOADER_NFS_SUPPORT Add NFS support +# LOADER_TFTP_SUPPORT Add TFTP support +# LOADER_UFS_SUPPORT Add support for UFS filesystems +# LOADER_ZFS_SUPPORT Add support for ZFS filesystems +# + .if ${LOADER_DISK_SUPPORT:Uyes} == "yes" CFLAGS.part.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib SRCS+= disk.c part.c vdisk.c From nobody Fri Oct 25 03:28: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 4XZSth1kCRz5bBnj; Fri, 25 Oct 2024 03:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZSth1Nrbz4bZT; Fri, 25 Oct 2024 03:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1c9bwoSAj9FlNPS/h6Ls/jqBJU0H+4jdkmG7gLm5OK0=; b=uIV1tsGE0620aSbyw2ss2lLOt1299vUkvgPHqvuK3fiu2MaRm5+mJ4qh/bh3JejxoNxYl+ LFJ0iAFKuQMLPQmfErNIGAOa6eHrMvNo33VhqtQ0hjDLYgQhxKZx9gLqvb/KUXOnoRBTnW HavkYU70jpbkkQdL5eDSdm7UDm7jc29vKs3lQ2RtYcCvsvcn3vIoBVCplszg/MzqOTEom2 pWGYE5Psnwn9vhK0dtOwdXBaEY9dJhX29x5BFgQs6bP5yJS1slb8T8gVVHdv5yzLeSADaK oHca7TEhNsqOtv3jmcGRzX4KA+0qJbikKlAdHOY+XBg4hzZNzOCp/p1iFe9kKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1c9bwoSAj9FlNPS/h6Ls/jqBJU0H+4jdkmG7gLm5OK0=; b=kR755RTH6xd1zP6sI4brSdix4eYCZxaj84Oo4L7GoDKMWzfnhtG6T+WtxFWYq3O4Rhpjfq Zsfy+qQ+sfIFQZwuq468Bz/PKAdhQ1oJ6tOkiAIUpcL4ca8xxuK2rddoe2mT3r0aCAw5+C E89gVJrdOBzMmNVl/kw5B8mP+LBaIZg9mBVSernNVZh7nd75qPcFraqBTqvR/+3l4/SHV7 Em1aNgDKcSVapl041l0pyiR32AQgAHUV7gL2WySU97Ic5z4xMpIbkDl8epGVfPV2v1nvYR 1LEUpsRaGMmisLp1HDDbbjmGnKcpsd1PRC5JStdYFPtZWBvJJu8Mp4FpUHneng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729826940; a=rsa-sha256; cv=none; b=tZVkXTN8OGKEGw9ugQkuRsuTgJl2tdIX8SiY+rCojZEInfrnaLHrscDn8s48avGPzwYqKr MIHcQvYVa0Sjejt4rcuYS4jxlDY/kXHP2fXg90maEnRu3lH1uZdEGIPHGXd4UV2lNgQBGH A74Lf6mUg4JVZJqGKF4MdbdMkIfIgUjG4aqzkFChJi0QIuDe1Oh5oUftl9bynvDjYufnIB YcWvjwcRZ8Z/Htpf7WCh1zTASeESXUPPJPMr13pHNO6O8+0y/9eiQnbjg8H8zv/4cBwoo3 JfJNlHOTjdEbyfN1k19xkhjp1ZCzbzhyvnk3WvFCJyHGvNcyhwegAZOtJCb73w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZSth0zfhz18dr; Fri, 25 Oct 2024 03:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3T0ZT030187; Fri, 25 Oct 2024 03:29:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3Sx3D030177; Fri, 25 Oct 2024 03:28:59 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:28:59 GMT Message-Id: <202410250328.49P3Sx3D030177@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: 0a096a7b3ae8 - stable/14 - unbound: Vendor import 1.22.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 0a096a7b3ae883d08f15bbfa26b33f7cda4aed40 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0a096a7b3ae883d08f15bbfa26b33f7cda4aed40 commit 0a096a7b3ae883d08f15bbfa26b33f7cda4aed40 Author: Cy Schubert AuthorDate: 2024-10-18 13:59:33 +0000 Commit: Cy Schubert CommitDate: 2024-10-25 03:28:45 +0000 unbound: Vendor import 1.22.0 Release notes at https://nlnetlabs.nl/news/2024/Oct/17/unbound-1.22.0-released/ Merge commit '0a6d797cf6eb751d7eb613900cd19803e05d905f' into main (cherry picked from commit 46d2f61818f594174cafe31ee338c6e083fa1876) --- contrib/unbound/Makefile.in | 19 +- contrib/unbound/aclocal.m4 | 292 +- contrib/unbound/cachedb/cachedb.c | 5 +- contrib/unbound/cachedb/redis.c | 29 +- contrib/unbound/config.h.in | 94 + contrib/unbound/configure | 769 +- contrib/unbound/configure.ac | 74 +- contrib/unbound/contrib/aaaa-filter-iterator.patch | 2 +- contrib/unbound/daemon/daemon.c | 10 + contrib/unbound/daemon/daemon.h | 3 + contrib/unbound/daemon/remote.c | 14 +- contrib/unbound/daemon/stats.c | 14 +- contrib/unbound/daemon/worker.c | 38 +- contrib/unbound/dns64/dns64.c | 5 +- contrib/unbound/dnstap/unbound-dnstap-socket.c | 24 +- contrib/unbound/doc/Changelog | 151 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 26 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 10 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 71 +- contrib/unbound/doc/unbound.doxygen | 8 +- contrib/unbound/install-sh | 174 +- contrib/unbound/iterator/iter_scrub.c | 45 +- contrib/unbound/iterator/iter_utils.c | 42 + contrib/unbound/iterator/iter_utils.h | 7 + contrib/unbound/iterator/iterator.c | 57 +- contrib/unbound/iterator/iterator.h | 2 +- contrib/unbound/libunbound/context.c | 2 +- contrib/unbound/libunbound/libworker.c | 16 + contrib/unbound/libunbound/unbound.h | 4 + contrib/unbound/ltmain.sh | 866 +- contrib/unbound/services/authzone.c | 39 +- contrib/unbound/services/cache/dns.c | 59 +- contrib/unbound/services/cache/dns.h | 3 +- contrib/unbound/services/cache/rrset.c | 10 +- contrib/unbound/services/listen_dnsport.c | 2534 +++++- contrib/unbound/services/listen_dnsport.h | 405 +- contrib/unbound/services/mesh.c | 13 +- contrib/unbound/services/mesh.h | 3 +- contrib/unbound/services/modstack.c | 2 +- contrib/unbound/services/rpz.c | 19 + .../unbound/smallapp/unbound-control-setup.sh.in | 2 +- contrib/unbound/smallapp/unbound-control.c | 6 + contrib/unbound/smallapp/unbound-host.c | 6 + contrib/unbound/smallapp/worker_cb.c | 16 + contrib/unbound/testcode/doqclient.c | 2701 +++++++ contrib/unbound/testcode/unitdoq.c | 84 + .../unbound/testdata/auth_tls.tdir/auth_tls.dsc | 16 + .../testdata/auth_tls.tdir/auth_tls.nsd.conf | 21 + .../unbound/testdata/auth_tls.tdir/auth_tls.post | 14 + .../unbound/testdata/auth_tls.tdir/auth_tls.pre | 47 + .../unbound/testdata/auth_tls.tdir/auth_tls.test | 48 + .../testdata/auth_tls.tdir/auth_tls.ub.conf | 22 + .../testdata/auth_tls.tdir/example.com.zone | 4 + .../unbound/testdata/auth_tls.tdir/nsd_server.key | 39 + .../unbound/testdata/auth_tls.tdir/nsd_server.pem | 22 + .../testdata/auth_tls.tdir/unbound_server.key | 39 + .../testdata/auth_tls.tdir/unbound_server.pem | 22 + .../auth_tls_failcert.tdir/auth_tls_failcert.dsc | 16 + .../auth_tls_failcert.nsd.conf | 21 + .../auth_tls_failcert.tdir/auth_tls_failcert.post | 14 + .../auth_tls_failcert.tdir/auth_tls_failcert.pre | 47 + .../auth_tls_failcert.tdir/auth_tls_failcert.test | 56 + .../auth_tls_failcert.ub.conf | 23 + .../auth_tls_failcert.tdir/example.com.zone | 4 + .../testdata/auth_tls_failcert.tdir/nsd_server.key | 39 + .../testdata/auth_tls_failcert.tdir/nsd_server.pem | 22 + .../auth_tls_failcert.tdir/unbound_server.key | 39 + .../auth_tls_failcert.tdir/unbound_server.pem | 22 + .../testdata/cookie_file.tdir/cookie_file.test | 6 +- contrib/unbound/testdata/dns64_prefetch_cache.rpl | 195 + .../doq_downstream.tdir/doq_downstream.conf | 21 + .../doq_downstream.tdir/doq_downstream.dsc | 16 + .../doq_downstream.tdir/doq_downstream.post | 13 + .../doq_downstream.tdir/doq_downstream.pre | 44 + .../doq_downstream.tdir/doq_downstream.test | 109 + .../doq_downstream.tdir/doq_downstream.testns | 13 + .../doq_downstream.tdir/unbound_server.key | 15 + .../doq_downstream.tdir/unbound_server.pem | 11 + contrib/unbound/testdata/iter_max_global_quota.rpl | 2236 ++++++ contrib/unbound/testdata/iter_unverified_glue.rpl | 188 + .../testdata/iter_unverified_glue_fallback.rpl | 138 + contrib/unbound/testdata/rpz_val_block.rpl | 643 ++ .../testdata/serve_expired_cached_servfail.rpl | 2 +- .../serve_expired_cached_servfail_refresh.rpl | 2 +- .../serve_expired_client_timeout_val_bogus.rpl | 317 + ...ired_client_timeout_val_insecure_delegation.rpl | 247 + .../unbound/testdata/serve_expired_ttl_reset.rpl | 102 + .../unbound/testdata/serve_expired_val_bogus.rpl | 316 + contrib/unbound/testdata/val_negcache_ttl.rpl | 188 + .../unbound/testdata/val_negcache_ttl_prefetch.rpl | 316 + contrib/unbound/util/alloc.c | 9 + contrib/unbound/util/config_file.c | 55 +- contrib/unbound/util/config_file.h | 23 + contrib/unbound/util/configlexer.c | 8484 ++++++++++---------- contrib/unbound/util/configlexer.lex | 11 +- contrib/unbound/util/configparser.c | 4713 +++++------ contrib/unbound/util/configparser.h | 296 +- contrib/unbound/util/configparser.y | 165 +- contrib/unbound/util/data/msgparse.h | 2 + contrib/unbound/util/data/msgreply.c | 47 +- contrib/unbound/util/data/msgreply.h | 39 +- contrib/unbound/util/data/packed_rrset.h | 3 + contrib/unbound/util/fptr_wlist.c | 17 + contrib/unbound/util/locks.h | 1 + contrib/unbound/util/log.c | 36 + contrib/unbound/util/log.h | 6 + contrib/unbound/util/module.h | 8 +- contrib/unbound/util/netevent.c | 2067 ++++- contrib/unbound/util/netevent.h | 164 + contrib/unbound/validator/val_neg.c | 6 +- contrib/unbound/validator/val_nsec3.c | 6 +- contrib/unbound/validator/validator.c | 81 +- contrib/unbound/validator/validator.h | 2 +- lib/libunbound/config.h | 8 +- 120 files changed, 22786 insertions(+), 7989 deletions(-) diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index 672435e01e9f..c262250ca2c5 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -179,11 +179,11 @@ testcode/unitlruhash.c testcode/unitmain.c testcode/unitmsgparse.c \ testcode/unitneg.c testcode/unitregional.c testcode/unitslabhash.c \ testcode/unitverify.c testcode/readhex.c testcode/testpkts.c testcode/unitldns.c \ testcode/unitecs.c testcode/unitauth.c testcode/unitzonemd.c \ -testcode/unittcpreuse.c +testcode/unittcpreuse.c testcode/unitdoq.c UNITTEST_OBJ=unitanchor.lo unitdname.lo unitlruhash.lo unitmain.lo \ unitmsgparse.lo unitneg.lo unitregional.lo unitslabhash.lo unitverify.lo \ readhex.lo testpkts.lo unitldns.lo unitecs.lo unitauth.lo unitzonemd.lo \ -unittcpreuse.lo +unittcpreuse.lo unitdoq.lo UNITTEST_OBJ_LINK=$(UNITTEST_OBJ) worker_cb.lo $(COMMON_OBJ) $(SLDNS_OBJ) \ $(COMPAT_OBJ) DAEMON_SRC=daemon/acl_list.c daemon/cachedump.c daemon/daemon.c \ @@ -242,6 +242,10 @@ DOHCLIENT_SRC=testcode/dohclient.c DOHCLIENT_OBJ=dohclient.lo DOHCLIENT_OBJ_LINK=$(DOHCLIENT_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \ $(SLDNS_OBJ) +DOQCLIENT_SRC=testcode/doqclient.c +DOQCLIENT_OBJ=doqclient.lo +DOQCLIENT_OBJ_LINK=$(DOQCLIENT_OBJ) $(COMMON_OBJ) $(COMPAT_OBJ) \ +$(SLDNS_OBJ) PERF_SRC=testcode/perf.c PERF_OBJ=perf.lo PERF_OBJ_LINK=$(PERF_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) $(SLDNS_OBJ) @@ -288,7 +292,7 @@ ALL_SRC=$(COMMON_SRC) $(UNITTEST_SRC) $(DAEMON_SRC) \ $(CONTROL_SRC) $(UBANCHOR_SRC) $(PETAL_SRC) $(DNSTAP_SOCKET_SRC)\ $(PYTHONMOD_SRC) $(PYUNBOUND_SRC) $(WIN_DAEMON_THE_SRC) \ $(SVCINST_SRC) $(SVCUNINST_SRC) $(ANCHORUPD_SRC) $(SLDNS_SRC) \ - $(DOHCLIENT_SRC) $(READZONE_SRC) + $(DOHCLIENT_SRC) $(DOQCLIENT_SRC) $(READZONE_SRC) ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ $(TESTBOUND_OBJ) $(LOCKVERIFY_OBJ) $(PKTVIEW_OBJ) \ @@ -297,7 +301,7 @@ ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ $(CONTROL_OBJ) $(UBANCHOR_OBJ) $(PETAL_OBJ) $(DNSTAP_SOCKET_OBJ)\ $(COMPAT_OBJ) $(PYUNBOUND_OBJ) \ $(SVCINST_OBJ) $(SVCUNINST_OBJ) $(ANCHORUPD_OBJ) $(SLDNS_OBJ) \ - $(DOHCLIENT_OBJ) $(READZONE_OBJ) + $(DOHCLIENT_OBJ) $(DOQCLIENT_OBJ) $(READZONE_OBJ) COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) @PTHREAD_CFLAGS_ONLY@ LINK=$(LIBTOOL) --tag=CC --mode=link $(CC) $(staticexe) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) @@ -334,7 +338,7 @@ rsrc_unbound_checkconf.o: $(srcdir)/winrc/rsrc_unbound_checkconf.rc config.h TEST_BIN=asynclook$(EXEEXT) delayer$(EXEEXT) \ lock-verify$(EXEEXT) memstats$(EXEEXT) perf$(EXEEXT) \ petal$(EXEEXT) pktview$(EXEEXT) streamtcp$(EXEEXT) \ - $(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) \ + $(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) doqclient$(EXEEXT) \ testbound$(EXEEXT) unittest$(EXEEXT) readzone$(EXEEXT) tests: all $(TEST_BIN) @@ -416,6 +420,9 @@ streamtcp$(EXEEXT): $(STREAMTCP_OBJ_LINK) dohclient$(EXEEXT): $(DOHCLIENT_OBJ_LINK) $(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS) +doqclient$(EXEEXT): $(DOQCLIENT_OBJ_LINK) + $(LINK) -o $@ $(DOQCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS) + perf$(EXEEXT): $(PERF_OBJ_LINK) $(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS) @@ -703,6 +710,8 @@ depend: # build rules ipset.lo ipset.o: $(srcdir)/ipset/ipset.c +doqclient.lo doqclient.o: $(srcdir)/testcode/doqclient.c +unitdoq.lo unitdoq.o: $(srcdir)/testcode/unitdoq.c # Dependencies dns.lo dns.o: $(srcdir)/services/cache/dns.c config.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ diff --git a/contrib/unbound/aclocal.m4 b/contrib/unbound/aclocal.m4 index 364e37267d00..bf3c57e2fd9f 100644 --- a/contrib/unbound/aclocal.m4 +++ b/contrib/unbound/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,8 +14,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -46,7 +45,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see . ]) -# serial 59 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -196,7 +195,6 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -235,8 +233,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC and -# ICC, which need '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -788,7 +786,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - $SED '$q' "$ltmain" >> "$cfgfile" \ + sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1050,8 +1048,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1075,12 +1073,17 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) - case $MACOSX_DEPLOYMENT_TARGET,$host in - 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - *) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1129,12 +1132,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1248,8 +1251,7 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[m4_require([_LT_DECL_SED])dnl -AC_MSG_CHECKING([for sysroot]) +[AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1266,7 +1268,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1296,7 +1298,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1313,7 +1315,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1325,7 +1327,7 @@ ia64-*-hpux*) ;; esac else - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1347,7 +1349,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1355,7 +1357,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1363,7 +1365,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1383,14 +1385,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1458,7 +1460,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1497,22 +1499,9 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} +: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) - -# Use ARFLAGS variable as AR's operation code to sync the variable naming with -# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have -# higher priority because thats what people were doing historically (setting -# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS -# variable obsoleted/removed. - -test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} -lt_ar_flags=$AR_FLAGS -_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) - -# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override -# by AR_FLAGS because that was never working and AR_FLAGS is about to die. -_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], - [Flags to create an archive]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1731,7 +1720,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1774,7 +1763,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2224,35 +2213,26 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -z "$STRIP"; then - AC_MSG_RESULT([no]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) else - if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) - else - case $host_os in - darwin*) - # FIXME - insert some real tests, host_os isn't really good enough +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - ;; - freebsd*) - if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) + else AC_MSG_RESULT([no]) - ;; - esac - fi + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2575,7 +2555,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2585,14 +2565,14 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl*) + # Native MSVC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2611,7 +2591,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2648,7 +2628,7 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2681,7 +2661,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3483,7 +3463,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='$FILECMD -L' + lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3517,14 +3497,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3538,7 +3518,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3585,7 +3565,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3712,13 +3692,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3744,7 +3724,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3984,7 +3964,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -4002,20 +3982,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4039,7 +4019,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4057,9 +4037,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4346,7 +4326,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4429,7 +4409,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4765,7 +4745,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4948,7 +4928,7 @@ m4_if([$1], [CXX], [ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4956,7 +4936,7 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl* | icl*) + cl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5013,15 +4993,15 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5073,7 +5053,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5185,7 +5165,6 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5200,7 +5179,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5243,7 +5222,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5255,7 +5234,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5271,7 +5250,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5403,7 +5382,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5586,12 +5565,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl* | icl*) - # Native MSVC or ICC + cl*) + # Native MSVC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5632,7 +5611,7 @@ _LT_EOF fi' ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5680,7 +5659,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5891,7 +5870,6 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6658,8 +6636,8 @@ if test yes != "$_lt_caught_CXX_error"; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl* | ,icl* | no,icl*) - # Native MSVC or ICC + ,cl* | no,cl*) + # Native MSVC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6757,7 +6735,6 @@ if test yes != "$_lt_caught_CXX_error"; then emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6788,7 +6765,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6925,7 +6902,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7065,13 +7042,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8209,14 +8186,6 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) -# _LT_DECL_FILECMD -# ---------------- -# Check for a file(cmd) program that can be used to detect file type and magic -m4_defun([_LT_DECL_FILECMD], -[AC_CHECK_TOOL([FILECMD], [file], [:]) -_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) -])# _LD_DECL_FILECMD - # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -8396,8 +8365,8 @@ _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free -# Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -8828,7 +8797,7 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenience], # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -8953,8 +8922,7 @@ m4_define([lt_dict_filter], # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, -# Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -8963,23 +8931,23 @@ m4_define([lt_dict_filter], # @configure_input@ -# serial 4245 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.7]) -m4_define([LT_PACKAGE_REVISION], [2.4.7]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.7' -macro_revision='2.4.7' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- *** 39660 LINES SKIPPED *** From nobody Fri Oct 25 03:29: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 4XZStj4HPHz5bCJP; Fri, 25 Oct 2024 03:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZStj3Ywdz4bfT; Fri, 25 Oct 2024 03:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJEh1xaKIsmv4ng/dK1/SVcFu5qbjazzSH0t1KXjSFg=; b=CxSnaKjW06EbsC0aAOVATgEQCwjjcJGs8qDCJNZb4Lsmg4+oeN2MAaepvDeagwb7Ef+AuU 4hGBnA+rgv/dxk4xinejs54NixH9S67gWueiKHH68+kwkkIHwUBqIZK/K+Aqippxedx/8N UQaDq5YnZCMeq3CT7+3Fv3EenS41gJhHpPSTuEYvyScAn50T0+KpP0hSViQ0Kj14Q55Dzv pbRlh8Vg+bQ3HfVgvxV/LkWYZC7ra2oXlSnyQWfU5NtLwuHZQq5W5N5redKGeQdtrcFF3K f3ur+SIAlJFgfQCkTMS1xRikgRumDeUhOpJU5lHV8obrNz9JbEUCFcC4zptjYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJEh1xaKIsmv4ng/dK1/SVcFu5qbjazzSH0t1KXjSFg=; b=ZYMsvkEVR6161JhBPAmif9TTqhggFR9/44tzJ43hHu/4ymfkhZ1gx9JQ1gEeoYYCKWLZIb ezCUIrO2HUwIOCEwV+pIC0SpRzx9jNRNoHmVNheRJjNg4gfmtHoDC0qDuU06VtazOROhHr Hfj22yEri2MXZ5fFyGHv9eOgi2Mebe2hRsf0qBhthH0z++S6/7dzrHtfAcDU+hVVvQN0jM lCbeHnBY/lY8uiCEaHwjr1Y24z4D1SVcoWh/pTu2pISEHksGX0/lcDEUtyncehHnY0dl97 qKLOg8ex77efVszdxkXjEg/sEnI4Jn1c6GfsAP3eil+IVQts4xQxJrgcfpJSpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729826941; a=rsa-sha256; cv=none; b=veqrRXqHw67RdJPwyrB8t7prGGWyf+4QQK1npxHlkjK1tADkqIV03Skqq0DF5ENxjLPDez F0w1lzPxuW6BWHL7er/WrzIfr+3TKmkc5xUksRo2Luk9eCT/tZbXglKTBWW0RgVixg+zE2 KE5m1mMYV06yOwplsdBukC+dKOgzFQxTF0g885yFj04Bhd4t9Zky6TtX7tJjxvx/gSDPwu Ku9Eb81iuDnKcGaG+RZCrXYQZfJJnjEJVyty4P4TORV/azSzwIlh48qZqJMPeVCtAdDjWU D+BsDMEPtsbZ2VO1q8K5UnhK//kPBj0F3SZ3wQyQG/b2Zjx6cxALm7qIHzU+rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZStj2gjtz18Pg; Fri, 25 Oct 2024 03:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3T1Rt030234; Fri, 25 Oct 2024 03:29:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3T1A6030231; Fri, 25 Oct 2024 03:29:01 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:29:01 GMT Message-Id: <202410250329.49P3T1A6030231@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: b45cf7181e5b - stable/14 - unbound: Remove testcode and testdata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b45cf7181e5bd1b866b8e1b067376c3820a3b455 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b45cf7181e5bd1b866b8e1b067376c3820a3b455 commit b45cf7181e5bd1b866b8e1b067376c3820a3b455 Author: Cy Schubert AuthorDate: 2024-10-18 14:14:41 +0000 Commit: Cy Schubert CommitDate: 2024-10-25 03:28:45 +0000 unbound: Remove testcode and testdata The testcode and testdata directories are not used by FreeBSD. Remove them. MFC after: 1 week (cherry picked from commit 0c2af19e78a0a8dbbf305b74c944b5758578ea30) --- contrib/unbound/testcode/doqclient.c | 2701 -------------------- contrib/unbound/testcode/unitdoq.c | 84 - contrib/unbound/testdata/00-lint.tdir/00-lint.pre | 14 - .../09-unbound-control.tdir/conf.bad_credentials | 5 - .../conf.spoofed_credentials | 5 - .../09-unbound-control.tdir/view_local_data | 4 - .../09-unbound-control.tdir/view_local_data_remove | 4 - .../testdata/acl_interface.tdir/rpz-nx.zone | 3 - .../testdata/acl_interface.tdir/rpz-one.zone | 3 - .../testdata/acl_interface.tdir/rpz-two.zone | 3 - .../unbound/testdata/auth_tls.tdir/auth_tls.dsc | 16 - .../testdata/auth_tls.tdir/auth_tls.nsd.conf | 21 - .../unbound/testdata/auth_tls.tdir/auth_tls.post | 14 - .../unbound/testdata/auth_tls.tdir/auth_tls.pre | 47 - .../unbound/testdata/auth_tls.tdir/auth_tls.test | 48 - .../testdata/auth_tls.tdir/auth_tls.ub.conf | 22 - .../testdata/auth_tls.tdir/example.com.zone | 4 - .../unbound/testdata/auth_tls.tdir/nsd_server.key | 39 - .../unbound/testdata/auth_tls.tdir/nsd_server.pem | 22 - .../testdata/auth_tls.tdir/unbound_server.key | 39 - .../testdata/auth_tls.tdir/unbound_server.pem | 22 - .../auth_tls_failcert.tdir/auth_tls_failcert.dsc | 16 - .../auth_tls_failcert.nsd.conf | 21 - .../auth_tls_failcert.tdir/auth_tls_failcert.post | 14 - .../auth_tls_failcert.tdir/auth_tls_failcert.pre | 47 - .../auth_tls_failcert.tdir/auth_tls_failcert.test | 56 - .../auth_tls_failcert.ub.conf | 23 - .../auth_tls_failcert.tdir/example.com.zone | 4 - .../testdata/auth_tls_failcert.tdir/nsd_server.key | 39 - .../testdata/auth_tls_failcert.tdir/nsd_server.pem | 22 - .../auth_tls_failcert.tdir/unbound_server.key | 39 - .../auth_tls_failcert.tdir/unbound_server.pem | 22 - contrib/unbound/testdata/cachedb_cached_ede.crpl | 91 - contrib/unbound/testdata/cachedb_expired.crpl | 324 --- .../testdata/cachedb_expired_client_timeout.crpl | 343 --- .../testdata/cachedb_expired_reply_ttl.crpl | 259 -- .../cachedb_no_store.tdir/cachedb_no_store.conf | 29 - .../cachedb_no_store.tdir/cachedb_no_store.dsc | 16 - .../cachedb_no_store.tdir/cachedb_no_store.post | 20 - .../cachedb_no_store.tdir/cachedb_no_store.pre | 36 - .../cachedb_no_store.servfail.testns | 8 - .../cachedb_no_store.tdir/cachedb_no_store.test | 132 - .../cachedb_no_store.tdir/cachedb_no_store.testns | 9 - .../unbound/testdata/cachedb_servfail_cname.crpl | 181 -- .../unbound/testdata/cachedb_subnet_change.crpl | 304 --- .../unbound/testdata/cachedb_subnet_expired.crpl | 322 --- .../testdata/cachedb_subnet_toecs_timeout.crpl | 229 -- contrib/unbound/testdata/cachedb_val_expired.crpl | 327 --- .../testdata/cookie_file.tdir/cookie_file.conf | 19 - .../testdata/cookie_file.tdir/cookie_file.dsc | 16 - .../testdata/cookie_file.tdir/cookie_file.pre | 24 - .../testdata/cookie_file.tdir/cookie_file.test | 250 -- contrib/unbound/testdata/disable_edns_do.rpl | 164 -- contrib/unbound/testdata/dns64_prefetch_cache.rpl | 195 -- .../doq_downstream.tdir/doq_downstream.conf | 21 - .../doq_downstream.tdir/doq_downstream.dsc | 16 - .../doq_downstream.tdir/doq_downstream.post | 13 - .../doq_downstream.tdir/doq_downstream.pre | 44 - .../doq_downstream.tdir/doq_downstream.test | 109 - .../doq_downstream.tdir/doq_downstream.testns | 13 - .../doq_downstream.tdir/unbound_server.key | 15 - .../doq_downstream.tdir/unbound_server.pem | 11 - .../unbound/testdata/edns_downstream_cookies.rpl | 235 -- contrib/unbound/testdata/fwd_name_lookup.rpl | 152 -- .../testdata/ip_ratelimit.tdir/ip_ratelimit.conf | 28 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.dsc | 16 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.post | 13 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.pre | 24 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.test | 165 -- .../testdata/ip_ratelimit.tdir/unbound_control.key | 39 - .../testdata/ip_ratelimit.tdir/unbound_control.pem | 22 - .../testdata/ip_ratelimit.tdir/unbound_server.key | 39 - .../testdata/ip_ratelimit.tdir/unbound_server.pem | 22 - .../unbound/testdata/iter_cname_minimise_nx.rpl | 245 -- contrib/unbound/testdata/iter_dname_ttl.rpl | 271 -- contrib/unbound/testdata/iter_failreply.rpl | 132 - .../testdata/iter_ghost_grandchild_delegation.rpl | 256 -- contrib/unbound/testdata/iter_ignore_empty.rpl | 248 -- contrib/unbound/testdata/iter_max_global_quota.rpl | 2236 ---------------- contrib/unbound/testdata/iter_nat64.rpl | 117 - contrib/unbound/testdata/iter_nat64_prefix.rpl | 119 - contrib/unbound/testdata/iter_nat64_prefix48.rpl | 118 - contrib/unbound/testdata/iter_scrub_rr_length.rpl | 298 --- contrib/unbound/testdata/iter_unverified_glue.rpl | 188 -- .../testdata/iter_unverified_glue_fallback.rpl | 138 - contrib/unbound/testdata/local_cnameother.rpl | 67 - .../testdata/root_zonemd.tdir/root_zonemd.conf | 34 - .../testdata/root_zonemd.tdir/root_zonemd.dsc | 16 - .../testdata/root_zonemd.tdir/root_zonemd.post | 14 - .../testdata/root_zonemd.tdir/root_zonemd.pre | 50 - .../testdata/root_zonemd.tdir/root_zonemd.test | 63 - .../testdata/root_zonemd.tdir/root_zonemd.testns | 9 - contrib/unbound/testdata/rpz_cached_cname.rpl | 122 - contrib/unbound/testdata/rpz_clientip_override.rpl | 269 -- contrib/unbound/testdata/rpz_cname_handle.rpl | 779 ------ contrib/unbound/testdata/rpz_cname_tag.rpl | 281 -- contrib/unbound/testdata/rpz_nsdname_override.rpl | 325 --- contrib/unbound/testdata/rpz_nsip_override.rpl | 332 --- contrib/unbound/testdata/rpz_passthru_clientip.rpl | 90 - contrib/unbound/testdata/rpz_qtype_cname.rpl | 120 - .../testdata/rpz_reload.tdir/example.org.zone | 2 - .../testdata/rpz_reload.tdir/rpz.example.com.zone | 6 - .../testdata/rpz_reload.tdir/rpz_reload.conf | 30 - .../testdata/rpz_reload.tdir/rpz_reload.dsc | 16 - .../testdata/rpz_reload.tdir/rpz_reload.post | 12 - .../testdata/rpz_reload.tdir/rpz_reload.pre | 26 - .../testdata/rpz_reload.tdir/rpz_reload.test | 109 - contrib/unbound/testdata/rpz_val_block.rpl | 643 ----- contrib/unbound/testdata/rrset_use_cached.rpl | 151 -- .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 154 -- .../testdata/serve_expired_0ttl_nxdomain.rpl | 154 -- .../testdata/serve_expired_0ttl_servfail.rpl | 129 - .../testdata/serve_expired_cached_servfail.rpl | 130 - .../serve_expired_cached_servfail_refresh.rpl | 145 -- .../serve_expired_client_timeout_val_bogus.rpl | 317 --- ...ired_client_timeout_val_insecure_delegation.rpl | 247 -- .../unbound/testdata/serve_expired_ttl_reset.rpl | 102 - .../unbound/testdata/serve_expired_val_bogus.rpl | 316 --- .../stat_values.tdir/stat_values_cachedb.conf | 36 - .../stat_values_downstream_cookies.conf | 32 - contrib/unbound/testdata/subnet_cached_ede.crpl | 114 - .../unbound/testdata/subnet_cached_servfail.crpl | 167 -- contrib/unbound/testdata/subnet_cached_size.crpl | 308 --- .../unbound/testdata/subnet_global_prefetch.crpl | 236 -- .../subnet_global_prefetch_always_forward.crpl | 167 -- .../testdata/subnet_global_prefetch_expired.crpl | 241 -- contrib/unbound/testdata/subnet_prezero.crpl | 155 -- .../unbound/testdata/subnet_scopezero_noedns.crpl | 441 ---- contrib/unbound/testdata/ttl_max_negative.rpl | 206 -- contrib/unbound/testdata/ttl_min_negative.rpl | 204 -- contrib/unbound/testdata/val_any_negcache.rpl | 243 -- contrib/unbound/testdata/val_cnameqtype_qmin.rpl | 784 ------ contrib/unbound/testdata/val_dname_twice.rpl | 226 -- contrib/unbound/testdata/val_dnameqtype.rpl | 689 ----- contrib/unbound/testdata/val_dnameqtype_qmin.rpl | 859 ------- contrib/unbound/testdata/val_failure_dnskey.rpl | 348 --- contrib/unbound/testdata/val_negcache_ttl.rpl | 188 -- .../unbound/testdata/val_negcache_ttl_prefetch.rpl | 316 --- contrib/unbound/testdata/val_scrub_rr_length.rpl | 164 -- 139 files changed, 23468 deletions(-) diff --git a/contrib/unbound/testcode/doqclient.c b/contrib/unbound/testcode/doqclient.c deleted file mode 100644 index 1a2fd418359b..000000000000 --- a/contrib/unbound/testcode/doqclient.c +++ /dev/null @@ -1,2701 +0,0 @@ -/* - * testcode/doqclient.c - debug program. Perform multiple DNS queries using DoQ. - * - * Copyright (c) 2022, NLnet Labs. All rights reserved. - * - * This software is open source. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 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. - * - * Neither the name of the NLNET LABS nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT - * HOLDER 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. - */ - -/** - * \file - * - * Simple DNS-over-QUIC client. For testing and debugging purposes. - * No authentication of TLS cert. - */ - -#include "config.h" -#ifdef HAVE_GETOPT_H -#include -#endif - -#ifdef HAVE_NGTCP2 -#include -#include -#ifdef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H -#include -#else -#include -#endif -#include -#include -#ifdef HAVE_TIME_H -#include -#endif -#include -#include "util/locks.h" -#include "util/net_help.h" -#include "sldns/sbuffer.h" -#include "sldns/str2wire.h" -#include "sldns/wire2str.h" -#include "util/data/msgreply.h" -#include "util/data/msgencode.h" -#include "util/data/msgparse.h" -#include "util/data/dname.h" -#include "util/random.h" -#include "util/ub_event.h" -struct doq_client_stream_list; -struct doq_client_stream; - -/** the local client data for the DoQ connection */ -struct doq_client_data { - /** file descriptor */ - int fd; - /** the event base for the events */ - struct ub_event_base* base; - /** the ub event */ - struct ub_event* ev; - /** the expiry timer */ - struct ub_event* expire_timer; - /** is the expire_timer added */ - int expire_timer_added; - /** the ngtcp2 connection information */ - struct ngtcp2_conn* conn; - /** random state */ - struct ub_randstate* rnd; - /** server connected to as a string */ - const char* svr; - /** the static secret */ - uint8_t* static_secret_data; - /** the static secret size */ - size_t static_secret_size; - /** destination address sockaddr */ - struct sockaddr_storage dest_addr; - /** length of dest addr */ - socklen_t dest_addr_len; - /** local address sockaddr */ - struct sockaddr_storage local_addr; - /** length of local addr */ - socklen_t local_addr_len; - /** SSL context */ - SSL_CTX* ctx; - /** SSL object */ - SSL* ssl; -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT - /** the connection reference for ngtcp2_conn and userdata in ssl */ - struct ngtcp2_crypto_conn_ref conn_ref; -#endif - /** the quic version to use */ - uint32_t quic_version; - /** the last error */ -#ifdef HAVE_NGTCP2_CCERR_DEFAULT - struct ngtcp2_ccerr ccerr; -#else - struct ngtcp2_connection_close_error last_error; -#endif - /** the recent tls alert error code */ - uint8_t tls_alert; - /** the buffer for packet operations */ - struct sldns_buffer* pkt_buf; - /** The list of queries to start. They have no stream associated. - * Once they do, they move to the send list. */ - struct doq_client_stream_list* query_list_start; - /** The list of queries to send. They have a stream, and they are - * sending data. Data could also be received, like errors. */ - struct doq_client_stream_list* query_list_send; - /** The list of queries to receive. They have a stream, and the - * send is done, it is possible to read data. */ - struct doq_client_stream_list* query_list_receive; - /** The list of queries that are stopped. They have no stream - * active any more. Write and read are done. The query is done, - * and it may be in error and then have no answer or partial answer. */ - struct doq_client_stream_list* query_list_stop; - /** is there a blocked packet in the blocked_pkt buffer */ - int have_blocked_pkt; - /** store blocked packet, a packet that could not be sent on the - * nonblocking socket. */ - struct sldns_buffer* blocked_pkt; - /** ecn info for the blocked packet */ - struct ngtcp2_pkt_info blocked_pkt_pi; - /** the congestion control algorithm */ - ngtcp2_cc_algo cc_algo; - /** the transport parameters file, for early data transmission */ - const char* transport_file; - /** the tls session file, for session resumption */ - const char* session_file; - /** if early data is enabled for the connection */ - int early_data_enabled; - /** how quiet is the output */ - int quiet; - /** the configured port for the destination */ - int port; -}; - -/** the local client stream list, for appending streams to */ -struct doq_client_stream_list { - /** first and last members of the list */ - struct doq_client_stream* first, *last; -}; - -/** the local client data for a DoQ stream */ -struct doq_client_stream { - /** next stream in list, and prev in list */ - struct doq_client_stream* next, *prev; - /** the data buffer */ - uint8_t* data; - /** length of the data buffer */ - size_t data_len; - /** if the client query has a stream, that is active, associated with - * it. The stream_id is in stream_id. */ - int has_stream; - /** the stream id */ - int64_t stream_id; - /** data written position */ - size_t nwrite; - /** the data length for write, in network format */ - uint16_t data_tcplen; - /** if the write of the query data is done. That means the - * write channel has FIN, is closed for writing. */ - int write_is_done; - /** data read position */ - size_t nread; - /** the answer length, in network byte order */ - uint16_t answer_len; - /** the answer buffer */ - struct sldns_buffer* answer; - /** the answer is complete */ - int answer_is_complete; - /** the query has an error, it has no answer, or no complete answer */ - int query_has_error; - /** if the query is done */ - int query_is_done; -}; - -#ifndef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT -/** the quic method struct, must remain valid during the QUIC connection. */ -static SSL_QUIC_METHOD quic_method; -#endif - -/** Get the connection ngtcp2_conn from the ssl app data - * ngtcp2_crypto_conn_ref */ -static ngtcp2_conn* conn_ref_get_conn(ngtcp2_crypto_conn_ref* conn_ref) -{ - struct doq_client_data* data = (struct doq_client_data*) - conn_ref->user_data; - return data->conn; -} - -static void -set_app_data(SSL* ssl, struct doq_client_data* data) -{ -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT - data->conn_ref.get_conn = &conn_ref_get_conn; - data->conn_ref.user_data = data; - SSL_set_app_data(ssl, &data->conn_ref); -#else - SSL_set_app_data(ssl, data); -#endif -} - -static struct doq_client_data* -get_app_data(SSL* ssl) -{ - struct doq_client_data* data; -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT - data = (struct doq_client_data*)((struct ngtcp2_crypto_conn_ref*) - SSL_get_app_data(ssl))->user_data; -#else - data = (struct doq_client_data*) SSL_get_app_data(ssl); -#endif - return data; -} - - - -/** write handle routine */ -static void on_write(struct doq_client_data* data); -/** update the timer */ -static void update_timer(struct doq_client_data* data); -/** disconnect we are done */ -static void disconnect(struct doq_client_data* data); -/** fetch and write the transport file */ -static void early_data_write_transport(struct doq_client_data* data); - -/** usage of doqclient */ -static void usage(char* argv[]) -{ - printf("usage: %s [options] name type class ...\n", argv[0]); - printf(" sends the name-type-class queries over " - "DNS-over-QUIC.\n"); - printf("-s server IP address to send the queries to, " - "default: 127.0.0.1\n"); - printf("-p Port to connect to, default: %d\n", - UNBOUND_DNS_OVER_QUIC_PORT); - printf("-v verbose output\n"); - printf("-q quiet, short output of answer\n"); - printf("-x file transport file, for read/write of transport parameters.\n\t\tIf it exists, it is used to send early data. It is then\n\t\twritten to contain the last used transport parameters.\n\t\tAlso -y must be enabled for early data to succeed.\n"); - printf("-y file session file, for read/write of TLS session. If it exists,\n\t\tit is used for TLS session resumption. It is then written\n\t\tto contain the last session used.\n\t\tOn its own, without also -x, resumes TLS session.\n"); - printf("-h This help text\n"); - exit(1); -} - -/** get the dest address */ -static void -get_dest_addr(struct doq_client_data* data, const char* svr, int port) -{ - if(!ipstrtoaddr(svr, port, &data->dest_addr, &data->dest_addr_len)) { - printf("fatal: bad server specs '%s'\n", svr); - exit(1); - } -} - -/** open UDP socket to svr */ -static int -open_svr_udp(struct doq_client_data* data) -{ - int fd = -1; - int r; - fd = socket(addr_is_ip6(&data->dest_addr, data->dest_addr_len)? - PF_INET6:PF_INET, SOCK_DGRAM, 0); - if(fd == -1) { - perror("socket() error"); - exit(1); - } - r = connect(fd, (struct sockaddr*)&data->dest_addr, - data->dest_addr_len); - if(r < 0 && r != EINPROGRESS) { - perror("connect() error"); - exit(1); - } - fd_set_nonblock(fd); - return fd; -} - -/** get the local address of the connection */ -static void -get_local_addr(struct doq_client_data* data) -{ - memset(&data->local_addr, 0, sizeof(data->local_addr)); - data->local_addr_len = (socklen_t)sizeof(data->local_addr); - if(getsockname(data->fd, (struct sockaddr*)&data->local_addr, - &data->local_addr_len) == -1) { - perror("getsockname() error"); - exit(1); - } - log_addr(1, "local_addr", &data->local_addr, data->local_addr_len); - log_addr(1, "dest_addr", &data->dest_addr, data->dest_addr_len); -} - -static sldns_buffer* -make_query(char* qname, char* qtype, char* qclass) -{ - struct query_info qinfo; - struct edns_data edns; - sldns_buffer* buf = sldns_buffer_new(65553); - if(!buf) fatal_exit("out of memory"); - qinfo.qname = sldns_str2wire_dname(qname, &qinfo.qname_len); - if(!qinfo.qname) { - printf("cannot parse query name: '%s'\n", qname); - exit(1); - } - - qinfo.qtype = sldns_get_rr_type_by_name(qtype); - qinfo.qclass = sldns_get_rr_class_by_name(qclass); - qinfo.local_alias = NULL; - - qinfo_query_encode(buf, &qinfo); /* flips buffer */ - free(qinfo.qname); - sldns_buffer_write_u16_at(buf, 0, 0x0000); - sldns_buffer_write_u16_at(buf, 2, BIT_RD); - memset(&edns, 0, sizeof(edns)); - edns.edns_present = 1; - edns.bits = EDNS_DO; - edns.udp_size = 4096; - if(sldns_buffer_capacity(buf) >= - sldns_buffer_limit(buf)+calc_edns_field_size(&edns)) - attach_edns_record(buf, &edns); - return buf; -} - -/** create client stream structure */ -static struct doq_client_stream* -client_stream_create(struct sldns_buffer* query_data) -{ - struct doq_client_stream* str = calloc(1, sizeof(*str)); - if(!str) - fatal_exit("calloc failed: out of memory"); - str->data = memdup(sldns_buffer_begin(query_data), - sldns_buffer_limit(query_data)); - if(!str->data) - fatal_exit("alloc data failed: out of memory"); - str->data_len = sldns_buffer_limit(query_data); - str->stream_id = -1; - return str; -} - -/** free client stream structure */ -static void -client_stream_free(struct doq_client_stream* str) -{ - if(!str) - return; - free(str->data); - sldns_buffer_free(str->answer); - free(str); -} - -/** setup the stream to start the write process */ -static void -client_stream_start_setup(struct doq_client_stream* str, int64_t stream_id) -{ - str->has_stream = 1; - str->stream_id = stream_id; - str->nwrite = 0; - str->nread = 0; - str->answer_len = 0; - str->query_is_done = 0; - str->answer_is_complete = 0; - str->query_has_error = 0; - if(str->answer) { - sldns_buffer_free(str->answer); - str->answer = NULL; - } -} - -/** Return string for log purposes with query name. */ -static char* -client_stream_string(struct doq_client_stream* str) -{ - char* s; - size_t dname_len; - char dname[256], tpstr[32], result[256+32+16]; - uint16_t tp; - if(str->data_len <= LDNS_HEADER_SIZE) { - s = strdup("query_with_no_question"); - if(!s) - fatal_exit("strdup failed: out of memory"); - return s; - } - dname_len = dname_valid(str->data+LDNS_HEADER_SIZE, - str->data_len-LDNS_HEADER_SIZE); - if(!dname_len) { - s = strdup("query_dname_not_valid"); - if(!s) - fatal_exit("strdup failed: out of memory"); - return s; - } - (void)sldns_wire2str_dname_buf(str->data+LDNS_HEADER_SIZE, dname_len, - dname, sizeof(dname)); - tp = sldns_wirerr_get_type(str->data+LDNS_HEADER_SIZE, - str->data_len-LDNS_HEADER_SIZE, dname_len); - (void)sldns_wire2str_type_buf(tp, tpstr, sizeof(tpstr)); - snprintf(result, sizeof(result), "%s %s", dname, tpstr); - s = strdup(result); - if(!s) - fatal_exit("strdup failed: out of memory"); - return s; -} - -/** create query stream list */ -static struct doq_client_stream_list* -stream_list_create(void) -{ - struct doq_client_stream_list* list = calloc(1, sizeof(*list)); - if(!list) - fatal_exit("calloc failed: out of memory"); - return list; -} - -/** free the query stream list */ -static void -stream_list_free(struct doq_client_stream_list* list) -{ - struct doq_client_stream* str; - if(!list) - return; - str = list->first; - while(str) { - struct doq_client_stream* next = str->next; - client_stream_free(str); - str = next; - } - free(list); -} - -/** append item to list */ -static void -stream_list_append(struct doq_client_stream_list* list, - struct doq_client_stream* str) -{ - if(list->last) { - str->prev = list->last; - list->last->next = str; - } else { - str->prev = NULL; - list->first = str; - } - str->next = NULL; - list->last = str; -} - -/** delete the item from the list */ -static void -stream_list_delete(struct doq_client_stream_list* list, - struct doq_client_stream* str) -{ - if(str->next) { - str->next->prev = str->prev; - } else { - list->last = str->prev; - } - if(str->prev) { - str->prev->next = str->next; - } else { - list->first = str->next; - } - str->prev = NULL; - str->next = NULL; -} - -/** move the item from list1 to list2 */ -static void -stream_list_move(struct doq_client_stream* str, - struct doq_client_stream_list* list1, - struct doq_client_stream_list* list2) -{ - stream_list_delete(list1, str); - stream_list_append(list2, str); -} - -/** allocate stream data buffer, then answer length is complete */ -static void -client_stream_datalen_complete(struct doq_client_stream* str) -{ - verbose(1, "answer length %d", (int)ntohs(str->answer_len)); - str->answer = sldns_buffer_new(ntohs(str->answer_len)); - if(!str->answer) - fatal_exit("sldns_buffer_new failed: out of memory"); - sldns_buffer_set_limit(str->answer, ntohs(str->answer_len)); -} - -/** print the answer rrs */ -static void -print_answer_rrs(uint8_t* pkt, size_t pktlen) -{ - char buf[65535]; - char* str; - size_t str_len; - int i, qdcount, ancount; - uint8_t* data = pkt; - size_t data_len = pktlen; - int comprloop = 0; - if(data_len < LDNS_HEADER_SIZE) - return; - qdcount = LDNS_QDCOUNT(data); - ancount = LDNS_ANCOUNT(data); - data += LDNS_HEADER_SIZE; - data_len -= LDNS_HEADER_SIZE; - - for(i=0; iquery_has_error) { - char* logs = client_stream_string(str); - printf("%s has error, there is no answer\n", logs); - free(logs); - return; - } - if(sldns_buffer_limit(str->answer) < LDNS_HEADER_SIZE) { - char* logs = client_stream_string(str); - printf("%s received short packet, smaller than header\n", - logs); - free(logs); - return; - } - rcode = LDNS_RCODE_WIRE(sldns_buffer_begin(str->answer)); - if(rcode != 0) { - char* logs = client_stream_string(str); - char rc[16]; - (void)sldns_wire2str_rcode_buf(rcode, rc, sizeof(rc)); - printf("%s rcode %s\n", logs, rc); - free(logs); - return; - } - ancount = LDNS_ANCOUNT(sldns_buffer_begin(str->answer)); - if(ancount == 0) { - char* logs = client_stream_string(str); - printf("%s nodata answer\n", logs); - free(logs); - return; - } - print_answer_rrs(sldns_buffer_begin(str->answer), - sldns_buffer_limit(str->answer)); -} - -/** print the stream output answer */ -static void -client_stream_print_long(struct doq_client_data* data, - struct doq_client_stream* str) -{ - char* s; - if(str->query_has_error) { - char* logs = client_stream_string(str); - printf("%s has error, there is no answer\n", logs); - free(logs); - return; - } - s = sldns_wire2str_pkt(sldns_buffer_begin(str->answer), - sldns_buffer_limit(str->answer)); - printf("%s", (s?s:";sldns_wire2str_pkt failed\n")); - printf(";; SERVER: %s %d\n", data->svr, data->port); - free(s); -} - -/** the stream has completed the data */ -static void -client_stream_data_complete(struct doq_client_stream* str) -{ - verbose(1, "received all answer content"); - if(verbosity > 0) { - char* logs = client_stream_string(str); - char* s; - log_buf(1, "received answer", str->answer); - s = sldns_wire2str_pkt(sldns_buffer_begin(str->answer), - sldns_buffer_limit(str->answer)); - if(!s) verbose(1, "could not sldns_wire2str_pkt"); - else verbose(1, "query %s received:\n%s", logs, s); - free(s); - free(logs); - } - str->answer_is_complete = 1; -} - -/** the stream has completed but with an error */ -static void -client_stream_answer_error(struct doq_client_stream* str) -{ - if(verbosity > 0) { - char* logs = client_stream_string(str); - if(str->answer) - verbose(1, "query %s has an error. received %d/%d bytes.", - logs, (int)sldns_buffer_position(str->answer), - (int)sldns_buffer_limit(str->answer)); - else - verbose(1, "query %s has an error. received no data.", - logs); - free(logs); - } - str->query_has_error = 1; -} - -/** receive data for a stream */ -static void -client_stream_recv_data(struct doq_client_stream* str, const uint8_t* data, - size_t datalen) -{ - int got_data = 0; - /* read the tcplength uint16_t at the start of the DNS message */ - if(str->nread < 2) { - size_t to_move = datalen; - if(datalen > 2-str->nread) - to_move = 2-str->nread; - memmove(((uint8_t*)&str->answer_len)+str->nread, data, - to_move); - str->nread += to_move; - data += to_move; - datalen -= to_move; - if(str->nread == 2) { - /* we can allocate the data buffer */ - client_stream_datalen_complete(str); - } - } - /* if we have data bytes */ - if(datalen > 0) { - size_t to_write = datalen; - if(datalen > sldns_buffer_remaining(str->answer)) - to_write = sldns_buffer_remaining(str->answer); - if(to_write > 0) { - sldns_buffer_write(str->answer, data, to_write); - str->nread += to_write; - data += to_write; - datalen -= to_write; - got_data = 1; - } - } - /* extra received bytes after end? */ - if(datalen > 0) { - verbose(1, "extra bytes after end of DNS length"); - if(verbosity > 0) - log_hex("extradata", (void*)data, datalen); - } - /* are we done with it? */ - if(got_data && str->nread >= (size_t)(ntohs(str->answer_len))+2) { - client_stream_data_complete(str); - } -} - -/** receive FIN from remote end on client stream, no more data to be - * received on the stream. */ -static void -client_stream_recv_fin(struct doq_client_data* data, - struct doq_client_stream* str, int is_fin) -{ - if(verbosity > 0) { - char* logs = client_stream_string(str); - if(is_fin) - verbose(1, "query %s: received FIN from remote", logs); - else - verbose(1, "query %s: stream reset from remote", logs); - free(logs); - } - if(str->write_is_done) - stream_list_move(str, data->query_list_receive, - data->query_list_stop); - else - stream_list_move(str, data->query_list_send, - data->query_list_stop); - if(!str->answer_is_complete) { - client_stream_answer_error(str); - } - str->query_is_done = 1; - if(data->quiet) - client_stream_print_short(str); - else client_stream_print_long(data, str); - if(data->query_list_send->first==NULL && - data->query_list_receive->first==NULL) - disconnect(data); -} - -/** fill a buffer with random data */ -static void fill_rand(struct ub_randstate* rnd, uint8_t* buf, size_t len) -{ - if(RAND_bytes(buf, len) != 1) { - size_t i; - for(i=0; istatic_secret_data = malloc(len); - if(!data->static_secret_data) - fatal_exit("malloc failed: out of memory"); - data->static_secret_size = len; - fill_rand(data->rnd, data->static_secret_data, len); -} - -/** fill cid structure with random data */ -static void cid_randfill(struct ngtcp2_cid* cid, size_t datalen, - struct ub_randstate* rnd) -{ - uint8_t buf[32]; - if(datalen > sizeof(buf)) - datalen = sizeof(buf); - fill_rand(rnd, buf, datalen); - ngtcp2_cid_init(cid, buf, datalen); -} - -/** send buf on the client stream */ -static int -client_bidi_stream(struct doq_client_data* data, int64_t* ret_stream_id, - void* stream_user_data) -{ - int64_t stream_id; - int rv; - - /* open new bidirectional stream */ - rv = ngtcp2_conn_open_bidi_stream(data->conn, &stream_id, - stream_user_data); - if(rv != 0) { - if(rv == NGTCP2_ERR_STREAM_ID_BLOCKED) { - /* no bidi stream count for this new stream */ - return 0; - } - fatal_exit("could not ngtcp2_conn_open_bidi_stream: %s", - ngtcp2_strerror(rv)); - } - *ret_stream_id = stream_id; - return 1; -} - -/** See if we can start query streams, by creating bidirectional streams - * on the QUIC transport for them. */ -static void -query_streams_start(struct doq_client_data* data) -{ - while(data->query_list_start->first) { - struct doq_client_stream* str = data->query_list_start->first; - int64_t stream_id = 0; - if(!client_bidi_stream(data, &stream_id, str)) { - /* no more bidi streams allowed */ - break; - } - if(verbosity > 0) { - char* logs = client_stream_string(str); - verbose(1, "query %s start on bidi stream id %lld", - logs, (long long int)stream_id); - free(logs); - } - /* setup the stream to start */ - client_stream_start_setup(str, stream_id); - /* move the query entry to the send list to write it */ - stream_list_move(str, data->query_list_start, - data->query_list_send); - } -} - -/** the rand callback routine from ngtcp2 */ -static void rand_cb(uint8_t* dest, size_t destlen, - const ngtcp2_rand_ctx* rand_ctx) -{ - struct ub_randstate* rnd = (struct ub_randstate*) - rand_ctx->native_handle; - fill_rand(rnd, dest, destlen); -} - -/** the get_new_connection_id callback routine from ngtcp2 */ -static int get_new_connection_id_cb(struct ngtcp2_conn* ATTR_UNUSED(conn), - struct ngtcp2_cid* cid, uint8_t* token, size_t cidlen, void* user_data) -{ - struct doq_client_data* data = (struct doq_client_data*)user_data; - cid_randfill(cid, cidlen, data->rnd); - if(ngtcp2_crypto_generate_stateless_reset_token(token, - data->static_secret_data, data->static_secret_size, cid) != 0) - return NGTCP2_ERR_CALLBACK_FAILURE; - return 0; -} - -/** handle that early data is rejected */ -static void -early_data_is_rejected(struct doq_client_data* data) -{ *** 23476 LINES SKIPPED *** From nobody Fri Oct 25 03:29: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 4XZSvf3VjRz5bCLm; Fri, 25 Oct 2024 03:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZSvf2n6Rz4cFg; Fri, 25 Oct 2024 03:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jmHx0FGVpei4lvBmz+U3GBGEA+iHNaEwfD8Jz0sfEJY=; b=QdmlE0uw7gQDbAlzCpzId0pWwDcUsqo8ylXQzNjKzaWplPmlnI218WXKHg08mY9aC2JDM2 2tgSshYv/+9OH4ofZr+rsQPV0icOBV/kn9KZmKyviuz0RnCvrzvOjGe+jPPbaAJdfxApHC SCLGRR3068GHI4aAMTiWbuoIO5Nd05RVBw1rcLAAtOT3lDQPxmyHjBVO3+BbNgBiBb9ALP N1neXVgHfeXghYyEusdJzwIsArXBMSSg/3GRN6E8hJ2WSu/9E4fYYKvIaVRCmPXQ5WABX+ WUHsDAdvtt1Qj4oM5WIx0WCqSSvQjYP4Q7/0LQM39BA5Tk9kBe4R9yLDfQVD6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jmHx0FGVpei4lvBmz+U3GBGEA+iHNaEwfD8Jz0sfEJY=; b=dVHuOEodz0+CNMFo/nZKx2c9ORqy7Y89BNABmCb/AEcqSnuBh2D1p+TKYJiDgF5+WwpKil pvPI8LRAm2AW7j/9QA7M/Vs6TiOOzA4bkmwc4f+dHhYePIggSr/px44K0rcWElp/UgfNkP vR71xHLKScqh/7lY3a/jN6lq3YuT4Y0ISsjAKKxPfeSfGLJS7N80MMLIB5NWABhNnI1Z/9 Zw2/jzzauRoIxOuZhapEH2Br7+tOZx0jVo1+lLv+xEld6CUEoVXHpHpdyrzYALyU+MZD8+ zVKZ9k+bTJOAMcExnjC8XiL1N4ZSw1c3684vCZVQqh4W2H3oQwDhirBHkLjBYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729826990; a=rsa-sha256; cv=none; b=SDedPpM91eqRsePIj324m3do9857oH87XBJOzEUzCwJ6yvUZz8b2Gn0I8H5jUklm3/zBon tyDkU9x6FNJz+sxjXCQp8uai2wIglROZ1SZbUJaKqmMzTPvXhMKr5z9lXDXHVEq+0H1Lfw Eexc/xIOegRXUI9XblGXY4hFs506ZNpIOPkJxV5QRE+ZezauJrn1XNxhNCFYR3Y2EFt603 ddi09e6/Jtt6mvZ6f2g6fUb/4SvcwdsDtZIbUmSQ6aYkq5o6egFwz8RMKBZlFYeh7gCE9n eknSaV311Of8YrueylV5SqtuZS2s1FaDLQeHFRNYpRcZ2bYEMiEs2rZFqcP/Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZSvf2NzWz18sw; Fri, 25 Oct 2024 03:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3ToTD030618; Fri, 25 Oct 2024 03:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3ToAx030615; Fri, 25 Oct 2024 03:29:50 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:29:50 GMT Message-Id: <202410250329.49P3ToAx030615@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: c78cc265cd39 - stable/13 - unbound: Move config.h to lib directory. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: c78cc265cd39e4b2622b6b39169e01aec6e4d09e Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c78cc265cd39e4b2622b6b39169e01aec6e4d09e commit c78cc265cd39e4b2622b6b39169e01aec6e4d09e Author: Dag-Erling Smørgrav AuthorDate: 2023-08-19 01:44:39 +0000 Commit: Cy Schubert CommitDate: 2024-10-25 03:29:15 +0000 unbound: Move config.h to lib directory. It was originally in contrib, and moved to usr.sbin in 6692aa840c1f; I always thought lib would make more sense but never got around to moving it. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41504 (cherry picked from commit 2ba1d4970a06a1660b46f6fd99351d154b295683) --- contrib/unbound/freebsd-configure.sh | 1 + lib/libunbound/Makefile | 3 +-- {usr.sbin/unbound => lib/libunbound}/config.h | 0 usr.sbin/unbound/anchor/Makefile | 3 ++- usr.sbin/unbound/checkconf/Makefile | 3 ++- usr.sbin/unbound/control/Makefile | 3 ++- usr.sbin/unbound/daemon/Makefile | 3 ++- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/unbound/freebsd-configure.sh b/contrib/unbound/freebsd-configure.sh index 7169bbcce732..cd45d4716320 100755 --- a/contrib/unbound/freebsd-configure.sh +++ b/contrib/unbound/freebsd-configure.sh @@ -39,3 +39,4 @@ cd $unbound --with-conf-file=/var/unbound/unbound.conf \ --with-run-dir=/var/unbound \ --with-username=unbound +mv config.h ../../lib/libunbound diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile index 64261ebad998..a82cc1be4e45 100644 --- a/lib/libunbound/Makefile +++ b/lib/libunbound/Makefile @@ -11,8 +11,7 @@ LIB= unbound PRIVATELIB= PACKAGE= unbound -CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -CFLAGS+= -I${SRCTOP}/usr.sbin/unbound +CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -I${.CURDIR} SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \ configlexer.l configparser.y context.c dname.c dns.c dns64.c \ diff --git a/usr.sbin/unbound/config.h b/lib/libunbound/config.h similarity index 100% rename from usr.sbin/unbound/config.h rename to lib/libunbound/config.h diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile index 01a7c53c8ae8..91ae1090415a 100644 --- a/usr.sbin/unbound/anchor/Makefile +++ b/usr.sbin/unbound/anchor/Makefile @@ -2,6 +2,7 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound EXPATDIR= ${SRCTOP}/contrib/expat .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc @@ -9,7 +10,7 @@ EXPATDIR= ${SRCTOP}/contrib/expat PROG= local-unbound-anchor SRCS= unbound-anchor.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound bsdxml ssl crypto pthread MAN= local-unbound-anchor.8 diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile index 264f3b829fc4..c8d8397225b0 100644 --- a/usr.sbin/unbound/checkconf/Makefile +++ b/usr.sbin/unbound/checkconf/Makefile @@ -2,13 +2,14 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc PROG= local-unbound-checkconf SRCS= ub_event.c unbound-checkconf.c worker_cb.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound pthread MAN= local-unbound-checkconf.8 diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile index b5340c0bca67..ad5f7eb21f09 100644 --- a/usr.sbin/unbound/control/Makefile +++ b/usr.sbin/unbound/control/Makefile @@ -2,13 +2,14 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc PROG= local-unbound-control SRCS= ub_event.c unbound-control.c worker_cb.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound crypto ssl pthread MAN= local-unbound-control.8 diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile index ad0f5b2fb245..28b451aa5061 100644 --- a/usr.sbin/unbound/daemon/Makefile +++ b/usr.sbin/unbound/daemon/Makefile @@ -2,6 +2,7 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/shm_side ${UNBOUNDDIR}/doc @@ -9,7 +10,7 @@ PROG= local-unbound SRCS= acl_list.c cachedump.c daemon.c remote.c shm_main.c stats.c \ ub_event.c unbound.c worker.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound util ssl crypto pthread MAN= local-unbound.8 local-unbound.conf.5 From nobody Fri Oct 25 03:29: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 4XZSvh0Mqzz5bCHp; Fri, 25 Oct 2024 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZSvg6nPBz4bx4; Fri, 25 Oct 2024 03:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RhBwbEi4OEvybxSCg/W2P042e896aRavvPqCC3mtjUM=; b=l3cmgbFXxlYK0Cewl8zGw7ZuWACfn8pTqcDHTR46rBy6kKP6DEodMYTyGX3h728n0lOMzf U4O65O5QJMvet/AY7Dc95s3djtJPOKWhnTXtQcH1bCxBiNm1QGNk7s4yNJYLpbxSeuX2lH giSLQ6WSW4fy8drUnTCnZFM1N20IOQAPPZ64H0KhAtqUKu2uJexAsb81I2BA4DFTnUdB80 kpeVbGO6g5yu8EZxlHO387Gy7O8ezADHubSPGqGnEhCBxLv5VhrsPsjYoTeVX7SeE0/J/Z 1hz49GyGh4uRJzZL09ejcMZdUyjnqSioVo8Ko85mde+pppC2o1c3iVaX8Z43zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RhBwbEi4OEvybxSCg/W2P042e896aRavvPqCC3mtjUM=; b=hMfz06DLlzpHmA4bl5Eqpff8VfURLdbmT84mEtBr3PCJS5ODCrhgbw16cbdfJEn1du/ChV wePafTwmVU8uxNycnPzztlEPVLVb2MA6AiRni838dVJ/4TNXK2h6C+pPpXVW8By9EqppUX aFVjPa1/YMAgSdxNtGRzi4z9/iTPYnkltGjex3ivRdi/2rS5bt8eVkEb4c14t2XOEkr+sS lF//c1EXugVkn+ZBjvUYjxhaP7j3NZyMCjqoc27ALN2lcd6XBn56M1FXvxLILItafiCzRS +YjXtos2fIFJ4l3FIRi5eWvM6c6Iao7i5QOvI07ynOjgH5Ty+jiRUkx2OceK+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729826991; a=rsa-sha256; cv=none; b=dlWsEYhUTXZL+jnBIrhTo2YTQNDKFTZxVYU6v1ldi+QfgCju1ML6UrU12Dg+gJ16iRP656 Vb58ILVCZEnW44AWCmq/39/gQBHSPwvC686uMajsGu0F+/e5FMYzg2shJmycdr9IuJCgKP 8jEHQbF9PZKbgERGVCGyYjyGqQJDfAzOY1hETEGW6PZ8CZwcTSa/DLdOonEkGzEjR4ZI4h 2+7MyTkhBCKw+rBgJWLzTjbdHqgcC8Uf2k5PxndYu1HotGD5XpRHtYKo1jVn4X+EryCmeB 0tDp4opc3WygDVSCQWoJvfRkfCt9g8wFjUfU2EV+3Hd4pDjhS1u5c/6Njwyeww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZSvg6NrCz18sx; Fri, 25 Oct 2024 03:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3Tpw1030663; Fri, 25 Oct 2024 03:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3TpRu030660; Fri, 25 Oct 2024 03:29:51 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:29:51 GMT Message-Id: <202410250329.49P3TpRu030660@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: 741bb8476204 - stable/13 - unbound: Vendor import 1.22.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: 741bb84762042f82923c02b10f3874c7d8ad4819 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=741bb84762042f82923c02b10f3874c7d8ad4819 commit 741bb84762042f82923c02b10f3874c7d8ad4819 Author: Cy Schubert AuthorDate: 2024-10-18 13:59:33 +0000 Commit: Cy Schubert CommitDate: 2024-10-25 03:29:15 +0000 unbound: Vendor import 1.22.0 Release notes at https://nlnetlabs.nl/news/2024/Oct/17/unbound-1.22.0-released/ MFC after: 1 week Merge commit '0a6d797cf6eb751d7eb613900cd19803e05d905f' into main (cherry picked from commit 46d2f61818f594174cafe31ee338c6e083fa1876) --- contrib/unbound/Makefile.in | 19 +- contrib/unbound/aclocal.m4 | 292 +- contrib/unbound/cachedb/cachedb.c | 5 +- contrib/unbound/cachedb/redis.c | 29 +- contrib/unbound/config.h.in | 94 + contrib/unbound/configure | 769 +- contrib/unbound/configure.ac | 74 +- contrib/unbound/contrib/aaaa-filter-iterator.patch | 2 +- contrib/unbound/daemon/daemon.c | 10 + contrib/unbound/daemon/daemon.h | 3 + contrib/unbound/daemon/remote.c | 14 +- contrib/unbound/daemon/stats.c | 14 +- contrib/unbound/daemon/worker.c | 38 +- contrib/unbound/dns64/dns64.c | 5 +- contrib/unbound/dnstap/unbound-dnstap-socket.c | 24 +- contrib/unbound/doc/Changelog | 151 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 26 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 10 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 71 +- contrib/unbound/doc/unbound.doxygen | 8 +- contrib/unbound/install-sh | 174 +- contrib/unbound/iterator/iter_scrub.c | 45 +- contrib/unbound/iterator/iter_utils.c | 42 + contrib/unbound/iterator/iter_utils.h | 7 + contrib/unbound/iterator/iterator.c | 57 +- contrib/unbound/iterator/iterator.h | 2 +- contrib/unbound/libunbound/context.c | 2 +- contrib/unbound/libunbound/libworker.c | 16 + contrib/unbound/libunbound/unbound.h | 4 + contrib/unbound/ltmain.sh | 866 +- contrib/unbound/services/authzone.c | 39 +- contrib/unbound/services/cache/dns.c | 59 +- contrib/unbound/services/cache/dns.h | 3 +- contrib/unbound/services/cache/rrset.c | 10 +- contrib/unbound/services/listen_dnsport.c | 2534 +++++- contrib/unbound/services/listen_dnsport.h | 405 +- contrib/unbound/services/mesh.c | 13 +- contrib/unbound/services/mesh.h | 3 +- contrib/unbound/services/modstack.c | 2 +- contrib/unbound/services/rpz.c | 19 + .../unbound/smallapp/unbound-control-setup.sh.in | 2 +- contrib/unbound/smallapp/unbound-control.c | 6 + contrib/unbound/smallapp/unbound-host.c | 6 + contrib/unbound/smallapp/worker_cb.c | 16 + contrib/unbound/testcode/doqclient.c | 2701 +++++++ contrib/unbound/testcode/unitdoq.c | 84 + .../unbound/testdata/auth_tls.tdir/auth_tls.dsc | 16 + .../testdata/auth_tls.tdir/auth_tls.nsd.conf | 21 + .../unbound/testdata/auth_tls.tdir/auth_tls.post | 14 + .../unbound/testdata/auth_tls.tdir/auth_tls.pre | 47 + .../unbound/testdata/auth_tls.tdir/auth_tls.test | 48 + .../testdata/auth_tls.tdir/auth_tls.ub.conf | 22 + .../testdata/auth_tls.tdir/example.com.zone | 4 + .../unbound/testdata/auth_tls.tdir/nsd_server.key | 39 + .../unbound/testdata/auth_tls.tdir/nsd_server.pem | 22 + .../testdata/auth_tls.tdir/unbound_server.key | 39 + .../testdata/auth_tls.tdir/unbound_server.pem | 22 + .../auth_tls_failcert.tdir/auth_tls_failcert.dsc | 16 + .../auth_tls_failcert.nsd.conf | 21 + .../auth_tls_failcert.tdir/auth_tls_failcert.post | 14 + .../auth_tls_failcert.tdir/auth_tls_failcert.pre | 47 + .../auth_tls_failcert.tdir/auth_tls_failcert.test | 56 + .../auth_tls_failcert.ub.conf | 23 + .../auth_tls_failcert.tdir/example.com.zone | 4 + .../testdata/auth_tls_failcert.tdir/nsd_server.key | 39 + .../testdata/auth_tls_failcert.tdir/nsd_server.pem | 22 + .../auth_tls_failcert.tdir/unbound_server.key | 39 + .../auth_tls_failcert.tdir/unbound_server.pem | 22 + .../testdata/cookie_file.tdir/cookie_file.test | 6 +- contrib/unbound/testdata/dns64_prefetch_cache.rpl | 195 + .../doq_downstream.tdir/doq_downstream.conf | 21 + .../doq_downstream.tdir/doq_downstream.dsc | 16 + .../doq_downstream.tdir/doq_downstream.post | 13 + .../doq_downstream.tdir/doq_downstream.pre | 44 + .../doq_downstream.tdir/doq_downstream.test | 109 + .../doq_downstream.tdir/doq_downstream.testns | 13 + .../doq_downstream.tdir/unbound_server.key | 15 + .../doq_downstream.tdir/unbound_server.pem | 11 + contrib/unbound/testdata/iter_max_global_quota.rpl | 2236 ++++++ contrib/unbound/testdata/iter_unverified_glue.rpl | 188 + .../testdata/iter_unverified_glue_fallback.rpl | 138 + contrib/unbound/testdata/rpz_val_block.rpl | 643 ++ .../testdata/serve_expired_cached_servfail.rpl | 2 +- .../serve_expired_cached_servfail_refresh.rpl | 2 +- .../serve_expired_client_timeout_val_bogus.rpl | 317 + ...ired_client_timeout_val_insecure_delegation.rpl | 247 + .../unbound/testdata/serve_expired_ttl_reset.rpl | 102 + .../unbound/testdata/serve_expired_val_bogus.rpl | 316 + contrib/unbound/testdata/val_negcache_ttl.rpl | 188 + .../unbound/testdata/val_negcache_ttl_prefetch.rpl | 316 + contrib/unbound/util/alloc.c | 9 + contrib/unbound/util/config_file.c | 55 +- contrib/unbound/util/config_file.h | 23 + contrib/unbound/util/configlexer.c | 8484 ++++++++++---------- contrib/unbound/util/configlexer.lex | 11 +- contrib/unbound/util/configparser.c | 4713 +++++------ contrib/unbound/util/configparser.h | 296 +- contrib/unbound/util/configparser.y | 165 +- contrib/unbound/util/data/msgparse.h | 2 + contrib/unbound/util/data/msgreply.c | 47 +- contrib/unbound/util/data/msgreply.h | 39 +- contrib/unbound/util/data/packed_rrset.h | 3 + contrib/unbound/util/fptr_wlist.c | 17 + contrib/unbound/util/locks.h | 1 + contrib/unbound/util/log.c | 36 + contrib/unbound/util/log.h | 6 + contrib/unbound/util/module.h | 8 +- contrib/unbound/util/netevent.c | 2067 ++++- contrib/unbound/util/netevent.h | 164 + contrib/unbound/validator/val_neg.c | 6 +- contrib/unbound/validator/val_nsec3.c | 6 +- contrib/unbound/validator/validator.c | 81 +- contrib/unbound/validator/validator.h | 2 +- lib/libunbound/config.h | 8 +- 120 files changed, 22786 insertions(+), 7989 deletions(-) diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index 672435e01e9f..c262250ca2c5 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -179,11 +179,11 @@ testcode/unitlruhash.c testcode/unitmain.c testcode/unitmsgparse.c \ testcode/unitneg.c testcode/unitregional.c testcode/unitslabhash.c \ testcode/unitverify.c testcode/readhex.c testcode/testpkts.c testcode/unitldns.c \ testcode/unitecs.c testcode/unitauth.c testcode/unitzonemd.c \ -testcode/unittcpreuse.c +testcode/unittcpreuse.c testcode/unitdoq.c UNITTEST_OBJ=unitanchor.lo unitdname.lo unitlruhash.lo unitmain.lo \ unitmsgparse.lo unitneg.lo unitregional.lo unitslabhash.lo unitverify.lo \ readhex.lo testpkts.lo unitldns.lo unitecs.lo unitauth.lo unitzonemd.lo \ -unittcpreuse.lo +unittcpreuse.lo unitdoq.lo UNITTEST_OBJ_LINK=$(UNITTEST_OBJ) worker_cb.lo $(COMMON_OBJ) $(SLDNS_OBJ) \ $(COMPAT_OBJ) DAEMON_SRC=daemon/acl_list.c daemon/cachedump.c daemon/daemon.c \ @@ -242,6 +242,10 @@ DOHCLIENT_SRC=testcode/dohclient.c DOHCLIENT_OBJ=dohclient.lo DOHCLIENT_OBJ_LINK=$(DOHCLIENT_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \ $(SLDNS_OBJ) +DOQCLIENT_SRC=testcode/doqclient.c +DOQCLIENT_OBJ=doqclient.lo +DOQCLIENT_OBJ_LINK=$(DOQCLIENT_OBJ) $(COMMON_OBJ) $(COMPAT_OBJ) \ +$(SLDNS_OBJ) PERF_SRC=testcode/perf.c PERF_OBJ=perf.lo PERF_OBJ_LINK=$(PERF_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) $(SLDNS_OBJ) @@ -288,7 +292,7 @@ ALL_SRC=$(COMMON_SRC) $(UNITTEST_SRC) $(DAEMON_SRC) \ $(CONTROL_SRC) $(UBANCHOR_SRC) $(PETAL_SRC) $(DNSTAP_SOCKET_SRC)\ $(PYTHONMOD_SRC) $(PYUNBOUND_SRC) $(WIN_DAEMON_THE_SRC) \ $(SVCINST_SRC) $(SVCUNINST_SRC) $(ANCHORUPD_SRC) $(SLDNS_SRC) \ - $(DOHCLIENT_SRC) $(READZONE_SRC) + $(DOHCLIENT_SRC) $(DOQCLIENT_SRC) $(READZONE_SRC) ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ $(TESTBOUND_OBJ) $(LOCKVERIFY_OBJ) $(PKTVIEW_OBJ) \ @@ -297,7 +301,7 @@ ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ $(CONTROL_OBJ) $(UBANCHOR_OBJ) $(PETAL_OBJ) $(DNSTAP_SOCKET_OBJ)\ $(COMPAT_OBJ) $(PYUNBOUND_OBJ) \ $(SVCINST_OBJ) $(SVCUNINST_OBJ) $(ANCHORUPD_OBJ) $(SLDNS_OBJ) \ - $(DOHCLIENT_OBJ) $(READZONE_OBJ) + $(DOHCLIENT_OBJ) $(DOQCLIENT_OBJ) $(READZONE_OBJ) COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) @PTHREAD_CFLAGS_ONLY@ LINK=$(LIBTOOL) --tag=CC --mode=link $(CC) $(staticexe) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) @@ -334,7 +338,7 @@ rsrc_unbound_checkconf.o: $(srcdir)/winrc/rsrc_unbound_checkconf.rc config.h TEST_BIN=asynclook$(EXEEXT) delayer$(EXEEXT) \ lock-verify$(EXEEXT) memstats$(EXEEXT) perf$(EXEEXT) \ petal$(EXEEXT) pktview$(EXEEXT) streamtcp$(EXEEXT) \ - $(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) \ + $(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) doqclient$(EXEEXT) \ testbound$(EXEEXT) unittest$(EXEEXT) readzone$(EXEEXT) tests: all $(TEST_BIN) @@ -416,6 +420,9 @@ streamtcp$(EXEEXT): $(STREAMTCP_OBJ_LINK) dohclient$(EXEEXT): $(DOHCLIENT_OBJ_LINK) $(LINK) -o $@ $(DOHCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS) +doqclient$(EXEEXT): $(DOQCLIENT_OBJ_LINK) + $(LINK) -o $@ $(DOQCLIENT_OBJ_LINK) $(SSLLIB) $(LIBS) + perf$(EXEEXT): $(PERF_OBJ_LINK) $(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS) @@ -703,6 +710,8 @@ depend: # build rules ipset.lo ipset.o: $(srcdir)/ipset/ipset.c +doqclient.lo doqclient.o: $(srcdir)/testcode/doqclient.c +unitdoq.lo unitdoq.o: $(srcdir)/testcode/unitdoq.c # Dependencies dns.lo dns.o: $(srcdir)/services/cache/dns.c config.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ diff --git a/contrib/unbound/aclocal.m4 b/contrib/unbound/aclocal.m4 index 364e37267d00..bf3c57e2fd9f 100644 --- a/contrib/unbound/aclocal.m4 +++ b/contrib/unbound/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,8 +14,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -46,7 +45,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see . ]) -# serial 59 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -196,7 +195,6 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -235,8 +233,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC and -# ICC, which need '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -788,7 +786,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - $SED '$q' "$ltmain" >> "$cfgfile" \ + sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1050,8 +1048,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1075,12 +1073,17 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) - case $MACOSX_DEPLOYMENT_TARGET,$host in - 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - *) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1129,12 +1132,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1248,8 +1251,7 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[m4_require([_LT_DECL_SED])dnl -AC_MSG_CHECKING([for sysroot]) +[AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1266,7 +1268,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1296,7 +1298,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1313,7 +1315,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1325,7 +1327,7 @@ ia64-*-hpux*) ;; esac else - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1347,7 +1349,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1355,7 +1357,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1363,7 +1365,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1383,14 +1385,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1458,7 +1460,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1497,22 +1499,9 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} +: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) - -# Use ARFLAGS variable as AR's operation code to sync the variable naming with -# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have -# higher priority because thats what people were doing historically (setting -# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS -# variable obsoleted/removed. - -test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} -lt_ar_flags=$AR_FLAGS -_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) - -# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override -# by AR_FLAGS because that was never working and AR_FLAGS is about to die. -_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], - [Flags to create an archive]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1731,7 +1720,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1774,7 +1763,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2224,35 +2213,26 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -z "$STRIP"; then - AC_MSG_RESULT([no]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) else - if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) - else - case $host_os in - darwin*) - # FIXME - insert some real tests, host_os isn't really good enough +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - ;; - freebsd*) - if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) + else AC_MSG_RESULT([no]) - ;; - esac - fi + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2575,7 +2555,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2585,14 +2565,14 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl*) + # Native MSVC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2611,7 +2591,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2648,7 +2628,7 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2681,7 +2661,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3483,7 +3463,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='$FILECMD -L' + lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3517,14 +3497,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3538,7 +3518,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3585,7 +3565,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3712,13 +3692,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3744,7 +3724,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3984,7 +3964,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -4002,20 +3982,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4039,7 +4019,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4057,9 +4037,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4346,7 +4326,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4429,7 +4409,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4765,7 +4745,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4948,7 +4928,7 @@ m4_if([$1], [CXX], [ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4956,7 +4936,7 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl* | icl*) + cl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5013,15 +4993,15 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5073,7 +5053,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5185,7 +5165,6 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5200,7 +5179,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5243,7 +5222,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5255,7 +5234,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5271,7 +5250,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5403,7 +5382,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5586,12 +5565,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl* | icl*) - # Native MSVC or ICC + cl*) + # Native MSVC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5632,7 +5611,7 @@ _LT_EOF fi' ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5680,7 +5659,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5891,7 +5870,6 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6658,8 +6636,8 @@ if test yes != "$_lt_caught_CXX_error"; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl* | ,icl* | no,icl*) - # Native MSVC or ICC + ,cl* | no,cl*) + # Native MSVC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6757,7 +6735,6 @@ if test yes != "$_lt_caught_CXX_error"; then emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6788,7 +6765,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6925,7 +6902,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7065,13 +7042,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8209,14 +8186,6 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) -# _LT_DECL_FILECMD -# ---------------- -# Check for a file(cmd) program that can be used to detect file type and magic -m4_defun([_LT_DECL_FILECMD], -[AC_CHECK_TOOL([FILECMD], [file], [:]) -_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) -])# _LD_DECL_FILECMD - # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -8396,8 +8365,8 @@ _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free -# Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -8828,7 +8797,7 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenience], # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -8953,8 +8922,7 @@ m4_define([lt_dict_filter], # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, -# Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -8963,23 +8931,23 @@ m4_define([lt_dict_filter], # @configure_input@ -# serial 4245 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.7]) -m4_define([LT_PACKAGE_REVISION], [2.4.7]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.7' -macro_revision='2.4.7' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) *** 39662 LINES SKIPPED *** From nobody Fri Oct 25 03:29: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 4XZSvj3Z55z5bCRc; Fri, 25 Oct 2024 03:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZSvj1yc4z4c4R; Fri, 25 Oct 2024 03:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQXd42Md7rBEhaZRYunBtnnS8T5UjoK85qXpiTGRnz4=; b=Kr2OAGVZ03gltvd1zjPw/RY3P5KbCyQlWeRrRpz9ofZ9Zd8xhPSYX6hEu1qjtf0JwGkZY3 65rz28b4HTyWmxunl8KHqPUvVkNCGucWqqOTyY4zlXBW4iIDpBzxXf47zIMo4yEWLg08du apGCQTN5ogF0ib3IhsqYXC0F/YPKiHDWuFRueoGocG3piFZksdh5Jqyisn1dQJIDNnfvRZ eijDiPrKDUGyYlve0I9fbDX48G4tY+GrI2Isa78YdavqKhD3CM3YB4ocNRqnFHFGkib9jX 3TL0NoR4h9Pq2if0sG2g0Oq9V6wA4ROr5IP7A2xjrBacfKhm0m7fHHCoaubZQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQXd42Md7rBEhaZRYunBtnnS8T5UjoK85qXpiTGRnz4=; b=DfXYkEQunAXXKxYHZdHdfECNZf7XkywpyMav0sx/OzodpPvsfGLm21wivt/F5LjZNq8QhY onKfooSmV5ODQoZxIPWy9q+zaN2EKZZ/sxgfu7wWkCFOp6FEXl5ewmawLEv7mouJ47WuYj PWOYnQumsOc0z1fZ7tE7D1ARLf/7M2Mo2VSoGxSo0i18zUx2bwaS0ABC0IUHdj5u58dsiD V9N+LQ4nnTqFk/6B2qXxNNS7qmQsfJ0phMdBY36fikrl5wcEJB926uik6mYf7ZrfPcb+EK y5SrgJTOA9TlktgY9NiejyvQddfNjCYOHsR9H0y4CIqPpIhnoLSDnNfX+yxgJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729826993; a=rsa-sha256; cv=none; b=VA4JAB+oIUd83/9T8vfofl2U1X8Dc/WN0M5FmmWzTom57ZLS/A7OplsuanytLIDjESxH23 Ekgwf3DCALewfSJceAsI09uIsj4owXR+7XAccFrhgMGutp10cyQum1zpBj47NKhMf3+EVs MVBAgm8PDPAfyiQYGkiyk1HiutXqLY+vzPWpuwAr5AzPYlLDqT7BfcWJgJLbhw3gU0dlr8 uonC54LvWJWhoP/T/Lqx1Cu9Weue1QPS72kJz2C9Mxw/Bgmdmkvg8u9O9P9FHiZLCGgPIN OU2QCM3s3l9GnVKwGR/V6RDaTCy8zqwOU2GuEuBU0j349et+ulbGaZU+8XVYvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZSvj1YsNz18h2; Fri, 25 Oct 2024 03:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3Trp1030705; Fri, 25 Oct 2024 03:29:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3TqZT030702; Fri, 25 Oct 2024 03:29:52 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:29:52 GMT Message-Id: <202410250329.49P3TqZT030702@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: 4a964120f57b - stable/13 - unbound: Remove testcode and testdata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: 4a964120f57b6f2f8b74dd572bfa2681b30b1f36 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4a964120f57b6f2f8b74dd572bfa2681b30b1f36 commit 4a964120f57b6f2f8b74dd572bfa2681b30b1f36 Author: Cy Schubert AuthorDate: 2024-10-18 14:14:41 +0000 Commit: Cy Schubert CommitDate: 2024-10-25 03:29:15 +0000 unbound: Remove testcode and testdata The testcode and testdata directories are not used by FreeBSD. Remove them. MFC after: 1 week (cherry picked from commit 0c2af19e78a0a8dbbf305b74c944b5758578ea30) --- contrib/unbound/testcode/doqclient.c | 2701 -------------------- contrib/unbound/testcode/unitdoq.c | 84 - contrib/unbound/testdata/00-lint.tdir/00-lint.pre | 14 - .../09-unbound-control.tdir/conf.bad_credentials | 5 - .../conf.spoofed_credentials | 5 - .../09-unbound-control.tdir/view_local_data | 4 - .../09-unbound-control.tdir/view_local_data_remove | 4 - .../testdata/acl_interface.tdir/rpz-nx.zone | 3 - .../testdata/acl_interface.tdir/rpz-one.zone | 3 - .../testdata/acl_interface.tdir/rpz-two.zone | 3 - .../unbound/testdata/auth_tls.tdir/auth_tls.dsc | 16 - .../testdata/auth_tls.tdir/auth_tls.nsd.conf | 21 - .../unbound/testdata/auth_tls.tdir/auth_tls.post | 14 - .../unbound/testdata/auth_tls.tdir/auth_tls.pre | 47 - .../unbound/testdata/auth_tls.tdir/auth_tls.test | 48 - .../testdata/auth_tls.tdir/auth_tls.ub.conf | 22 - .../testdata/auth_tls.tdir/example.com.zone | 4 - .../unbound/testdata/auth_tls.tdir/nsd_server.key | 39 - .../unbound/testdata/auth_tls.tdir/nsd_server.pem | 22 - .../testdata/auth_tls.tdir/unbound_server.key | 39 - .../testdata/auth_tls.tdir/unbound_server.pem | 22 - .../auth_tls_failcert.tdir/auth_tls_failcert.dsc | 16 - .../auth_tls_failcert.nsd.conf | 21 - .../auth_tls_failcert.tdir/auth_tls_failcert.post | 14 - .../auth_tls_failcert.tdir/auth_tls_failcert.pre | 47 - .../auth_tls_failcert.tdir/auth_tls_failcert.test | 56 - .../auth_tls_failcert.ub.conf | 23 - .../auth_tls_failcert.tdir/example.com.zone | 4 - .../testdata/auth_tls_failcert.tdir/nsd_server.key | 39 - .../testdata/auth_tls_failcert.tdir/nsd_server.pem | 22 - .../auth_tls_failcert.tdir/unbound_server.key | 39 - .../auth_tls_failcert.tdir/unbound_server.pem | 22 - contrib/unbound/testdata/cachedb_cached_ede.crpl | 91 - contrib/unbound/testdata/cachedb_expired.crpl | 324 --- .../testdata/cachedb_expired_client_timeout.crpl | 343 --- .../testdata/cachedb_expired_reply_ttl.crpl | 259 -- .../cachedb_no_store.tdir/cachedb_no_store.conf | 29 - .../cachedb_no_store.tdir/cachedb_no_store.dsc | 16 - .../cachedb_no_store.tdir/cachedb_no_store.post | 20 - .../cachedb_no_store.tdir/cachedb_no_store.pre | 36 - .../cachedb_no_store.servfail.testns | 8 - .../cachedb_no_store.tdir/cachedb_no_store.test | 132 - .../cachedb_no_store.tdir/cachedb_no_store.testns | 9 - .../unbound/testdata/cachedb_servfail_cname.crpl | 181 -- .../unbound/testdata/cachedb_subnet_change.crpl | 304 --- .../unbound/testdata/cachedb_subnet_expired.crpl | 322 --- .../testdata/cachedb_subnet_toecs_timeout.crpl | 229 -- contrib/unbound/testdata/cachedb_val_expired.crpl | 327 --- .../testdata/cookie_file.tdir/cookie_file.conf | 19 - .../testdata/cookie_file.tdir/cookie_file.dsc | 16 - .../testdata/cookie_file.tdir/cookie_file.pre | 24 - .../testdata/cookie_file.tdir/cookie_file.test | 250 -- contrib/unbound/testdata/disable_edns_do.rpl | 164 -- contrib/unbound/testdata/dns64_prefetch_cache.rpl | 195 -- .../doq_downstream.tdir/doq_downstream.conf | 21 - .../doq_downstream.tdir/doq_downstream.dsc | 16 - .../doq_downstream.tdir/doq_downstream.post | 13 - .../doq_downstream.tdir/doq_downstream.pre | 44 - .../doq_downstream.tdir/doq_downstream.test | 109 - .../doq_downstream.tdir/doq_downstream.testns | 13 - .../doq_downstream.tdir/unbound_server.key | 15 - .../doq_downstream.tdir/unbound_server.pem | 11 - .../unbound/testdata/edns_downstream_cookies.rpl | 235 -- contrib/unbound/testdata/fwd_name_lookup.rpl | 152 -- .../testdata/ip_ratelimit.tdir/ip_ratelimit.conf | 28 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.dsc | 16 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.post | 13 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.pre | 24 - .../testdata/ip_ratelimit.tdir/ip_ratelimit.test | 165 -- .../testdata/ip_ratelimit.tdir/unbound_control.key | 39 - .../testdata/ip_ratelimit.tdir/unbound_control.pem | 22 - .../testdata/ip_ratelimit.tdir/unbound_server.key | 39 - .../testdata/ip_ratelimit.tdir/unbound_server.pem | 22 - .../unbound/testdata/iter_cname_minimise_nx.rpl | 245 -- contrib/unbound/testdata/iter_dname_ttl.rpl | 271 -- contrib/unbound/testdata/iter_failreply.rpl | 132 - .../testdata/iter_ghost_grandchild_delegation.rpl | 256 -- contrib/unbound/testdata/iter_ignore_empty.rpl | 248 -- contrib/unbound/testdata/iter_max_global_quota.rpl | 2236 ---------------- contrib/unbound/testdata/iter_nat64.rpl | 117 - contrib/unbound/testdata/iter_nat64_prefix.rpl | 119 - contrib/unbound/testdata/iter_nat64_prefix48.rpl | 118 - contrib/unbound/testdata/iter_scrub_rr_length.rpl | 298 --- contrib/unbound/testdata/iter_unverified_glue.rpl | 188 -- .../testdata/iter_unverified_glue_fallback.rpl | 138 - contrib/unbound/testdata/local_cnameother.rpl | 67 - .../testdata/root_zonemd.tdir/root_zonemd.conf | 34 - .../testdata/root_zonemd.tdir/root_zonemd.dsc | 16 - .../testdata/root_zonemd.tdir/root_zonemd.post | 14 - .../testdata/root_zonemd.tdir/root_zonemd.pre | 50 - .../testdata/root_zonemd.tdir/root_zonemd.test | 63 - .../testdata/root_zonemd.tdir/root_zonemd.testns | 9 - contrib/unbound/testdata/rpz_cached_cname.rpl | 122 - contrib/unbound/testdata/rpz_clientip_override.rpl | 269 -- contrib/unbound/testdata/rpz_cname_handle.rpl | 779 ------ contrib/unbound/testdata/rpz_cname_tag.rpl | 281 -- contrib/unbound/testdata/rpz_nsdname_override.rpl | 325 --- contrib/unbound/testdata/rpz_nsip_override.rpl | 332 --- contrib/unbound/testdata/rpz_passthru_clientip.rpl | 90 - contrib/unbound/testdata/rpz_qtype_cname.rpl | 120 - .../testdata/rpz_reload.tdir/example.org.zone | 2 - .../testdata/rpz_reload.tdir/rpz.example.com.zone | 6 - .../testdata/rpz_reload.tdir/rpz_reload.conf | 30 - .../testdata/rpz_reload.tdir/rpz_reload.dsc | 16 - .../testdata/rpz_reload.tdir/rpz_reload.post | 12 - .../testdata/rpz_reload.tdir/rpz_reload.pre | 26 - .../testdata/rpz_reload.tdir/rpz_reload.test | 109 - contrib/unbound/testdata/rpz_val_block.rpl | 643 ----- contrib/unbound/testdata/rrset_use_cached.rpl | 151 -- .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 154 -- .../testdata/serve_expired_0ttl_nxdomain.rpl | 154 -- .../testdata/serve_expired_0ttl_servfail.rpl | 129 - .../testdata/serve_expired_cached_servfail.rpl | 130 - .../serve_expired_cached_servfail_refresh.rpl | 145 -- .../serve_expired_client_timeout_val_bogus.rpl | 317 --- ...ired_client_timeout_val_insecure_delegation.rpl | 247 -- .../unbound/testdata/serve_expired_ttl_reset.rpl | 102 - .../unbound/testdata/serve_expired_val_bogus.rpl | 316 --- .../stat_values.tdir/stat_values_cachedb.conf | 36 - .../stat_values_downstream_cookies.conf | 32 - contrib/unbound/testdata/subnet_cached_ede.crpl | 114 - .../unbound/testdata/subnet_cached_servfail.crpl | 167 -- contrib/unbound/testdata/subnet_cached_size.crpl | 308 --- .../unbound/testdata/subnet_global_prefetch.crpl | 236 -- .../subnet_global_prefetch_always_forward.crpl | 167 -- .../testdata/subnet_global_prefetch_expired.crpl | 241 -- contrib/unbound/testdata/subnet_prezero.crpl | 155 -- .../unbound/testdata/subnet_scopezero_noedns.crpl | 441 ---- contrib/unbound/testdata/ttl_max_negative.rpl | 206 -- contrib/unbound/testdata/ttl_min_negative.rpl | 204 -- contrib/unbound/testdata/val_any_negcache.rpl | 243 -- contrib/unbound/testdata/val_cnameqtype_qmin.rpl | 784 ------ contrib/unbound/testdata/val_dname_twice.rpl | 226 -- contrib/unbound/testdata/val_dnameqtype.rpl | 689 ----- contrib/unbound/testdata/val_dnameqtype_qmin.rpl | 859 ------- contrib/unbound/testdata/val_failure_dnskey.rpl | 348 --- contrib/unbound/testdata/val_negcache_ttl.rpl | 188 -- .../unbound/testdata/val_negcache_ttl_prefetch.rpl | 316 --- contrib/unbound/testdata/val_scrub_rr_length.rpl | 164 -- 139 files changed, 23468 deletions(-) diff --git a/contrib/unbound/testcode/doqclient.c b/contrib/unbound/testcode/doqclient.c deleted file mode 100644 index 1a2fd418359b..000000000000 --- a/contrib/unbound/testcode/doqclient.c +++ /dev/null @@ -1,2701 +0,0 @@ -/* - * testcode/doqclient.c - debug program. Perform multiple DNS queries using DoQ. - * - * Copyright (c) 2022, NLnet Labs. All rights reserved. - * - * This software is open source. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 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. - * - * Neither the name of the NLNET LABS nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT - * HOLDER 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. - */ - -/** - * \file - * - * Simple DNS-over-QUIC client. For testing and debugging purposes. - * No authentication of TLS cert. - */ - -#include "config.h" -#ifdef HAVE_GETOPT_H -#include -#endif - -#ifdef HAVE_NGTCP2 -#include -#include -#ifdef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H -#include -#else -#include -#endif -#include -#include -#ifdef HAVE_TIME_H -#include -#endif -#include -#include "util/locks.h" -#include "util/net_help.h" -#include "sldns/sbuffer.h" -#include "sldns/str2wire.h" -#include "sldns/wire2str.h" -#include "util/data/msgreply.h" -#include "util/data/msgencode.h" -#include "util/data/msgparse.h" -#include "util/data/dname.h" -#include "util/random.h" -#include "util/ub_event.h" -struct doq_client_stream_list; -struct doq_client_stream; - -/** the local client data for the DoQ connection */ -struct doq_client_data { - /** file descriptor */ - int fd; - /** the event base for the events */ - struct ub_event_base* base; - /** the ub event */ - struct ub_event* ev; - /** the expiry timer */ - struct ub_event* expire_timer; - /** is the expire_timer added */ - int expire_timer_added; - /** the ngtcp2 connection information */ - struct ngtcp2_conn* conn; - /** random state */ - struct ub_randstate* rnd; - /** server connected to as a string */ - const char* svr; - /** the static secret */ - uint8_t* static_secret_data; - /** the static secret size */ - size_t static_secret_size; - /** destination address sockaddr */ - struct sockaddr_storage dest_addr; - /** length of dest addr */ - socklen_t dest_addr_len; - /** local address sockaddr */ - struct sockaddr_storage local_addr; - /** length of local addr */ - socklen_t local_addr_len; - /** SSL context */ - SSL_CTX* ctx; - /** SSL object */ - SSL* ssl; -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT - /** the connection reference for ngtcp2_conn and userdata in ssl */ - struct ngtcp2_crypto_conn_ref conn_ref; -#endif - /** the quic version to use */ - uint32_t quic_version; - /** the last error */ -#ifdef HAVE_NGTCP2_CCERR_DEFAULT - struct ngtcp2_ccerr ccerr; -#else - struct ngtcp2_connection_close_error last_error; -#endif - /** the recent tls alert error code */ - uint8_t tls_alert; - /** the buffer for packet operations */ - struct sldns_buffer* pkt_buf; - /** The list of queries to start. They have no stream associated. - * Once they do, they move to the send list. */ - struct doq_client_stream_list* query_list_start; - /** The list of queries to send. They have a stream, and they are - * sending data. Data could also be received, like errors. */ - struct doq_client_stream_list* query_list_send; - /** The list of queries to receive. They have a stream, and the - * send is done, it is possible to read data. */ - struct doq_client_stream_list* query_list_receive; - /** The list of queries that are stopped. They have no stream - * active any more. Write and read are done. The query is done, - * and it may be in error and then have no answer or partial answer. */ - struct doq_client_stream_list* query_list_stop; - /** is there a blocked packet in the blocked_pkt buffer */ - int have_blocked_pkt; - /** store blocked packet, a packet that could not be sent on the - * nonblocking socket. */ - struct sldns_buffer* blocked_pkt; - /** ecn info for the blocked packet */ - struct ngtcp2_pkt_info blocked_pkt_pi; - /** the congestion control algorithm */ - ngtcp2_cc_algo cc_algo; - /** the transport parameters file, for early data transmission */ - const char* transport_file; - /** the tls session file, for session resumption */ - const char* session_file; - /** if early data is enabled for the connection */ - int early_data_enabled; - /** how quiet is the output */ - int quiet; - /** the configured port for the destination */ - int port; -}; - -/** the local client stream list, for appending streams to */ -struct doq_client_stream_list { - /** first and last members of the list */ - struct doq_client_stream* first, *last; -}; - -/** the local client data for a DoQ stream */ -struct doq_client_stream { - /** next stream in list, and prev in list */ - struct doq_client_stream* next, *prev; - /** the data buffer */ - uint8_t* data; - /** length of the data buffer */ - size_t data_len; - /** if the client query has a stream, that is active, associated with - * it. The stream_id is in stream_id. */ - int has_stream; - /** the stream id */ - int64_t stream_id; - /** data written position */ - size_t nwrite; - /** the data length for write, in network format */ - uint16_t data_tcplen; - /** if the write of the query data is done. That means the - * write channel has FIN, is closed for writing. */ - int write_is_done; - /** data read position */ - size_t nread; - /** the answer length, in network byte order */ - uint16_t answer_len; - /** the answer buffer */ - struct sldns_buffer* answer; - /** the answer is complete */ - int answer_is_complete; - /** the query has an error, it has no answer, or no complete answer */ - int query_has_error; - /** if the query is done */ - int query_is_done; -}; - -#ifndef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT -/** the quic method struct, must remain valid during the QUIC connection. */ -static SSL_QUIC_METHOD quic_method; -#endif - -/** Get the connection ngtcp2_conn from the ssl app data - * ngtcp2_crypto_conn_ref */ -static ngtcp2_conn* conn_ref_get_conn(ngtcp2_crypto_conn_ref* conn_ref) -{ - struct doq_client_data* data = (struct doq_client_data*) - conn_ref->user_data; - return data->conn; -} - -static void -set_app_data(SSL* ssl, struct doq_client_data* data) -{ -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT - data->conn_ref.get_conn = &conn_ref_get_conn; - data->conn_ref.user_data = data; - SSL_set_app_data(ssl, &data->conn_ref); -#else - SSL_set_app_data(ssl, data); -#endif -} - -static struct doq_client_data* -get_app_data(SSL* ssl) -{ - struct doq_client_data* data; -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT - data = (struct doq_client_data*)((struct ngtcp2_crypto_conn_ref*) - SSL_get_app_data(ssl))->user_data; -#else - data = (struct doq_client_data*) SSL_get_app_data(ssl); -#endif - return data; -} - - - -/** write handle routine */ -static void on_write(struct doq_client_data* data); -/** update the timer */ -static void update_timer(struct doq_client_data* data); -/** disconnect we are done */ -static void disconnect(struct doq_client_data* data); -/** fetch and write the transport file */ -static void early_data_write_transport(struct doq_client_data* data); - -/** usage of doqclient */ -static void usage(char* argv[]) -{ - printf("usage: %s [options] name type class ...\n", argv[0]); - printf(" sends the name-type-class queries over " - "DNS-over-QUIC.\n"); - printf("-s server IP address to send the queries to, " - "default: 127.0.0.1\n"); - printf("-p Port to connect to, default: %d\n", - UNBOUND_DNS_OVER_QUIC_PORT); - printf("-v verbose output\n"); - printf("-q quiet, short output of answer\n"); - printf("-x file transport file, for read/write of transport parameters.\n\t\tIf it exists, it is used to send early data. It is then\n\t\twritten to contain the last used transport parameters.\n\t\tAlso -y must be enabled for early data to succeed.\n"); - printf("-y file session file, for read/write of TLS session. If it exists,\n\t\tit is used for TLS session resumption. It is then written\n\t\tto contain the last session used.\n\t\tOn its own, without also -x, resumes TLS session.\n"); - printf("-h This help text\n"); - exit(1); -} - -/** get the dest address */ -static void -get_dest_addr(struct doq_client_data* data, const char* svr, int port) -{ - if(!ipstrtoaddr(svr, port, &data->dest_addr, &data->dest_addr_len)) { - printf("fatal: bad server specs '%s'\n", svr); - exit(1); - } -} - -/** open UDP socket to svr */ -static int -open_svr_udp(struct doq_client_data* data) -{ - int fd = -1; - int r; - fd = socket(addr_is_ip6(&data->dest_addr, data->dest_addr_len)? - PF_INET6:PF_INET, SOCK_DGRAM, 0); - if(fd == -1) { - perror("socket() error"); - exit(1); - } - r = connect(fd, (struct sockaddr*)&data->dest_addr, - data->dest_addr_len); - if(r < 0 && r != EINPROGRESS) { - perror("connect() error"); - exit(1); - } - fd_set_nonblock(fd); - return fd; -} - -/** get the local address of the connection */ -static void -get_local_addr(struct doq_client_data* data) -{ - memset(&data->local_addr, 0, sizeof(data->local_addr)); - data->local_addr_len = (socklen_t)sizeof(data->local_addr); - if(getsockname(data->fd, (struct sockaddr*)&data->local_addr, - &data->local_addr_len) == -1) { - perror("getsockname() error"); - exit(1); - } - log_addr(1, "local_addr", &data->local_addr, data->local_addr_len); - log_addr(1, "dest_addr", &data->dest_addr, data->dest_addr_len); -} - -static sldns_buffer* -make_query(char* qname, char* qtype, char* qclass) -{ - struct query_info qinfo; - struct edns_data edns; - sldns_buffer* buf = sldns_buffer_new(65553); - if(!buf) fatal_exit("out of memory"); - qinfo.qname = sldns_str2wire_dname(qname, &qinfo.qname_len); - if(!qinfo.qname) { - printf("cannot parse query name: '%s'\n", qname); - exit(1); - } - - qinfo.qtype = sldns_get_rr_type_by_name(qtype); - qinfo.qclass = sldns_get_rr_class_by_name(qclass); - qinfo.local_alias = NULL; - - qinfo_query_encode(buf, &qinfo); /* flips buffer */ - free(qinfo.qname); - sldns_buffer_write_u16_at(buf, 0, 0x0000); - sldns_buffer_write_u16_at(buf, 2, BIT_RD); - memset(&edns, 0, sizeof(edns)); - edns.edns_present = 1; - edns.bits = EDNS_DO; - edns.udp_size = 4096; - if(sldns_buffer_capacity(buf) >= - sldns_buffer_limit(buf)+calc_edns_field_size(&edns)) - attach_edns_record(buf, &edns); - return buf; -} - -/** create client stream structure */ -static struct doq_client_stream* -client_stream_create(struct sldns_buffer* query_data) -{ - struct doq_client_stream* str = calloc(1, sizeof(*str)); - if(!str) - fatal_exit("calloc failed: out of memory"); - str->data = memdup(sldns_buffer_begin(query_data), - sldns_buffer_limit(query_data)); - if(!str->data) - fatal_exit("alloc data failed: out of memory"); - str->data_len = sldns_buffer_limit(query_data); - str->stream_id = -1; - return str; -} - -/** free client stream structure */ -static void -client_stream_free(struct doq_client_stream* str) -{ - if(!str) - return; - free(str->data); - sldns_buffer_free(str->answer); - free(str); -} - -/** setup the stream to start the write process */ -static void -client_stream_start_setup(struct doq_client_stream* str, int64_t stream_id) -{ - str->has_stream = 1; - str->stream_id = stream_id; - str->nwrite = 0; - str->nread = 0; - str->answer_len = 0; - str->query_is_done = 0; - str->answer_is_complete = 0; - str->query_has_error = 0; - if(str->answer) { - sldns_buffer_free(str->answer); - str->answer = NULL; - } -} - -/** Return string for log purposes with query name. */ -static char* -client_stream_string(struct doq_client_stream* str) -{ - char* s; - size_t dname_len; - char dname[256], tpstr[32], result[256+32+16]; - uint16_t tp; - if(str->data_len <= LDNS_HEADER_SIZE) { - s = strdup("query_with_no_question"); - if(!s) - fatal_exit("strdup failed: out of memory"); - return s; - } - dname_len = dname_valid(str->data+LDNS_HEADER_SIZE, - str->data_len-LDNS_HEADER_SIZE); - if(!dname_len) { - s = strdup("query_dname_not_valid"); - if(!s) - fatal_exit("strdup failed: out of memory"); - return s; - } - (void)sldns_wire2str_dname_buf(str->data+LDNS_HEADER_SIZE, dname_len, - dname, sizeof(dname)); - tp = sldns_wirerr_get_type(str->data+LDNS_HEADER_SIZE, - str->data_len-LDNS_HEADER_SIZE, dname_len); - (void)sldns_wire2str_type_buf(tp, tpstr, sizeof(tpstr)); - snprintf(result, sizeof(result), "%s %s", dname, tpstr); - s = strdup(result); - if(!s) - fatal_exit("strdup failed: out of memory"); - return s; -} - -/** create query stream list */ -static struct doq_client_stream_list* -stream_list_create(void) -{ - struct doq_client_stream_list* list = calloc(1, sizeof(*list)); - if(!list) - fatal_exit("calloc failed: out of memory"); - return list; -} - -/** free the query stream list */ -static void -stream_list_free(struct doq_client_stream_list* list) -{ - struct doq_client_stream* str; - if(!list) - return; - str = list->first; - while(str) { - struct doq_client_stream* next = str->next; - client_stream_free(str); - str = next; - } - free(list); -} - -/** append item to list */ -static void -stream_list_append(struct doq_client_stream_list* list, - struct doq_client_stream* str) -{ - if(list->last) { - str->prev = list->last; - list->last->next = str; - } else { - str->prev = NULL; - list->first = str; - } - str->next = NULL; - list->last = str; -} - -/** delete the item from the list */ -static void -stream_list_delete(struct doq_client_stream_list* list, - struct doq_client_stream* str) -{ - if(str->next) { - str->next->prev = str->prev; - } else { - list->last = str->prev; - } - if(str->prev) { - str->prev->next = str->next; - } else { - list->first = str->next; - } - str->prev = NULL; - str->next = NULL; -} - -/** move the item from list1 to list2 */ -static void -stream_list_move(struct doq_client_stream* str, - struct doq_client_stream_list* list1, - struct doq_client_stream_list* list2) -{ - stream_list_delete(list1, str); - stream_list_append(list2, str); -} - -/** allocate stream data buffer, then answer length is complete */ -static void -client_stream_datalen_complete(struct doq_client_stream* str) -{ - verbose(1, "answer length %d", (int)ntohs(str->answer_len)); - str->answer = sldns_buffer_new(ntohs(str->answer_len)); - if(!str->answer) - fatal_exit("sldns_buffer_new failed: out of memory"); - sldns_buffer_set_limit(str->answer, ntohs(str->answer_len)); -} - -/** print the answer rrs */ -static void -print_answer_rrs(uint8_t* pkt, size_t pktlen) -{ - char buf[65535]; - char* str; - size_t str_len; - int i, qdcount, ancount; - uint8_t* data = pkt; - size_t data_len = pktlen; - int comprloop = 0; - if(data_len < LDNS_HEADER_SIZE) - return; - qdcount = LDNS_QDCOUNT(data); - ancount = LDNS_ANCOUNT(data); - data += LDNS_HEADER_SIZE; - data_len -= LDNS_HEADER_SIZE; - - for(i=0; iquery_has_error) { - char* logs = client_stream_string(str); - printf("%s has error, there is no answer\n", logs); - free(logs); - return; - } - if(sldns_buffer_limit(str->answer) < LDNS_HEADER_SIZE) { - char* logs = client_stream_string(str); - printf("%s received short packet, smaller than header\n", - logs); - free(logs); - return; - } - rcode = LDNS_RCODE_WIRE(sldns_buffer_begin(str->answer)); - if(rcode != 0) { - char* logs = client_stream_string(str); - char rc[16]; - (void)sldns_wire2str_rcode_buf(rcode, rc, sizeof(rc)); - printf("%s rcode %s\n", logs, rc); - free(logs); - return; - } - ancount = LDNS_ANCOUNT(sldns_buffer_begin(str->answer)); - if(ancount == 0) { - char* logs = client_stream_string(str); - printf("%s nodata answer\n", logs); - free(logs); - return; - } - print_answer_rrs(sldns_buffer_begin(str->answer), - sldns_buffer_limit(str->answer)); -} - -/** print the stream output answer */ -static void -client_stream_print_long(struct doq_client_data* data, - struct doq_client_stream* str) -{ - char* s; - if(str->query_has_error) { - char* logs = client_stream_string(str); - printf("%s has error, there is no answer\n", logs); - free(logs); - return; - } - s = sldns_wire2str_pkt(sldns_buffer_begin(str->answer), - sldns_buffer_limit(str->answer)); - printf("%s", (s?s:";sldns_wire2str_pkt failed\n")); - printf(";; SERVER: %s %d\n", data->svr, data->port); - free(s); -} - -/** the stream has completed the data */ -static void -client_stream_data_complete(struct doq_client_stream* str) -{ - verbose(1, "received all answer content"); - if(verbosity > 0) { - char* logs = client_stream_string(str); - char* s; - log_buf(1, "received answer", str->answer); - s = sldns_wire2str_pkt(sldns_buffer_begin(str->answer), - sldns_buffer_limit(str->answer)); - if(!s) verbose(1, "could not sldns_wire2str_pkt"); - else verbose(1, "query %s received:\n%s", logs, s); - free(s); - free(logs); - } - str->answer_is_complete = 1; -} - -/** the stream has completed but with an error */ -static void -client_stream_answer_error(struct doq_client_stream* str) -{ - if(verbosity > 0) { - char* logs = client_stream_string(str); - if(str->answer) - verbose(1, "query %s has an error. received %d/%d bytes.", - logs, (int)sldns_buffer_position(str->answer), - (int)sldns_buffer_limit(str->answer)); - else - verbose(1, "query %s has an error. received no data.", - logs); - free(logs); - } - str->query_has_error = 1; -} - -/** receive data for a stream */ -static void -client_stream_recv_data(struct doq_client_stream* str, const uint8_t* data, - size_t datalen) -{ - int got_data = 0; - /* read the tcplength uint16_t at the start of the DNS message */ - if(str->nread < 2) { - size_t to_move = datalen; - if(datalen > 2-str->nread) - to_move = 2-str->nread; - memmove(((uint8_t*)&str->answer_len)+str->nread, data, - to_move); - str->nread += to_move; - data += to_move; - datalen -= to_move; - if(str->nread == 2) { - /* we can allocate the data buffer */ - client_stream_datalen_complete(str); - } - } - /* if we have data bytes */ - if(datalen > 0) { - size_t to_write = datalen; - if(datalen > sldns_buffer_remaining(str->answer)) - to_write = sldns_buffer_remaining(str->answer); - if(to_write > 0) { - sldns_buffer_write(str->answer, data, to_write); - str->nread += to_write; - data += to_write; - datalen -= to_write; - got_data = 1; - } - } - /* extra received bytes after end? */ - if(datalen > 0) { - verbose(1, "extra bytes after end of DNS length"); - if(verbosity > 0) - log_hex("extradata", (void*)data, datalen); - } - /* are we done with it? */ - if(got_data && str->nread >= (size_t)(ntohs(str->answer_len))+2) { - client_stream_data_complete(str); - } -} - -/** receive FIN from remote end on client stream, no more data to be - * received on the stream. */ -static void -client_stream_recv_fin(struct doq_client_data* data, - struct doq_client_stream* str, int is_fin) -{ - if(verbosity > 0) { - char* logs = client_stream_string(str); - if(is_fin) - verbose(1, "query %s: received FIN from remote", logs); - else - verbose(1, "query %s: stream reset from remote", logs); - free(logs); - } - if(str->write_is_done) - stream_list_move(str, data->query_list_receive, - data->query_list_stop); - else - stream_list_move(str, data->query_list_send, - data->query_list_stop); - if(!str->answer_is_complete) { - client_stream_answer_error(str); - } - str->query_is_done = 1; - if(data->quiet) - client_stream_print_short(str); - else client_stream_print_long(data, str); - if(data->query_list_send->first==NULL && - data->query_list_receive->first==NULL) - disconnect(data); -} - -/** fill a buffer with random data */ -static void fill_rand(struct ub_randstate* rnd, uint8_t* buf, size_t len) -{ - if(RAND_bytes(buf, len) != 1) { - size_t i; - for(i=0; istatic_secret_data = malloc(len); - if(!data->static_secret_data) - fatal_exit("malloc failed: out of memory"); - data->static_secret_size = len; - fill_rand(data->rnd, data->static_secret_data, len); -} - -/** fill cid structure with random data */ -static void cid_randfill(struct ngtcp2_cid* cid, size_t datalen, - struct ub_randstate* rnd) -{ - uint8_t buf[32]; - if(datalen > sizeof(buf)) - datalen = sizeof(buf); - fill_rand(rnd, buf, datalen); - ngtcp2_cid_init(cid, buf, datalen); -} - -/** send buf on the client stream */ -static int -client_bidi_stream(struct doq_client_data* data, int64_t* ret_stream_id, - void* stream_user_data) -{ - int64_t stream_id; - int rv; - - /* open new bidirectional stream */ - rv = ngtcp2_conn_open_bidi_stream(data->conn, &stream_id, - stream_user_data); - if(rv != 0) { - if(rv == NGTCP2_ERR_STREAM_ID_BLOCKED) { - /* no bidi stream count for this new stream */ - return 0; - } - fatal_exit("could not ngtcp2_conn_open_bidi_stream: %s", - ngtcp2_strerror(rv)); - } - *ret_stream_id = stream_id; - return 1; -} - -/** See if we can start query streams, by creating bidirectional streams - * on the QUIC transport for them. */ -static void -query_streams_start(struct doq_client_data* data) -{ - while(data->query_list_start->first) { - struct doq_client_stream* str = data->query_list_start->first; - int64_t stream_id = 0; - if(!client_bidi_stream(data, &stream_id, str)) { - /* no more bidi streams allowed */ - break; - } - if(verbosity > 0) { - char* logs = client_stream_string(str); - verbose(1, "query %s start on bidi stream id %lld", - logs, (long long int)stream_id); - free(logs); - } - /* setup the stream to start */ - client_stream_start_setup(str, stream_id); - /* move the query entry to the send list to write it */ - stream_list_move(str, data->query_list_start, - data->query_list_send); - } -} - -/** the rand callback routine from ngtcp2 */ -static void rand_cb(uint8_t* dest, size_t destlen, - const ngtcp2_rand_ctx* rand_ctx) -{ - struct ub_randstate* rnd = (struct ub_randstate*) - rand_ctx->native_handle; - fill_rand(rnd, dest, destlen); -} - -/** the get_new_connection_id callback routine from ngtcp2 */ -static int get_new_connection_id_cb(struct ngtcp2_conn* ATTR_UNUSED(conn), - struct ngtcp2_cid* cid, uint8_t* token, size_t cidlen, void* user_data) -{ - struct doq_client_data* data = (struct doq_client_data*)user_data; - cid_randfill(cid, cidlen, data->rnd); - if(ngtcp2_crypto_generate_stateless_reset_token(token, - data->static_secret_data, data->static_secret_size, cid) != 0) - return NGTCP2_ERR_CALLBACK_FAILURE; - return 0; -} - -/** handle that early data is rejected */ -static void -early_data_is_rejected(struct doq_client_data* data) -{ *** 23476 LINES SKIPPED *** From nobody Fri Oct 25 07:32: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 4XZZHz51Fpz5bNgq; Fri, 25 Oct 2024 07:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZZHz4bSqz4xnq; Fri, 25 Oct 2024 07:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729841567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZcQ/+hNEbDtSIsbOkjOYNrWGR5WbSItId+RkW4eGiY=; b=SsCmncfqUsJ5vWaaFbuIB/BEZ44CG7DVCG54DVlc3DvFn7AvFVUm2ZY1ppH0PlVxGZtmaS 3WqfiqJciZC19n6/aAGj6UhX99rHVMWptAos/rv/l9rRqylKsviSxrUfieHgcmw+Lzk7Xj ppG8d2QpIrN6LWblMJYhqlaQx2JkLqe64OZqnTc68GhKBy1cZvv6IxLPQ13B+RMhTxfjIv xNK937ClmR3n4V0EgWRD48UhWwIlNOvUe9+F9hh+rgv5+Jo+DLMK3poRM1rbLU10IXkgcz UTOF7SzlcvqtoPUt31+xLcV5v2f0A5qaVD6/wdSjssmEY9rl1jHgLAqK0gAUZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729841567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZcQ/+hNEbDtSIsbOkjOYNrWGR5WbSItId+RkW4eGiY=; b=EDH25SKV4hlklldZUTbLMFQHZ7As3e1mbJoRgGoVOOaP8PXpK+XMzEK1wSi/QM8dwXNhZV UWLANZDnV/aaQZxXqVAenlmi/q+f3/TR1LehfOmjmG0pyX4GeUItSA4tIUrVqPxkuvgE5m LbzzqH9H19iV7L7mc+TTRKN42UF+tFFCSRVaafSherQQwTwZI2hqnTdJ89vPFQ6JYVGu/Z lRCmJDD2Y38XEUU/hnQedjnMjvRb54wZN8o0BiapImC9wVVDjjUCNjCps5FLzLwmjZ9doF 6uxCBxNfM/dXqTUfpsbmNsa8E+l+bhIedXjyWsX15FFkwMNnOlGtWOYKT3X0eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729841567; a=rsa-sha256; cv=none; b=XRWDpdP+dqra4JtGOyIaJo2t/nX+oSlXx7tETrnFXIDYRH8jIVhxlpKs0rLReN43y85qOr t0840JjRkzzFiYHGgglp5fEvgbSnlwwQDb9h3eaw5x0B6fNd5VTQENc2OIhpL21/cfgpVu bBWF6fab7HrTCW01XrOlkdMynYkNzABja5e5pwQeTC8eahXo+jTqbv2Nq5FhC9n/tLppOt PJpvCo8zSzXwiyi5T8TpUMwoVkGF3faUiPWb+Og5RHsSG087duxPqQxmWWH0lY2EO318z3 2FxlkxfUuETAAdDYwTMslxYBf/I15rbZOMcZQ7qSNWzXj1M9W7KZn5jPxFobkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZZHz3wwczHrN; Fri, 25 Oct 2024 07:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P7WlJp090031; Fri, 25 Oct 2024 07:32:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P7WlCV090028; Fri, 25 Oct 2024 07:32:47 GMT (envelope-from git) Date: Fri, 25 Oct 2024 07:32:47 GMT Message-Id: <202410250732.49P7WlCV090028@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: 3df1abdfd9c3 - main - Revise qsort(3 reflect POSIX.1-2024 update. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3df1abdfd9c309efbdc7884d6b6f6fe25efcb397 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=3df1abdfd9c309efbdc7884d6b6f6fe25efcb397 commit 3df1abdfd9c309efbdc7884d6b6f6fe25efcb397 Author: Xin LI AuthorDate: 2024-10-25 07:31:50 +0000 Commit: Xin LI CommitDate: 2024-10-25 07:31:50 +0000 Revise qsort(3 reflect POSIX.1-2024 update. Reviewed by: emaste, trasz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47262 --- lib/libc/stdlib/qsort.3 | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3 index 553f83eca8c7..e2e29e7cf04f 100644 --- a/lib/libc/stdlib/qsort.3 +++ b/lib/libc/stdlib/qsort.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 19, 2023 +.Dd October 25, 2024 .Dt QSORT 3 .Os .Sh NAME @@ -248,16 +248,8 @@ untrue. The .Fn qsort_s function behaves the same as -.Fn qsort_r , except that: -.Bl -dash -.It -The order of arguments is different -.It -The order of arguments to -.Fa compar -is different -.It -If +.Fn qsort_r , +except that if .Fa nmemb or .Fa size @@ -277,7 +269,6 @@ returns an error. Note that the handler is called before .Fn qsort_s returns the error, and the handler function might not return. -.El .Sh RETURN VALUES The .Fn qsort @@ -333,16 +324,21 @@ main(void) .Sh COMPATIBILITY The order of arguments for the comparison function used with .Fn qsort_r -is different from the one used by -.Fn qsort_s , +is historically different from the one used by +.Fn qsort_s and the GNU libc implementation of .Fn qsort_r . -When porting software written for GNU libc, it is usually possible -to replace +However, as of +.Fx 14.0 , +the .Fn qsort_r -with -.Fn qsort_s -to work around this problem. +has been updated so that the +.Fa thunk +parameter appears last to match +.St -p1003.1-2024 . +Both the historical and the updated interfaces are now accepted +via C11 generic selection and C++ polymorphism, +but the updated interface is recommended for portable applications. .Pp .Fn qsort_s is part of the @@ -426,11 +422,15 @@ were unable to allocate memory. .Sh STANDARDS The .Fn qsort -function -conforms to +function conforms to .St -isoC . +The +.Fn qsort_r +function conforms to +.St -p1003.1-2024 . +The .Fn qsort_s -conforms to +function conforms to .St -isoC-2011 K.3.6.3.2. .Sh HISTORY @@ -442,4 +442,5 @@ In .Fx 14.0 , the prototype of .Fn qsort_r -was updated to match POSIX. +was updated to match +.St -p1003.1-2024 . From nobody Fri Oct 25 11:33: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 4XZgdZ2nqzz5Zcq3; Fri, 25 Oct 2024 11:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZgdZ2JQmz47gd; Fri, 25 Oct 2024 11:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729856002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQDmhfmS8pDw3qlaLBLVzKDKJ1nvTIDlWaKLImGkbkw=; b=YvCws2amamsPONN46ZLHDWRZaQ9H+h8r5lJNYfLa+aXUWbZzeYf3xWrm/+Yhtt4yRphV6I wBYAaLLtN0R3n+0TAaycKkZ67fkILpULRlOp78BJ7CifDPrS77Oa5iCCi8Zab8KxzxEQmf BDdDhRokIeO7Ws8SiIq2ZUAOCCOQDMYLWG8FUmRHiQCR/+YxsrmEZyYJzsS8XoEWqHtoFb bwYPeQhbox4WmdhnqGwQFRT7DWNzJpN+yjOoXN4U3asSkazvik29Whs/3gCQc308qKOSWM 2Ly79KORwLm6KKyvoxoYFDbD+1OHpMCdH9cdU3E8U2CB/2Qz498zk3jjZLgI/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729856002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQDmhfmS8pDw3qlaLBLVzKDKJ1nvTIDlWaKLImGkbkw=; b=E4/pKNpELIR87Uc7SQJoKcMFLgIEywliYpPvdGSkJXJDLIg8r/7W2mWb6TmeiTagswjwXy 1jD/39Clm/cMDMsvjB7dgJZLfL8/Iobj2SSbR/bxjyzSJU9cCcUP6ZnILq5hbv+BaCzbx5 S0zwMWjTIzUjIR/Qgz9nCMSD6d6ONZDXxHLtKasLVdKdRvDVIfG5EQ5ACR41q/z37I4AR/ 6/zMPJEhWLaaxoT356kQ20fLDH5QgZMRQ3HHXqwblwAK2de9+JOUUsmZCJC5bTrstVuwic YnarIVgVKYMQyMqT2uPzc8JGDsddCtrPCkvbQ8g+7cSlxDVX9ZPeM8S6aLd3nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729856002; a=rsa-sha256; cv=none; b=SsLC1i7582wXRefTZcV3x8RRoVBe7xqba6o1OZiJRxQCLfCrw0T5RAJsoD8do/e/5UmT7G AnM/NHL6OKhV9zaY2t03KS50Q7OeKQnP58B+P80AG+0S+SDP0bSd5/izZhYbFvseu8VhY9 X3ar+kdfAOibPBquTgwJaFqxfMgtc0sqv3QOv0/gOK22sOSUA1PX5/PYcrCeDQco7q3T9p 3jg0hJA0ay4ej3+1x4ncelaOpirAWfmrwfzvXW6k36bda+Lr9nzdYmSCPS/PXWrY9aQVDT gAwJ8IfnvgroILa99Vewb1VdHA+ju+GdOr8PBJtucpNcKea25NAPofZDFFC9pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZgdZ1RhnzPQF; Fri, 25 Oct 2024 11:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PBXM5R038050; Fri, 25 Oct 2024 11:33:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PBXMgi038047; Fri, 25 Oct 2024 11:33:22 GMT (envelope-from git) Date: Fri, 25 Oct 2024 11:33:22 GMT Message-Id: <202410251133.49PBXMgi038047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7224e9f2d4af - stable/14 - mididump(1): Initial revision List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7224e9f2d4af666550d93cf565db22b1f577f593 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7224e9f2d4af666550d93cf565db22b1f577f593 commit 7224e9f2d4af666550d93cf565db22b1f577f593 Author: Christos Margiolis AuthorDate: 2024-10-18 08:42:12 +0000 Commit: Christos Margiolis CommitDate: 2024-10-25 11:30:26 +0000 mididump(1): Initial revision A new utility which dumps MIDI 1.0 events in real-time. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D46418 (cherry picked from commit f57efe95cc25ae527c632d4ffcf064799f922216) (cherry picked from commit b8007cfdb72c1be27d1d93937886fd60f21915ab) (cherry picked from commit feb9ba2993cf6aefa49b7b17ca49c52210c26035) (cherry picked from commit 53314e34d5e8e7f781ab990805b22f7a56bc0580) --- usr.bin/Makefile | 1 + usr.bin/mididump/Makefile | 8 ++ usr.bin/mididump/mididump.1 | 80 +++++++++++ usr.bin/mididump/mididump.c | 320 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 409 insertions(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 61834d33cabc..58945f7ecb18 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -90,6 +90,7 @@ SUBDIR= alias \ mandoc \ mdo \ mesg \ + mididump \ ministat \ mkdep \ mkfifo \ diff --git a/usr.bin/mididump/Makefile b/usr.bin/mididump/Makefile new file mode 100644 index 000000000000..758bbb3a1189 --- /dev/null +++ b/usr.bin/mididump/Makefile @@ -0,0 +1,8 @@ +.include + +PROG= mididump +SRCS= ${PROG}.c +MAN= ${PROG}.1 +LIBADD+= m + +.include diff --git a/usr.bin/mididump/mididump.1 b/usr.bin/mididump/mididump.1 new file mode 100644 index 000000000000..7b2bc649eb24 --- /dev/null +++ b/usr.bin/mididump/mididump.1 @@ -0,0 +1,80 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 The FreeBSD Foundation +.\" +.\" Portions of this software were developed by Christos Margiolis +.\" 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. +.\" +.Dd September 14, 2024 +.Dt MIDIDUMP 1 +.Os +.Sh NAME +.Nm mididump +.Nd dump MIDI events +.Sh SYNOPSIS +.Nm +.Op Fl t +.Ar device +.Sh DESCRIPTION +The +.Nm +utility is used to dump MIDI 1.0 events in real-time. +.Pp +The options are as follows: +.Bl -tag -width "-t" +.It Fl t +Print "Timing Clock" events. +These events are not printed by default, as they tend to clutter output. +.El +.Pp +The +.Ar device +argument corresponds to the MIDI device (e.g. +.Pa /dev/umidi0.0 ) . +.Sh SEE ALSO +.Rs +.%T Summary of MIDI 1.0 Messages +.%U https://midi.org/summary-of-midi-1-0-messages +.Re +.Rs +.%T Expanded MIDI 1.0 Messages List (Status Bytes) +.%U https://midi.org/expanded-midi-1-0-messages-list +.Re +.Rs +.%T Standard MIDI-File Format Spec. 1.1, updated +.%U https://www.music.mcgill.ca/~ich/classes/mumt306/StandardMIDIfileformat.html +.Re +.Rs +.%T MIDI CC List for Continuous Controllers +.%U https://anotherproducer.com/online-tools-for-musicians/midi-cc-list/ +.Re +.Sh AUTHORS +The +.Nm +utility was implemented by +.An Christos Margiolis Aq Mt christos@FreeBSD.org +under sponsorship from the +.Fx +Foundation. diff --git a/usr.bin/mididump/mididump.c b/usr.bin/mididump/mididump.c new file mode 100644 index 000000000000..8ebcce547ac4 --- /dev/null +++ b/usr.bin/mididump/mididump.c @@ -0,0 +1,320 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 The FreeBSD Foundation + * + * This software was developed by Christos Margiolis + * 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 + +#define NOTE2OCTAVE(n) (n / 12 - 1) +#define NOTE2FREQ(n) (440 * pow(2.0f, ((float)n - 69) / 12)) +#define CHAN_MASK 0x0f + +static struct note { + const char *name; + const char *alt; +} notes[] = { + { "C", NULL }, + { "C#", "Db" }, + { "D", NULL }, + { "D#", "Eb" }, + { "E", NULL }, + { "F", NULL }, + { "F#", "Gb" }, + { "G", NULL }, + { "G#", "Ab" }, + { "A", NULL }, + { "A#", "Bb" }, + { "B", NULL }, +}; + +/* Hardcoded values are not defined in sys/soundcard.h. */ +static const char *ctls[] = { + [CTL_BANK_SELECT] = "Bank Select", + [CTL_MODWHEEL] = "Modulation Wheel", + [CTL_BREATH] = "Breath Controller", + [0x03] = "Undefined", + [CTL_FOOT] = "Foot Pedal", + [CTL_PORTAMENTO_TIME] = "Portamento Time", + [CTL_DATA_ENTRY] = "Data Entry", + [CTL_MAIN_VOLUME] = "Volume", + [CTL_BALANCE] = "Balance", + [0x09] = "Undefined", + [CTL_PAN] = "Pan", + [CTL_EXPRESSION] = "Expression", + [0x0c] = "Effect Controller 1", + [0x0d] = "Effect Controller 2", + [0x0e] = "Undefined", + [0x0f] = "Undefined", + [CTL_GENERAL_PURPOSE1] = "General Purpose 1", + [CTL_GENERAL_PURPOSE2] = "General Purpose 2", + [CTL_GENERAL_PURPOSE3] = "General Purpose 3", + [CTL_GENERAL_PURPOSE4] = "General Purpose 4", + [0x14 ... 0x1f] = "Undefined", + [0x20 ... 0x3f] = "LSB Controller", + [CTL_DAMPER_PEDAL] = "Damper Pedal (Sustain)", + [CTL_PORTAMENTO] = "Portamento", + [CTL_SOSTENUTO] = "Sostenuto Pedal", + [CTL_SOFT_PEDAL] = "Soft Pedal", + [0x44] = "Legato Foot-Switch", + [CTL_HOLD2] = "Hold 2", + [0x46] = "Sound Controller 1", + [0x47] = "Sound Controller 2", + [0x48] = "Sound Controller 3", + [0x49] = "Sound Controller 4", + [0x4a] = "Sound Controller 5", + [0x4b] = "Sound Controller 6", + [0x4c] = "Sound Controller 7", + [0x4d] = "Sound Controller 8", + [0x4e] = "Sound Controller 9", + [0x4f] = "Sound Controller 10", + [CTL_GENERAL_PURPOSE5] = "General Purpose 5", + [CTL_GENERAL_PURPOSE6] = "General Purpose 6", + [CTL_GENERAL_PURPOSE7] = "General Purpose 7", + [CTL_GENERAL_PURPOSE8] = "General Purpose 8", + [0x54] = "Portamento CC", + [0x55 ... 0x57] = "Undefined", + [0x58] = "Hi-Res Velocity Prefix", + [0x59 ... 0x5a] = "Undefined", + [CTL_EXT_EFF_DEPTH] = "Effect 1 Depth", + [CTL_TREMOLO_DEPTH] = "Effect 2 Depth", + [CTL_CHORUS_DEPTH] = "Effect 3 Depth", + [CTL_DETUNE_DEPTH] = "Effect 4 Depth", + [CTL_PHASER_DEPTH] = "Effect 5 Depth", + [CTL_DATA_INCREMENT] = "Data Increment", + [CTL_DATA_DECREMENT] = "Data Decrement", + [CTL_NONREG_PARM_NUM_LSB] = "NRPN (LSB)", + [CTL_NONREG_PARM_NUM_MSB] = "NRPN (MSB)", + [CTL_REGIST_PARM_NUM_LSB] = "RPN (LSB)", + [CTL_REGIST_PARM_NUM_MSB] = "RPN (MSB)", + [0x66 ... 0x77] = "Undefined", + /* Channel mode messages */ + [0x78] = "All Sound Off", + [0x79] = "Reset All Controllers", + [0x7a] = "Local On/Off Switch", + [0x7b] = "All Notes Off", + [0x7c] = "Omni Mode Off", + [0x7d] = "Omni Mode On", + [0x7e] = "Mono Mode", + [0x7f] = "Poly Mode", +}; + +static void __dead2 +usage(void) +{ + fprintf(stderr, "usage: %s [-t] device\n", getprogname()); + exit(1); +} + +static uint8_t +read_byte(int fd) +{ + uint8_t byte; + + if (read(fd, &byte, sizeof(byte)) < (ssize_t)sizeof(byte)) + err(1, "read"); + + return (byte); +} + +int +main(int argc, char *argv[]) +{ + struct note *pn; + char buf[16]; + int fd, ch, tflag = 0; + uint8_t event, chan, b1, b2; + + while ((ch = getopt(argc, argv, "t")) != -1) { + switch (ch) { + case 't': + tflag = 1; + break; + case '?': /* FALLTHROUGH */ + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if (argc < 1) + usage(); + + if ((fd = open(*argv, O_RDONLY)) < 0) + err(1, "open(%s)", *argv); + + for (;;) { + event = read_byte(fd); + if (!(event & 0x80)) + continue; + chan = (event & CHAN_MASK) + 1; + + switch (event) { + case 0x80 ... 0x8f: /* FALLTHROUGH */ + case 0x90 ... 0x9f: + b1 = read_byte(fd); + b2 = read_byte(fd); + pn = ¬es[b1 % nitems(notes)]; + snprintf(buf, sizeof(buf), "%s%d", pn->name, + NOTE2OCTAVE(b1)); + if (pn->alt != NULL) { + snprintf(buf + strlen(buf), sizeof(buf), + "/%s%d", pn->alt, NOTE2OCTAVE(b1)); + } + printf("Note %-3s channel=%d, " + "note=%d (%s, %.2fHz), velocity=%d\n", + (event >= 0x80 && event <= 0x8f) ? "off" : "on", + chan, b1, buf, NOTE2FREQ(b1), b2); + break; + case 0xa0 ... 0xaf: + b1 = read_byte(fd); + b2 = read_byte(fd); + printf("Polyphonic aftertouch channel=%d, note=%d, " + "pressure=%d\n", + chan, b1, b2); + break; + case 0xb0 ... 0xbf: + b1 = read_byte(fd); + b2 = read_byte(fd); + if (b1 > nitems(ctls) - 1) + break; + printf("Control/Mode change channel=%d, " + "control=%d (%s), value=%d", + chan, b1, ctls[b1], b2); + if (b1 >= 0x40 && b1 <= 0x45) { + if (b2 <= 63) + printf(" (off)"); + else + printf(" (on)"); + } + if (b1 == 0x7a) { + if (b2 == 0) + printf(" (off)"); + else if (b2 == 127) + printf(" (on"); + } + putchar('\n'); + break; + case 0xc0 ... 0xcf: + b1 = read_byte(fd); + printf("Program change channel=%d, " + "program=%d\n", + chan, b1); + break; + case 0xd0 ... 0xdf: + b1 = read_byte(fd); + printf("Channel aftertouch channel=%d, " + "pressure=%d\n", + chan, b1); + break; + case 0xe0 ... 0xef: + /* TODO Improve */ + b1 = read_byte(fd); + b2 = read_byte(fd); + printf("Pitch bend channel=%d, change=%d\n", + chan, b1 | b2 << 7); + break; + case 0xf0: + printf("SysEx vendorid="); + b1 = read_byte(fd); + printf("0x%02x", b1); + if (b1 == 0) { + printf(" 0x%02x 0x%02x", + read_byte(fd), read_byte(fd)); + } + printf(" data="); + for (;;) { + b1 = read_byte(fd); + printf("0x%02x ", b1); + /* End of SysEx (EOX) */ + if (b1 == 0xf7) + break; + } + putchar('\n'); + break; + case 0xf2: + b1 = read_byte(fd); + b2 = read_byte(fd); + printf("Song position pointer ptr=%d\n", + b1 | b2 << 7); + break; + case 0xf3: + b1 = read_byte(fd); + printf("Song select song=%d\n", b1); + break; + case 0xf6: + printf("Tune request\n"); + break; + case 0xf7: + printf("End of SysEx (EOX)\n"); + break; + case 0xf8: + if (tflag) + printf("Timing clock\n"); + break; + case 0xfa: + printf("Start\n"); + break; + case 0xfb: + printf("Continue\n"); + break; + case 0xfc: + printf("Stop\n"); + break; + case 0xfe: + printf("Active sensing\n"); + break; + case 0xff: + printf("System reset\n"); + break; + case 0xf1: /* TODO? MIDI time code qtr. frame */ + case 0xf4: /* Undefined (reserved) */ + case 0xf5: + case 0xf9: + case 0xfd: + break; + default: + printf("Unknown event type: 0x%02x\n", event); + break; + } + } + + close(fd); + + return (0); +} From nobody Fri Oct 25 11:37: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 4XZgjr68gJz5ZcnY; Fri, 25 Oct 2024 11:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZgjr57Bbz48vZ; Fri, 25 Oct 2024 11:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729856224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aijl9Zj0AnCBSyTzkwT4Fy5gvoPi+amZMIphrD4HDYw=; b=rjyQgRqbGlYWPpHZc/MY+VnU5ARKKcwv1EYr6o57pahZcv5sCoWT+9EUH7ouyJR0g/Tflq cvEMDdamFiHhxp4YCpsT8vwC0kx6msE6q2HpDtnIz5U00AO8jEcABOc6UU2cEO8WagPEZm KCvZBfAKHZTU+2Fu1TziTu4PrILW2OcbiLmAZDUfLClwDBye5cYDwOV5TaWPPgLmik05DU zdYUCJjsrTkKnBEfWn9hfyZSS5mNhYaYD4l5DxMmocIc9OBVcgssfJfNX3lFlehIlIIxsZ aiwFiKCqOl2OA4CC4HyE3ooow9IClyqnPNraKwcK+C4FL88Ddb5dQxKDQETj6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729856224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aijl9Zj0AnCBSyTzkwT4Fy5gvoPi+amZMIphrD4HDYw=; b=gcbu5SJ2oHw3M1VEBT9iS9J502yjKqIaTIw2P85C+VCAPtxTtsrQ4u05zYyzIIacKH9d8w sxPl7M+usjUlo02BiXCOc+C/7juifE08b1WUn96Zb8pQRF8BFtAvKcO38fFC6nFemj1x+f pu+DECRZW/Xj4CvYdzQoS7+j7lAX6u+LrfZmEaEoBqcaHTwYz98iU/TYHE69Oe4hLuqP80 KTEFO4hluwNWFhc9UReTEmg3cziLEHNzaWBOiGGjkjFR+fnAb8u9vFPxAhYIvRcdh5Yb/+ a5jYdFTADPF5Blj3VPcvGC/RUrN1uorm+P9Hytqm4lqYHYwoqzLBcjgYdo/u+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729856224; a=rsa-sha256; cv=none; b=TOuehrFKO5ibYvos13Ng+IF+9reYLYXdq6kaYh5byAdw19KCAmAX7/FN7/yxXyoiwwGuAA rteneYcdJXImK/yIs9XmH1shObUaLfrEeuZMBctRG/OdK1zneZbtKQk1EDwVSLONd0afC2 PWPf4aB5rnB/LOvnPsQfvcbtdX9mcenGd/teuZvCujvMrJ7ZxykTeAIOyQynhVm/aueiIz cOx+vyZzojKPoFD2Zcw6D9sYu+9Gc46WK/nf/poSJ3Vjg5IgoGAkHUDgrzRJ+tp37I+uKa RWAw8Qnnd3imSt1JOyuc/tVDo1zgbqTp8NuA90jDVT8xPIbg8vBmlZMOHEYCCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZgjr4cWJzPbd; Fri, 25 Oct 2024 11:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PBb4IY039233; Fri, 25 Oct 2024 11:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PBb4m1039230; Fri, 25 Oct 2024 11:37:04 GMT (envelope-from git) Date: Fri, 25 Oct 2024 11:37:04 GMT Message-Id: <202410251137.49PBb4m1039230@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: 43c0b593c2c3 - main - sound: Remove redundant refcount checks in vchan_setnew() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 43c0b593c2c3b2c07009c031a0e7e8190a45b31a Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=43c0b593c2c3b2c07009c031a0e7e8190a45b31a commit 43c0b593c2c3b2c07009c031a0e7e8190a45b31a Author: Christos Margiolis AuthorDate: 2024-10-25 11:36:51 +0000 Commit: Christos Margiolis CommitDate: 2024-10-25 11:36:51 +0000 sound: Remove redundant refcount checks in vchan_setnew() When adding a new vchan, we are looking for a parent channel which either already has vchans (i.e CHN_F_HAS_VCHAN), or does not, but is also not being used (i.e !CHN_F_BUSY). Since CHN_F_BUSY essentially tells us if the channel is currently being used or not, there is no need to check if the channel's refcount is 0 as well. When removing a vchan, we first check if we have only 1 vchan allocated that is also being used (so we cannot remove it at the moment), and then we check if the vchan is not busy and remove it. Again, checking CHN_F_BUSY is enough. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47268 --- sys/dev/sound/pcm/vchan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index c9db9d79847b..ed13a3c55961 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -928,7 +928,6 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt) CHN_LOCK(c); if (c->direction == direction && ((c->flags & CHN_F_HAS_VCHAN) || (vcnt == 0 && - c->refcount < 1 && !(c->flags & (CHN_F_BUSY | CHN_F_VIRTUAL))))) { /* * Reuse hw channel with vchans already @@ -987,12 +986,11 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt) } CHN_FOREACH_SAFE(ch, c, nch, children) { CHN_LOCK(ch); - if (vcnt == 1 && c->refcount > 0) { + if (vcnt == 1 && ch->flags & CHN_F_BUSY) { CHN_UNLOCK(ch); break; } - if (!(ch->flags & CHN_F_BUSY) && - ch->refcount < 1) { + if (!(ch->flags & CHN_F_BUSY)) { err = vchan_destroy(ch); if (err == 0) vcnt--; From nobody Fri Oct 25 11:37: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 4XZgjt01Wdz5ZcwF; Fri, 25 Oct 2024 11:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZgjs5Zp8z48vR; Fri, 25 Oct 2024 11:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729856225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzTTOX5PAMB2/+IHI24vegaeucU+LagTPstKwfgjAfo=; b=aGWLHA8xzm52zXu33TMBDjO7xzVo8uXdndhp6QIviGGKU2VM8497vtygC5S/fDz3ul+ICK zXebBYxF/72ao5kr/QdOBoGL5WduhL0dDRZdq0U8OCT4T7e5hxtWLT0Zplm3mLdluNGRrl 31BO4QvX1sAYbXz4DVX3szsJUVGpdZ/VKnxF81HUfdRC1QaEEu/4oiNrB00UlsTQVRdFt0 qe2qHWgoYWKQe1ofVPLUY5Z3ZmEKaxfSuJJJWPs/1mi1xw2sd0hM2qqTtrlUV7y8yk+6fN YJF6O5jFsMLfTm0Ki2hfdBhYItB7KxTcsEbc8UNBnxWLWkQS/2Bx1QMERXTafg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729856225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xzTTOX5PAMB2/+IHI24vegaeucU+LagTPstKwfgjAfo=; b=jEfPQMnKaWG+ATYrDxrxJUYQEa+biq9sIzD1dMXwJT9yJ1MGbeoRhkWCEmG5HTB1weWb81 Mbv5GjLw2+4oBjIbmNb2TvUUN8g0NwhMledItbNQy5KbLqIgpnQVMVCciagB6ISLpirsd5 wwvKFZy0tZGppE0R+RawbH20FqU1FeGrRP6qR9hvTd+gy7qRI+sB28qt+r4YavcGorumLF AYLrXr3I5GCLj7kaIqaZxTIq/MofkHWMZ4NieZRSoUGug3aTCOza3DmdQT1Mnh1Ot+LL4L p23tQFXtpuG4TOKl21OY5PHJ9JePHzkRIwkzyXz+sytWTLdaWodCEFO2cAE3VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729856225; a=rsa-sha256; cv=none; b=fngroCsaA1xVgfEJY2Bs9i66NkcXsgFENDb7DWWqLimrmQEuz2lYyxJNIlZQoi4U1YYIH6 WCfkfMT6bxdM3J9zQPHkUn63IV0Xfxs3HHF6PfojNFAuP8SXW6HXYYsNjTQoqH/eLscL66 9VZDDR6aWY84cMXogowr59g2gcVR54c/0HhjXO4RZveHUZpFrAXviQVQw5b6nR/TI/FrDI mj9kKjA4kEOfn322+he350wmXYnlXNnlcddOCyZdlB4NmCzTmoPSSFFd1Bqb+8GFfgBI38 Rovyecccz0BjASFY/z2UmEgonq1N9yvUuBl/yA9dFhkk31NR+G/qc+Xm6HceSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZgjs4tvTzPhN; Fri, 25 Oct 2024 11:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PBb5Cv039284; Fri, 25 Oct 2024 11:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PBb5ol039280; Fri, 25 Oct 2024 11:37:05 GMT (envelope-from git) Date: Fri, 25 Oct 2024 11:37:05 GMT Message-Id: <202410251137.49PBb5ol039280@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: 9a6cf27583ff - main - sound: Retire channel refcount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9a6cf27583ffc13bb0a7c5be0704ba0d2f3b834d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9a6cf27583ffc13bb0a7c5be0704ba0d2f3b834d commit 9a6cf27583ffc13bb0a7c5be0704ba0d2f3b834d Author: Christos Margiolis AuthorDate: 2024-10-25 11:36:59 +0000 Commit: Christos Margiolis CommitDate: 2024-10-25 11:36:59 +0000 sound: Retire channel refcount No longer used. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47269 --- sys/dev/sound/pcm/channel.c | 13 ------------- sys/dev/sound/pcm/channel.h | 2 -- sys/dev/sound/pcm/dsp.c | 29 ++++------------------------- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 7bcd841d541f..eb70e910f51d 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1435,19 +1435,6 @@ chn_release(struct pcm_channel *c) return (0); } -int -chn_ref(struct pcm_channel *c, int ref) -{ - PCM_BUSYASSERT(c->parentsnddev); - CHN_LOCKASSERT(c); - KASSERT((c->refcount + ref) >= 0, - ("%s(): new refcount will be negative", __func__)); - - c->refcount += ref; - - return (c->refcount); -} - int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 6c6692fa8bc2..0788fbe42a5a 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -84,7 +84,6 @@ struct pcm_channel { kobj_t methods; pid_t pid; - int refcount; struct pcm_feeder *feeder; u_int32_t align; @@ -266,7 +265,6 @@ struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent, void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); int chn_release(struct pcm_channel *c); -int chn_ref(struct pcm_channel *c, int ref); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 7d80a82d31c8..6a59bcfc1ade 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -168,9 +168,9 @@ static void dsp_close(void *data) { struct dsp_cdevpriv *priv = data; - struct pcm_channel *rdch, *wrch, *volch; + struct pcm_channel *rdch, *wrch; struct snddev_info *d; - int sg_ids, rdref, wdref; + int sg_ids; if (priv == NULL) return; @@ -188,22 +188,6 @@ dsp_close(void *data) rdch = priv->rdch; wrch = priv->wrch; - volch = priv->volch; - - rdref = -1; - wdref = -1; - - if (volch != NULL) { - if (volch == rdch) - rdref--; - else if (volch == wrch) - wdref--; - else { - CHN_LOCK(volch); - chn_ref(volch, -1); - CHN_UNLOCK(volch); - } - } if (rdch != NULL) CHN_REMOVE(d, rdch, channels.pcm.opened); @@ -231,7 +215,6 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(rdch); - chn_ref(rdch, rdref); chn_abort(rdch); /* won't sleep */ rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); @@ -249,7 +232,6 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(wrch); - chn_ref(wrch, wdref); chn_flush(wrch); /* may sleep */ wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); @@ -382,7 +364,6 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) rdch->flags |= CHN_F_NBIO; if (flags & O_EXCL) rdch->flags |= CHN_F_EXCLUSIVE; - chn_ref(rdch, 1); chn_vpc_reset(rdch, SND_VOL_C_PCM, 0); CHN_UNLOCK(rdch); } @@ -402,11 +383,10 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (!DSP_F_DUPLEX(flags)) { if (rdch != NULL) { /* - * Lock, deref and release previously - * created record channel + * Lock, and release previously created + * record channel */ CHN_LOCK(rdch); - chn_ref(rdch, -1); chn_release(rdch); } PCM_RELEASE_QUICK(d); @@ -419,7 +399,6 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) wrch->flags |= CHN_F_NBIO; if (flags & O_EXCL) wrch->flags |= CHN_F_EXCLUSIVE; - chn_ref(wrch, 1); chn_vpc_reset(wrch, SND_VOL_C_PCM, 0); CHN_UNLOCK(wrch); } From nobody Fri Oct 25 13:23: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 4XZk4Z6mQqz5Zjnh; Fri, 25 Oct 2024 13:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZk4Z5Ml8z4KGH; Fri, 25 Oct 2024 13:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729862606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oaCvMYB4StV8nNlts2FPkx+GpnvNkpgTkvqSZpXTWb4=; b=lOGJlQYOxHvCl/uSSx8iB+abpqW/ocS36QHA4PrfAQ88xbIbqVuBt9b0Nil1aXZT0rtUGY 0T3eLBhdN5IYHuirQmESS4csmZnv3TU1V4advhSoZIdugz1qBr7/sJLkoY/XEPzUztEMbq nU8FM65eJd+2ayHA5c8zPgHIdLB2rENc/ij8pMRV1o1URgr41WwnnP5tNpeLuuCyk3E32F qJNyBy33uBPKZwFGEGVnKoRi8Jy04E4dEILAqTMtXO7bpPWXnA1Y1bz4+TMh9BNrzTMDKk eFeDaUA+AIkvg2ckQ27yM2T+Ds8MoUPTdE3aN8ba22nGlsr8iQz+ix2PLUkQng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729862606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oaCvMYB4StV8nNlts2FPkx+GpnvNkpgTkvqSZpXTWb4=; b=DAwh0veSEfD3zRJ4vdg+XJa3ZxXHprLtYzDsVVhhdRjkieFXsrRsVU21vteUqXVei/aYP2 Gph7iCs43M9w8gazsRWgSZyJrME69t7SiihHbsBrLbGEtXzAGotrEkKqpp/ZkgMSFCT0rN R1/4WKmjC+EuOsEULSXk3i5nvg9p72Idh7c4baoHqsbMjccCcmHmFGYMP3d8I9ZXD+Hx/6 hI4kuyMS4vrAkLuGW8oI2MCvcicX9hbwWV7z7IiUmv7Ogru7CiCuDwXHgrkZ1jLVlN0NpU 2M+aTWC6DshGfCiMlyh8Goa0hEs/0TN7X/qsWwXfGkzQ9GxXR3benMmbP/TDWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729862606; a=rsa-sha256; cv=none; b=RLFOjqbq+r179BJhiv01ekgWpuo6ZVETpdkGZOwOBGG2tuXHitW2HOho+yT4iMJ3mxHYzO IVB88rW5HI3HgTC5zq4HJahR9VfAQllDzAvfpV0DsIYBcjvUxYnMj1iIeHWq/QUDPPmRi/ 3gzwcRyVR6NYL0EODBgfkz8A2vEgnJx9FE+GZhEH0gfRrCZtNr5urIHQnHx0YaMPRKILdB qDoWxe3omS1rDaSQgpv6LrjC7WNlp/bHcLSzEkegz1mswPDTwy8bvoOFA55t8MKmlJIYYN F3WyDak+AZnDXbaDRF7zhLwNQoiUkIVkwd+V5d3/H3pRHt2UvPmsc6BBJJOG2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZk4Z4ywXzSW5; Fri, 25 Oct 2024 13:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PDNQk1041918; Fri, 25 Oct 2024 13:23:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PDNQx2041915; Fri, 25 Oct 2024 13:23:26 GMT (envelope-from git) Date: Fri, 25 Oct 2024 13:23:26 GMT Message-Id: <202410251323.49PDNQx2041915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 7d875598fc9f - main - git-arc: Make patch with reviewers more portable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d875598fc9fdbe554644fc1109645362f21b824 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d875598fc9fdbe554644fc1109645362f21b824 commit 7d875598fc9fdbe554644fc1109645362f21b824 Author: Jose Luis Duran AuthorDate: 2024-10-25 13:14:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-25 13:22:52 +0000 git-arc: Make patch with reviewers more portable Avoid an ArcanistUsageException: Provide method parameters on stdin as a JSON blob. Due to an invalid JSON input on strict POSIX-compliant shells (macOS): echo '{ "constraints": {"phids": [-n,"PHID-USER-xxx",]} }' ^^^ ^ Change the non-portable "echo -n" to a printf. Reviewed by: 0mp, imp, markj Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46781 --- tools/tools/git/git-arc.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index e9398a60d2f7..3261f4461dc6 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -328,10 +328,10 @@ diff2reviewers() jq '.response.data[0].attachments.reviewers.reviewers[] | select(.status == "accepted").reviewerPHID') if [ -n "$userids" ]; then echo '{ - "constraints": {"phids": ['"$(echo -n "$userids" | tr '[:space:]' ',')"']} + "constraints": {"phids": ['"$(printf "%s" "$userids" | tr '[:space:]' ',')"']} }' | - arc_call_conduit -- user.search | - jq -r '.response.data[].fields.username' + arc_call_conduit -- user.search | + jq -r '.response.data[].fields.username' fi } @@ -444,7 +444,7 @@ gitarc__list() for commit in $commits; do chash=$(git show -s --format='%C(auto)%h' "$commit") - echo -n "${chash} " + printf "%s" "${chash} " diff=$(log2diff "$commit") if [ -n "$diff" ]; then @@ -461,7 +461,7 @@ gitarc__list() if [ -z "$diff" ]; then echo "No Review : $title" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then - echo -n "Ambiguous Reviews: " + printf "%s" "Ambiguous Reviews: " echo "$diff" | grep -E -o 'D[1-9][0-9]*:' | tr -d ':' \ | paste -sd ',' - | sed 's/,/, /g' else From nobody Fri Oct 25 13:23: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 4XZk4b73XQz5Zjnj; Fri, 25 Oct 2024 13:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZk4b6LPfz4KTk; Fri, 25 Oct 2024 13:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729862607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLXk0gs7jqIdE+62A/25CktaU6nh2wJzeZQpGWG2zyo=; b=u59DkJJss52dEpGe8rhCD4NPr/Ah72wmUcoDm4hC4er5BEOFzCPSM4Rzw5j43WjZyNVv92 DfWwR1DfbzGreihkSOx7gEkSvWS/ipcHOddzwpbzCAXG4zM/PdWWAjTO0YYXNtO37DKtjH M/LDTQV5diHVwtWMtyrUHtdk/mQNtl15bA2lD2stIlG/JaYZNbC06PQv61bI6XY+Dv3drB xqyyD2A1B9LsqchMgu0Xq8V2/6PR88N2ntuU/gESGq5WVxaOEI4Sg1P0J742+pFnt+k7wK pxOo+Cc55zXXlkbEgqhbdNGeNZGrwvqZEdKIRdHoxuZQvj4COHiz5yZfEYw9/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729862607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLXk0gs7jqIdE+62A/25CktaU6nh2wJzeZQpGWG2zyo=; b=kg54c8gDwTSeGFbyjFYlHgo8JTvARQw1rsfl2ucb+y6BzoieHwvfhb+ItXR1JBB6u71xCj /6Zv1Sf90jZ5GLqcdSWVZXbY5iKhk5FCGf8FK4yg7I3g3HnY5umAyFuxhoroVJfkTEeZhm hXdZymtPsKMRndL0gUkrZGllZul33FeHnfz+XWJhyVDR2hb8GcaVqgSwq+CcLhtIOLx65M CsLtNDmvLnarrG9idvzTEEEtCpJHHq45ZiLtxXBmCbjgd0I8cer+mF7iEWrooqPtylDgMD ZRLLNkQdKemxaXtT/ge95k9WUIot1NpZ/ozPyjOcm1pYBQfcMrqCrS4i0sjrAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729862607; a=rsa-sha256; cv=none; b=hpj8jF8VWKngOVkYscT90HMOrnnYe9Gf+/qsjW8hGrESMGPxLTh5pVJCMXs+H9lInrQWY6 +ABtOMnQwiRlrEN9dbi7DkeOxKXC2V3j/+YmIvYzCVV1LOorYcgC4hMn9sCjv7TGDLeSCa kuaulfgsKVa+rS+nq1Z+IJvnWOr4jcvtE8qVOdNADIC1jhn5bCEc7AHAb9DlX0WsmNThYl P8m2vBGbz3Q1LOK4TNxcLAPV3vJ+G+zzyM97xROg2F2JwSgbPGNQ2yK2TOXZ90mcCu9ANd ORIkUB51GGofKkrM5TB/kyH3QCIsCf1emRWMghEvfZr0s21f7tSBvlxEg6QxNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZk4b5xgpzSb8; Fri, 25 Oct 2024 13:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PDNRHT041971; Fri, 25 Oct 2024 13:23:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PDNRD8041968; Fri, 25 Oct 2024 13:23:27 GMT (envelope-from git) Date: Fri, 25 Oct 2024 13:23:27 GMT Message-Id: <202410251323.49PDNRD8041968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3ab8697d9e45 - main - git-arc: Do not echo unescaped literals to jq List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ab8697d9e45adc504142a4aa06d2b5c9245f4e6 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3ab8697d9e45adc504142a4aa06d2b5c9245f4e6 commit 3ab8697d9e45adc504142a4aa06d2b5c9245f4e6 Author: Jose Luis Duran AuthorDate: 2024-10-25 13:20:53 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-10-25 13:23:02 +0000 git-arc: Do not echo unescaped literals to jq Store the json blobs in temporary files instead of variables, and feed them to jq for parsing. When echoing "\n", the new line will become a literal new line, and therefore, invalid json input: ``` jq: parse error: Invalid string: control characters from U+0000 through U+001F must be escaped ... ``` To reproduce: % git arc patch -c D12345 Reviewed by: 0mp, imp, markj Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46767 --- tools/tools/git/git-arc.sh | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 3261f4461dc6..cca70f61a4cd 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -548,32 +548,32 @@ patch_commit() diff=$1 reviewid=$(diff2phid "$diff") # Get the author phid for this patch - review_data=$(echo '{ - "constraints": {"phids": ["'"$reviewid"'"]} - }' | - arc_call_conduit -- differential.revision.search) - authorid=$(echo "$review_data" | jq -r '.response.data[].fields.authorPHID' ) + review_data=$(mktemp) + echo '{"constraints": {"phids": ["'"$reviewid"'"]}}' | \ + arc_call_conduit -- differential.revision.search > "$review_data" + authorid=$(jq -r '.response.data[].fields.authorPHID' "$review_data") # Get metadata about the user that submitted this patch - user_data=$(echo '{ - "constraints": {"phids": ["'"$authorid"'"]} - }' | - arc call-conduit -- user.search | grep -v ^Warning: | - jq -r '.response.data[].fields') - user_addr=$(echo "$user_data" | jq -r '.username') - user_name=$(echo "$user_data" | jq -r '.realName') + user_data=$(mktemp) + echo '{"constraints": {"phids": ["'"$authorid"'"]}}' | \ + arc_call_conduit -- user.search | \ + jq -r '.response.data[].fields' > "$user_data" + user_addr=$(jq -r '.username' "$user_data") + user_name=$(jq -r '.realName' "$user_data") + rm "$user_data" # Dig the data out of querydiffs api endpoint, although it's deprecated, # since it's one of the few places we can get email addresses. It's unclear # if we can expect multiple difference ones of these. Some records don't # have this data, so we remove all the 'null's. We sort the results and # remove duplicates 'just to be sure' since we've not seen multiple # records that match. - diff_data=$(echo '{ - "revisionIDs": [ '"${diff#D}"' ] - }' | arc_call_conduit -- differential.querydiffs | - jq -r '.response | flatten | .[]') - author_addr=$(echo "$diff_data" | jq -r ".authorEmail?" | sort -u) - author_name=$(echo "$diff_data" | jq -r ".authorName?" | sort -u) + diff_data=$(mktemp) + echo '{"revisionIDs": [ '"${diff#D}"' ]}' | \ + arc_call_conduit -- differential.querydiffs | + jq -r '.response | flatten | .[]' > "$diff_data" + author_addr=$(jq -r ".authorEmail?" "$diff_data" | sort -u) + author_name=$(jq -r ".authorName?" "$diff_data" | sort -u) author=$(find_author "$user_addr" "$user_name" "$author_addr" "$author_name") + rm "$diff_data" # If we had to guess, and the user didn't want to guess, abort if [ "${author}" = "ABORT" ]; then @@ -582,10 +582,11 @@ patch_commit() fi tmp=$(mktemp) - echo "$review_data" | jq -r '.response.data[].fields.title' > $tmp + jq -r '.response.data[].fields.title' "$review_data" > $tmp echo >> $tmp - echo "$review_data" | jq -r '.response.data[].fields.summary' >> $tmp + jq -r '.response.data[].fields.summary' "$review_data" >> $tmp echo >> $tmp + rm "$review_data" # XXX this leaves an extra newline in some cases. reviewers=$(diff2reviewers "$diff" | sed '/^$/d' | paste -sd ',' - | sed 's/,/, /g') if [ -n "$reviewers" ]; then From nobody Fri Oct 25 14:18:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XZlHh4qMvz5ZlKL; Fri, 25 Oct 2024 14:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZlHh4L90z4M42; Fri, 25 Oct 2024 14:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729865888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJ8kTZnPbq2p5dQiz1Ydmnxl8K0k83klnUoSZyXmHDU=; b=tJaCyLFamgQEFZ8Uc0RttgGxyrm86O1JW7dmWpn5gbXxaZTOeMslMfI/0JZ5s9STjX/XYH 2lvjb1nna/bZqmNWqD1a+0X9xax6ma9nzwmZuM4lPM4ETMNbbJcd0jZeMjYuA7NbRzNW4W LhelpataCm1+l5lniBVpmhijaPACrl+FONumU+5CUdm69iUNUknXBw9wm5LBHHFuwHeNBB Y+rSOWSLB/+/2InyKJ3Z/UPUnLRC2hsJPFr2BOFm1dCirwrQEwie90I9ZunW9aYAhzjzzi PVGfrkhxVN/AzFgRcyOIpHrCL+F6ZJ9pTKVcCkV3MXjBZUWUldqbiB15Sb7e9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729865888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJ8kTZnPbq2p5dQiz1Ydmnxl8K0k83klnUoSZyXmHDU=; b=i3QryYyBLaANQynR84qgI7qd0HP7Sp87qp7c6bXOAW/NsqgC5QUxvE2RcTrzcQQogPji0w HLzFSANOCtLEIVH1Uo/tHHnwaMApuTg6l3IvvjaPeZeOcNWd/IKnz23ZAmEgn5FxpibL6j 8F2zQwcywyL1xb9Cc9MV/SvgmbFHY8Vp6rLMTa6H1hfdsHucYEcDICxn8SYCE7pUpdYWTu UJFhusTjYtDMkIzvC/rWhdLbtL+l05MmIVp8Lkl3V7otl1aI7/PPCf1hrSL8pB00q0kbaO 0VNU4Zlv37raSRYUc2JxI9yrhJasUSEbA5ODO1FOXcwZZXE7YDaKZkCx4r+0og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729865888; a=rsa-sha256; cv=none; b=GwKI0DkYwB6jfQZw1/pwMELVghhPgKAoMINNQIB0SJWk4mxbBG9+Vri5MYpLYtgMAiwvt8 V2sTnjC9m/Cs9ZA5iQtq1pTkyDAxldetK29T5FUpmRsDjtpdZjV+TVuh//k3lhygUq1kVd FHFC4sixo5FDktmOGenXLwBWBin6vYd0F9MJ1HUKXajeAjaJuySW5xUpLZ2zdw1lAqhDrC w8DXwJNjnhT5i9TzfNWq3ZHpAc6uhu4BZGId6+tYGLTdYOgYtug269Od2z0fKq/7farjze Ek8Ov7b8zCZeyzKpycqg+UGt7ppc51JYoLDVQeCIIeZrjLIZpx1yQpzpqwST0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZlHh3xTHzSv0; Fri, 25 Oct 2024 14:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PEI84P017088; Fri, 25 Oct 2024 14:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PEI8xT017085; Fri, 25 Oct 2024 14:18:08 GMT (envelope-from git) Date: Fri, 25 Oct 2024 14:18:08 GMT Message-Id: <202410251418.49PEI8xT017085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a2c0d2026fb4 - main - lib/libcrypt: use explicit_bzero() to clear sensitive buffers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: a2c0d2026fb422ade2171da4bc6d5d2773b268a6 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a2c0d2026fb422ade2171da4bc6d5d2773b268a6 commit a2c0d2026fb422ade2171da4bc6d5d2773b268a6 Author: Robert Clausecker AuthorDate: 2024-10-10 09:08:35 +0000 Commit: Robert Clausecker CommitDate: 2024-10-25 14:02:38 +0000 lib/libcrypt: use explicit_bzero() to clear sensitive buffers Prevent a potentially sufficiently smart compiler from optimising away our attempts to clear sensitive buffers. A related change was discussed and rejected in D16059, but I don't believe the reasoning there applies: the code clearly documents its intent that the `memset` calls clear sensitive buffers so they don't hang around. `explicit_bzero` is the appropriate function for this purpose. A potential performance disadvantage seems less important: the functions in crypt are specifically designed to be slow, so a few extra calls to guarantee that sensitive buffers are cleared does not significantly affect runtime. See also: D16059 Reviewed by: delphij, kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47037 --- lib/libcrypt/crypt-md5.c | 5 +++-- lib/libcrypt/crypt-sha256.c | 7 ++++--- lib/libcrypt/crypt-sha512.c | 7 ++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c index 52d38c64cdeb..609fbbf67b77 100644 --- a/lib/libcrypt/crypt-md5.c +++ b/lib/libcrypt/crypt-md5.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include "crypt.h" @@ -84,7 +85,7 @@ crypt_md5(const char *pw, const char *salt, char *buffer) (u_int)(pl > MD5_SIZE ? MD5_SIZE : pl)); /* Don't leave anything around in vm they could use. */ - memset(final, 0, sizeof(final)); + explicit_bzero(final, sizeof(final)); /* Then something really weird... */ for (i = strlen(pw); i; i >>= 1) @@ -140,7 +141,7 @@ crypt_md5(const char *pw, const char *salt, char *buffer) *buffer = '\0'; /* Don't leave anything around in vm they could use. */ - memset(final, 0, sizeof(final)); + explicit_bzero(final, sizeof(final)); return (0); } diff --git a/lib/libcrypt/crypt-sha256.c b/lib/libcrypt/crypt-sha256.c index 35c36bf93f3d..6da1d518b12d 100644 --- a/lib/libcrypt/crypt-sha256.c +++ b/lib/libcrypt/crypt-sha256.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "crypt.h" @@ -234,9 +235,9 @@ crypt_sha256(const char *key, const char *salt, char *buffer) * the SHA256 implementation as well. */ SHA256_Init(&ctx); SHA256_Final(alt_result, &ctx); - memset(temp_result, '\0', sizeof(temp_result)); - memset(p_bytes, '\0', key_len); - memset(s_bytes, '\0', salt_len); + explicit_bzero(temp_result, sizeof(temp_result)); + explicit_bzero(p_bytes, key_len); + explicit_bzero(s_bytes, salt_len); return (0); } diff --git a/lib/libcrypt/crypt-sha512.c b/lib/libcrypt/crypt-sha512.c index 640398afadc4..b760623b5d8d 100644 --- a/lib/libcrypt/crypt-sha512.c +++ b/lib/libcrypt/crypt-sha512.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "crypt.h" @@ -246,9 +247,9 @@ crypt_sha512(const char *key, const char *salt, char *buffer) * the SHA512 implementation as well. */ SHA512_Init(&ctx); SHA512_Final(alt_result, &ctx); - memset(temp_result, '\0', sizeof(temp_result)); - memset(p_bytes, '\0', key_len); - memset(s_bytes, '\0', salt_len); + explicit_bzero(temp_result, sizeof(temp_result)); + explicit_bzero(p_bytes, key_len); + explicit_bzero(s_bytes, salt_len); return (0); } From nobody Fri Oct 25 14:18:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XZlHj6vV3z5ZlBW; Fri, 25 Oct 2024 14:18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZlHj5K5Hz4LwM; Fri, 25 Oct 2024 14:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729865889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTj0itY60KdQRuWvhbMpmsLPCC1oPj0h70mS9JWWUIg=; b=PCL/lfS30I5GKjukTqAP0/aSZP1EWNlEud00DUS70LpNAIMg5XP6xOkcQIGVEm4I/PhRhV 2tdFUId2bca8417v9EgNRIVxFOC8I/uHEcla+hfdi6eNwMBzJaxAv1WwivCgP9ibPSAjCp +IIGtViirm3oh64byBsm6wTITlgI5R1CJjpRvYig6+3UKJM17i+GhmS2LfXHpTcaiZ6j9h JQSGt75rIAu6uY84kN2N8BggnFSpivKZFmeMWIihC2Xioab9lt9Se2bsKZSF97GDXjl+DO zOaEyuKujhCyKFoYFa+ax/n8OyxKZ3tarJNOLM0qO5YM6srhwWCpMzjKBUFQRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729865889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTj0itY60KdQRuWvhbMpmsLPCC1oPj0h70mS9JWWUIg=; b=edLk7I2kPJuNsVDWxPU3lwZgrNUqM0ZyVx+ZtWAZZkvhqdxjDfK8SoCcTLmgNVZ5/7jTaD jKbOBd00+3+mfADVNDHo1LV1qxilQpiy+y52XGdyD5dKhuhjUt4DmtTcoeWx2YdFW5CCw6 KOeE1XfgCpIyGC9xW1qqrGl9qSczMj568zNXGZigOu0e5cQfTAy401j0BFMAqtGnSLYexV bfPGwjnY9Ftf0HpBYvO+qqdrNaRHwl98/6ZdN+hOyDeULpOLJl7vKOGHEd2QY4HLdx31ha q5Y1dM+zROELzFK62YB7DD8gnK/NMlEi1gdrj/K7T72zMpHvC0yu9QouXOHDTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729865889; a=rsa-sha256; cv=none; b=HZmb4o/6e3qisIVjqhK6L4LgqRdSmLCDIHA5FjAxdhJ4+IYMXihcK/ZgpAF5O4M0PlMAWw d45/fO6rB6y4j6xmKMwnFu1YcqvBzxlNMKF0NK/6GR8g+K6rOcOjia8UP4RT+8NXMGbpil 3DHHgfQYdo2pf6QroiFtJmJ+h9KZOAzO+sv5fASmoJ43dZzEG5/4/1QFLFKyP11AgN+xiO /ewkVWKwjDnHmSnFoeihK/xxAU2OhT5h4femdvu2ZzOj2YQNI+sBvZdIbu92wbmbZQhIQK atmLc/+EjMRx9v/eM3Ry1IXGTM7HzjCJI21vwuYP7I27jamFVxuXozIGi1ZB7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZlHj4wL8zSxb; Fri, 25 Oct 2024 14:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PEI99H017127; Fri, 25 Oct 2024 14:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PEI9sv017124; Fri, 25 Oct 2024 14:18:09 GMT (envelope-from git) Date: Fri, 25 Oct 2024 14:18:09 GMT Message-Id: <202410251418.49PEI9sv017124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: cb5e41b16083 - main - lib/libcrypt: unbundle hash 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: cb5e41b160838880de7d03100afa02e4edee5a9e Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=cb5e41b160838880de7d03100afa02e4edee5a9e commit cb5e41b160838880de7d03100afa02e4edee5a9e Author: Robert Clausecker AuthorDate: 2024-10-11 15:41:52 +0000 Commit: Robert Clausecker CommitDate: 2024-10-25 14:02:38 +0000 lib/libcrypt: unbundle hash functions libcrypt bundles the various hash functions it needs, duplicating code that is also found in libmd. Unbundle the hash functions and apply the same hack used for libncursesw so static consumers link -lmd in addition to -lcrypt. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D47062 --- Makefile.inc1 | 1 + lib/Makefile | 1 + lib/libcrypt/Makefile | 41 +++++++++++++++++++++++------------------ lib/libcrypt/libcrypt.aldscript | 1 + lib/libcrypt/libcrypt.ldscript | 1 + share/mk/src.libnames.mk | 1 + 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0a8895933bea..69a1ad2c8d01 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3223,6 +3223,7 @@ lib/libc__L: lib/libsys__L lib/libgcc_s__L: lib/libc__L lib/libgcc_s__L: lib/libc_nonshared__L lib/libcxxrt__L: lib/libgcc_s__L +lib/libcrypt__L: lib/libmd__L _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libhdb} \ diff --git a/lib/Makefile b/lib/Makefile index e4a4aa95a1ef..fdfe198bea10 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -128,6 +128,7 @@ SUBDIR_DEPEND_libc++:= libcxxrt SUBDIR_DEPEND_libc= libsys libcompiler_rt libssp_nonshared SUBDIR_DEPEND_libcam= libsbuf SUBDIR_DEPEND_libcasper= libnv +SUBDIR_DEPEND_libcrypt= libmd SUBDIR_DEPEND_libdevstat= libkvm SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil SUBDIR_DEPEND_libedit= ncurses diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index d9bd85f7e699..5a9eac4c682f 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -10,17 +10,15 @@ PACKAGE= runtime SHLIB_MAJOR= 5 LIB= crypt -.PATH: ${SRCTOP}/sys/kern ${SRCTOP}/sys/crypto/sha2 SRCS= crypt.c misc.c \ - crypt-md5.c md5c.c \ - crypt-nthash.c md4c.c \ - crypt-sha256.c sha256c.c \ - crypt-sha512.c sha512c.c + crypt-md5.c \ + crypt-nthash.c \ + crypt-sha256.c \ + crypt-sha512.c MAN= crypt.3 MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \ crypt.3 crypt_set_format.3 -CFLAGS+= -I${SRCTOP}/lib/libmd \ - -I${SRCTOP}/sys/crypto/sha2 +CFLAGS+= -I${SRCTOP}/lib/libmd # Pull in the strong crypto, if it is present. .if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no" @@ -29,17 +27,6 @@ SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH .endif -.for sym in MD4Init MD4Final MD4Update MD4Pad \ - MD5Init MD5Final MD5Update MD5Pad \ - SHA224_Init SHA224_Final SHA224_Update \ - SHA256_Init SHA256_Final SHA256_Update \ - SHA512_224_Init SHA512_224_Final SHA512_224_Update \ - SHA512_256_Init SHA512_256_Final SHA512_256_Update \ - SHA384_Init SHA384_Final SHA384_Update \ - SHA512_Init SHA512_Final SHA512_Update -CFLAGS+= -D${sym}=__${sym} -.endfor - WARNS?= 2 PRECIOUSLIB= @@ -47,4 +34,22 @@ PRECIOUSLIB= HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +LIBADD+= md +SHLIB_LDSCRIPT= libcrypt.ldscript +STATIC_LDSCRIPT= libcrypt.aldscript +CLEANFILES+= libcrypt.ald + +libcrypt.ald: ${.CURDIR}/${STATIC_LDSCRIPT} + sed -e 's,@@LIB@@,${LIB},g' \ + -e 's,@@STATICLIB_SUFFIX@@,${_STATICLIB_SUFFIX},g' \ + ${.ALLSRC} > ${.TARGET} + +all: ${STATIC_LDSCRIPT} libcrypt.ald + +install-libcrypt.a: libcrypt.ald + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} libcrypt.ald ${DESTDIR}${_LIBDIR}/lib${LIB}.a + +realinstall: install-libcrypt.a + .include diff --git a/lib/libcrypt/libcrypt.aldscript b/lib/libcrypt/libcrypt.aldscript new file mode 100644 index 000000000000..cfc8020dd9e3 --- /dev/null +++ b/lib/libcrypt/libcrypt.aldscript @@ -0,0 +1 @@ +INPUT(-l@@LIB@@@@STATICLIB_SUFFIX@@ -lmd) diff --git a/lib/libcrypt/libcrypt.ldscript b/lib/libcrypt/libcrypt.ldscript new file mode 100644 index 000000000000..a0b20fa43fe8 --- /dev/null +++ b/lib/libcrypt/libcrypt.ldscript @@ -0,0 +1 @@ +INPUT(@@SHLIB@@ AS_NEEDED(-lmd)) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 092e1b444beb..588291d8ec9c 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -322,6 +322,7 @@ _DP_cap_grp= nv _DP_cap_pwd= nv _DP_cap_sysctl= nv _DP_cap_syslog= nv +_DP_crypt= md .if ${MK_OFED} != "no" _DP_pcap= ibverbs mlx5 .endif From nobody Fri Oct 25 14:29: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 4XZlXN5NbJz5ZmCQ; Fri, 25 Oct 2024 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZlXN4cX0z4PbK; Fri, 25 Oct 2024 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729866548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJbuP+LeiMCNtvWbo8f5qtQ/g8xWYXQQF+dgxNrlaas=; b=qdOSWzIy3IfU3/5S5xhscDFOBBxPFtkI69A1ouE8PDxe2qrocmB3mmQsQwj7uwFf8TM6CY 3oTathQ/TwoT5Cud5plWOLCuCvpUOBNgSJyPs/obSn4UsxTuKbatnwDhrXZBjOgdIyUnSe o0ensnFnQJ2bcQPiuDICoq5zRRF04+xNdnrk3LRUH3AgdQ/wyx1r8/nxJvmuPmEZG8XCdK LPNM0PTMroKhJNGtMsiUqCEzQvgL1rBbE8d8BshFwb0oqIklYjHtM4niV1A3lz5YzqceHk 9416jfCE9Hd+9FvGHcxNV3ngR9iDFyIByBsUrtNy0p4gpP5uttGR0xnxnG+M9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729866548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJbuP+LeiMCNtvWbo8f5qtQ/g8xWYXQQF+dgxNrlaas=; b=gk8FwIAN7ZKQcaSfjAdxpmSI1CXMKaVtkqiEShxvV6p150Zrb2sHTfQjuSger7fdkYmeXF 9hhTdowpfPydMjjkBHHa2zg3jv2Zvfw7X5u1l4ILTAtbFj9qkO4KmZT7hpZ3Ow2iaJyf0i Whr74+n/+7Iqtnb4qZmCfxA2jTeNKkOBIV7PlpZBoxyVOrNmAGCwF09Gi9manw8tjzhANs iKOmd5xVGZXGgE0Y8jYi49msr1qIoZz46OG384yaZLJkLjldW9VrDf96atyquxGxnhLt4h 880+2KBr8X44Xqbxm+dCXy0O/5pXRbZHX7msSf3rDOE2q9piJdi5Lz2quSNFJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729866548; a=rsa-sha256; cv=none; b=QXkeI5JJytBRyDBF4+ifC3g2cN8xFy6glLqKjpQy42jDgOssUwHdIDRY+1roph/BcUBr3Q 70elebp9sFjM4d47mlA8GeATsjbYsQLoTST2jTvqhgh0kdL52q90/map9+Vc6H4axO6v4L KxWqS/nbZ2J13PHkmya6mMuGyl33g2fwfuE76MCt+h/m0iIpX9hksgPzPsyRElI/qONpv7 VJjv+HF39N8Rai1jjr/R9coVOvty0J2hwVc759O/UXHbQPTSvH50nLHDJgjWq7kWCWHtCD gl+sls4MFCKOUzahaW3zCfpdJF63qaF0e7/1eOrU4nAE9d64Nlu/kA/L2RYx6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZlXN4CnHzT2F; Fri, 25 Oct 2024 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PET8ck036146; Fri, 25 Oct 2024 14:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PET8lx036141; Fri, 25 Oct 2024 14:29:08 GMT (envelope-from git) Date: Fri, 25 Oct 2024 14:29:08 GMT Message-Id: <202410251429.49PET8lx036141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 02478e65910a - main - sctp: further cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02478e65910ab1ef53511ebb2271cdcf0e9a14cf Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=02478e65910ab1ef53511ebb2271cdcf0e9a14cf commit 02478e65910ab1ef53511ebb2271cdcf0e9a14cf Author: Michael Tuexen AuthorDate: 2024-10-25 11:47:43 +0000 Commit: Michael Tuexen CommitDate: 2024-10-25 11:47:43 +0000 sctp: further cleanup MFC after: 3 days --- sys/netinet/sctp_pcb.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 3b59a72e1f1a..112242a0e7e3 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -455,7 +455,6 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, struct sctp_ifalist *hash_addr_head; struct sctp_ifnlist *hash_ifn_head; uint32_t hash_of_addr; - int new_ifn_af = 0; #ifdef SCTP_DEBUG SCTPDBG(SCTP_DEBUG_PCB4, "vrf_id 0x%x: adding address: ", vrf_id); @@ -519,7 +518,6 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, LIST_INSERT_HEAD(hash_ifn_head, sctp_ifnp, next_bucket); LIST_INSERT_HEAD(&vrf->ifnlist, sctp_ifnp, next_ifn); atomic_add_int(&SCTP_BASE_INFO(ipi_count_ifns), 1); - new_ifn_af = 1; } sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); if (sctp_ifap) { @@ -529,7 +527,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, SCTPDBG(SCTP_DEBUG_PCB4, "Using existing ifn %s (0x%x) for ifa %p\n", sctp_ifap->ifn_p->ifn_name, ifn_index, (void *)sctp_ifap); - if (new_ifn_af) { + if (new_sctp_ifnp == NULL) { /* Remove the created one that we don't want */ sctp_delete_ifn(sctp_ifnp); } @@ -597,8 +595,8 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifap->src_is_priv = 1; } sctp_ifnp->num_v4++; - if (new_ifn_af) - new_ifn_af = AF_INET; + if (new_sctp_ifnp == NULL) + sctp_ifnp->registered_af = AF_INET; break; } #endif @@ -617,13 +615,12 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifap->src_is_priv = 1; } sctp_ifnp->num_v6++; - if (new_ifn_af) - new_ifn_af = AF_INET6; + if (new_sctp_ifnp == NULL) + sctp_ifnp->registered_af = AF_INET6; break; } #endif default: - new_ifn_af = 0; break; } hash_of_addr = sctp_get_ifa_hash_val(&sctp_ifap->address.sa); @@ -639,9 +636,6 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, sctp_ifnp->ifa_count++; vrf->total_ifa_count++; atomic_add_int(&SCTP_BASE_INFO(ipi_count_ifas), 1); - if (new_ifn_af) { - sctp_ifnp->registered_af = new_ifn_af; - } SCTP_IPI_ADDR_WUNLOCK(); if (new_sctp_ifnp != NULL) { SCTP_FREE(new_sctp_ifnp, SCTP_M_IFN); From nobody Fri Oct 25 14:58: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 4XZmB90Xz8z5ZmwJ; Fri, 25 Oct 2024 14:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZmB901qxz4S3m; Fri, 25 Oct 2024 14:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729868305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lCIltLjGiibWEA+FJ9Bjj/qZ87qHfrfBY4+hzRP+hZQ=; b=QJK5pzUopvNRMhJ6z+eI08eJ6RRlAdX3w4GGeibDckQv2JARVd8ZrmG6cV7aVTZOU6IB7B pnSczw5VkZ6CubyOoFhpyeIAPJfvR3br3xulfEPGnhHThBhqlXqlCSbKkYCcpoBDKZtJy6 dlaC9sKbnkZ24Kwb18/BfaS+zilkXGgdix0+WSl7qHfnrzLfbmSkdFyhigchK0ObwtoKds IQ9TcAY6anGZibFoUn90LJoJ331LU6mmTzlZwbOL0ozyC1z2t+9AoCNY4rFWGwV65lO0NG 8RebG3t3QFNXW1ulWUN8r3yKtfe+MFtmpXKhfWalIWFU3ccR8LFB1wrhwWst5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729868305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lCIltLjGiibWEA+FJ9Bjj/qZ87qHfrfBY4+hzRP+hZQ=; b=XaPKolXvGcQ9T8FckljYIXoiLvnad8Q+dL5AbvkLYObT1dgyyVmeb+P51CSyRslpeCrpG2 k4qmhPZDaNM5NCpPUoOGaqmVydM9MHv1dGbGxfejWosRf3XXpO56NkrbJdQa5QPpNs9Dy9 fu39JRHd6iHzgeqLDCDbyI0/ALBUnB4wYg6PtR9LuIPh1u0oNnfyQmnQPHik5N+uVBJFjK b9RSyv/vjT7hCyYWrUTDRVgL/rBYzDyG0srNZc5YgY21rgSxGBAtvcXvVkxtwqNIGPIgha dpgfVjG/Sw44rUqpcxJtotYzKHJhctrUKYFpKCAZswstx0B73XCnHJzy/f1Zgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729868305; a=rsa-sha256; cv=none; b=Dgrj7lWBJr5BKGy32UDzLy7qTiFhXbjJxNA1FrH/Zrql7j1rO9L9gf1Sv1Pc07qN55uof7 qbGjiHvP6hQdVz4blDJEmEh3LJyahXKDFW4a5+dDk/DBb+07USzdEu1OnGtR5g1aTOUK8h tUAUdELuvpJp2lKePMcuXrrz0M9xVE9u0lyJL8M6Rykz2a6QUmK1H/xzum1Z37jnc7rcUr Nr+yDx14lAG02v4xOPybE9oQze3iY9RZo3FffvfqpkkUkg9JbvFQYAm04/7M9WGV0Jcb+t pxOewFcM6Jh/ndlHkUHQgT7+8VsCbt04IX6Nxft+bB3DeseNAUYJaceTaXWxfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZmB86fdVzVnn; Fri, 25 Oct 2024 14:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PEwOL8090712; Fri, 25 Oct 2024 14:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PEwO8M090709; Fri, 25 Oct 2024 14:58:24 GMT (envelope-from git) Date: Fri, 25 Oct 2024 14:58:24 GMT Message-Id: <202410251458.49PEwO8M090709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: a05620b0f67f - main - sctp: cleanup the addition of addresses which are already known List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a05620b0f67fe526350bf386882262ca8005533f Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a05620b0f67fe526350bf386882262ca8005533f commit a05620b0f67fe526350bf386882262ca8005533f Author: Michael Tuexen AuthorDate: 2024-10-25 12:11:09 +0000 Commit: Michael Tuexen CommitDate: 2024-10-25 12:11:09 +0000 sctp: cleanup the addition of addresses which are already known No functional change intended. MFC after: 3 days --- sys/netinet/sctp_pcb.c | 83 ++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 112242a0e7e3..b69e7d764330 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -520,56 +520,61 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, atomic_add_int(&SCTP_BASE_INFO(ipi_count_ifns), 1); } sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap) { - /* Hmm, it already exists? */ - if ((sctp_ifap->ifn_p) && - (sctp_ifap->ifn_p->ifn_index == ifn_index)) { - SCTPDBG(SCTP_DEBUG_PCB4, "Using existing ifn %s (0x%x) for ifa %p\n", - sctp_ifap->ifn_p->ifn_name, ifn_index, - (void *)sctp_ifap); - if (new_sctp_ifnp == NULL) { - /* Remove the created one that we don't want */ - sctp_delete_ifn(sctp_ifnp); - } - if (sctp_ifap->localifa_flags & SCTP_BEING_DELETED) { - /* easy to solve, just switch back to active */ - SCTPDBG(SCTP_DEBUG_PCB4, "Clearing deleted ifa flag\n"); - sctp_ifap->localifa_flags = SCTP_ADDR_VALID; - sctp_ifap->ifn_p = sctp_ifnp; - atomic_add_int(&sctp_ifap->ifn_p->refcount, 1); - } - exit_stage_left: - SCTP_IPI_ADDR_WUNLOCK(); - if (new_sctp_ifnp != NULL) { - SCTP_FREE(new_sctp_ifnp, SCTP_M_IFN); - } - SCTP_FREE(new_sctp_ifap, SCTP_M_IFA); - return (sctp_ifap); - } else { - if (sctp_ifap->ifn_p) { + if (sctp_ifap != NULL) { + /* The address being added is already or still known. */ + if (sctp_ifap->ifn_p != NULL) { + if (sctp_ifap->ifn_p->ifn_index == ifn_index) { + SCTPDBG(SCTP_DEBUG_PCB4, + "Using existing ifn %s (0x%x) for ifa %p\n", + sctp_ifap->ifn_p->ifn_name, ifn_index, + (void *)sctp_ifap); + if (new_sctp_ifnp == NULL) { + /* Remove the created one not used. */ + sctp_delete_ifn(sctp_ifnp); + } + if (sctp_ifap->localifa_flags & SCTP_BEING_DELETED) { + /* Switch back to active. */ + SCTPDBG(SCTP_DEBUG_PCB4, + "Clearing deleted ifa flag\n"); + sctp_ifap->localifa_flags = SCTP_ADDR_VALID; + sctp_ifap->ifn_p = sctp_ifnp; + atomic_add_int(&sctp_ifap->ifn_p->refcount, 1); + } + } else { /* * The last IFN gets the address, remove the * old one */ - SCTPDBG(SCTP_DEBUG_PCB4, "Moving ifa %p from %s (0x%x) to %s (0x%x)\n", - (void *)sctp_ifap, sctp_ifap->ifn_p->ifn_name, + SCTPDBG(SCTP_DEBUG_PCB4, + "Moving ifa %p from %s (0x%x) to %s (0x%x)\n", + (void *)sctp_ifap, + sctp_ifap->ifn_p->ifn_name, sctp_ifap->ifn_p->ifn_index, if_name, ifn_index); /* remove the address from the old ifn */ sctp_remove_ifa_from_ifn(sctp_ifap); /* move the address over to the new ifn */ sctp_add_ifa_to_ifn(sctp_ifnp, sctp_ifap); - goto exit_stage_left; - } else { - /* repair ifnp which was NULL ? */ - sctp_ifap->localifa_flags = SCTP_ADDR_VALID; - SCTPDBG(SCTP_DEBUG_PCB4, "Repairing ifn %p for ifa %p\n", - (void *)sctp_ifnp, (void *)sctp_ifap); - sctp_add_ifa_to_ifn(sctp_ifnp, sctp_ifap); } - goto exit_stage_left; - } - } + } else { + /* Repair ifn_p, which was NULL... */ + sctp_ifap->localifa_flags = SCTP_ADDR_VALID; + SCTPDBG(SCTP_DEBUG_PCB4, + "Repairing ifn %p for ifa %p\n", + (void *)sctp_ifnp, (void *)sctp_ifap); + sctp_add_ifa_to_ifn(sctp_ifnp, sctp_ifap); + } + SCTP_IPI_ADDR_WUNLOCK(); + if (new_sctp_ifnp != NULL) { + SCTP_FREE(new_sctp_ifnp, SCTP_M_IFN); + } + SCTP_FREE(new_sctp_ifap, SCTP_M_IFA); + return (sctp_ifap); + } + KASSERT(sctp_ifnp != NULL, + ("sctp_add_addr_to_vrf: sctp_ifnp == NULL")); + KASSERT(sctp_ifap == NULL, + ("sctp_add_addr_to_vrf: sctp_ifap (%p) != NULL", sctp_ifap)); sctp_ifap = new_sctp_ifap; memset(sctp_ifap, 0, sizeof(struct sctp_ifa)); sctp_ifap->ifn_p = sctp_ifnp; From nobody Fri Oct 25 15:16: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 4XZmZb4Qztz5Znpm; Fri, 25 Oct 2024 15:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZmZb3slmz4Tsn; Fri, 25 Oct 2024 15:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729869367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/AiQCILIf5tsUWGGNWk3sp6Ynzbu6z4v5X8MZJy1es=; b=xpBWMDxAKS2sNPGgtXKNbm1qJKQwbumpJu09jhT4BgOXwNeiooUFEJdtB5M72Hj7AejMV+ qtgDSdo0bwu46jxh7b9KM8vYocHAyG+E2VN53GCm8QhAAPegvH3MDmajp4naoey2ff7Vh6 nEz1x3wMEo0qhoVC3mCTXUsa39gsGl1e2+9NxCs5GyzNfyRomU4g4VHxwfaJ1IAGSuHrLc LHHBUUGdEOYsb0ibgFBQh4jtOMBIyngOAcMindYZJHh0E43hG9KvpgVY7mwwpF/sSKi/a9 0subhrnXTeUXsgjFAb8oQt0eSWDFTE1ceVAKtr5S976Gq0pScSJYbU349APU1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729869367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/AiQCILIf5tsUWGGNWk3sp6Ynzbu6z4v5X8MZJy1es=; b=T/J+omyHZ04fgU56PiaBXnSWH4d2okW0MsPRgFoS18JtHlC9RUUCuNyxiLRV7J7uFUBkNz wwdwyYCJ1Q0IIU1IReefoU43e1QLMJMpMfTRfatN31ebAvpG0UWXmIx7ibCrPtdAhQ81mM mQzB/kur0pEIK4t7Hc2x6D4PmF/vNH792Waf6gaHJcLxCZw2MzYyw3R3jeTlIXxZ2LQXEe cjjj4Fb7epdiK0LxOIakG9CHLMlyWWuSDQj4rNLXxrKJCQVImdBHjNi675AmSHUZcNYFaZ Uvshtg46E6O5h6cCEy0Ry1fKQykYYWED6URoFgCsPlvHzaAs6aD7go+iW57faw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729869367; a=rsa-sha256; cv=none; b=qwZCZ0jbrGdODTXJdoA9yZRcvbpB3p+W49BqqwcGc6t1Av4Guoa8SYL9M+CB0iZZlko4+t rOoOBMbxjacsSIO4Arbk4QYVRSN6rqpohftLqZMwIZzNTwlLjl1UTguBjEh/uIP3XWJ1fR RrcF7uP2FUHaAs2bvi12pH9Oo4J8OAlZTg1SCNpfanwPU/B2tlS/fcNO9p8PcxWXV34KEk o+5CMjHiWI89LiF5RTuhFt/xmx+8C86XMAYDlaQzqp9Pk0uO6pbk/9kXNwwcAqJmVgzwVw 6oAdOMWL1MIeSQnbjlFEVAytWDjjfi+Q4KoxGLPl3PZDj0awHysshgF9mmnnvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZmZb3LQ7zW9F; Fri, 25 Oct 2024 15:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PFG7XP027920; Fri, 25 Oct 2024 15:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PFG7jZ027917; Fri, 25 Oct 2024 15:16:07 GMT (envelope-from git) Date: Fri, 25 Oct 2024 15:16:07 GMT Message-Id: <202410251516.49PFG7jZ027917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: c61104166084 - main - release: tweak Oracle Cloud settings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c611041660845e8ee8bf3009b32327d1f783a47b Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=c611041660845e8ee8bf3009b32327d1f783a47b commit c611041660845e8ee8bf3009b32327d1f783a47b Author: Dave Cottlehuber AuthorDate: 2024-10-25 15:11:24 +0000 Commit: Dave Cottlehuber CommitDate: 2024-10-25 15:13:20 +0000 release: tweak Oracle Cloud settings - use raw image disk type and enable zfs, this yields smaller images for upload after using native qcow2 + zstd compression Reviewed by: lwhsu, emaste Differential Revision: https://reviews.freebsd.org/D47055 MFC after: 3 days Approved by: emaste --- release/Makefile.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index a78a5f33a285..5ae603b05983 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -46,8 +46,8 @@ EC2-SMALL_DESC= Amazon EC2 small image GCE_FORMAT= raw GCE_FSLIST?= ufs zfs GCE_DESC= Google Compute Engine image -ORACLE_FORMAT= qcow2 -ORACLE_FSLIST?= ufs +ORACLE_FORMAT= raw +ORACLE_FSLIST?= ufs zfs ORACLE_DESC= Oracle Cloud Infrastructure image OPENSTACK_FORMAT=qcow2 OPENSTACK_FSLIST?= ufs From nobody Fri Oct 25 15:58: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 4XZnWm6hvrz5ZrG3; Fri, 25 Oct 2024 15:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZnWm67Dgz4b11; Fri, 25 Oct 2024 15:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729871924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2JF7t1G8ItdG4VoAm0WI1CylCZ9iUT1o4SfNryjoI24=; b=EnkuaINtkYA00WDrwzP3qZsM2lwoT1QyDLFktLOnkS0g2NdIW3XzSX4s9XJmxj97oMM31a b5oT1J1BlWVgPLYlCdtX/p5md080vGgy1wyZsReGWE4SO5uKIuNROBH/0uFtBu0Or8jZ9n MzqafCo9qQeNiFwliFLkI0HDEyMUwwAmiwcsR4BHu8CPK7ADLriT48SR4UOFI+z28obrrl 5uqn4gdmHqb5zn1N1k63PGseCtEP0TuMVZpkvyWLseNcUlUJzljA+1ZrGSTggPbBeBKOeh W5Sl4akr77lkSQNx2eJpHXTlSSJDtk4lbSRoiDoWWqRnI4pfXdKHd0E17Wk5XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729871924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2JF7t1G8ItdG4VoAm0WI1CylCZ9iUT1o4SfNryjoI24=; b=OjeT0jYXjWJSp2qdJW9s3cFKiOPZs1x1X82DFLXHWD4Zggr/hOSkDgj6I9sqK21w1sP5Dc dYFWwIL0CAFg9gOUm+jTaIBeR3I+tIo2lFxZH5wpHMJwmJBhWMGjYINyDrkXTdyE4ZfqD+ /AtMxobTlaSg432HvafLQkpCkTTwTU/OQfdc6ie68rhFJWCiR0yiYKrrkRagGOrvCMNjeH Z+Nhi6o0sTOrlp1Uou2slAia5SvoVWUaYu9hyOAOhm0Nol1RowkFaclR+ufWivhzTFDp+e SarbkCVTTlmt66CtcMSvQC+LaNdLpYbCI5e6N6Tp8lHS10QRAjK/advlFxyhbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729871924; a=rsa-sha256; cv=none; b=lQui9E/oy7OaycNluJkEPeNsar8YWffBWbI2vhSerBxA/ICX93+7qv6D2Hv45+UaZ1Vl3Z JDnaEKlRgeWGeiVwm9ryzP/GDYUQnX9wq2ODW09iH96ZtwphcUETkG22dFtA2g3l4mUNbt XtiTm0puYNijRKpK+W5w0jols1Dx7vQwYAzXSJhrFajsXhZm3p7YN73kVgoyWfoZ9WQeLS Xe3E8yydfJ1NZcjHbpulQWX+UOwSHeXqqaEWlmVYtvuP1o+Rd64ZAGWt9LN3CDyFzZdpIG hK20VHUuBkbpfEQhI7o98XeXzQHl6cMvG5OmzyDdIkIaITy0KC4xKuY+qbdydQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZnWm5c2FzXVW; Fri, 25 Oct 2024 15:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PFwikI003091; Fri, 25 Oct 2024 15:58:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PFwiZQ003088; Fri, 25 Oct 2024 15:58:44 GMT (envelope-from git) Date: Fri, 25 Oct 2024 15:58:44 GMT Message-Id: <202410251558.49PFwiZQ003088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2a0d3dd35197 - stable/14 - sysctl(8): Fix typo in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2a0d3dd35197d7220c43efb281f85f37cc7019f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2a0d3dd35197d7220c43efb281f85f37cc7019f8 commit 2a0d3dd35197d7220c43efb281f85f37cc7019f8 Author: Hao-Yu Hou AuthorDate: 2023-12-30 09:36:11 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-25 15:57:04 +0000 sysctl(8): Fix typo in comment Line214: combind -> combine Reviewed by: zlei Event: Advanced UNIX Programming Course (Fall’23) at NTHU Request: https://github.com/freebsd/freebsd-src/pull/966 (cherry picked from commit 2e8ad2b698498a1c380d0d6fc5792b2c56926801) --- sbin/sysctl/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 7ed7be95c9a5..df388e41c560 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -212,7 +212,7 @@ main(int argc, char **argv) argc -= optind; argv += optind; - /* Nflag is name only and doesn't make sense to combind with these */ + /* Nflag is name only and doesn't make sense to combine with these */ /* TODO: few other combinations do not make sense but come back later */ if (Nflag && (lflag || nflag)) usage(); From nobody Fri Oct 25 15:58: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 4XZnWp3hgmz5ZqqY; Fri, 25 Oct 2024 15:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZnWp1MRQz4ZpJ; Fri, 25 Oct 2024 15:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729871926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j86+V4ht3ExZ6jn/aw9El5ZvJFco79SvH6xTgWLGomc=; b=q6OiuUMi6TrQIdBrZZ/MS+37wQ30TY2mDf2utz3la8ZcAfH4TmSt1pAzIkG2G1DDyDdcKG 8Mh/mjdIRuGkNS4RVrsNh1qycvx6JDuWCfGlb4RjF5nH4+QeVnPdQdw5sF0u+diHtjUlMU l6UAWr6gLr0BlA7s+uUE1ufmHrNFbI9BzoP8x0somRnGeB8iqiY+z9zVNlBA0oE4yPfuNA IMtMe1KOs15gL92ykLKis2TyFJWBLlKvI8kZU9cMSidG6j+6TdbbNzb2br9v0/C+R1MMaG tGayM6mixgMFPraPzDT10XQ0epg2tHFTKjZHxE+4jTF3Dpa/w8eqbH66+dw5fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729871926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j86+V4ht3ExZ6jn/aw9El5ZvJFco79SvH6xTgWLGomc=; b=BsNLqYMaHWXATSLw7zykg21bEVsGr9NQ4VlNCWC9JkEnYhlU63wdFUNiwKN54SJ9DUlFTI AtTrIBpOPxYTeduSfgYVpYEdKjW71qgGnjtwx9g/1/iZhdn10ufEiCxFchRUmC08EJInXE 0A3/15OrVESUPesGGZwWis9MUkcKFWu0WnSuoBw4NTdAJNT1KGjVt08Q8pF73JYplI69YY aTX9U2ZMtbjM2GK13eIApdb2Pmn+L/A6IxE1az8fkh24a3Qc/qR7Wc1RGKS0OlcM9e5m6H 1ZhoiCN7Ql/gPOSBeYGRMJN0dIRREKn8ytWajjm+aoD+/6JaiRd8PTFdTaKJCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729871926; a=rsa-sha256; cv=none; b=r6oDEecb947rslMoIVDoRzTsZrS5lN2G2V++SuqLX97ToTwcUsM6UFjnmBECCTjbFb8DLL Maer35NvRNKCmlbpLGVqlJ0fbpOhh4Xe/IbnYwFLBbrH0s5GMqt7OCIwiGDyQwjVDVSDu2 7N3Rm0DnQ/ju6NRCpCNFLqwcFZhAPMAQXEA34zLYlz0PbabU9gLUWAfTIaUpSt7Tzq7ybM erIdTjwDYxylIQ+dnRUs2dfbT6HkipZJFvDETHR3tN8HbHFCaMalRcubAen7jBhGgcOOlO 8MGGy/ZmFlPg5lf6TFdHxwofSjgqs7MI+PhQkB9MvvwdvgOM45n+831PDQRVKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZnWn6bTczXVX; Fri, 25 Oct 2024 15:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PFwjmx003133; Fri, 25 Oct 2024 15:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PFwjdp003130; Fri, 25 Oct 2024 15:58:45 GMT (envelope-from git) Date: Fri, 25 Oct 2024 15:58:45 GMT Message-Id: <202410251558.49PFwjdp003130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: bbd018d0aaaf - stable/14 - ping(8): Fix typo in ping6.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bbd018d0aaaf24148c5e23b23802fa7f3cec734e Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bbd018d0aaaf24148c5e23b23802fa7f3cec734e commit bbd018d0aaaf24148c5e23b23802fa7f3cec734e Author: Hao-Yu Hou AuthorDate: 2023-12-30 09:59:27 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-25 15:57:05 +0000 ping(8): Fix typo in ping6.c Line 703 & 863: kerel -> kernel Line 2110: resposne -> response Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/967 (cherry picked from commit e9866ce84f41bf8a5122713b027d1af05cbbb5b3) --- sbin/ping/ping6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index 10deb57ad6bc..afbaba33e4f7 100644 --- a/sbin/ping/ping6.c +++ b/sbin/ping/ping6.c @@ -713,7 +713,7 @@ ping6(int argc, char *argv[]) } /* - * let the kerel pass extension headers of incoming packets, + * let the kernel pass extension headers of incoming packets, * for privileged socket options */ if ((options & F_VERBOSE) != 0) { @@ -873,7 +873,7 @@ ping6(int argc, char *argv[]) } #endif /*ICMP6_FILTER*/ - /* let the kerel pass extension headers of incoming packets */ + /* let the kernel pass extension headers of incoming packets */ if ((options & F_VERBOSE) != 0) { int opton = 1; @@ -2120,7 +2120,7 @@ pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen) /* * In icmp-name-lookups 05 and later, TTL of each returned address - * is contained in the resposne. We try to detect the version + * is contained in the response. We try to detect the version * by the length of the data, but note that the detection algorithm * is incomplete. We assume the latest draft by default. */ From nobody Fri Oct 25 16:08: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 4XZnlS475Dz5Ztdg; Fri, 25 Oct 2024 16:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZnlR4jfNz3y9n; Fri, 25 Oct 2024 16:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729872531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vh0uD4KnWnVIHlO07SxwmcuQnHyP8yy6tEAWJcI2g8M=; b=A60D2PpxRMX6b1kBpZR2gofOeCb4kM8l0YTh82jZ/f94WRbALyHb4XWg9jUb5mjPxLpqO1 DJ5ltyUqr6OJ8lPZD/ulG5xQoMedYOtXBpHT3cS0V5Sxz0lhfileE6GakSRcBkHOQk19Ca ec41RG2LVPodX0ZTe4NYbIAifkD67DeboN/JpHMBl2jLRI8KjJKQPE36D14htR2oWNwfIa Cm6FdRou7ecOa7ROstwmFWe7n+LzON2Ldl/ui7ScqVU9zDUT5Ym4Uo2Nsh9Dup+rlFAjGd E7QFas5JH7VZqxPq+ueBxwJ70wfEHs1JO2BLrtU98C3QgCqUyrRBZZc/z/I3Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729872531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vh0uD4KnWnVIHlO07SxwmcuQnHyP8yy6tEAWJcI2g8M=; b=vqhtxY87ZxksanzXQE6uQZ//F7v6dPw5hhs7vJ6l0neeuLJZi5le7Q9nQusTIssHzDIXAo 3xd/cR/mKV+YdSwyFLL68bYQY13dP7a8jJ1YXMQtoHVFr4UqCtc0kId9+VT/J/o2ouD0x7 zsMZq9UB4gfCcoiwA5t1N21znj8NMvB1pmeX8UvATAXXKqifM0AIjOYbmpAzl9/pC4UMSH HmU6RkR9na3ILNcgG9Z6CY9ba62t4rV9oSZOremV3gnx5jMKOkqg7TLu85bpiIy2k+N7nI szfjjoZ4Z6qL33Dj80Pi4L2lDIl3hUgfcF/4GajlGyqwpXBkDK2dlPzv80/Vfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729872531; a=rsa-sha256; cv=none; b=sSIrxFwBKs95Nak5v9sv04Xeo3y/+MRZ/8j6EFZIaIB1iaLhb13AQgAhLficeIZn/zKOtU 82nlIuFdqUYiEd943Bc9MiUbdmpXTnyCQN0pyaG/eAyDOO2RNKOlCqwerNTeqPHvRCdI/D SR4dG29Ug9rCZO3L+xGt6PRmOswa/O/c4o7LuvjTQ3pi0pXbPPasygphpn/YrXMjNqew7u q6hcBO1DCBaBnHv9YHzii5POrVJEnMX4pct9J4Jyhz/wYKa3AxMvpwq+eozOj2vJhriO3t x1Kq+Fadl+5bK5vt9DgWfPGZlH2MR8aWqhFbmoywfJ4a5awoLl6K94be7jmmMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZnlR31CzzXpQ; Fri, 25 Oct 2024 16:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PG8ptK044796; Fri, 25 Oct 2024 16:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PG8pSI044793; Fri, 25 Oct 2024 16:08:51 GMT (envelope-from git) Date: Fri, 25 Oct 2024 16:08:51 GMT Message-Id: <202410251608.49PG8pSI044793@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: bc9e19dce0ab - main - Fix buildworld with gcc 12 after llvm-19 import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bc9e19dce0abee80750e6fa04aaf979873bfe0d2 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9e19dce0abee80750e6fa04aaf979873bfe0d2 commit bc9e19dce0abee80750e6fa04aaf979873bfe0d2 Author: Dimitry Andric AuthorDate: 2024-10-25 16:07:59 +0000 Commit: Dimitry Andric CommitDate: 2024-10-25 16:08:32 +0000 Fix buildworld with gcc 12 after llvm-19 import Unfortunately gcc 12's is not yet capable of compiling all of libc++ 19's C++23 code, which results in errors similar to: /usr/src/freebsd/src/contrib/llvm-project/libcxx/include/__algorithm/ranges_contains.h:41:3: error: 'static constexpr bool std::__1::ranges::__contains::__fn::operator()(_Iter, _Sent, const _Type&, _Proj)' must be a non-static member function 41 | operator()(_Iter __first, _Sent __last, const _Type& __value, _Proj __proj = {}) { | ^~~~~~~~ /usr/src/freebsd/src/contrib/llvm-project/libcxx/include/__algorithm/ranges_contains.h:48:3: error: 'static constexpr bool std::__1::ranges::__contains::__fn::operator()(_Range&&, const _Type&, _Proj)' must be a non-static member function 48 | operator()(_Range&& __range, const _Type& __value, _Proj __proj = {}) { | ^~~~~~~~ Until we can get rid of gcc 12, work around this by making it compile libc++ in C++20 mode instead. NOTE: The resulting libc++ library will not be C++23 compatible! Please try to avoid shipping it, and use gcc 13 instead, if you must use gcc. PR: 280562 MFC after: 3 days --- contrib/llvm-project/libcxx/src/expected.cpp | 2 ++ lib/libc++/Makefile | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/contrib/llvm-project/libcxx/src/expected.cpp b/contrib/llvm-project/libcxx/src/expected.cpp index f30efb516479..ed3bf9e37e35 100644 --- a/contrib/llvm-project/libcxx/src/expected.cpp +++ b/contrib/llvm-project/libcxx/src/expected.cpp @@ -9,5 +9,7 @@ #include _LIBCPP_BEGIN_NAMESPACE_STD +#if _LIBCPP_STD_VER >= 23 const char* bad_expected_access::what() const noexcept { return "bad access to std::expected"; } +#endif _LIBCPP_END_NAMESPACE_STD diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index b30eefd6e2f7..9c12f419f6f1 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -104,7 +104,15 @@ CFLAGS+= -ffunction-sections CFLAGS+= -fno-semantic-interposition CFLAGS+= -fvisibility-inlines-hidden CFLAGS+= -fvisibility=hidden + +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 130000 +# NOTE: gcc 12 cannot correctly compile all libc++'s C++23 code. To temporarily +# support gcc 12, compile libc++ in C++20 mode, but this will leave out any +# C++23 features. +CXXSTD?= c++20 +.else CXXSTD?= c++23 +.endif LIBADD+= cxxrt From nobody Fri Oct 25 16:19: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 4XZp0D3mRVz5Zv5J; Fri, 25 Oct 2024 16:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZp0D3Fqvz4K1K; Fri, 25 Oct 2024 16:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729873196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bukaKQmn9L6+DEt3uWtxbtvxz9tdgvWB82dvVKavPMM=; b=Qxte5aNk5cAGYwWRkty8mKTtTInf8vWLbjdZr+XIWPVHR8ytyVgEm1FwXOE65fsYT2G+Cx 0VDNO+7MEXvMFL8Z/zY2sdB6v4xftzM46ZlASJlyOoReIZBmaA+u2FlAUcgbf09jioQ84N B9cKQJY0/2KR+CzhEKqH5rJQYCUy2njBHsTT/RMM7xBRJPeybfZsmHj/iG8j6LnwktlQ02 WPtSaa8iAHZvpQxYzO8VgLa5cm0GPh4v0jRalLToT9Eq6uyK+WEY7eLLWfnW/pEFlxA2eH CQEeoHT1OLzDT65wt9YA1gAIJlyfsdiKsTHf+rcrB3bl339vHj4w8yMvlgafaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729873196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bukaKQmn9L6+DEt3uWtxbtvxz9tdgvWB82dvVKavPMM=; b=C4VLhLWzXwKM3teq9RzC0TjyAprZy6/QEvftI9NMF/xfl6uC7y1ZkUi9+GB6YjvY+pIJGx tlIu5z/B4fCh3+cgz5OiSOC/We3UflLrx35gbKhgnVbC1z7E6bAuJZXJltBGIxj/+cTCEQ LcCjPDx3z96c5oHXWJx8Jfg1dTjNmTZEIEZryT+3KpgNK6nNTCfyVTIwkEs9xPizQnQehl u8kdQfI2kdARtkuTZIVv/MF/5T2ly9p9x+dLK9KiUJqB2w84Jf4rWMR2c0wqYDfg+I2QJz dGXie0Q5TdshSbetAgTlS1vkMOdHhEBqYQyLO/e5IAW8gIqS+Hysva45cI9UBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729873196; a=rsa-sha256; cv=none; b=Ig9XlLjrZOqm4FQbrbn4lkMitqmnPwcgWykRPG21CW/ybnefT5DAeu2szRwjR6jgoHIUVi MYo0EFWX9e9P/EJBvpRCSnrpR7oA27HoYD+s7PBUi5jOykDl6y6PFsxC5yVPJcny1kCMFq nibsvfcR821fZYIZxkJp+Y/D6NEiwf8tmwTgaOA6h5gSgnUEkPyGtKXH4B2Jz17Drkp+G8 dPylMtf9YaYxyqsEHg6JzrNC4dN6SX0aH7Cs3Rfo7HDfj9Ft0G6Kg4ZlKDNoo9aWhjMBL6 OF2pxt5WDWg2G3sKw15TlLR0LpOWrcnR0JdQItVNC4HzNHsmbwj7SBjCijY6Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZp0D2hSnzYFB; Fri, 25 Oct 2024 16:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PGJuJu063492; Fri, 25 Oct 2024 16:19:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PGJu0l063489; Fri, 25 Oct 2024 16:19:56 GMT (envelope-from git) Date: Fri, 25 Oct 2024 16:19:56 GMT Message-Id: <202410251619.49PGJu0l063489@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: 3ceba58a7509 - main - Fix gcc uninitialized warning in FreeBSD zio_crypt.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3ceba58a7509418b47b8fca2d2b6bbf088714e26 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3ceba58a7509418b47b8fca2d2b6bbf088714e26 commit 3ceba58a7509418b47b8fca2d2b6bbf088714e26 Author: Dimitry Andric AuthorDate: 2024-10-25 12:51:05 +0000 Commit: Dimitry Andric CommitDate: 2024-10-25 16:19:25 +0000 Fix gcc uninitialized warning in FreeBSD zio_crypt.c With gcc we are seeing the following -Werror warning: In file included from /workspace/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/sunddi.h:28, from /workspace/src/sys/contrib/openzfs/include/sys/zfs_context.h:69: In function 'zfs_uio_init', inlined from 'zio_do_crypt_data' at /workspace/src/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c:1690:2: /workspace/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/uio.h:102:45: error: 'puio_s.uio_offset' is used uninitialized [-Werror=uninitialized] 102 | zfs_uio_soffset(uio) = uio_s->uio_offset; | ~~~~~^~~~~~~~~~~~ /workspace/src/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c: In function 'zio_do_crypt_data': /workspace/src/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c:1683:20: note: 'puio_s' declared here 1683 | struct uio puio_s, cuio_s; | ^~~~~~ In function 'zfs_uio_init', inlined from 'zio_do_crypt_data' at /workspace/src/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c:1691:2: /workspace/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/uio.h:102:45: error: 'cuio_s.uio_offset' is used uninitialized [-Werror=uninitialized] 102 | zfs_uio_soffset(uio) = uio_s->uio_offset; | ~~~~~^~~~~~~~~~~~ /workspace/src/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c: In function 'zio_do_crypt_data': /workspace/src/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c:1683:28: note: 'cuio_s' declared here 1683 | struct uio puio_s, cuio_s; | ^~~~~~ Indeed, `zfs_uio_init()` does: static __inline void zfs_uio_init(zfs_uio_t *uio, struct uio *uio_s) { memset(uio, 0, sizeof (zfs_uio_t)); if (uio_s != NULL) { GET_UIO_STRUCT(uio) = uio_s; zfs_uio_soffset(uio) = uio_s->uio_offset; } } while the code in `zio_crypt.c` has: /* * Primary encryption / decryption entrypoint for zio data. */ int zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key, dmu_object_type_t ot, boolean_t byteswap, uint8_t *salt, uint8_t *iv, uint8_t *mac, uint_t datalen, uint8_t *plainbuf, uint8_t *cipherbuf, boolean_t *no_crypt) { int ret; boolean_t locked = B_FALSE; uint64_t crypt = key->zk_crypt; uint_t keydata_len = zio_crypt_table[crypt].ci_keylen; uint_t enc_len, auth_len; zfs_uio_t puio, cuio; struct uio puio_s, cuio_s; uint8_t enc_keydata[MASTER_KEY_MAX_LEN]; crypto_key_t tmp_ckey, *ckey = NULL; freebsd_crypt_session_t *tmpl = NULL; uint8_t *authbuf = NULL; zfs_uio_init(&puio, &puio_s); zfs_uio_init(&cuio, &cuio_s); memset(GET_UIO_STRUCT(&puio), 0, sizeof (struct uio)); memset(GET_UIO_STRUCT(&cuio), 0, sizeof (struct uio)); So between the declaration of `puio_s` and `cuio_s`, there is no initialization of these variables before `zfs_uio_init()` gets called. Similar to the Linux variant of zio_crypt.c, I think it would be better to memset the structs `puio_s` and `cuis_s` _before_ calling `zfs_uio_init()`. Reviewed by: tsoome MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47281 --- sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c index 2b62abcccb78..feaca93fb933 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c @@ -1686,11 +1686,10 @@ zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key, freebsd_crypt_session_t *tmpl = NULL; uint8_t *authbuf = NULL; - + memset(&puio_s, 0, sizeof (puio_s)); + memset(&cuio_s, 0, sizeof (cuio_s)); zfs_uio_init(&puio, &puio_s); zfs_uio_init(&cuio, &cuio_s); - memset(GET_UIO_STRUCT(&puio), 0, sizeof (struct uio)); - memset(GET_UIO_STRUCT(&cuio), 0, sizeof (struct uio)); #ifdef FCRYPTO_DEBUG printf("%s(%s, %p, %p, %d, %p, %p, %u, %s, %p, %p, %p)\n", From nobody Fri Oct 25 16:20: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 4XZp0f2cX6z5ZvFM; Fri, 25 Oct 2024 16:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZp0f25Z5z4KLr; Fri, 25 Oct 2024 16:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729873218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0igswFo6Rzlo2cNnn2Var+rHG10Uw1og/KOe9WNiUyY=; b=xdBoXDR3omZg46SA6QLCpn3q+yfVlb6Kt4IPS0Pt+HvXfQlhfyju7ZrNkkzOvPKpARbMSy U490UjUlnT2KlaXozBkYRA3XzLVJPvVXVVFSU7pfgbHVXo/jeusUWN7Y92OT4EE27QLmaZ TAbRufCtPmlt1ihqiv6a5toOfQWbFICAarLEQwd8CtgqhLzWgoWmnoUY0xTLfy6jXgnmBT pRpakb//x/aqjRA2ui2YWNu+Gax8gfLyBUcEzKa55Lqg3pLBgGrirNg/H90pXCXHXP8DKE tMpni9y//DbHuvppRtOY6O7h35FBecV4kSBkEDMAvmrynHUFjb4uIZfsmr7q/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729873218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0igswFo6Rzlo2cNnn2Var+rHG10Uw1og/KOe9WNiUyY=; b=ahiP2ZMFKXjVHUBxLaCPVyzxXyES7TEtkK7QuPFvA+wuNZRLYTiITi6oeHT8PKPnlwD+Nf Qx1gJg9ZCsIV3gytRmHBM/VGN7ryxKHIUvWU3MIdi+pEPEY+ZKtRnRF3brbuxW5HKqSXhX mwYhTsnPwuahw353WmouQrKjbMYp5K7ZU4hV0bQKkv9LLqGdEz5T7jgQGerLbPT3YWfB+v +MU7pd/cF81loaYXRTt0VC5eovh0ZzVuAP4enWDNvJRChYb7wMGSuhQZvx2vznzKHwBtDf 85N31+IIVGpov1M6NhhKz7shcWa1BDBAPhUQOnjvNSjgl/QgYRvzRrvUrrJONw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729873218; a=rsa-sha256; cv=none; b=UNSKMXEInWWgWU+0WSAH7Puq0n0qvMAT/IeCptMjviC1VhfkX5MhWlda/zJRAvZdG2RIcv CwCp4uu0JPkox9W//EqvoOKHGlglKBnMeWgpj+craYEZTUtl+SOEUi+QCsOmPIh+JsQnsA W1CuSZbeO1OCknI8DfP8Poaj8V6xXZ1LX1W8P3SkqfmBBF3PNGO55AAoKP+V9LbcmTCOhd ZsgxXSvHu0UZCUz6HoAYeDNve+3GVobkPuTpCCb1Yv1JXHf/8DrveE0XOcUaxgyeWNuWbv rhJHk32f82kfrn8dWfcquKGgP4iztPsg+tyonszYoK3cvnrbrgdiUl9DgT7aCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZp0f159TzYBg; Fri, 25 Oct 2024 16:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PGKIXk072284; Fri, 25 Oct 2024 16:20:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PGKImZ072281; Fri, 25 Oct 2024 16:20:18 GMT (envelope-from git) Date: Fri, 25 Oct 2024 16:20:18 GMT Message-Id: <202410251620.49PGKImZ072281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 72e15f76a1b3 - main - libkldelf: add see_local parameter to elf_lookup_symbol List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72e15f76a1b3e7bddb5fa1b0429e41d07950af65 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=72e15f76a1b3e7bddb5fa1b0429e41d07950af65 commit 72e15f76a1b3e7bddb5fa1b0429e41d07950af65 Author: Ka Ho Ng AuthorDate: 2024-10-25 16:19:57 +0000 Commit: Ka Ho Ng CommitDate: 2024-10-25 16:20:16 +0000 libkldelf: add see_local parameter to elf_lookup_symbol This gives the function the ability to return only global symbols. Sponsored by: Juniper Networks, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47206 --- lib/libkldelf/ef.c | 15 +++++++++------ lib/libkldelf/ef_obj.c | 12 ++++++++---- lib/libkldelf/elf.c | 5 +++-- lib/libkldelf/kldelf.h | 11 +++++------ 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/lib/libkldelf/ef.c b/lib/libkldelf/ef.c index dcd87fe2bf83..28576df99bf2 100644 --- a/lib/libkldelf/ef.c +++ b/lib/libkldelf/ef.c @@ -81,7 +81,7 @@ static GElf_Addr ef_symaddr(elf_file_t ef, GElf_Size symidx); static int ef_lookup_set(elf_file_t ef, const char *name, GElf_Addr *startp, GElf_Addr *stopp, long *countp); static int ef_lookup_symbol(elf_file_t ef, const char *name, - GElf_Sym **sym); + GElf_Sym **sym, bool see_local); static struct elf_file_ops ef_file_ops = { .close = ef_close, @@ -126,7 +126,7 @@ ef_get_offset(elf_file_t ef, GElf_Addr addr) * next two functions copied from link_elf.c */ static int -ef_lookup_symbol(elf_file_t ef, const char *name, GElf_Sym **sym) +ef_lookup_symbol(elf_file_t ef, const char *name, GElf_Sym **sym, bool see_local) { unsigned long hash, symnum; GElf_Sym *symp; @@ -156,8 +156,11 @@ ef_lookup_symbol(elf_file_t ef, const char *name, GElf_Sym **sym) if (symp->st_shndx != SHN_UNDEF || (symp->st_value != 0 && GELF_ST_TYPE(symp->st_info) == STT_FUNC)) { - *sym = symp; - return (0); + if (see_local || + GELF_ST_BIND(symp->st_info) != STB_LOCAL) { + *sym = symp; + return (0); + } } else return (ENOENT); } @@ -183,14 +186,14 @@ ef_lookup_set(elf_file_t ef, const char *name, GElf_Addr *startp, /* get address of first entry */ snprintf(setsym, len, "%s%s", "__start_set_", name); - error = ef_lookup_symbol(ef, setsym, &sym); + error = ef_lookup_symbol(ef, setsym, &sym, true); if (error != 0) goto out; *startp = sym->st_value; /* get address of last entry */ snprintf(setsym, len, "%s%s", "__stop_set_", name); - error = ef_lookup_symbol(ef, setsym, &sym); + error = ef_lookup_symbol(ef, setsym, &sym, true); if (error != 0) goto out; *stopp = sym->st_value; diff --git a/lib/libkldelf/ef_obj.c b/lib/libkldelf/ef_obj.c index 30e0d7886995..151bac74b17d 100644 --- a/lib/libkldelf/ef_obj.c +++ b/lib/libkldelf/ef_obj.c @@ -101,7 +101,7 @@ static GElf_Addr ef_obj_symaddr(elf_file_t ef, GElf_Size symidx); static int ef_obj_lookup_set(elf_file_t ef, const char *name, GElf_Addr *startp, GElf_Addr *stopp, long *countp); static int ef_obj_lookup_symbol(elf_file_t ef, const char *name, - GElf_Sym **sym); + GElf_Sym **sym, bool see_local); static struct elf_file_ops ef_obj_file_ops = { .close = ef_obj_close, @@ -129,7 +129,8 @@ ef_obj_get_offset(elf_file_t ef, GElf_Addr addr) } static int -ef_obj_lookup_symbol(elf_file_t ef, const char *name, GElf_Sym **sym) +ef_obj_lookup_symbol(elf_file_t ef, const char *name, GElf_Sym **sym, + bool see_local) { GElf_Sym *symp; const char *strp; @@ -138,8 +139,11 @@ ef_obj_lookup_symbol(elf_file_t ef, const char *name, GElf_Sym **sym) for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { strp = ef->ddbstrtab + symp->st_name; if (symp->st_shndx != SHN_UNDEF && strcmp(name, strp) == 0) { - *sym = symp; - return (0); + if (see_local || + GELF_ST_BIND(symp->st_info) != STB_LOCAL) { + *sym = symp; + return (0); + } } } return (ENOENT); diff --git a/lib/libkldelf/elf.c b/lib/libkldelf/elf.c index 8af02622de13..cf43d9bfd5fd 100644 --- a/lib/libkldelf/elf.c +++ b/lib/libkldelf/elf.c @@ -688,7 +688,8 @@ elf_reloc(struct elf_file *efile, const void *reldata, Elf_Type reltype, } int -elf_lookup_symbol(struct elf_file *efile, const char *name, GElf_Sym **sym) +elf_lookup_symbol(struct elf_file *efile, const char *name, GElf_Sym **sym, + bool see_local) { - return (EF_LOOKUP_SYMBOL(efile, name, sym)); + return (EF_LOOKUP_SYMBOL(efile, name, sym, see_local)); } diff --git a/lib/libkldelf/kldelf.h b/lib/libkldelf/kldelf.h index 71de31a94291..4fb5fcc5f5aa 100644 --- a/lib/libkldelf/kldelf.h +++ b/lib/libkldelf/kldelf.h @@ -48,8 +48,8 @@ (ef)->ef_ops->symaddr((ef)->ef_ef, symidx) #define EF_LOOKUP_SET(ef, name, startp, stopp, countp) \ (ef)->ef_ops->lookup_set((ef)->ef_ef, name, startp, stopp, countp) -#define EF_LOOKUP_SYMBOL(ef, name, sym) \ - (ef)->ef_ops->lookup_symbol((ef)->ef_ef, name, sym) +#define EF_LOOKUP_SYMBOL(ef, name, sym, see_local) \ + (ef)->ef_ops->lookup_symbol((ef)->ef_ef, name, sym, see_local) /* XXX, should have a different name. */ typedef struct ef_file *elf_file_t; @@ -69,7 +69,8 @@ struct elf_file_ops { GElf_Addr (*symaddr)(elf_file_t ef, GElf_Size symidx); int (*lookup_set)(elf_file_t ef, const char *name, GElf_Addr *startp, GElf_Addr *stopp, long *countp); - int (*lookup_symbol)(elf_file_t ef, const char *name, GElf_Sym **sym); + int (*lookup_symbol)(elf_file_t ef, const char *name, GElf_Sym **sym, + bool see_local); }; typedef int (elf_reloc_t)(struct elf_file *ef, const void *reldata, @@ -317,11 +318,9 @@ int elf_reloc(struct elf_file *ef, const void *reldata, Elf_Type reltype, * Find the symbol with the specified symbol name 'name' within the given * 'efile'. 0 is returned when such a symbol is found, otherwise ENOENT is * returned. - * - * XXX: This only return the first symbol being found when traversing symtab. */ int elf_lookup_symbol(struct elf_file *efile, const char *name, - GElf_Sym **sym); + GElf_Sym **sym, bool see_local); __END_DECLS From nobody Fri Oct 25 17:38: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 4XZqkl1CRBz5Zyst; Fri, 25 Oct 2024 17:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZqkl0Gdlz4SLD; Fri, 25 Oct 2024 17:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729877903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bsmPQaA3UMluJ/MYwhpkP/+mPHIa/7W/YZYq1W8FOQ=; b=hRYTRAbSO+hebhbHR0nySNxxWIyasW7Sq3owgMZhIAh05sskA7YuyzXege4w5RY1Rw8B/0 eohWist9FSklqA3pcelo7u69WkOv8N84A6tHmNIuE3Zb6HBXp/iEOIr6vLsyH2um0cPg00 O/7Jb+hYsrzN6KwQ8U2b8yGQ81t4xYCydeuDV6ltursm8L+QEG7dhTGTcu8wRkdTkZExhZ 3YTlTcmHZ4qTNsfLbp4ySomZUK2EH5ooqL45hl1F8yfDQTCYB0IaYJV8me6S23U1jFkWPR U113RZ1q28O2sfBD1NznHgjN0HiBl7a2vl1rCVw0JB4I6/CtkYwfChSyall1Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729877903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bsmPQaA3UMluJ/MYwhpkP/+mPHIa/7W/YZYq1W8FOQ=; b=hzuQdXTJS3S8OPPhyJhlCqz2VhZltbaI8kBQ14YAtl1VdSaVgsniAOCynYHuMs+nq2gHLK 5gOm6Fsg6WvFb4mlw5f21omE6dmHo3soA5Q/I7Sf1GCfTka2vEYuShl+t4lFiPKk4UjlVl 8XjeZ4dw8XD/ub8kbCX1DJPOpuPLaDb3HlZCWIPI7HSrevWIqTUdgc2oDYLb1v64QbgCq9 SJQbndUAeCySXUVJ7sq9zVc22POntYKVvUlSC4k+TNJJE19sq8T46xl9QBjowYKCRw4qrp nuMWu9w3vmtQ9inXTV7RGWmJgw9J9FupZ6wH86hrjMVYaFisFPwU9x9tmDjJLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729877903; a=rsa-sha256; cv=none; b=pXDDpc+NZPW/8bqgmFLAQcSUi9AWaFM34oaAFQS/eeoH6XNWuj3HErQRNMeF+oPdVdL+i7 QDxsduSexDNLUi5hPqy+h7wJVGgeAC585wpyIvSnCar15gjRk4yKvLvF7FQA2+bhlINCpJ nq1lZfYJbOpflGmcbag2OTGrQhRkqyg4RTY/beTzQk5drTccLfIwwzn/vLh8/fT+WZAYNT 7OsCGF/6EYCxxlxqXGV85COmUxu/jysqgOv4xZEzdr/Ym412s0Q0QYP3ajDaxKQ4i2ZVIj UfIkzjwUSbepuOWRgjZ1B5jXOgc5CPk4qfKJCcaSUCTSoomHg6RRrGZb9h8nnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZqkk6rZ2zbMf; Fri, 25 Oct 2024 17:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PHcMa1012273; Fri, 25 Oct 2024 17:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PHcMr4012270; Fri, 25 Oct 2024 17:38:22 GMT (envelope-from git) Date: Fri, 25 Oct 2024 17:38:22 GMT Message-Id: <202410251738.49PHcMr4012270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: f11a9f19b298 - main - pctrie: drop meaningless neighbor 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f11a9f19b298e7d6dfa102275207e1b7c90aaff0 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=f11a9f19b298e7d6dfa102275207e1b7c90aaff0 commit f11a9f19b298e7d6dfa102275207e1b7c90aaff0 Author: Doug Moore AuthorDate: 2024-10-25 17:37:01 +0000 Commit: Doug Moore CommitDate: 2024-10-25 17:37:01 +0000 pctrie: drop meaningless neighbor check In PCTRIE_INSERT_LOOKUP_{G,L}E, there is a test - if two pointers are equal, replace one with a new value. The pointers can never be equal; one points to a struct pctrie_node and the other is the (void*) cast of a pointer to a field within a struct pctrie_node. So the tests and assignments can be removed with no effect. Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D47277 --- sys/sys/pctrie.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h index d71290c8cf23..209380d805b2 100644 --- a/sys/sys/pctrie.h +++ b/sys/sys/pctrie.h @@ -147,8 +147,6 @@ name##_PCTRIE_INSERT_LOOKUP_GE(struct pctrie *ptree, struct type *ptr, \ *found_out = NULL; \ return (ENOMEM); \ } \ - if (neighbor == parentp) \ - neighbor = parent; \ pctrie_insert_node(parentp, parent, val); \ } \ found = pctrie_subtree_lookup_gt(neighbor, *val); \ @@ -178,8 +176,6 @@ name##_PCTRIE_INSERT_LOOKUP_LE(struct pctrie *ptree, struct type *ptr, \ *found_out = NULL; \ return (ENOMEM); \ } \ - if (neighbor == parentp) \ - neighbor = parent; \ pctrie_insert_node(parentp, parent, val); \ } \ found = pctrie_subtree_lookup_lt(neighbor, *val); \ From nobody Fri Oct 25 18:19: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 4XZrfh3M0qz5b1Yx; Fri, 25 Oct 2024 18:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZrfh2rnTz4XdS; Fri, 25 Oct 2024 18:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HzQ0F6Gt+9vLwLWoP+RaZoJfacuxlVlr5abygAaR5RE=; b=Qcw3BT+nPkl0rng8qrbMwOdvg7K+GA8vNSWGpuYtIUpqIajoKvdl/Xw88KbXI9Gbsoplz5 LWFGHyolCP/71etj/SSv9xXsg+Fh0CX+1i7RwRzyG84nmzuvIHiZe4THvC2qf0th44OeMW dYAf7gvTkDDgXxHhZTECLg+KGNPVwvt+9hUmtH0mVXpGElQC+NZ2J3lxMPnRycZvkur3TJ 129pepoVF5Wn4UVKHdIW01PFiYM1bUNsjiuAcKUIsx4HNOJiV8yQaVZTQobmUCB2FomBbH QQ1KJ0uf33I31pp8TI9FN3RzIHwRKR1/KkjiCmeX5skIOmZXv+YOO5Hylm1Mxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HzQ0F6Gt+9vLwLWoP+RaZoJfacuxlVlr5abygAaR5RE=; b=l30uxFXaEZwwbSWylzwMMC0n9oDtdHsbkxplcW5yRa/jCMAm+acpu/E11XNg0Gqw17ogPL 6pYHwYakTOIzHHMPvsEcW3urNVc9HF0jn/NvxNosqv3FmDixM2dhRqFdYCfuP9SMPp0Lpe HRl7Y58ERtFr2cEgL6KsJqNY5bZYe37348TwBjeKtcBvzw0DGdgCjplO6klpvaDAo5EN02 oLhpz0yQijCxQGcfj+iUNg69NpMFghlw3UtkDEuXAPjJPZSmqMZwBalMfxJeqxoNCA0qD+ mo7RphxvBCg/HN8VQU2KvhJMtMrUQiY2qPG1uk4VC4G8WqywXGOtKBKGBul7hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729880396; a=rsa-sha256; cv=none; b=blIryDt2cmBH7D9yKmOrsj4W8qTYzHFfo6HUfeVuxbbIEtp+9gwYhtBAsXmn0AIHYJMp/H 531sa+HwXkX8puAt/C+bvLnDV4e7tp5uIyCOqShFG4rKNtUVoIIqKu3PSaYFRezA38YvEX DaBYVFSrujRmdqIFy0YS7mhZ+TW+B3A9t/BKGIRO/Wzg3dVJ3Xchr6ihgrhsckgIR1o912 oYY/QxrZ3L5UwRoP11RFEvc9ez6RypnsHMPuXtqt6oREgUseQffPZsVWy84bSnCvd9gdHS p/l2tOA7z19NyLinfY+zqyFh659GCw2xLQa1gSP512ahKUy+DhUx1vKk6CLF1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZrfh2L6Pzcc1; Fri, 25 Oct 2024 18:19:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PIJuVf087194; Fri, 25 Oct 2024 18:19:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PIJuBn087191; Fri, 25 Oct 2024 18:19:56 GMT (envelope-from git) Date: Fri, 25 Oct 2024 18:19:56 GMT Message-Id: <202410251819.49PIJuBn087191@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: f86e328d324d - main - p9fs: Fix whitespace in request tag handling 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f86e328d324d4d67ab4db4a89ef6239c8978bb87 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f86e328d324d4d67ab4db4a89ef6239c8978bb87 commit f86e328d324d4d67ab4db4a89ef6239c8978bb87 Author: Mark Johnston AuthorDate: 2024-10-25 17:50:37 +0000 Commit: Mark Johnston CommitDate: 2024-10-25 17:50:37 +0000 p9fs: Fix whitespace in request tag handling functions No functional change intended. Sponsored by: Klara, Inc. --- sys/fs/p9fs/p9_client.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/fs/p9fs/p9_client.c b/sys/fs/p9fs/p9_client.c index 8f36cc4e775a..45d24870306c 100644 --- a/sys/fs/p9fs/p9_client.c +++ b/sys/fs/p9fs/p9_client.c @@ -380,16 +380,16 @@ out: uint16_t p9_tag_create(struct p9_client *clnt) { - int tag; + int tag; - tag = alloc_unr(&clnt->tagpool); - P9_DEBUG(LPROTO, "%s: clnt %p: tag %d\n", __func__, clnt, tag); + tag = alloc_unr(&clnt->tagpool); + P9_DEBUG(LPROTO, "%s: clnt %p: tag %d\n", __func__, clnt, tag); - /* Alloc_unr returning -1 is an error for no units left */ - if (tag == -1) { - return (P9_NOTAG); - } - return (tag); + /* Alloc_unr returning -1 is an error for no units left */ + if (tag == -1) { + return (P9_NOTAG); + } + return (tag); } /* Clean up tag structures */ @@ -397,10 +397,10 @@ void p9_tag_destroy(struct p9_client *clnt, uint16_t tag) { - P9_DEBUG(LPROTO, "%s: clnt %p: tag %d\n", __func__, clnt, tag); + P9_DEBUG(LPROTO, "%s: clnt %p: tag %d\n", __func__, clnt, tag); - /* Release to the pool */ - free_unr(&clnt->tagpool, tag); + /* Release to the pool */ + free_unr(&clnt->tagpool, tag); } /* Allocate a new fid from the fidpool */ From nobody Fri Oct 25 18:19: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 4XZrfj4yTXz5b1T7; Fri, 25 Oct 2024 18:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZrfj3Jcgz4Xv1; Fri, 25 Oct 2024 18:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0rAaDFXe9/OZMWyqaAVU4YYud+/mMbpf/P3hYc38Lmk=; b=sX3/036EH2s7bizH83G78KFAq0gXIQg1+X8vsyDsF/cv1i5+PYlnFglxiqtIn0d5pzvE+H 6DME0n63rcDD4VLbSrF/7tK/UF5vznXC/rLi2+zFfjQ+fGZ7Rbn/MQgijtV0SAiHXDigLN gqqYrSgg8vwxklSCT/uJkj2KKVXrwEuN4PEr/FIazF5d6G1/GmwGESD08L7AMEgKOP9iKN 2xU2D5joXJQjjYNR3/Rvme/7qt4PeVH87Mso5M4mKy/bNLG4z4/6jPjSoLEFm9cdgPcDv2 8j+K3dxdhdXnDTLHVMbQoXQn26WByJZA/mYa+Z5IMRPyiyfykgk0U/aB4rHVzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0rAaDFXe9/OZMWyqaAVU4YYud+/mMbpf/P3hYc38Lmk=; b=e0cpSxPGpxqTpgbrefxY5DSPZjTO8KVzlZAvChJYxu+Jyk3M6enJg67hLsW1LELUAQI7+5 PeEQgOly4/LJo7wJagadC2NEeqadsApvxyNr3tP6ETk+zAsXYuks02qeMpRv0n4a4uTid+ w+XaWvFtavOGL380RrulzXeQe0FeypOb/AJJK7aTyFHdMRczpL3ZnVcE93PnP7sL18MMsB Y3lcp12i4VdEJ7L6WVRhcsYPrJTXox9Sf/zTujWxkcmzcngBbJL4WNGTF9yXNMhgQdOPAQ Qa65VXXrvWMw4zVbr3viJQuYla4kVuz6pSuk4W2AFnirp8DXFC/bNP5Ob0nSyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729880397; a=rsa-sha256; cv=none; b=BKqtnaHPvIZ0FdV0aqwD0YDSVO96CyHWfO5hnjh6xWEoW5TTeB3wvNR0KiWi2sQ81xsB2X yCw6ZhZPXVjOXL9AjZBpeWShnxQL8Ywq/bgPNKGP+5hkJc4tuER4FbQiZ5tD48YF/sf80p nq8mC4Uhnk9VP7hBnWFAXo07Rl59bRPOXtaxtEGCIYwRgbPZ4ys+lej5f2bUzpZTogVI5/ +WWGipKdKpnbXgi7b8H2T41HnTU+/PHHuM93gBEPpeFgnvlsQW58yrdE8jQ6NHDfPy1G7j uXC2p5q4gicmiQc6KRSZNsHk3PYjF/lgoS+xfs0+FZN2M4HlBj5OEBacmE28Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZrfj2vqgzcWm; Fri, 25 Oct 2024 18:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PIJvsr087239; Fri, 25 Oct 2024 18:19:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PIJvet087236; Fri, 25 Oct 2024 18:19:57 GMT (envelope-from git) Date: Fri, 25 Oct 2024 18:19:57 GMT Message-Id: <202410251819.49PIJvet087236@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: b9500cbd3896 - main - virtio_p9fs: Fix some style issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b9500cbd38967686a801b1ed3ab1dd5b5b5571fb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9500cbd38967686a801b1ed3ab1dd5b5b5571fb commit b9500cbd38967686a801b1ed3ab1dd5b5b5571fb Author: Mark Johnston AuthorDate: 2024-10-25 17:50:43 +0000 Commit: Mark Johnston CommitDate: 2024-10-25 17:50:43 +0000 virtio_p9fs: Fix some style issues - Remove superfluous newlines. - Use bool literals. - Replace an unneeded SYSINIT with static initialization. No functional change intended. Sponsored by: Klara, Inc. --- sys/dev/virtio/p9fs/virtio_p9fs.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index 3600e0ea09c9..cdcd9c125dbb 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -74,30 +74,20 @@ struct vt9p_softc { }; /* Global channel list, Each channel will correspond to a mount point */ -static STAILQ_HEAD( ,vt9p_softc) global_chan_list; +static STAILQ_HEAD( ,vt9p_softc) global_chan_list = + STAILQ_HEAD_INITIALIZER(global_chan_list); struct mtx global_chan_list_mtx; +MTX_SYSINIT(global_chan_list_mtx, &global_chan_list_mtx, "9pglobal", MTX_DEF); static struct virtio_feature_desc virtio_9p_feature_desc[] = { { VIRTIO_9PNET_F_MOUNT_TAG, "9PMountTag" }, { 0, NULL } }; -static void -global_chan_list_init(void) -{ - - mtx_init(&global_chan_list_mtx, "9pglobal", - NULL, MTX_DEF); - STAILQ_INIT(&global_chan_list); -} -SYSINIT(global_chan_list_init, SI_SUB_KLD, SI_ORDER_FIRST, - global_chan_list_init, NULL); - /* We don't currently allow canceling of virtio requests */ static int vt9p_cancel(void *handle, struct p9_req_t *req) { - return (1); } @@ -108,7 +98,6 @@ SYSCTL_NODE(_vfs, OID_AUTO, 9p, CTLFLAG_RW, 0, "9P File System Protocol"); * ack from the host, before exiting */ static unsigned int vt9p_ackmaxidle = 120; - SYSCTL_UINT(_vfs_9p, OID_AUTO, ackmaxidle, CTLFLAG_RW, &vt9p_ackmaxidle, 0, "Maximum time request thread waits for ack from host"); @@ -369,20 +358,16 @@ vt9p_attach(device_t dev) /* We expect one virtqueue, for requests. */ error = vt9p_alloc_virtqueue(chan); - if (error != 0) { P9_DEBUG(ERROR, "%s: Allocating the virtqueue failed \n", __func__); goto out; } - error = virtio_setup_intr(dev, INTR_TYPE_MISC|INTR_MPSAFE); - if (error != 0) { P9_DEBUG(ERROR, "%s: Cannot setup virtqueue interrupt\n", __func__); goto out; } error = virtqueue_enable_intr(chan->vt9p_vq); - if (error != 0) { P9_DEBUG(ERROR, "%s: Cannot enable virtqueue interrupt\n", __func__); goto out; @@ -436,7 +421,7 @@ vt9p_create(const char *mount_tag, void **handlep) /* If we dont have one, for now bail out.*/ if (chan) { *handlep = (void *)chan; - chan->busy = TRUE; + chan->busy = true; } else { P9_DEBUG(TRANS, "%s: No Global channel with mount_tag=%s\n", __func__, mount_tag); @@ -450,7 +435,8 @@ static void vt9p_close(void *handle) { struct vt9p_softc *chan = handle; - chan->busy = FALSE; + + chan->busy = false; } static struct p9_trans_module vt9p_trans = { From nobody Fri Oct 25 18:19: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 4XZrfk6JfLz5b1f8; Fri, 25 Oct 2024 18:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZrfk4Jdpz4Xgq; Fri, 25 Oct 2024 18:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfBeAu/6VY5SA22mM1Qcq8yFF5iQNHskdlBniZhAeSI=; b=MYOAph9zd50CUKncbHdlz5kWWgxZWIA2rDwEF0SE/eSKyN9SJ3EiIQrwCkUGNNJ6MPQqAt hDxn6RjwoWzTi5ZkjeNsRdyN6pOxA+QBdS2w3TUWHOnhoiNilnZz5/TU6KnSUtZUj4lzPs 1dRfpErGd7GggRDYtR60q4Sfd6tIdnKp4AeFqVWY2bQBCLav5DKv5IQHc7c7GekiWyVi0Z 2AcuWo7vavdDxkWvzbIZNzmbR53DwLYVZ82i5IEJOgtI/uA9DvnqAqm7huRYgXNslx9ufj MsS5BgTSORVGgckzvP4vIijbGF5p2uQi6iFDTQ416in0veBip3giyajUsIwDpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfBeAu/6VY5SA22mM1Qcq8yFF5iQNHskdlBniZhAeSI=; b=xxV9fA90xxX3sAIplpyK9IOsvVpoDe6qtdJKn9gyV29r8Az/FZT6hmFHy05qEeaI0bU+e6 JsuZ4vsQon9gVR0uPsOo+auzDx0lG/6gnHOEGdpCn6+3u3L5ucaGW4AUkUKY7ZtrIk1oTZ eooQNdDwpxohTv2HaCoCy+L9MyHGvnsKugdNK/pw6tciJOQDyi0+QRLCKeXUiAaHNaWqgn 02hNG9IR5u06tRbx6WISNOOmE+ZaRV9Nqxrj/A6ap12ZRJXkYi+NmHZguHp03pW0QD2jCg lAQMHazw/Qv3Z+6PxWk0vrFvk6p8BPjjqeEDvKLoxvCOhI3SKNRejDGXMvPedw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729880398; a=rsa-sha256; cv=none; b=nUnd3liOrYYbYq3O+m38k879Xwx3twx9moQepzQX5SccbQWK5Z4kTtCs7hgnZgLog6hwjQ J1OQb0i2ao50g938VDdvT85hiZa6CDRZ5sLSpvFn8AgKY7oe/90H2J1ZBmOscVUblTDdmS lZP5/NILsQCUySazrBpdpUlGz10JVE5kOpjC7n/uJWwotkolrCGHjyqF0WovamhXjzRoYd OCyuw6zEjZqml5YjaGVsmcNNomo7tDRKVqI9bMe7kkx2+FogJID+O/qDMZKOIJlj22PMt4 5bbJjRbAFIVlbeeR8HGNtQVpuWXvwWj7Sr2bG9Rfp/q2U2JZEUv++7nA1n3d2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZrfk3wBxzc8Y; Fri, 25 Oct 2024 18:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PIJwqt087290; Fri, 25 Oct 2024 18:19:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PIJw9P087287; Fri, 25 Oct 2024 18:19:58 GMT (envelope-from git) Date: Fri, 25 Oct 2024 18:19:58 GMT Message-Id: <202410251819.49PIJw9P087287@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: fff518117b40 - main - virtio_p9fs: Fix handling of a full request queue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: fff518117b40cbc3bca49073eed85dc725ebae4c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fff518117b40cbc3bca49073eed85dc725ebae4c commit fff518117b40cbc3bca49073eed85dc725ebae4c Author: Mark Johnston AuthorDate: 2024-10-25 17:51:16 +0000 Commit: Mark Johnston CommitDate: 2024-10-25 17:51:16 +0000 virtio_p9fs: Fix handling of a full request queue If, when submitting a request, the virtqueue is full, we sleep until an interrupt has fired, then restart the request. However, while sleeping the channel lock is dropped, and in the meantime another thread may have reset the per-channel SG list, so upon retrying we'd (re)submit whatever happened to be left over in the previous request. Fix the problem by rebuilding the SG list after sleeping. Sponsored by: Klara, Inc. --- sys/dev/virtio/p9fs/virtio_p9fs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index cdcd9c125dbb..42f47a4f63cb 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -152,6 +152,7 @@ vt9p_request(void *handle, struct p9_req_t *req) /* Grab the channel lock*/ VT9P_LOCK(chan); +req_retry: sglist_reset(sg); /* Handle out VirtIO ring buffers */ error = sglist_append(sg, req->tc->sdata, req->tc->size); @@ -170,9 +171,7 @@ vt9p_request(void *handle, struct p9_req_t *req) } writable = sg->sg_nseg - readable; -req_retry: error = virtqueue_enqueue(vq, req, sg, readable, writable); - if (error != 0) { if (error == ENOSPC) { /* From nobody Fri Oct 25 18:19: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 4XZrfm4Pn7z5b1Z8; Fri, 25 Oct 2024 18:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZrfl5QHTz4Xs3; Fri, 25 Oct 2024 18:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fm0PVrzRjDjsxUgS2Pk/PDua+nCeB7/0Sqk5vJHfhpk=; b=da9ahfMCLlHvRFF+nztC39Gcstyrk91huMFb/k2DCrItZpPQ/DFYtcx/4lSIBwolrnSI1N c2e/49dj0ISWhgmD9NxW+LcsAvg5tI4ZgiHD4WZlauhBtBsWA1MQlB3gNwLsbXKP7hzzLd jLdwr4eHBTzFLPkK7JF6J/KdfnQ7we9vnjVoIIH92YxBKX02IYDAylnzSHnV9baJ0RrpC4 OP/87FQwzrANGGVRMkaIs+OB4P4jbH7IqDVF1OfTLzjJZ5wZFqkp1G4eZjBTcQHhLkEtnx 8dMJN2eMWjj49n2LPZjxd5wC2YCfof9mHEwXzgfgDnyD23tWZPIFQCOOzQThwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fm0PVrzRjDjsxUgS2Pk/PDua+nCeB7/0Sqk5vJHfhpk=; b=wjMfLXoG9xtONiQxQBKx3aP6dN5vyaWR3sFI7683i31a+IyXZpcl5lGAFoPkApCXOzES1b xZm/ZCF9sgQ+pO2DpzHux/cg4B4FdPH+2XFL6H4JDsGpdFs8whIYztSZ9vkIWiwDlfYcKD 2UZc533GHjqPBCrmtfqBOpotnW3QBV/XVDnpE6MBNy/UFBPYH9raC8gs6AwOYwZymf9Guv +/4NG9yjysKxMrg0OsRkT9bVg66DVgt067zUZ0qeQMAsy8AbxpV0Ev7SsDSqKw/18fC0CR 6QbrKWn0owKu5MQ+jBHrGlkP7t1pVaiOafszSQZWB+6633KY4YczzCWzYyUadg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729880399; a=rsa-sha256; cv=none; b=UCWXsqI/brOmu/9/2wjupNbNBdcIPqcQ5gjIx/+MxVhq6d+4KfIeDJKWQGLQ6D/Fc/pCw2 PJ3mH79XwJ9pWba6nklDOh6HzYI6408+aTW4+cyYhiA7NJodk30vDr2FJrfDgUGMoSs/Vp ibnKS7iw/COqD1WmO/nRMHyaVH+hs8C7auECw1Zg64WylxuONOZPTnfHurnnkcfHCT5p2N fd3s6HzwXfmbdzMGB1OUDkEtrrYs/it8vdlM0ikgRW4/B5KSZTybYelD7PO7FeuRU/hNDJ eiVXE+zkZmi0DUs5y+M/1qXJLqunU1DbWg84zxZ71kRI6avXhE9Gzo3jBUdPPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZrfl4wXVzc8Z; Fri, 25 Oct 2024 18:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PIJxcl087339; Fri, 25 Oct 2024 18:19:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PIJxdS087336; Fri, 25 Oct 2024 18:19:59 GMT (envelope-from git) Date: Fri, 25 Oct 2024 18:19:59 GMT Message-Id: <202410251819.49PIJxdS087336@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: 1f6f247b3526 - main - virtio_p9fs: Check for completions after enabling interrupts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1f6f247b3526abd4d5927684735012220aefe373 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f6f247b3526abd4d5927684735012220aefe373 commit 1f6f247b3526abd4d5927684735012220aefe373 Author: Mark Johnston AuthorDate: 2024-10-25 17:52:22 +0000 Commit: Mark Johnston CommitDate: 2024-10-25 17:53:11 +0000 virtio_p9fs: Check for completions after enabling interrupts Otherwise we can end up with a lost interrupt, causing lost request completion wakeups and hangs in the filesystem layer. Continue processing until we enable interrupts and then observe an empty queue, like other virtio drivers do. Sponsored by: Klara, Inc. --- sys/dev/virtio/p9fs/virtio_p9fs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index 42f47a4f63cb..dae38a507428 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -222,11 +222,15 @@ vt9p_intr_complete(void *xsc) P9_DEBUG(TRANS, "%s: completing\n", __func__); VT9P_LOCK(chan); +again: while ((curreq = virtqueue_dequeue(vq, NULL)) != NULL) { curreq->rc->tag = curreq->tc->tag; wakeup_one(curreq); } - virtqueue_enable_intr(vq); + if (virtqueue_enable_intr(vq) != 0) { + virtqueue_disable_intr(vq); + goto again; + } cv_signal(&chan->submit_cv); VT9P_UNLOCK(chan); } From nobody Fri Oct 25 18:20: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 4XZrfn3b7cz5b1Wk; Fri, 25 Oct 2024 18:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZrfm5nkjz4XmK; Fri, 25 Oct 2024 18:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YVc3aRTjpnWagEBr5jZ3Gq7TcGigCjn4KGsOSHhUEiM=; b=rgz/fXFxncE6VHpI5i+9Z3jooa5u+/+g+ztmP0sOdidWnnn2mNrVRjKTsX3IfYPYkYIvCG oR3zK6Rpz5IpdPCDHrVGerpiVUA/yAsPbI9L92Bp6hhbs5O7FGQUqbLSsI/L8ZKumhW1KO DB/5MkHTF/G1+BENAm/PIKrj/iM8f8SYjiVO8qgftoN60kUvPw9gYFGyDmIvFLZnzfYWlx 5gBwyIxKDCMtA+FLqjx+BKj4DnBZ9rk+iMR17w87mHyUVaCcFtE4X1mKniq6YnRv/eUKzf 9WyOs9kBWPMiQRKVyOJj5i4YDIGFrQNqtrp5y41CNkfN+tIea1MrDwzgw4WAUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729880400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YVc3aRTjpnWagEBr5jZ3Gq7TcGigCjn4KGsOSHhUEiM=; b=hDj0IOFDxd0c++IRnwbvmd0r2/UPUaJTIAV75f2mzQxwHjJHAQ9jL0ovioxQ86nHnzhun9 DHBQ7qz17lq5Bn/+BVwpjbMDJsTG4chf/7wtJzhQS76T1DG5IYznADk+XTk7EqmLgdF6UM LHUVU+/zdO7JUzJ/eWO6K1OT2NWFSNf0BnxvjVVPjxOFl2Gh1381TC/+IFPc4120r/Un9M h3XdjscxHBRzdxaO4pdVPoKPM0MdDeZ7lPc3MqYWrj6OiYohiZbNAFw0kpur83BDkz6BAa DXA0aH34tsHQh1qnspjIdcamCcunbQJ1x0TcOlLAmnD3Csc5rdjRyBDIO2gevQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729880400; a=rsa-sha256; cv=none; b=seeSbJhcYJKkFNrJjhVBScgcdDw5kpL6PbEuZHEPe9vwYfGYGIrj2B7M43QXTujppiZHkT 0Ry6r+euEBdrLIJZY5uycvhgfH/LQni3KKvyt53q8ujhfHaqcX3sNhCQLIc/W6YxyWCM3t qvcOwbkZi3gSKvvnriyhhYoioFcMpfR3oLQpf1qjbzQouZKaKTROrJVA5TpVd8dtfEamBO pn8v7S150DBi1c2GFi3bsc6/n4aPNYX6oFfz65tMxrG5KEFP/Qm9krxV3Wg8cZMBSL86SR xFXxZEABoDTlAzEipgpMAZmUNLAGWPhcVbfX9ikXaSZ5dtIOIuFPwC1MWg0yug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZrfm5Q0zzc8c; Fri, 25 Oct 2024 18:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PIK0Vb088096; Fri, 25 Oct 2024 18:20:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PIK08B088075; Fri, 25 Oct 2024 18:20:00 GMT (envelope-from git) Date: Fri, 25 Oct 2024 18:20:00 GMT Message-Id: <202410251820.49PIK08B088075@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: 28c9b13b236d - main - virtio_p9fs: Simplify vt9p_req_wait() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 28c9b13b236d25512cfe4e1902411ff421a14b64 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=28c9b13b236d25512cfe4e1902411ff421a14b64 commit 28c9b13b236d25512cfe4e1902411ff421a14b64 Author: Mark Johnston AuthorDate: 2024-10-25 17:52:52 +0000 Commit: Mark Johnston CommitDate: 2024-10-25 17:54:39 +0000 virtio_p9fs: Simplify vt9p_req_wait() a bit Remove an always-false check for whether the request has already completed before sleeping. Even if the request is complete, the response tag is updated while holding the channel lock, which is also held here. No functional change intended. Sponsored by: Klara, Inc. --- sys/dev/virtio/p9fs/virtio_p9fs.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index dae38a507428..1fdeeaae2a96 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -110,20 +110,20 @@ SYSCTL_UINT(_vfs_9p, OID_AUTO, ackmaxidle, CTLFLAG_RW, &vt9p_ackmaxidle, 0, static int vt9p_req_wait(struct vt9p_softc *chan, struct p9_req_t *req) { - if (req->tc->tag != req->rc->tag) { - if (msleep(req, VT9P_MTX(chan), 0, "chan lock", - vt9p_ackmaxidle * hz)) { - /* - * Waited for 120s. No response from host. - * Can't wait for ever.. - */ - P9_DEBUG(ERROR, "Timeout after waiting %u seconds" - "for an ack from host\n", vt9p_ackmaxidle); - return (EIO); - } - KASSERT(req->tc->tag == req->rc->tag, - ("Spurious event on p9 req")); + KASSERT(req->tc->tag != req->rc->tag, + ("%s: request %p already completed", __func__, req)); + + if (msleep(req, VT9P_MTX(chan), 0, "chan lock", vt9p_ackmaxidle * hz)) { + /* + * Waited for 120s. No response from host. + * Can't wait for ever.. + */ + P9_DEBUG(ERROR, "Timeout after waiting %u seconds" + "for an ack from host\n", vt9p_ackmaxidle); + return (EIO); } + KASSERT(req->tc->tag == req->rc->tag, + ("%s spurious event on request %p", __func__, req)); return (0); } From nobody Fri Oct 25 20:56: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 4XZw7Z60sTz5b84p; Fri, 25 Oct 2024 20:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZw7Z4Rc0z4sL1; Fri, 25 Oct 2024 20:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729889802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxJVYNPZp1mXyHsBNdNN1UrZ4JktDkugiFgvoIJ9aaY=; b=j5xj3JqSIWExs4siMsOvhuS2lX4VYCC4kNsnxpq3T692wDZZxmZ+aHoTsv/1bVRrjiZQmJ HEtnUCxlLsrwHcnveiDElWhLV6AH/RBNyA2haYx44p7P3zK3bnEa+qWqPOsfbXWEepWlvE IuPsAp6Rxytaanj+l2WsxVNcsEIE3wb/8iYGgH/caA2QlhwT7RaHHYz2NR1Cw14kB8t8Ym UBIyRpMk6Y+SlNVisGxqGJy28afM2aawDQkRDMldMXpVk/pDztYBssB/p1wTyzOulBVBuk 3zzB18+QRlVwaLxo6Su1R5Weilu5c7Hl/Jbx2eFguRah4JeQWQc23WptPvzGdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729889802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxJVYNPZp1mXyHsBNdNN1UrZ4JktDkugiFgvoIJ9aaY=; b=MNWA4G0Ms977CNrPBO0TfnmSuUdVHErXogAUVB+9CpYr3S5fCR7pSsoyK3PI9PB6yliLKL Yfjw3+cKsayDjDh1ESmTR7z5X++s1hk/8MlKl28p965diNQIo1QRuuwxtiVbt7bbsDERdd sMWEFB2XW/ry5ALDv5AB26r5egMBRpfxmk4OaAlm5c0omg/u7MNkS1uQyn1QQx1ZVPWckR fMhEhELQZNj6D0MdgK/vgIX+BAQZPNclqSAFzGTl2yqnZDjk4Wp3kfcKLILRjBKlUo0cr9 88OQk9l9QHcQkNwy+++EZqmZ3k6Bz0IcSNp3URj5+VjvB2IFEQWwSIIvfjSwvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729889802; a=rsa-sha256; cv=none; b=DYtoK6aopczqt73UFb/6opBs7XnFNTWayxHie7ObKHp2O4Tf+ShcuZaOP5mZ3Rm2J8y5zP mdcHSSdOZIyNOjONt/Bm4ePy8WNib2Ib3tAd9dIRDE2P9rbsR9KqDLFWQJfFc37T+5+jVK GArfXBQnCbChyCkQ/0QoBMxElwpg4YA4e9UXYmpte2viP5N9xVeL+EL+g6p4Teet/kQl28 0MLZL8H2JcoTAl+HrHa2jo4D69wzBEmNYkJbTg++oJWcO8jrunoWbYhnuEneIOjGf9fUVh inLZvzQO8d3NUeKd1AyS7Q37wtT6Hase6mNQJJce0kWEPFofTzQJiA6UUBWHow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZw7Z377BzhbH; Fri, 25 Oct 2024 20:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PKug6h080310; Fri, 25 Oct 2024 20:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PKugTC080307; Fri, 25 Oct 2024 20:56:42 GMT (envelope-from git) Date: Fri, 25 Oct 2024 20:56:42 GMT Message-Id: <202410252056.49PKugTC080307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d8cd2d0833e0 - main - depend-cleanup.sh: clean up after hash function removal from libcrypt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: d8cd2d0833e0e8d6f41fcf481ea27a21358b21d2 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d8cd2d0833e0e8d6f41fcf481ea27a21358b21d2 commit d8cd2d0833e0e8d6f41fcf481ea27a21358b21d2 Author: Robert Clausecker AuthorDate: 2024-10-25 20:39:06 +0000 Commit: Robert Clausecker CommitDate: 2024-10-25 20:56:04 +0000 depend-cleanup.sh: clean up after hash function removal from libcrypt The hash function removal changed the mangled names of MD[45] and SHA{256,512} hash function identifiers. Clean these files to pick up the symbol change. Reported by: bapt Tested by: brooks Fixes: cb5e41b160838880de7d03100afa02e4edee5a9e --- tools/build/depend-cleanup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 3678e3368b39..6e7585f0afe6 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -225,3 +225,9 @@ if [ -e "$f" ]; then run rm -f "$p"/*.inc fi fi + +# 20241025 cb5e41b16083 Unbundle hash functions fom lib/libcrypt +clean_dep lib/libcrypt crypt-md5 c +clean_dep lib/libcrypt crypt-nthash c +clean_dep lib/libcrypt crypt-sha256 c +clean_dep lib/libcrypt crypt-sha512 c From nobody Fri Oct 25 21:18: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 4XZwdF3pMDz5b9PZ; Fri, 25 Oct 2024 21:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZwdF3JHGz3wyr; Fri, 25 Oct 2024 21:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729891137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGJcKMdOE5LoW96n+FRWsSec8Lhg4BsFlGnBlxTGdJA=; b=YCfWm2PnW73FBeHLKgQj/ommqnAKgGtm99kD7gFyhr1G0J29ZY9yJYEfOSuw9YyZop2O16 ZcHAsWaj2pN7MlFIJtX5mWTGf4IemMT2uUVvZsl1/+5+9mU3W1b4zwiYlhASTPtyNBYA5e Y2gs7opSiJDmH7HlQmD+4eXquh1q+HpG2+7b1oI2hBYKjglh/O25IcQKzhqdNBwQtFNJwS mHu42sCrwm44gz6UuIbAIUJD7jv2nQ8IE6Eq23HZyrN7mMNBKqGtoVfAvYYUAJfxvUw8QQ 4E4XxDojaw+qNjJp218QZFH2jtiY+n+rMAmobaq88awiOkrIxZxtx6UP3wOC1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729891137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGJcKMdOE5LoW96n+FRWsSec8Lhg4BsFlGnBlxTGdJA=; b=PmcZi7sGMZjLly/FiWAKLY+y4kXK51leXZtJeypoTrIEREMD5IVU/7E+sx+1qDGgXIVWqN 59QUDJn+pMAtTxyY67OrT9y+WwQh8rErlYDnwaShHm/30oQSm2Yg4mmnpCuHMX8xIy8aWw KLAtVepKwRbDtjJhJYzV97SCSHFcahwz3sKzkv9DSxCY5FX1EoG9yqww5w9j5fBnsSLK6e QMfdZCTuW2rNfCbxVvWMF/nwHRClCThDEM6Oh/54lPu37fqmLRMrrFQ4omJRSIxIoNkWay gyiKZ7gYDBn9rtTPyiW8UsZpbqysnEaBrJO3q3XhFBFrilntb5NSaJa4e2SA6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729891137; a=rsa-sha256; cv=none; b=Spo/RUFYXYFCZmmqB1pqHfBI1rBpaVfXBO0kraLVJya3OQzfSic/GsbYbYsU6o0/zgme5f udHypALK9CB2cKWMfpOIwmB5XWeYOBQhG+jzzlDnV5iB8Nazh3q6RFe7Cz2qjaRxmGvgWZ YT9rEWTlTVZY07yBy6fTXHfwmTuVVsjaqsLd47pBNZqbsN0mE6TEOonJWEgNoc+DuxvnTS SYPOn9FJ9apvYDfLSwoQ6mKWbCid6/gRrYjxb9SgY3D9pKWoKFnBiVD+KtdjDYSDZTEUWr 33IuSPj8JUhp6S4dRGtm7J52S80exuOb0f8qzABlOJQ9TePnbQBEl+sIs06+Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZwdF2v2nzj4s; Fri, 25 Oct 2024 21:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PLIvXN018815; Fri, 25 Oct 2024 21:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PLIvqU018812; Fri, 25 Oct 2024 21:18:57 GMT (envelope-from git) Date: Fri, 25 Oct 2024 21:18:57 GMT Message-Id: <202410252118.49PLIvqU018812@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: 4b01a7fa76ce - main - Revert "intrng: change multi-interrupt root support type to enum" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4b01a7fa76ce5abd0ade631ac5566804ba657090 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4b01a7fa76ce5abd0ade631ac5566804ba657090 commit 4b01a7fa76ce5abd0ade631ac5566804ba657090 Author: Kyle Evans AuthorDate: 2024-10-25 21:18:32 +0000 Commit: Kyle Evans CommitDate: 2024-10-25 21:18:40 +0000 Revert "intrng: change multi-interrupt root support type to enum" This reverts commit 536c8d948e8563141356fd41fb8bfe65be289385. The change seemed fine on the surface, but converting to an enum has raised some concerns due to the asm <-> C interface. Back it out and let someone else deal with it later if they'd like to. Further context about the concerns can be found in D47279. --- sys/arm/arm/genassym.c | 4 ++-- sys/arm/arm/gic.c | 2 +- sys/arm/broadcom/bcm2835/bcm2836.c | 2 +- sys/arm/include/intr.h | 6 ------ sys/arm64/arm64/genassym.c | 2 +- sys/arm64/arm64/gic_v3.c | 4 ++-- sys/arm64/arm64/gicv3_its.c | 2 +- sys/arm64/include/intr.h | 10 +++------ sys/kern/pic_if.m | 4 ++-- sys/kern/subr_intr.c | 43 +++++++++++++++++++++++--------------- sys/riscv/include/intr.h | 6 ------ sys/riscv/riscv/intc.c | 2 +- sys/sys/intr.h | 10 +++++---- 13 files changed, 46 insertions(+), 51 deletions(-) diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c index 2cf1861b1178..9d6232739022 100644 --- a/sys/arm/arm/genassym.c +++ b/sys/arm/arm/genassym.c @@ -28,14 +28,15 @@ */ #include +#include #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -48,7 +49,6 @@ #include #include #include -#include #include #include /* For KERNVIRTADDR */ diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index ffce86e62128..b1b7aacd63ab 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -200,7 +200,7 @@ gic_cpu_mask(struct arm_gic_softc *sc) #ifdef SMP static void -arm_gic_init_secondary(device_t dev, enum root_type root_type) +arm_gic_init_secondary(device_t dev, uint32_t rootnum) { struct arm_gic_softc *sc = device_get_softc(dev); u_int irq, cpu; diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c index fd34ff8818ad..7ed9dedaa77e 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.c +++ b/sys/arm/broadcom/bcm2835/bcm2836.c @@ -538,7 +538,7 @@ bcm_lintc_init_pmu_on_ap(struct bcm_lintc_softc *sc, u_int cpu) } static void -bcm_lintc_init_secondary(device_t dev, enum root_type root_type) +bcm_lintc_init_secondary(device_t dev, uint32_t rootnum) { u_int cpu; struct bcm_lintc_softc *sc; diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h index 32297f656392..e64edd47dad2 100644 --- a/sys/arm/include/intr.h +++ b/sys/arm/include/intr.h @@ -43,12 +43,6 @@ #include #endif -enum root_type { - INTR_ROOT_IRQ = 0, - - INTR_ROOT_COUNT /* MUST BE LAST */ -}; - #ifndef NIRQ #define NIRQ 1024 /* XXX - It should be an option. */ #endif diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index 8612d2eda309..3ca712ca3de3 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -29,12 +29,12 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 750f734a7757..964a129111e2 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -1093,7 +1093,7 @@ gic_v3_bind_intr(device_t dev, struct intr_irqsrc *isrc) #ifdef SMP static void -gic_v3_init_secondary(device_t dev, enum root_type root_type) +gic_v3_init_secondary(device_t dev, uint32_t rootnum) { struct gic_v3_setup_periph_args pargs; device_t child; @@ -1140,7 +1140,7 @@ gic_v3_init_secondary(device_t dev, enum root_type root_type) for (i = 0; i < sc->gic_nchildren; i++) { child = sc->gic_children[i]; - PIC_INIT_SECONDARY(child, root_type); + PIC_INIT_SECONDARY(child, rootnum); } } diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 31e23fc01224..5ecd9b8c0e94 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -1293,7 +1293,7 @@ gicv3_its_setup_intr(device_t dev, struct intr_irqsrc *isrc, #ifdef SMP static void -gicv3_its_init_secondary(device_t dev, enum root_type root_type) +gicv3_its_init_secondary(device_t dev, uint32_t rootnum) { struct gicv3_its_softc *sc; diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h index c3fe5edc8a6c..38cba6ae8b0d 100644 --- a/sys/arm64/include/intr.h +++ b/sys/arm64/include/intr.h @@ -31,13 +31,6 @@ #include #endif -enum root_type { - INTR_ROOT_IRQ = 0, - INTR_ROOT_FIQ = 1, - - INTR_ROOT_COUNT /* MUST BE LAST */ -}; - #ifndef NIRQ #define NIRQ 16384 /* XXX - It should be an option. */ #endif @@ -53,4 +46,7 @@ arm_irq_memory_barrier(uintptr_t irq) #define ACPI_GPIO_XREF 3 #endif +#define INTR_ROOT_FIQ 1 +#define INTR_ROOT_NUM 2 + #endif /* _MACHINE_INTR_H */ diff --git a/sys/kern/pic_if.m b/sys/kern/pic_if.m index 2d938520b106..f78e787594c5 100644 --- a/sys/kern/pic_if.m +++ b/sys/kern/pic_if.m @@ -74,7 +74,7 @@ CODE { } static void - null_pic_init_secondary(device_t dev, enum root_type root_type) + null_pic_init_secondary(device_t dev, uint32_t rootnum) { } @@ -157,7 +157,7 @@ METHOD void pre_ithread { METHOD void init_secondary { device_t dev; - enum root_type root_type; + uint32_t rootnum; } DEFAULT null_pic_init_secondary; METHOD void ipi_send { diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index e88018e58729..b8d85bf20f28 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -89,6 +89,15 @@ #define INTRNAME_LEN (2*MAXCOMLEN + 1) +/* + * Archs may define multiple roots with INTR_ROOT_NUM to support different kinds + * of interrupts (e.g. arm64 FIQs which use a different exception vector than + * IRQs). + */ +#if !defined(INTR_ROOT_NUM) +#define INTR_ROOT_NUM 1 +#endif + #ifdef DEBUG #define debugf(fmt, args...) do { printf("%s(): ", __func__); \ printf(fmt,##args); } while (0) @@ -106,7 +115,7 @@ struct intr_irq_root { void *arg; }; -static struct intr_irq_root intr_irq_roots[INTR_ROOT_COUNT]; +static struct intr_irq_root intr_irq_roots[INTR_ROOT_NUM]; struct intr_pic_child { SLIST_ENTRY(intr_pic_child) pc_next; @@ -328,16 +337,16 @@ isrc_release_counters(struct intr_irqsrc *isrc) * from the assembler, where CPU interrupt is served. */ void -intr_irq_handler(struct trapframe *tf, u_register_t root_type) +intr_irq_handler(struct trapframe *tf, uint32_t rootnum) { struct trapframe * oldframe; struct thread * td; struct intr_irq_root *root; - KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, - ("%s: invalid interrupt root %ju", __func__, (uintmax_t)root_type)); + KASSERT(rootnum < INTR_ROOT_NUM, + ("%s: invalid interrupt root %d", __func__, rootnum)); - root = &intr_irq_roots[root_type]; + root = &intr_irq_roots[rootnum]; KASSERT(root->filter != NULL, ("%s: no filter", __func__)); kasan_mark(tf, sizeof(*tf), sizeof(*tf), 0); @@ -486,11 +495,11 @@ isrc_free_irq(struct intr_irqsrc *isrc) } device_t -intr_irq_root_device(enum root_type root_type) +intr_irq_root_device(uint32_t rootnum) { - KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, - ("%s: invalid interrupt root %ju", __func__, (uintmax_t)root_type)); - return (intr_irq_roots[root_type].dev); + KASSERT(rootnum < INTR_ROOT_NUM, + ("%s: invalid interrupt root %d", __func__, rootnum)); + return (intr_irq_roots[rootnum].dev); } /* @@ -891,7 +900,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, enum root_type root_type) + void *arg, uint32_t rootnum) { struct intr_pic *pic; struct intr_irq_root *root; @@ -916,9 +925,9 @@ intr_pic_claim_root(device_t dev, intptr_t xref, intr_irq_filter_t *filter, * Note that we further suppose that there is not threaded interrupt * routine (handler) on the root. See intr_irq_handler(). */ - KASSERT((uintmax_t)root_type < INTR_ROOT_COUNT, - ("%s: invalid interrupt root %ju", __func__, (uintmax_t)root_type)); - root = &intr_irq_roots[root_type]; + KASSERT(rootnum < INTR_ROOT_NUM, + ("%s: invalid interrupt root %d", __func__, rootnum)); + root = &intr_irq_roots[rootnum]; if (root->dev != NULL) { device_printf(dev, "another root already set\n"); return (EBUSY); @@ -1571,16 +1580,16 @@ void intr_pic_init_secondary(void) { device_t dev; - enum root_type root_type; + uint32_t rootnum; /* * QQQ: Only root PICs are aware of other CPUs ??? */ //mtx_lock(&isrc_table_lock); - for (root_type = 0; root_type < INTR_ROOT_COUNT; root_type++) { - dev = intr_irq_roots[root_type].dev; + for (rootnum = 0; rootnum < INTR_ROOT_NUM; rootnum++) { + dev = intr_irq_roots[rootnum].dev; if (dev != NULL) { - PIC_INIT_SECONDARY(dev, root_type); + PIC_INIT_SECONDARY(dev, rootnum); } } //mtx_unlock(&isrc_table_lock); diff --git a/sys/riscv/include/intr.h b/sys/riscv/include/intr.h index 100f1ba40ff3..657781efb620 100644 --- a/sys/riscv/include/intr.h +++ b/sys/riscv/include/intr.h @@ -35,12 +35,6 @@ #ifndef _MACHINE_INTR_MACHDEP_H_ #define _MACHINE_INTR_MACHDEP_H_ -enum root_type { - INTR_ROOT_IRQ = 0, - - INTR_ROOT_COUNT /* MUST BE LAST */ -}; - #ifndef NIRQ #define NIRQ 1024 #endif diff --git a/sys/riscv/riscv/intc.c b/sys/riscv/riscv/intc.c index fcfc0c826fb9..248175e8bea3 100644 --- a/sys/riscv/riscv/intc.c +++ b/sys/riscv/riscv/intc.c @@ -241,7 +241,7 @@ intc_setup_intr(device_t dev, struct intr_irqsrc *isrc, #ifdef SMP static void -intc_init_secondary(device_t dev, enum root_type root_type) +intc_init_secondary(device_t dev, uint32_t rootnum) { struct intc_softc *sc; struct intr_irqsrc *isrc; diff --git a/sys/sys/intr.h b/sys/sys/intr.h index f612fc2744f1..f11e96777927 100644 --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -39,6 +39,8 @@ #define INTR_IRQ_INVALID 0xFFFFFFFF +#define INTR_ROOT_IRQ 0 + enum intr_map_data_type { INTR_MAP_DATA_ACPI = 0, INTR_MAP_DATA_FDT, @@ -113,12 +115,12 @@ 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 *, - enum root_type); + uint32_t); 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 *); -device_t intr_irq_root_device(enum root_type); +device_t intr_irq_root_device(uint32_t); /* Intr interface for BUS. */ @@ -166,7 +168,7 @@ void intr_ipi_send(cpuset_t cpus, u_int ipi); void intr_ipi_dispatch(u_int ipi); #endif -/* Main interrupt handler called from asm on many archs. */ -void intr_irq_handler(struct trapframe *tf, u_register_t root_type); +/* Main interrupt handler called from asm on most archs except riscv. */ +void intr_irq_handler(struct trapframe *tf, uint32_t rootnum); #endif /* _SYS_INTR_H */ From nobody Fri Oct 25 22:01: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 4XZxZt0k1Hz5bBgn; Fri, 25 Oct 2024 22:01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZxZs75X7z417N; Fri, 25 Oct 2024 22:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729893718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=640lr0RLezKduWAtOu6DVbHYdbXWxu6TXIqWa4ViPtA=; b=YYMhxHX3QIh3VW4U64Vkrkxln8YPkwq6/K8GNmz3SSaHMSaYf4bwCG89Fs/1NqdgQSMtZX kxi28OsPonJdFheeuPBwTKGw7bkpek0O2osuu1UZyPbLzl4if2OLjxTRibYESLA2gcnj4z 4QoYFRxA97tLl8zr6M2WNmK5kvnU+fBjJt8XG1UExdNCc58f1s+5QGbPwpEnO47BPah5qt L17Pbr7JaagLnWDB4i1jyJzVyf8q0wmAoqVIjVBhYTDtJ8dqrtfa6biUa14rPy45q33dkg RZpaariRpU5ByVj3LqBTmF6KEBUo7Uv+ZdShju+PyRNJlL4j7C943/gmJJut4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729893718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=640lr0RLezKduWAtOu6DVbHYdbXWxu6TXIqWa4ViPtA=; b=THYFp2AIRwF0sl1EfHQ4qr7YcXvoWJX/4KNsojLXISLiDDir1IfYpsjlMpJB5n4PtOOACc /9lrrFRdgrjoWL4Jr7XRCW8ORMcRUm2WV1W7dhBt/+nLJQo7B09BP/uJs/9A0NMASJGsSh PY2gnZvnh0XiIHN/7zLpKnUoUVuXFN3j3AyEfy2Ga0EUsLOnXi4kum1xWMgYdoWIUPqd6d IjY+5At6qCFADeqcwmCI5vtvIlO9l2S8HeZilh1eT1a4PX36rbHNvhWUD2PkCzA4M4CJ2M eEN4Xp8q3FQevxDpnEzJmLkIdD52CGcR+Xa74qEMYmL2VlgRAxFIlWu5wVGYCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729893718; a=rsa-sha256; cv=none; b=WF79GZNk+kWEZSZlzMFdZsrWlPqwiRNjVag4H4UoznvaOup64sp+Gu9ibSSYDhttzxJTtb zAuyLs9NeWH0BIAM4ABMyuo3TBb0VonwIJSfqrTikQZW0LYPeOeI39wDY/9/AmEAYfaCeq cdL28T/WO1O81SAuOP6XrOkgoNrEU0eYaB6cX2T7FiecfMe4ZStO3fjSZrb+cPpjGzUQDJ UlOuNluc1D51i3Za2mmQ87xhScFIMWxunaJnC492mHmaoInZm12LCWw1qk6Q5ZH9buC6/5 Xm1Mgu/+0um+ykHcxCBhCbL6MUtpIyiURerKcrocWterEh0q7MhVTt7BaagSsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XZxZs6j3Jzk9l; Fri, 25 Oct 2024 22:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49PM1vRP004894; Fri, 25 Oct 2024 22:01:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49PM1vv4004891; Fri, 25 Oct 2024 22:01:57 GMT (envelope-from git) Date: Fri, 25 Oct 2024 22:01:57 GMT Message-Id: <202410252201.49PM1vv4004891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 0d965bc03428 - main - subr_pctrie: improve iter nbr search List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d965bc03428b66689d311fa4275868dfe27c82e Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=0d965bc03428b66689d311fa4275868dfe27c82e commit 0d965bc03428b66689d311fa4275868dfe27c82e Author: Doug Moore AuthorDate: 2024-10-25 22:00:31 +0000 Commit: Doug Moore CommitDate: 2024-10-25 22:00:31 +0000 subr_pctrie: improve iter nbr search pctrie_toval(node) can be applied to either a leaf or an internal node; in the latter case it provides the address of the pn_owner field. In a couple of places where a neighbor search is about to begin for an iterator, the current code distinguishes the leaf and non-leaf cases in a way that isn't really necessary. This change shrinks each function by 16 bytes, and by a branch instruction. Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D47207 --- sys/kern/subr_pctrie.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index ea1c1cf881d2..e4865c602ce4 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -801,9 +801,7 @@ pctrie_iter_lookup_ge(struct pctrie_iter *it, uint64_t index) * If no such node was found, and instead this path leads only to nodes * < index, back up to find a subtrie with the least value > index. */ - if (pctrie_isleaf(node) ? - (m = pctrie_toval(node)) == NULL || *m < index : - node->pn_owner < index) { + if (node == PCTRIE_NULL || *pctrie_toval(node) < index) { /* Climb the path to find a node with a descendant > index. */ while (it->top != 0) { node = it->path[it->top - 1]; @@ -960,9 +958,7 @@ pctrie_iter_lookup_le(struct pctrie_iter *it, uint64_t index) * If no such node was found, and instead this path leads only to nodes * > index, back up to find a subtrie with the greatest value < index. */ - if (pctrie_isleaf(node) ? - (m = pctrie_toval(node)) == NULL || *m > index : - node->pn_owner > index) { + if (node == PCTRIE_NULL || *pctrie_toval(node) > index) { /* Climb the path to find a node with a descendant < index. */ while (it->top != 0) { node = it->path[it->top - 1]; From nobody Sat Oct 26 02:35: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 4Xb3f6726Kz5bQqM; Sat, 26 Oct 2024 02:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xb3f66X5kz4RvT; Sat, 26 Oct 2024 02:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729910110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZgFGDXDbFONjeEa7g9u6fVMFRwNBbI0h06ZToJvHWo=; b=tQD2aV6YDzorV4Nenm8p15via75Kn603lPPDnZBHporMoHlOA5lDRkXQ1Ti+1Q13St9+He UnuGebBqTqzI4otFAOxSvciKcoXdpUjsMtGB46f6EAinxgNZiarWGP4Qjx3k7p8xgXHgAR PaxEQadA4kYn6SU6KC2Ic70HS0Mywjo4PWgp0zEb8q/EeUwgNnGF2RfTRLfGHWlrRZW1MP RXMhKpxsMgmD3gZmV9QDSPcc8q369CLg6+rGnzS+a1Jv2IWDsuQW1LiHuR78/IXTu95/Eq hKqPgoOoMDaXsbqxpwqxdLFKX/3vl5YaN2zZTiOMCXTQ7VhkRgWheSUd+V2Sww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729910110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZgFGDXDbFONjeEa7g9u6fVMFRwNBbI0h06ZToJvHWo=; b=UorYiYR004YqfHq7ny8xgKyCf8UTZbeE2nb8vCErv1P67kfGCwIJqWgKSPLige8rhCCJU2 aoB3Q5US0P/T4l9dDdXbmUL2u3EFTkGTF3ttnbBiLc+kiJR8dNCQal1t3SI4aUeW9iTB0o 1cl6TDdq9fbK+gaw7QYaPiurSP9NJOGKXkePNC4Vsi+fHw4arh2+h1FKTZXJQ8UXWvRHNn ne4yQyGOLFrIdFEZCxlnOEPuyNcw8YgUwLP5zCtUXhU2dm325dgb3bSljFXIbgWFc0QH2j LdV7tRHwj0pu5xueVDGlVqe3Wb8+pACEztPUoujQ4JuQ3jaVodO6Qgym55+8gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729910110; a=rsa-sha256; cv=none; b=X+44J6FhjrSNIQ+zliKxdt6I0V0vyWQtsXCRWqEvNY6dnwRCPjBFvbTGC2b94nyaTkl8Cf H3zRhhGLqlXGuGFcnZBpwywWNMgD+BK6UgnHaZrGpDCXHfhf9EpX0/brUvfG3+KfeoMxAd Y7ag4yMvxt2iF9v8mBjLuJBhXdSNzlZ/rKxEvZm/H1mY27is6OxtAdziJrBCzjmDErTMzX xNxJ8/8OGHCrXl+94cDX9TXUBNOj1IusbY5K+XHwKMOYM+DvY7DWaVFMuC2FwrfbWJws/2 TLWg96qNoNtbc9yflJMcBwJEhrDCWVQzx7B16B+3sejXzgQreP8OqQ3aqiSZJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xb3f666TPzrsf; Sat, 26 Oct 2024 02:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49Q2ZA1E007517; Sat, 26 Oct 2024 02:35:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49Q2ZA9j007514; Sat, 26 Oct 2024 02:35:10 GMT (envelope-from git) Date: Sat, 26 Oct 2024 02:35:10 GMT Message-Id: <202410260235.49Q2ZA9j007514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2f3f867ac6dd - main - ACPI: Add ACPI_Q_AEI_NOPULL quirk and use in EC2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f3f867ac6dd7ff3769366b828b79c44b38828e1 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2f3f867ac6dd7ff3769366b828b79c44b38828e1 commit 2f3f867ac6dd7ff3769366b828b79c44b38828e1 Author: Colin Percival AuthorDate: 2024-10-22 14:47:30 +0000 Commit: Colin Percival CommitDate: 2024-10-26 02:34:56 +0000 ACPI: Add ACPI_Q_AEI_NOPULL quirk and use in EC2 AWS Graviton [1234] systems have a bug in their ACPI where they mark the PL061's GPIO pins as needing to be configured in PullUp mode (in fact the PL061 has no pullup/pulldown resistors); this flag needs to be removed in order for _AEI objects to be handled on these systems. Reviewed by: Ali Saidi MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D47239 --- release/tools/ec2.conf | 5 +++++ sys/dev/acpica/acpivar.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 54eb0b0b8060..ea61c2fa6db9 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -70,6 +70,11 @@ ec2_common() { # nodes, but apply the workaround just in case. echo 'hw.broken_txfifo="1"' >> ${DESTDIR}/boot/loader.conf + # Graviton 1 through Graviton 4 have a bug in their ACPI where they + # mark the PL061's pins as needing to be configured in PullUp mode + # (in fact the PL061 has no pullup/pulldown resistors). + echo 'debug.acpi.quirks="8"' >> ${DESTDIR}/boot/loader.conf + # Load the kernel module for the Amazon "Elastic Network Adapter" echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index a71eb9b47eb7..ea32c58b1371 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -227,12 +227,15 @@ extern struct mtx acpi_mutex; * ACPI_Q_MADT_IRQ0: Specifies that ISA IRQ 0 is wired up to pin 0 of the * first APIC and that the MADT should force that by ignoring the PC-AT * compatible flag and ignoring overrides that redirect IRQ 0 to pin 2. + * ACPI_Q_AEI_NOPULL: Specifies that _AEI objects incorrectly designate pins + * as "PullUp" and they should be treated as "NoPull" instead. */ extern int acpi_quirks; #define ACPI_Q_OK 0 #define ACPI_Q_BROKEN (1 << 0) #define ACPI_Q_TIMER (1 << 1) #define ACPI_Q_MADT_IRQ0 (1 << 2) +#define ACPI_Q_AEI_NOPULL (1 << 3) #if defined(__amd64__) || defined(__i386__) /* From nobody Sat Oct 26 02:35: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 4Xb3f81qvmz5bQPr; Sat, 26 Oct 2024 02:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xb3f80bVmz4RvV; Sat, 26 Oct 2024 02:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729910112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=llnG6oPFA/3GaoWquVB0QQeLcWo3g1P7hWO0uss4TVU=; b=E35EsQhrAWNgMOlbysYvZVpAolEzRf15+al7vZoAB9vjYtZwkwT0muxbSF46fG0McHIXBh Xdt68E7C3ohTPGudcYPoXubzg+1zB716vkPvzqGTOO6K4nCst/An7Tw6G4WjFdTSSbFAh5 v8L+R/RC4xcdvt4p6P9rXJQs42UNf9fqTthZtzVMd50zJah508PDVljkF61Bd5KfZn1jIc 14bf6ZyUQ1SiJm1C2XSnXNoO+iODO4+Py0CNTIV7KdC1InuKL7jvDi+AWKp+jzMxYkhvJu gVH4mCMh4+aWHlDLmMCPMUYOVDIuN/djwXSd8Nk9n0wjPenkYKL2W6RPcPM/8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729910112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=llnG6oPFA/3GaoWquVB0QQeLcWo3g1P7hWO0uss4TVU=; b=Q15xbrL+hSdtHoggVJlaQWJMdRsINL9chHt/uj9NwGuvmMg7e/EPFKATscdmmTNAOVZ5zU tYs0HS1G5+QR7B3jVguNu3AKGM7B/2pkP+k5JiDiGxJs8vXUcJWhvXmUlRxUhM78pLO8TX Dv8sjh6PMtXybshp+o70aH568qweNO9U9BoH6xlUuEcY7zRa2sHIcDsj49J6+kaN+zQrso fi97lcq0LFHbULEn4p3zPrfJnwO2sHzpUnGxxjE7bLLeRaPraKHC6v8uLAEYLQwMDrpuc6 UO8IAyrUsEk35kVx0B8yu7lEa6gS5lozJDUHfNi6MBPh7aYWN6HFDDE7WdJW3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729910112; a=rsa-sha256; cv=none; b=adg0NTxpotVt5Xgsmb+haaP9blC/4kI9+8tcMNQQdlL1TfvZBQQgxRUd1V9y1YUpg/r6m0 hMFnbVBNASlm0TsAWX9YXifq9TIjvaU8mSC9oeYxVUT3km5UP8Jtq8Vm1fmZUbOxib395e 3fdD161oqItRsfEjIqM72dbgdIua8tmO8AYwDIKtI/6dW4mco5MkJM8AZLXd8YHxDoJZOh zupVahWjp4+8vhFZ0nLXz2SPvS4hN05tMPwqrGPlGLAUJZUl2X1b21sNRscN2uknDiYR+d fMRUFzd5YW5u85Wljb/qkPKUt3KN/ckmt5JYdMfFN7+oX56gluUsbpX6S+jvfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xb3f76xnzzrXy; Sat, 26 Oct 2024 02:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49Q2ZBco007556; Sat, 26 Oct 2024 02:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49Q2ZBQU007553; Sat, 26 Oct 2024 02:35:11 GMT (envelope-from git) Date: Sat, 26 Oct 2024 02:35:11 GMT Message-Id: <202410260235.49Q2ZBQU007553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: bc0d10d01c3c - main - gpiobus: Make gpiobus_read_ivar extern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc0d10d01c3c69004d600e14d53cd0dceffe4b09 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bc0d10d01c3c69004d600e14d53cd0dceffe4b09 commit bc0d10d01c3c69004d600e14d53cd0dceffe4b09 Author: Colin Percival AuthorDate: 2024-10-22 17:51:57 +0000 Commit: Colin Percival CommitDate: 2024-10-26 02:34:57 +0000 gpiobus: Make gpiobus_read_ivar extern This allows acpi_gpiobus to override the method and fall back to the generic gpiobus_read_ivar function if needed. Reviewed by: andrew MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D47250 --- sys/dev/gpio/gpiobus.c | 2 +- sys/dev/gpio/gpiobusvar.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 44484d82e2b9..02c02bcd645d 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -752,7 +752,7 @@ gpiobus_hinted_child(device_t bus, const char *dname, int dunit) } } -static int +int gpiobus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct gpiobus_ivar *devi; diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h index e3669e82e594..74783e112f89 100644 --- a/sys/dev/gpio/gpiobusvar.h +++ b/sys/dev/gpio/gpiobusvar.h @@ -179,6 +179,7 @@ int gpiobus_detach(device_t); int gpiobus_init_softc(device_t); int gpiobus_alloc_ivars(struct gpiobus_ivar *); void gpiobus_free_ivars(struct gpiobus_ivar *); +int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *); int gpiobus_acquire_pin(device_t, uint32_t); int gpiobus_release_pin(device_t, uint32_t); From nobody Sat Oct 26 02:35: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 4Xb3f94thpz5bQPs; Sat, 26 Oct 2024 02:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xb3f91cvJz4S5G; Sat, 26 Oct 2024 02:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729910113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lwbZmlBoq9bFvhhI5l1MS4A4xeByGTJe+md0YxA7RQ=; b=gHEqGAJ4xfPYIpL//ETNOQt5/1ohTMeqpiyAkrdQPjg9DZd0EgNsLw7KVHRLJcpp2bQR7M 3koDwV6qq2ljZuV1y27bIGmiLki/210m5o1jwzXwbEMqo2kB/p7/eLNrEstXdfRqqcFvQ8 AjxFu53phWtPxWCEraJDwJfInUiqQgDmK9ngro0BEiaCkMVlUxRakJABjnc2315lDI55+w ITcNCC6YZnxa78DQ8+DowGLiYqTBSYo0f7bFvssy0mqFKhnP4cxqTcTcByin7uGImh0Z/y /gkMayG7xbiG/DIxZUXUZTosgsdlc+IqPnlAlvE+13GgFiROUKBHzcHtiKTeLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729910113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lwbZmlBoq9bFvhhI5l1MS4A4xeByGTJe+md0YxA7RQ=; b=EoFfrH48I8qyGL7paSj2Y6HajtJ5RFCefxrwklausyhhpuhwNFxT026d1S/p1/4zC9Lqop z9Xwq+gQEuQV4EOBAaWN0Y7vRHt1UFgWFHS0I1kpBccA50XtdIjICanHcpvKp3LHU1NG+b e/vbIDMc6KTG9iA3fLV5FTmlExDYFPStNSr4BMdC/b0Cku9iLFbmtxnKuTC7DNDgqDMtIt dRUUiAirBHQToti8zzgI3q0Y+JKhdw0SPtNooLXb5nlJ9XvLmDWqS88XXpmxcL+V0UvIqr ZRh8JEKF7uADeBlk89V3wI2yh8ybJvbvxhjnzp37/FHZDvCNm2f4u6r3yu17cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729910113; a=rsa-sha256; cv=none; b=J10h7ZTU6Shpp1MaSnpJTrPEnuvyHBDAsqmomCsbfGLwQ0+UosOej43rcujzJ7vFbfEZB6 vvGhhX40mlxK7LT1zaxXNFU6MxXjOn/6b89skUpu/iyXdRQ8NuDfeOrrdoKSftQh9mq6/Z XJ95EhlyZpdugX1swKpxSxxPJE8RPmZu7WoNcyp1j/rZKnES3sYyFIVvYvCZJU0SWcPUuU ne0/k3njZKhZght8GUOq6kn0FAae8tFyZMaGcZiaOiDjYIFbLSIoI4fXjncVM0MBrSRBAj QilC5ND1ahzusvbJeuWEn5DGG4WHJgLvcZbq5NzKbv2BOlgRUAw1ix0HyAPRGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xb3f90qhCzrY0; Sat, 26 Oct 2024 02:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49Q2ZDRx007599; Sat, 26 Oct 2024 02:35:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49Q2ZDMu007596; Sat, 26 Oct 2024 02:35:13 GMT (envelope-from git) Date: Sat, 26 Oct 2024 02:35:13 GMT Message-Id: <202410260235.49Q2ZDMu007596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2d4219919a48 - main - acpi_gpiobus: Narrow scope of NOT_YET List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d4219919a48aa6d67ae62e2b8859ffe3b035bd2 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2d4219919a48aa6d67ae62e2b8859ffe3b035bd2 commit 2d4219919a48aa6d67ae62e2b8859ffe3b035bd2 Author: Colin Percival AuthorDate: 2024-10-22 18:25:11 +0000 Commit: Colin Percival CommitDate: 2024-10-26 02:34:57 +0000 acpi_gpiobus: Narrow scope of NOT_YET GPIO interrupts work just fine and will be used shortly. We still do not support GPIO_INTR_SHAREABLE however, so leave that within the NOT_YET scope. Reviwed by: andrew MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D47251 --- sys/dev/gpio/acpi_gpiobus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 3b6fc6dde674..9828170daeca 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -52,8 +52,6 @@ acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *gpio_res) uint32_t flags = 0; /* Figure out pin flags */ -#ifdef NOT_YET - /* These are currently unused. */ if (gpio_res->ConnectionType == ACPI_RESOURCE_GPIO_TYPE_INT) { switch (gpio_res->Polarity) { case ACPI_ACTIVE_HIGH: @@ -69,10 +67,12 @@ acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *gpio_res) break; } +#ifdef NOT_YET + /* This is not currently implemented. */ if (gpio_res->Shareable == ACPI_SHARED) flags |= GPIO_INTR_SHAREABLE; - } #endif + } switch (gpio_res->IoRestriction) { case ACPI_IO_RESTRICT_INPUT: flags |= GPIO_PIN_INPUT; From nobody Sat Oct 26 02:41: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 4Xb3nS75kXz5bR9q for ; Sat, 26 Oct 2024 02:41:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xb3nS5GjVz4T53 for ; Sat, 26 Oct 2024 02:41:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43169902057so25015855e9.0 for ; Fri, 25 Oct 2024 19:41:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729910491; x=1730515291; 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=822lAoZ6IEMBcZbK2gJGcKyFuD1zNbg/E7ZXuTPfI/A=; b=p9Wo0Y2lyChlLvlARZS88bGaBFrjDY9xTJVVQacqp0RISkdcq1Yjrv97ddImYnuoCl ythYTkcNt528st7pGCnGf722KMDw0dKBS2KhLAD556P0uUasEB9JbCY+l6lYXKdfGmgG ZLyWr70164zEp+ycNUTrFadN4+ynQwBKTH9fNFv7ynyDyjI/Q6sYKlvR/uMdRHDnRKGk MQ9DDDYHCozt8+n6bFy7tq/bkSIGwq1pYH6gsLWRPKDt7Mt7hhQ0g4iWE+4GLH2Zdf2Z BAzIgzdvkXjvOyNjrxCa0yKCTqVRvCr6h1F/P825kZkbRvCBU2i9++IdVJkuvFVq0ME0 ocHA== X-Forwarded-Encrypted: i=1; AJvYcCU93oGvAsEEhOe/DmAtgfOXeYStyt7pQF/gg8c4SH7PVRoWw8CZcVmjx3feQIVdfeNJP7XQ1RI+fjD6URkHeREfMtDy@freebsd.org X-Gm-Message-State: AOJu0Yyjaiq5KsevTjx5sJiMzvNvk7vJaidWEEOW0i7zmaXbB8S8Ca36 UCIIb0qU8wxf/w7YSAQCdf7fwy4BOJXa5nuhlUSpYpVRJKo8IlLS1Y9C1QqUTFk= X-Google-Smtp-Source: AGHT+IFX0GXXYlVIKWvlKsHR8Z5iVTIhRGQtDPQbvoeoxMlHq95mTQyJGXOjzXSuHdqPyRadtHljDw== X-Received: by 2002:a05:600c:19d3:b0:431:6060:8b22 with SMTP id 5b1f17b1804b1-4319ac9a6bemr9288115e9.10.1729910491113; Fri, 25 Oct 2024 19:41:31 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4317ddec611sm64671605e9.1.2024.10.25.19.41.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Oct 2024 19:41:30 -0700 (PDT) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: 2f3f867ac6dd - main - ACPI: Add ACPI_Q_AEI_NOPULL quirk and use in EC2 From: Jessica Clarke In-Reply-To: <202410260235.49Q2ZA9j007514@gitrepo.freebsd.org> Date: Sat, 26 Oct 2024 03:41:19 +0100 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: <202410260235.49Q2ZA9j007514@gitrepo.freebsd.org> To: Colin Percival X-Mailer: Apple Mail (2.3818.100.11.1.3) 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] X-Rspamd-Queue-Id: 4Xb3nS5GjVz4T53 X-Spamd-Bar: ---- On 26 Oct 2024, at 03:35, Colin Percival wrote: >=20 > The branch main has been updated by cperciva: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2f3f867ac6dd7ff3769366b828b79c44= b38828e1 >=20 > commit 2f3f867ac6dd7ff3769366b828b79c44b38828e1 > Author: Colin Percival > AuthorDate: 2024-10-22 14:47:30 +0000 > Commit: Colin Percival > CommitDate: 2024-10-26 02:34:56 +0000 >=20 > ACPI: Add ACPI_Q_AEI_NOPULL quirk and use in EC2 >=20 > AWS Graviton [1234] systems have a bug in their ACPI where they = mark > the PL061's GPIO pins as needing to be configured in PullUp mode = (in > fact the PL061 has no pullup/pulldown resistors); this flag needs = to > be removed in order for _AEI objects to be handled on these = systems. >=20 > Reviewed by: Ali Saidi > MFC after: 1 week > Sponsored by: Amazon > Differential Revision: https://reviews.freebsd.org/D47239 > --- > release/tools/ec2.conf | 5 +++++ > sys/dev/acpica/acpivar.h | 3 +++ > 2 files changed, 8 insertions(+) >=20 > diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf > index 54eb0b0b8060..ea61c2fa6db9 100644 > --- a/release/tools/ec2.conf > +++ b/release/tools/ec2.conf > @@ -70,6 +70,11 @@ ec2_common() { > # nodes, but apply the workaround just in case. > echo 'hw.broken_txfifo=3D"1"' >> ${DESTDIR}/boot/loader.conf >=20 > + # Graviton 1 through Graviton 4 have a bug in their ACPI where they > + # mark the PL061's pins as needing to be configured in PullUp mode > + # (in fact the PL061 has no pullup/pulldown resistors). > + echo 'debug.acpi.quirks=3D"8"' >> ${DESTDIR}/boot/loader.conf Should this not be restricted to arm64 in case it affects something on amd64? Also, is there no way to be able to dynamically set this at run time based on some _HID or similar? Requiring quirks in loader.conf in order to get a working system is less than ideal, especially if anyone=E2=80=99s trying to produce their own image, or updating an = existing system (whether via freebsd-update, pkg or make). Jess From nobody Sat Oct 26 04:13: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 4Xb5qR0B9lz5bW1d for ; Sat, 26 Oct 2024 04:13:23 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with SMTP id 4Xb5qQ4jQ0z4c4F for ; Sat, 26 Oct 2024 04:13:22 +0000 (UTC) (envelope-from cperciva@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: (qmail 98120 invoked from network); 26 Oct 2024 04:13:21 -0000 Received: from unknown (HELO framework.daemonology.net) (127.0.0.1) by mail.tarsnap.com with SMTP; 26 Oct 2024 04:13:21 -0000 Received: (qmail 50752 invoked from network); 26 Oct 2024 04:13:21 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by localhost with SMTP; 26 Oct 2024 04:13:21 -0000 Message-ID: <97c9b2c6-7ed5-4288-a445-b44356d97986@freebsd.org> Date: Fri, 25 Oct 2024 21:13:21 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 2f3f867ac6dd - main - ACPI: Add ACPI_Q_AEI_NOPULL quirk and use in EC2 To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202410260235.49Q2ZA9j007514@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@freebsd.org; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFARnJlZUJTRC5vcmc+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSrYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT++ ig/9GZKdN2fHSyrANKZX38ivd7IX2wAYouqH9DrQM94W8IciaDLmarN4Pl9mY+aucMwQUSyp uNtKOJwKqhVVaalF9Zw0sRMH4CJuvT7vKCtZ3q1Okb7soRvFte4d+vXhvPxCvBFDA5JzU7Lg DR5eqqcvF1dN1OuCq16pl0zCOSH/Jr5ToE3LM3Av1KBGcZD7ZSzHRWsFjV5AOUJKySuA3GwJ e/jASQcQ0YfCnru8ntLmYg/2SKvZFlfthZiCBnAppMt4n4BUAw3TDvf10HIDtdneejawcbLS gofLCvGqumwbZYAMKWrFzT4+7KQvr0pOw8QD7EbxnB4f9hQ7UiVF8qWsyKU3iv6b5JLhbS59 ooKRccyOvdMLcVJ0ZdpqoxrNv061ZUqLL5RiWjBlc1qjBnDxeg5oyM0rT8WLftdgvyH6RQt0 KWngumBAT5AT2DUYL8Uz1490cqfO9K4yEGZAJB9XRVX1g2IWTOjae+0g9ZII+h91UngFz+Rz aKDeseKBbCGDOFXx1TqKiHl2g255ZnUxKYTlucFtguv4gDGBgEk4G9JaEWBw1IWblcKhxH7L 2vWsUhvwghjIxHdO/RkeIeHvSp4YZxCJ7a3TaJLYAlwYopfTKVzNhcDY5h5syEuoHjyJCxXK SyoJYAVu8Yl2KUhvOtOmL1VZ6xyHnpdMRWKJZ5jOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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:14618, ipnet:54.86.0.0/16, country:US] X-Rspamd-Queue-Id: 4Xb5qQ4jQ0z4c4F X-Spamd-Bar: ---- On 10/25/24 19:41, Jessica Clarke wrote: > On 26 Oct 2024, at 03:35, Colin Percival wrote: >> --- a/release/tools/ec2.conf >> +++ b/release/tools/ec2.conf >> + # Graviton 1 through Graviton 4 have a bug in their ACPI where they >> + # mark the PL061's pins as needing to be configured in PullUp mode >> + # (in fact the PL061 has no pullup/pulldown resistors). >> + echo 'debug.acpi.quirks="8"' >> ${DESTDIR}/boot/loader.conf > > Should this not be restricted to arm64 in case it affects something on > amd64? It doesn't. :-) > Also, is there no way to be able to dynamically set this at run > time based on some _HID or similar? Requiring quirks in loader.conf in > order to get a working system is less than ideal, especially if > anyone’s trying to produce their own image, or updating an existing > system (whether via freebsd-update, pkg or make). This isn't the first time we've had a quirk in loader.conf (e.g. immediately above this we have the hw.broken_txfifo quirk) but point taken. Yes, turning this on based on detecting Amazon's ACPI might be better -- although I'm not entirely sure how. The GPIO device in question has _HID=ARMH0061 which I'm assuming applies to all pl061 devices; and probably the best we could do for autodetection is to check a combination of "ACPI is from Amazon" and the ARM CPU generation but I have no idea what Graviton 5 is gong to look like yet. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Sat Oct 26 08:32: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 4XbCZC72RVz5bjTB; Sat, 26 Oct 2024 08:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbCZC5G6sz53Rn; Sat, 26 Oct 2024 08:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729931539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/kes4nOuAQ7fbSrhpbnCsnwbkyqWScBYMEJDTlC+W4=; b=mwgF657vkqQBuTF29zpcokh6SK16IIk86VCcFJznOeSOOPHvsLDvvZEl1vE5PeGWq6kd8B 9MZQb7s6eFexty6DACF+7yrYNV+qAxqqKuAGEcUKwreMaDExidzSeIC46KrtnGjXD62Q4X GHoYD7cpcJMyCljEz1+MdO5pfKWMaLpYCHsXia2fr3kvFx01ugIPdw2Gw7wveOIEx49cp7 H4r8NkMYf+gnVtVymysf48n2sQBZeaAf7p7J4tkqDwds/rPP4W2sxXwZ6jRBC1L/1Aywr/ c21+A4RNqyyVwu1bCl0zd3Buj56sqnj7et0+ugKY7R6kZb/vfAa4ENHcnjtmBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729931539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/kes4nOuAQ7fbSrhpbnCsnwbkyqWScBYMEJDTlC+W4=; b=BHh90o7Qzt3l37IpQxfi5JnauxMCdpWlY+edEYVsbJgbfZDRilm5v8wH7rDBRUA5W5TWcQ 9zayVR58qZjmW3axIz6/DpwITVRM2ShSs+CqfEBPblJeOkj0wyMZICSjzYNrblyIypwhtJ FaXfgulWCkg4mGB1Jc/e7al44h1tWQHKKhgQDRWc3DcZhzc+T3/Gn2zr1MsYBt9AoZHrmw cm1Cprt8CIU7rJE7DMrN3jhv2R/s/E2VaeIFR4kbN7XGT43OXwJwTeXJC2vNjkPsPorJ1P t+ZB89rFbCWO6sEXsFsC3snQ+lWpXGAFJMRB8D2M9LCXWJy+LmEJ8316NyZLPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729931539; a=rsa-sha256; cv=none; b=NR/rZBuFxPVCGOIlCSKPgm/aj7od+k1lHxNYPN9/O7WDEB5a0bwFELzJPDJgIkWlReyNvs PkOY5aagp/vTGaHJGkw+U2U1HcQMJpYJYl1aujy4q5oxaTJMHUXWZ2b7enakSWHlzZrWks 51cxCEMs+BwsnoSabrLX/chwHdlRpg4u0T7Q1qH99yNk7n7+xV8NmucrD9Q4vdhoCVnR+M 87Io4NrRTB8r75jo84NseDCLZW14fXso8237o3tzZIY1MUKCaTJqPlB7yhMt+vzNAEPi5z OmYTh4zpbtjBF92p02JEPo47l4K4+8KDmcuNd1+Hp6TgaJZiHP12yUKN5xfsyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbCZC4sdLz13LG; Sat, 26 Oct 2024 08:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49Q8WJj1079099; Sat, 26 Oct 2024 08:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49Q8WJUI079096; Sat, 26 Oct 2024 08:32:19 GMT (envelope-from git) Date: Sat, 26 Oct 2024 08:32:19 GMT Message-Id: <202410260832.49Q8WJUI079096@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: 9d585fc395c3 - main - absolute-symlink.sh: check for absolute symlinks on a FreeBSD system List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9d585fc395c3af6d1ceaec7df7c7ef60466f0528 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=9d585fc395c3af6d1ceaec7df7c7ef60466f0528 commit 9d585fc395c3af6d1ceaec7df7c7ef60466f0528 Author: Wolfram Schneider AuthorDate: 2024-10-26 08:31:19 +0000 Commit: Wolfram Schneider CommitDate: 2024-10-26 08:31:19 +0000 absolute-symlink.sh: check for absolute symlinks on a FreeBSD system The purpose of this script is to detect absolute symlinks on a machine, e.g.: /etc/localtime -> /usr/share/zoneinfo/UTC Some of these absolute symbolic links can be created intentionally, but it is usually better to use relative symlinks. You can run the script after `make installworld', or any other make targets thats installs files. You can also check your local ports with: env ABSOLUTE_SYMLINK_DIRS=/usr/local ./absolute-symlink.sh --- tools/build/absolute-symlink.sh | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tools/build/absolute-symlink.sh b/tools/build/absolute-symlink.sh new file mode 100755 index 000000000000..9d5d636e2dfb --- /dev/null +++ b/tools/build/absolute-symlink.sh @@ -0,0 +1,49 @@ +#!/bin/sh +# Copyright (c) Oct 2024 Wolfram Schneider +# SPDX-License-Identifier: BSD-2-Clause +# +# absolute-symlink.sh - check for absolute symlinks on a FreeBSD system +# +# The purpose of this script is to detect absolute symlinks on +# a machine, e.g.: +# +# /etc/localtime -> /usr/share/zoneinfo/UTC +# +# Some of these absolute symbolic links can be created intentionally, +# but it is usually better to use relative symlinks. +# +# You can run the script after `make installworld', or any other +# make targets thats installs files. +# +# You can also check your local ports with: +# +# env ABSOLUTE_SYMLINK_DIRS=/usr/local ./absolute-symlink.sh + + +PATH="/bin:/usr/bin"; export PATH +LANG="C"; export LANG + +# check other directories as well +: ${ABSOLUTE_SYMLINK_DIRS=""} + +find -s -H \ + /bin \ + /boot \ + /etc \ + /lib \ + /libexec \ + /sbin \ + /usr/bin \ + /usr/include \ + /usr/lib \ + /usr/lib32 \ + /usr/libdata \ + /usr/libexec \ + /usr/sbin \ + /usr/src \ + /usr/share \ + $ABSOLUTE_SYMLINK_DIRS \ + -type l \ + -ls | grep -Ea -- ' -> /' + +#EOF From nobody Sat Oct 26 12:53: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 4XbKMV01ZNz5Zk0p; Sat, 26 Oct 2024 12:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbKMT6F62z4Dk3; Sat, 26 Oct 2024 12:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729947205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzZmNU9odpcFDPd0O6jLuBJ9gbfYTAUq2lsUNIrxRpY=; b=LNoF1l0Y0N1gjJdb1ntGmdCe5MmMEH6OcrN6ugxelX9mQVkTLg7DnNc7WMNrgzjDT5Pece F6j37+zw9hH25Zntarg4lJO3iWN7Gj0Hb9LsrjnXRcFQbDrZVz0YT9PFsjFjYvKdSMn25Q +zmiNixI2m+5I3I0MvLvZZTZKSkwvEVs2LPpZb0EkLBokbBonf3v7zMzfnTkBSwTzE/Svu 9DwjCAR3L4Uk1pN2XEIV568fe4gzKSYTAliRBw9bkWCuoM3tAWn2zSXK3KhkIVZ451u1sb GFhlE/jCl1T2g2ZIDzD8axHnHckQfhKPcvBa5KqpibExc57YTmtiAJjYvdDIVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729947205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzZmNU9odpcFDPd0O6jLuBJ9gbfYTAUq2lsUNIrxRpY=; b=sQTkJXbAt4RX893g8D1Ocqc7FOMonuXa4KYdXfgvNFmOez8O1nbr8gQeRPzaKbiLrik+jB OavLCffbl/QGmtCzR+fnJJwQF+f52fMpEz6y0rPcECsvuEso2kLxoLFgBlBWY6Iw+S6HzO IozfmN5bS5CyBj23yFv/VkazLpauOd46x9So6CYl6pgsf44dBwm0UZUEcK0U00VNzXwJbF cjmNhsaP01EfcFm32jaYjrxM5i2+7eSgqRaD/rTOy2PsSPTvRiGdSfHJRbb1hQGbmDH+Q3 ktHZWDOLbARktFKIEHOjNWQ2LhttkaVlfIhfLrAfbhQ1vU8MxZ0NDxp9NMsqtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729947205; a=rsa-sha256; cv=none; b=unV6+xhxpc5kyecyKKWq4xfJBLQL7ia5hCB5mY5Eed3//CkvlFlbWYVBEyBg6R/7liN5Rc /PwbWKjCpGhIE7GXFXJFIAedopXtl3zK/fUzQxDHizICLbL74cJxinP547gXotaccm0oHq E/O2uAd1Dk4kTvn6YaJgaAUXtN7qmfL03zgQupB0Bdgn3ByZxRCp2iDVEokdMjdAOIkYwU nvtO1yp79NUyLj/eukOvzMLoz7O96jiFAFvfNtrIaEITyZdbRwJYshclGJVMXgbgh23+9S D4dabwX44XgMB8/d4fowA3epm0mQCqFTlN4HlWtnsKKD826Ha1Hhcd98sjeE7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbKMT5rfWz19gB; Sat, 26 Oct 2024 12:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QCrPWZ060463; Sat, 26 Oct 2024 12:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QCrPPX060460; Sat, 26 Oct 2024 12:53:25 GMT (envelope-from git) Date: Sat, 26 Oct 2024 12:53:25 GMT Message-Id: <202410261253.49QCrPPX060460@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: 01a5af6a98fc - main - zstream: avoid absolute symlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 01a5af6a98fc3935b57a5b0616521f46e916caec Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=01a5af6a98fc3935b57a5b0616521f46e916caec commit 01a5af6a98fc3935b57a5b0616521f46e916caec Author: Ed Maste AuthorDate: 2024-10-21 17:15:46 +0000 Commit: Ed Maste CommitDate: 2024-10-26 12:53:16 +0000 zstream: avoid absolute symlink PR: 282192 Reported by: wosch Fixes: 44877c8db05b Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47226 --- cddl/usr.bin/zstream/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index e08cadb31a7d..b131901cb6a9 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -16,7 +16,7 @@ SRCS= \ zstream_redup.c \ zstream_token.c -SYMLINKS= ${BINDIR}/zstream ${BINDIR}/zstreamdump +SYMLINKS= zstream ${BINDIR}/zstreamdump WARNS?= 2 CFLAGS+= \ From nobody Sat Oct 26 12:59: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 4XbKW34tv0z5Zjyt; Sat, 26 Oct 2024 12:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbKW341Qqz4H7m; Sat, 26 Oct 2024 12:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729947599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P9SeMhLiRpP8TB8SSgj0MHrzGsYIyb7zm++jN56Yflw=; b=KZVkVUyMwsVrz+JujAr/v8d0h+kZIYQP+CXJr3dfTZZE8ej51CKeOK8YxqsIGHhktSqWkh 80HUzfwRPcB5vOMSf2FeYavelMWtbb6GCgJBkJq+f2Cpgvj6ofid3c52RhN1qEn1C1B8Di ypKSiUxyowt9432An9yNkuNwoVBvMeqKk55QmVHpIFE9kBDScwCliAQsRZDcWbGwSVx1bp LhxK2r+jmfye3BMBhVtipsAq3itiMy5fGnfc/KwDXm37EHIHpx0Y9xBCyyKt7gmkqPbl9E KK2wIFcHVM5qG2pWcq9Tqt19upOVE7Sg4wl8rZ1zH/3iyA7/pUdeV10wFpSGrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729947599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P9SeMhLiRpP8TB8SSgj0MHrzGsYIyb7zm++jN56Yflw=; b=f30ekdsD/krOHS0Is6Ygo32f5JGDteLTsZogcsnTnSnlwJBLMdkrSNyHiMFgwUheRz4Z7+ 97IeC86wk3DWaCpxLEVifBvA8SmeIs3e2tolRW4AFmz1X/4HcR4kHAz0VE/1btjIdM0KNH beXTHthmEGrBCC2IVvOPkRInHQ3xQqaRpj4aNhH/a+S/i0XBR7IuT3/1aqjaagfbPMhSwQ RExN8/Xj7ugtLJdlRdCRD6qS1oDMF1TIRtQCKRN39fwZ0Hu+K+NCqju8fYmK+fV19wG+zJ POLoV2Ra+RX1F4ovOZHVaNQ2pRhQ6vcAK0OEVf+rgXu/WPkGph/4iAVjy+CJuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729947599; a=rsa-sha256; cv=none; b=uU1HhjXctvvNz9Fqrmqp0r3vKarwLZzC8TLGpfDlS7Q+uLMZXOoYVP0prdOXEM6K9rtMdz 0oCzI/JHy0iQI7HmnG/hawcIAT6r7bgFRZHcdvmDUSBi3Hl5xUoCm3MftvZ/WmMCwwYmqV z0CAkZzwrUb7KpeL4eLp3se2H8SoWMP5XQT7FHlk9CCd5/092LpZfOKAUlURZW9EIj6NVu 3EOyE9wKeGCUgA1vTPWx8TvhewbS8wtDkZL0gN1hpC2LImndkTYMqsEKFnOApD1O9+ScYE v2mz2QBl8khiKTe/j6uSB+tpkgm/UU0uwneXWsQZPkC+dwmNf/Piiw9lbh3q0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbKW33N6xz19gH; Sat, 26 Oct 2024 12:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QCxx7V062613; Sat, 26 Oct 2024 12:59:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QCxxA8062610; Sat, 26 Oct 2024 12:59:59 GMT (envelope-from git) Date: Sat, 26 Oct 2024 12:59:59 GMT Message-Id: <202410261259.49QCxxA8062610@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: b947b53f0f9f - stable/14 - vm_page: Fix a logic bug in vm_page_unwire_managed() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b947b53f0f9fc7a9ab265dfaf1548e1a1d96e2f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b947b53f0f9fc7a9ab265dfaf1548e1a1d96e2f3 commit b947b53f0f9fc7a9ab265dfaf1548e1a1d96e2f3 Author: Mark Johnston AuthorDate: 2024-10-07 20:50:49 +0000 Commit: Mark Johnston CommitDate: 2024-10-26 12:58:50 +0000 vm_page: Fix a logic bug in vm_page_unwire_managed() When releasing a page reference, we have logic for various cases, based on the value of the counter. But, the implementation fails to take into account the possibility that the VPRC_BLOCKED flag is set, which is ORed into the counter for short windows when removing mappings of a page. If the flag is set while the last reference is being released, we may fail to add the page to a page queue when the last wiring reference is released. Fix the problem by performing comparisons with VPRC_BLOCKED masked off. While here, add a related assertion. Reviewed by: dougm, kib Tested by: pho MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46944 (cherry picked from commit c59166e5b4e8821556a3d23af7bd17ca556f2e22) --- sys/vm/vm_page.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 7c3083de42de..3713fe17dd13 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4090,10 +4090,13 @@ vm_page_unwire_managed(vm_page_t m, uint8_t nqueue, bool noreuse) */ old = atomic_load_int(&m->ref_count); do { + u_int count; + KASSERT(VPRC_WIRE_COUNT(old) > 0, ("vm_page_unwire: wire count underflow for page %p", m)); - if (old > VPRC_OBJREF + 1) { + count = old & ~VPRC_BLOCKED; + if (count > VPRC_OBJREF + 1) { /* * The page has at least one other wiring reference. An * earlier iteration of this loop may have called @@ -4102,7 +4105,7 @@ vm_page_unwire_managed(vm_page_t m, uint8_t nqueue, bool noreuse) */ if ((vm_page_astate_load(m).flags & PGA_DEQUEUE) == 0) vm_page_aflag_set(m, PGA_DEQUEUE); - } else if (old == VPRC_OBJREF + 1) { + } else if (count == VPRC_OBJREF + 1) { /* * This is the last wiring. Clear PGA_DEQUEUE and * update the page's queue state to reflect the @@ -4111,7 +4114,7 @@ vm_page_unwire_managed(vm_page_t m, uint8_t nqueue, bool noreuse) * clear leftover queue state. */ vm_page_release_toq(m, nqueue, noreuse); - } else if (old == 1) { + } else if (count == 1) { vm_page_aflag_clear(m, PGA_DEQUEUE); } } while (!atomic_fcmpset_rel_int(&m->ref_count, &old, old - 1)); @@ -4387,6 +4390,8 @@ vm_page_try_blocked_op(vm_page_t m, void (*op)(vm_page_t)) do { KASSERT(old != 0, ("vm_page_try_blocked_op: page %p has no references", m)); + KASSERT((old & VPRC_BLOCKED) == 0, + ("vm_page_try_blocked_op: page %p blocks wirings", m)); if (VPRC_WIRE_COUNT(old) != 0) return (false); } while (!atomic_fcmpset_int(&m->ref_count, &old, old | VPRC_BLOCKED)); From nobody Sat Oct 26 13:50: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 4XbLdY4BN4z5ZmnK; Sat, 26 Oct 2024 13:50: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbLdY3f2kz4NY5; Sat, 26 Oct 2024 13:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729950641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U2AQYQcmnrg65VCeFA4Fhq4rNLqdNpmDhGoWP4hkJMU=; b=igzPTkBG+H3Gu5rNNFbYpjD/pJDEocTiAk8EP6gI/HV1wguIIfpU/oNiCq3ws1uEVEmK7z DL/1Q5n9EPTN+6EMeNPo7clESqNQBu2/265buZLt6afgVnp7khBAJq5/xvHB01m+gdwTEY OWKk6eVp5TwDS07HJSyiZ5hW7LQfgkWVfU0tEZCTf1yLVPCtJIc9CuZiGpDLmmrNdzVRlk 1i4OvDbmxty+akhcFYwZuhVe/pRMSZxFmXRVDEtwdIRVSXB1F/dtBJ0KCAoTOLANqthf0N Y+uoDNlDRA4vZLqt2QsJk+tE1M6FmaPMdWEFou30Vhxk2/7eDPDWCoHeBEclqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729950641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U2AQYQcmnrg65VCeFA4Fhq4rNLqdNpmDhGoWP4hkJMU=; b=ozBq6eEuoaovE/fblopdDh0UrsRlia6Hw3kLjv3ciyX/yUauhcuiQpwWgNpSMWe1+1iimq JsGSzsyP9nmKt3pIFRO0TkAHzVYt41AzjXM4PJjIvw2E2gyI6jj4q4FlpeCKaodkFq/Eo9 c4u0bO5YNWcJU99aOPwaQ2TuY7Mn8asIG4tdLzqg/Er09hnIEf61Y/VJVqcW+c/cqFYNWd Ypd6aID/iZ2ZH8M8xc7ccIZYVBZ3priXf5vmu1O/mZqjCbpMCwniDT9vgDmrdF/o/8yLaI KbcMJBIV7DITijyW7JwiwEsKmZH9UKwQvb3anHQNVhjoIU139qFoPPzIx32dpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729950641; a=rsa-sha256; cv=none; b=Ra/q/OVNMp9f7PX6mdhhjpacqgq9DK740anqO9jA80t3uteTOZQTiQU5cM7c72/LddANQb Mx1/Eg4GH1cZRLbqbSj1by+zzU8/5perCpXlV4cH9vaNPWFzdGu7b0FA4KRaNtAqgnMmMB JgNl3hTc6tAJydmfR/4sPWC1hEzxYHgmX2+Sq+4TrXBTTGKrNxEFGC8b4z7HI2C+ydoC0F oPqxswYKBsKmEd5eG6Z3UQT3cDwiSWrFBj7T31mJxxWt0qgSGISAEDtpj4QJY0QA0Q+tG1 xK1PvFEBL6uCdOydLzWSFJOfKpA5ScL1DJB/T6MFuzAIemEgRdkHIxexMAmztQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbLdY3F0fz1BfP; Sat, 26 Oct 2024 13:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QDofAQ068275; Sat, 26 Oct 2024 13:50:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QDofQP068272; Sat, 26 Oct 2024 13:50:41 GMT (envelope-from git) Date: Sat, 26 Oct 2024 13:50:41 GMT Message-Id: <202410261350.49QDofQP068272@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: 52d895fe63eb - main - nfs: trivial typo fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 52d895fe63eb22c1265362c54983db6038ebea3c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=52d895fe63eb22c1265362c54983db6038ebea3c commit 52d895fe63eb22c1265362c54983db6038ebea3c Author: Ed Maste AuthorDate: 2024-10-08 16:46:47 +0000 Commit: Ed Maste CommitDate: 2024-10-26 13:50:22 +0000 nfs: trivial typo fix via is not an abbreviation and doesn't need a period. --- sys/fs/nfsclient/nfs_clvfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index c050eef7d4c3..1cbe8e70867f 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -415,7 +415,7 @@ ncl_fsinfo(struct nfsmount *nmp, struct vnode *vp, struct ucred *cred, } /* - * Mount a remote root fs via. nfs. This depends on the info in the + * Mount a remote root fs via nfs. This depends on the info in the * nfs_diskless structure that has been filled in properly by some primary * bootstrap. * It goes something like this: From nobody Sat Oct 26 14:36: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 4XbMfW4VnYz5ZpTD; Sat, 26 Oct 2024 14:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbMfW3hRYz4RF4; Sat, 26 Oct 2024 14:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729953395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bM8PIlXQexppXbYiOgEG2CywS8ac9aNr8CKjNTXybO8=; b=ihlvVCV7t/9i/DZfVIHMPF38BTJKoTKxHZZltAmF3JkC5lOX/aPSuAlRudn2072UC9ZNhU rPXwY1W7d3AnldC0D5m/k55oqkRRpx3Z1ze8YCfaXUjY9/2qb8P9qVdPRNgLrKclnavXeb rwuMDCVf3w/tMxxzWKo3Sw1g49qcPPMY3QIJtjC7xUNh99+saYOeKiFEbKT3y/pu3m/jxG ugojxSUA8MGwy/uwz/7N//2htU5+Uh0SQChraj/BjiBYBfjhredOubMhAorZXGeGqNIMc1 JzeqWn5tVeg8g4+HJc4WIJsbncmzHpmMb7RIt35a1tA08krE1rCblg4sVs34fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729953395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bM8PIlXQexppXbYiOgEG2CywS8ac9aNr8CKjNTXybO8=; b=IqPjFxqN+8HPh3+3Tl13l5D9Apy/5MEZkiogHynKFoskx3/0fXD/tnzGSbz+zkBPqJGbas GWoSDd9olf9p2uyORVQyTb1rXeNyalyvbnsfe8icimbnjtWJpna1+NCcVLHVGHFwtlbgy7 KGkLe3huOXUVmSM7hLf5ThKYKHPW9JVPmTeh1aEK5/2diC7M2Ibttz5FmVq6XB+/4X+kDk IOWEiWYCoBn83+56XAP1zWKD4LMumGQJB4ojeZAXVvcKyZ7ATJfshwPf1gxn41vf71H4qF NCb6pci7/3zhh45cK+/e1FE3CnSeGL33P7R4ELNW+CUozkb7E8MnWKASB8lMrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729953395; a=rsa-sha256; cv=none; b=MSFTIZpgZIRVFdyi4BhtEArB9JLiui/v/ysoocj5Gp+PZw4fQyPqhHLW++MEkAz8PLwmXb 25/VG9EQEt9C2N8+wkZJPqUNPC7k9jobvEJPPi/KoOnhwx06aNAsd15iE5gsuP/lB9zoo0 FcXJb1RZhsWTdRYklGigbRj/9kaJ4tkHM4+bjHJfvGgGOFDgwpMIpJI+SxKyYvO/S6xCYZ hdgmk8h4BAfaoWTQAR5X3hAIYRoelDMSbNHy6DU8xio5y6avxTL4RqOGzPloNQhmBLnDXJ ctmriL5xIAA8OrKccoXnQ8xj3plsEntAkIbqMteHsLsCyuNu2phY5rVU6kcZVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbMfW311hzDyT; Sat, 26 Oct 2024 14:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QEaZ0H047439; Sat, 26 Oct 2024 14:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QEaZt4047436; Sat, 26 Oct 2024 14:36:35 GMT (envelope-from git) Date: Sat, 26 Oct 2024 14:36:35 GMT Message-Id: <202410261436.49QEaZt4047436@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: f44029e32244 - main - linker: Make linker.h more self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: f44029e322446469f116bbd26d51ba857083bacb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f44029e322446469f116bbd26d51ba857083bacb commit f44029e322446469f116bbd26d51ba857083bacb Author: Mark Johnston AuthorDate: 2024-10-26 14:05:56 +0000 Commit: Mark Johnston CommitDate: 2024-10-26 14:05:56 +0000 linker: Make linker.h more self-contained struct kld_file_stat embeds a reference to MAXPATHLEN, defined in param.h. PR: 280432 MFC after: 2 weeks --- lib/libsys/kldfind.2 | 1 - lib/libsys/kldfirstmod.2 | 1 - lib/libsys/kldload.2 | 1 - lib/libsys/kldnext.2 | 1 - lib/libsys/kldstat.2 | 1 - lib/libsys/kldsym.2 | 1 - lib/libsys/kldunload.2 | 1 - sys/sys/linker.h | 2 ++ 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libsys/kldfind.2 b/lib/libsys/kldfind.2 index a7e147af55f1..5ede0d1e1464 100644 --- a/lib/libsys/kldfind.2 +++ b/lib/libsys/kldfind.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldfind "const char *file" diff --git a/lib/libsys/kldfirstmod.2 b/lib/libsys/kldfirstmod.2 index 8e69b366c8aa..b6dbab2c94b7 100644 --- a/lib/libsys/kldfirstmod.2 +++ b/lib/libsys/kldfirstmod.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldfirstmod "int fileid" diff --git a/lib/libsys/kldload.2 b/lib/libsys/kldload.2 index 20bf3778c1ae..63a13c328d58 100644 --- a/lib/libsys/kldload.2 +++ b/lib/libsys/kldload.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldload "const char *file" diff --git a/lib/libsys/kldnext.2 b/lib/libsys/kldnext.2 index 8d8102711494..28b14dfc3035 100644 --- a/lib/libsys/kldnext.2 +++ b/lib/libsys/kldnext.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldnext "int fileid" diff --git a/lib/libsys/kldstat.2 b/lib/libsys/kldstat.2 index f0ab26ac2608..111323a0da8d 100644 --- a/lib/libsys/kldstat.2 +++ b/lib/libsys/kldstat.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldstat "int fileid" "struct kld_file_stat *stat" diff --git a/lib/libsys/kldsym.2 b/lib/libsys/kldsym.2 index d3025ca536f8..641fc26c38ec 100644 --- a/lib/libsys/kldsym.2 +++ b/lib/libsys/kldsym.2 @@ -31,7 +31,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldsym "int fileid" "int cmd" "void *data" diff --git a/lib/libsys/kldunload.2 b/lib/libsys/kldunload.2 index 2d33aabb3f33..c89f869e9eeb 100644 --- a/lib/libsys/kldunload.2 +++ b/lib/libsys/kldunload.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldunload "int fileid" diff --git a/sys/sys/linker.h b/sys/sys/linker.h index a316aa26d0eb..fbbc0ebc5de1 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -29,6 +29,8 @@ #ifndef _SYS_LINKER_H_ #define _SYS_LINKER_H_ +#include + #ifdef _KERNEL #include From nobody Sat Oct 26 18:07: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 4XbSKt5VvGz5b2Pc; Sat, 26 Oct 2024 18:07: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbSKt4smQz4m62; Sat, 26 Oct 2024 18:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ETBLADf/d11O/vww9BrjPi4TiPmcgAZNv6KgtRr6iU=; b=qGqmEKeMR+evh8NBbkW2Fq+2P1KdDDNvHQGXbjpJ0wnGHzNFgzevCV1OdS/XmqOWYDMqfQ JjCv9e6sOZc0roGVObOgTyqwNF62wZcQYhlMSdTjMPXx+mmw0enmVDQa4XDEUdIP3Ndjgb KuBNC+YqPIB114BL/D/HEICYPGNLocEv9qXQLNL//cW6Jd+hPhvUSJPXQ7B+Pa2u6tXGZR 4xrWSTrqHT/EO/bKRVaOlE0FigLJyTFP42Y9kNJTor+ryGtIT4HIB1uT3ufayFB3u7UAtU BijwhgUuhQd+Hoe9OqhNhZtd+DdyEPg7wDVAkEJfvBPHX0ApdfqrxJ0R+M7o0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ETBLADf/d11O/vww9BrjPi4TiPmcgAZNv6KgtRr6iU=; b=y4em/EKeqKKSRHZAwdC5ccJbDU8cSChuDmkJbzcGd+iamL/JENo2oBgwGvIvug1OdAwRd1 fnDlcZX+aaLzqPjweufRQO5l8wIXqagTTFvTTT4zTnDUIAkDpRmFKzks2BYQ/o+Ep1xW3w 7cdLSM+SRMf7tKc3q8iwhOpji+bjg2aE3TX2p/ego/1AHhjtEN8iKg3uOGLfHkjyevM0Ol eYhGxOt1ny4jqaaD3+fTIrlvXHGTG8kvCgNFXbPq7RMQUdTrVhbQLjGHFEfDQH4ZlPCpTH ImdQcoHaiVnJ63G+swwWBkiuWxgjIOWPDEM/osVB94fGHaNl3k7QdoNEXX4R6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729966050; a=rsa-sha256; cv=none; b=ysV4wT3VjJXZekMKoHktkdIi9/fXq7a3jTZa3ekVfF9yhKd+WeCNvu8a4HtevCXnNdfwtq k0MZaze8SIf2gFoirD53tWenNGMpQeCeswJnYusqkZxjs0oItpdbPdLCI+INcf1axRzNrO qvDmUkfwbkJNa7o33OcCE9ttO88CWQCIExSh6NSZxBg5j0Fy8MDuqCHUcYoxq3zdBG5FUM USbPPnX22F+VUsR6PXa8anjIAF5XmSWpodoOwxh+4CVQHs4EH+/ulP4x6ys+v+7kp3k2/d 2uXms4rim8r9zvWwu1My04WtAzQpUBJCrIKCm3cQlDz2IQ1bcvcF9NoIatq0bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbSKt4TgczKdY; Sat, 26 Oct 2024 18:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QI7UCc035673; Sat, 26 Oct 2024 18:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QI7US6035670; Sat, 26 Oct 2024 18:07:30 GMT (envelope-from git) Date: Sat, 26 Oct 2024 18:07:30 GMT Message-Id: <202410261807.49QI7US6035670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 39f6d1e7f835 - main - swap_pager: iter in haspage, lookup, getpages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39f6d1e7f8356825e84392952127f9a70213229d Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=39f6d1e7f8356825e84392952127f9a70213229d commit 39f6d1e7f8356825e84392952127f9a70213229d Author: Doug Moore AuthorDate: 2024-10-26 18:03:40 +0000 Commit: Doug Moore CommitDate: 2024-10-26 18:03:40 +0000 swap_pager: iter in haspage, lookup, getpages Use pctrie iterators for swblk traversal in more swap_pager functions: swap_pager_haspage, swp_pager_meta_lookup, and swap_pager_getpages. Reported by: markj Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47232 --- sys/vm/swap_pager.c | 76 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index e1795e8fd3ae..a402516fdb0e 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -494,7 +494,7 @@ static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t, static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst, vm_pindex_t pindex, vm_pindex_t count); static void swp_pager_meta_free_all(vm_object_t); -static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t); +static daddr_t swp_pager_meta_lookup(struct pctrie_iter *, vm_pindex_t); static void swp_pager_init_freerange(struct page_range *range) @@ -1191,8 +1191,9 @@ swap_pager_copy(vm_object_t srcobject, vm_object_t dstobject, } /* - * SWAP_PAGER_HASPAGE() - determine if we have good backing store for - * the requested page. + * SWP_PAGER_HASPAGE_ITER() - determine if we have good backing store for + * the requested page, accessed with the given + * iterator. * * We determine whether good backing store exists for the requested * page and return TRUE if it does, FALSE if it doesn't. @@ -1201,20 +1202,16 @@ swap_pager_copy(vm_object_t srcobject, vm_object_t dstobject, * store exists before and after the requested page. */ static boolean_t -swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, - int *after) +swp_pager_haspage_iter(struct pctrie_iter *blks, vm_pindex_t pindex, + int *before, int *after) { daddr_t blk, blk0; int i; - VM_OBJECT_ASSERT_LOCKED(object); - KASSERT((object->flags & OBJ_SWAP) != 0, - ("%s: object not swappable", __func__)); - /* * do we have good backing store at the requested index ? */ - blk0 = swp_pager_meta_lookup(object, pindex); + blk0 = swp_pager_meta_lookup(blks, pindex); if (blk0 == SWAPBLK_NONE) { if (before) *before = 0; @@ -1230,7 +1227,7 @@ swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, for (i = 1; i < SWB_NPAGES; i++) { if (i > pindex) break; - blk = swp_pager_meta_lookup(object, pindex - i); + blk = swp_pager_meta_lookup(blks, pindex - i); if (blk != blk0 - i) break; } @@ -1242,7 +1239,7 @@ swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, */ if (after != NULL) { for (i = 1; i < SWB_NPAGES; i++) { - blk = swp_pager_meta_lookup(object, pindex + i); + blk = swp_pager_meta_lookup(blks, pindex + i); if (blk != blk0 + i) break; } @@ -1251,6 +1248,26 @@ swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, return (TRUE); } +/* + * SWAP_PAGER_HASPAGE() - determine if we have good backing store for + * the requested page, in the given object. + * + * We determine whether good backing store exists for the requested + * page and return TRUE if it does, FALSE if it doesn't. + * + * If TRUE, we also try to determine how much valid, contiguous backing + * store exists before and after the requested page. + */ +static boolean_t +swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, + int *after) +{ + struct pctrie_iter blks; + + swblk_iter_init_only(&blks, object); + return (swp_pager_haspage_iter(&blks, pindex, before, after)); +} + static void swap_pager_unswapped_acct(vm_page_t m) { @@ -1338,8 +1355,8 @@ swap_pager_unswapped(vm_page_t m) * The pages in "ma" must be busied and will remain busied upon return. */ static int -swap_pager_getpages_locked(vm_object_t object, vm_page_t *ma, int count, - int *rbehind, int *rahead) +swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, + vm_page_t *ma, int count, int *rbehind, int *rahead) { struct buf *bp; vm_page_t bm, mpred, msucc, p; @@ -1352,7 +1369,8 @@ swap_pager_getpages_locked(vm_object_t object, vm_page_t *ma, int count, KASSERT((object->flags & OBJ_SWAP) != 0, ("%s: object not swappable", __func__)); - if (!swap_pager_haspage(object, ma[0]->pindex, &maxbehind, &maxahead)) { + if (!swp_pager_haspage_iter(blks, ma[0]->pindex, &maxbehind, + &maxahead)) { VM_OBJECT_WUNLOCK(object); return (VM_PAGER_FAIL); } @@ -1425,7 +1443,7 @@ swap_pager_getpages_locked(vm_object_t object, vm_page_t *ma, int count, vm_object_pip_add(object, count); pindex = bm->pindex; - blk = swp_pager_meta_lookup(object, pindex); + blk = swp_pager_meta_lookup(blks, pindex); KASSERT(blk != SWAPBLK_NONE, ("no swap blocking containing %p(%jx)", object, (uintmax_t)pindex)); @@ -1507,9 +1525,12 @@ static int swap_pager_getpages(vm_object_t object, vm_page_t *ma, int count, int *rbehind, int *rahead) { + struct pctrie_iter blks; VM_OBJECT_WLOCK(object); - return (swap_pager_getpages_locked(object, ma, count, rbehind, rahead)); + swblk_iter_init_only(&blks, object); + return (swap_pager_getpages_locked(&blks, object, ma, count, rbehind, + rahead)); } /* @@ -1968,7 +1989,7 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) /* Get the page from swap, and restart the scan. */ vm_object_pip_add(object, 1); rahead = SWAP_META_PAGES; - rv = swap_pager_getpages_locked(object, &m, 1, + rv = swap_pager_getpages_locked(&blks, object, &m, 1, NULL, &rahead); if (rv != VM_PAGER_OK) panic("%s: read from swap failed: %d", @@ -2423,20 +2444,11 @@ swp_pager_meta_free_all(vm_object_t object) * busy page. */ static daddr_t -swp_pager_meta_lookup(vm_object_t object, vm_pindex_t pindex) +swp_pager_meta_lookup(struct pctrie_iter *blks, vm_pindex_t pindex) { struct swblk *sb; - VM_OBJECT_ASSERT_LOCKED(object); - - /* - * The meta data only exists if the object is OBJT_SWAP - * and even then might not be allocated yet. - */ - KASSERT((object->flags & OBJ_SWAP) != 0, - ("Lookup object not swappable")); - - sb = swblk_lookup(object, pindex); + sb = swblk_iter_lookup(blks, pindex); if (sb == NULL) return (SWAPBLK_NONE); return (sb->d[pindex % SWAP_META_PAGES]); @@ -2542,7 +2554,7 @@ swap_pager_seek_hole(vm_object_t object, vm_pindex_t pindex) bool swap_pager_scan_all_shadowed(vm_object_t object) { - struct pctrie_iter backing_blks, backing_pages, pages; + struct pctrie_iter backing_blks, backing_pages, blks, pages; vm_object_t backing_object; vm_page_t p, pp; vm_pindex_t backing_offset_index, new_pindex, pi, pi_ubound, ps, pv; @@ -2562,6 +2574,7 @@ swap_pager_scan_all_shadowed(vm_object_t object) backing_offset_index + object->size); vm_page_iter_init(&pages, object); vm_page_iter_init(&backing_pages, backing_object); + swblk_iter_init_only(&blks, object); swblk_iter_init_only(&backing_blks, backing_object); /* @@ -2620,7 +2633,8 @@ swap_pager_scan_all_shadowed(vm_object_t object) * required to clear valid and initiate paging. */ if ((pp == NULL || vm_page_none_valid(pp)) && - !swap_pager_haspage(object, new_pindex, NULL, NULL)) + !swp_pager_haspage_iter(&blks, new_pindex, NULL, + NULL)) break; if (pi == pv) vm_page_xunbusy(p); From nobody Sat Oct 26 18:12: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 4XbSR75HnWz5b22g; Sat, 26 Oct 2024 18:12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbSR74s6xz4n50; Sat, 26 Oct 2024 18:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZW+AHpptHrevJsq5WiwNU2VvLuVJLzmlTA9jNeVtC8=; b=skCYwhdp1vLmqVfAJpg8PuqD0sKWn6inzHtxgY33jsL+HyXbfQB5i637EZJmu1ABbU4Jsi kerN7i8y+iMtU7RcF/JzOAtmU8n9c+g1aFQ4hd+cdPNaUBbdpOReW3XDJGfnXjDrLOnU8d NlHPlNSukGdVyT8mGwEh93UhVyWxKJmOfdzOCOwG9Mm0+29z0+tA7vmNgWim5r8WxgIKfk oubTUQMitegMoLQKDX6JYy7o06Lj3IxY0XiLj0pR315Tkf/H/ve+NYCiqDmMZp+LJT6e+s kjve18GTgXopgeKeKy4GDatiwYHQusBJHMlre1zWyqIgXv3DmVMersN2AVDszg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZW+AHpptHrevJsq5WiwNU2VvLuVJLzmlTA9jNeVtC8=; b=J/6utsRxfpWpU0TPXW0Sh9yDvKL8kOPe15ItED6d8NHMPK/hHGyJ0HYqBKe1EqWyqg1M2Z n3dHeyEiHFOYPm6cauA8dRzGlKOPxHuSRGrErdFy5t11lR9Dtdh5dBuzpsrUDsJmx5pXja IxN5XMBc77Twbl+WkUtzLVA0g+SGapJTvssayaBWeOnVj6/qjmgq2OBdxdQamIUd6rSTgQ D4PrvQOyoyjn1CvgkHHvUuJFIsBeMHuL4LrPYAFf9O4kOEuZ/j//OS82KQS89P0YKIlb4p DP97nthsoMukD6+moiTfPW07DM7kOobaXXdD9F9qTPfN62A2fVzGFPY9FGGeSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729966323; a=rsa-sha256; cv=none; b=Act1vh5O1VrxT3mMHjKgVhOBZFrZMH3hW3U0oJ8TNIokWCs+snvbrMDHgo1+SM/M7LQuEU 7Ym+41jTPfml1og/V+Z8qnju/1YdiQj1STUX8bWpruHh8QTu168lCv+oM+NZ0DRK20rkCv znFmACUzWhTSAtCMu0RMgqlQwKXfF1X2DyBPTCVOn8vVAmxXtnTsuBIjrS+7wEmhbmiWiQ G2r/YUbl/Ci/lqIgvNQ39kkGHKdFigYmH+ze2LQbXtYrp8RTStH/0rQOdtrjuKaH04vjTu cENT/A9xVgTQP4+n1PRcFGHbFFiK7KCp8eAsMc3IsAjFcLyWDx4QzcJ9K1zjmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbSR74SWRzL1g; Sat, 26 Oct 2024 18:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QIC3PQ047772; Sat, 26 Oct 2024 18:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QIC3hj047769; Sat, 26 Oct 2024 18:12:03 GMT (envelope-from git) Date: Sat, 26 Oct 2024 18:12:03 GMT Message-Id: <202410261812.49QIC3hj047769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 87c2aab0a0b3 - main - lib/libcrypt: reinstate CFLAGS+=-I${SRCTOP}/sys/crypto/sha2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 commit 87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 Author: Robert Clausecker AuthorDate: 2024-10-26 14:16:10 +0000 Commit: Robert Clausecker CommitDate: 2024-10-26 18:11:02 +0000 lib/libcrypt: reinstate CFLAGS+=-I${SRCTOP}/sys/crypto/sha2 This is apparently needed for the cross-build from Linux to succeed. Fixes: cb5e41b160838880de7d03100afa02e4edee5a9e --- lib/libcrypt/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 5a9eac4c682f..e939bae1bc25 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -1,6 +1,3 @@ -# -# - SHLIBDIR?= /lib .include @@ -18,7 +15,8 @@ SRCS= crypt.c misc.c \ MAN= crypt.3 MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \ crypt.3 crypt_set_format.3 -CFLAGS+= -I${SRCTOP}/lib/libmd +CFLAGS+= -I${SRCTOP}/lib/libmd \ + -I${SRCTOP}/sys/crypto/sha2 # Pull in the strong crypto, if it is present. .if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no" From nobody Sat Oct 26 18:12: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 4XbSR9008Wz5b2lK; Sat, 26 Oct 2024 18: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbSR85YM3z4n51; Sat, 26 Oct 2024 18:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yeDNS4HnGoFjDVmfBOxnVPomteLrV4rqG3Vg9tILI0s=; b=qIxsOqlf5uApKVwDxlAcbA4/pBZpGo7mf396+EYqvOow2Vz5kboNApUV2cxkbH8NcwlsEi rJK/97u3eG5frZJDbrAFLOjVShV5PY885kcyYtvC813j6VFhaH/rHkzz5mi8ZPo5bcw+wf lryNCxRkg36fBz11MvuVYLftR3MSeSjZphJp+FjpHg6c8ZFaTkpK/0sHtqOTk7V6Sx8BTt eBtI9Tb4/Ij6hCxlfXTK+KuDAnTYIGphVwU53Lkmu+J1SSiRerinH/HWAabIcVSxBU0ZL8 4e3t0Ig8P6ZCih+A4GG9kB9WVk7yRXofAZd0mF0BSQto9NHFP9ZV9Jp7p9psqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729966324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yeDNS4HnGoFjDVmfBOxnVPomteLrV4rqG3Vg9tILI0s=; b=eO4XItGW6nJogBfuNL1vUkWVWcnac38wVZrf78uRJL8AV4jHUY515dxxi6OwOHbxPIJCw2 NOktrz4/mT8QBxRLjlWWUknAPInNYBeXQfvaKzC5+V6g5GtpZe5W8mHcVSVHcAsNkKhKtC XqmCdbk0QUCWIyC5Wk6wvIA1iSTKIRNq3ylLiPKlqzdxFJ+2JJ8SUz+bkszdUwnOtLlmBV +7WpiiyPjHjbCnHEYGnrakFpgKqXanXAgX4VATUiLf1gL3vfsEZQZtBcNCaJ87CecIkhOE dpJlaaC7ktuXYFrrhXHKuoyjxzLEHfpb7aJi9oDdTica8ayl9umYcPDWfFeYEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729966324; a=rsa-sha256; cv=none; b=GSwHtj1RKkBMFSQBGxLbzaCZ90Y/NyAMfAM25vvUnluCvtQ1lJ7iT7y7laTVGVz4dFrOfI xvNRdkQlr5QWbdDqZJLxKztr05lxxgHDd1CHSMMI+saLMNy6boea6R6KrSXzsx21AECIuL kzEPPnKsoSlRpYeqwTsz3BddfZlPuvF2zIG3mCS0NShV3uWzscBSD2AaC3slcapp5Eo+u1 YlA7+Wmr9NIaIAWW2p/5RRlGgpKmSF4ooWfRdHvKGjTHl0KdxS+nuZS0/NZc6HrNcL+Oa/ 4bV6fskm0sm95ciXgl3FgMtjkFbQfWSJx0SDKw4YlF8aSPVJmYX0LJsqbQFytg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbSR858pRzL8l; Sat, 26 Oct 2024 18:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QIC486047824; Sat, 26 Oct 2024 18:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QIC4u7047821; Sat, 26 Oct 2024 18:12:04 GMT (envelope-from git) Date: Sat, 26 Oct 2024 18:12:04 GMT Message-Id: <202410261812.49QIC4u7047821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 7ed159c6cc00 - main - contrib/mandoc: add -isoC-2024 and -svid1 to mdoc(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 7ed159c6cc00adf6f75f9a43024f23509f5b8e5e Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7ed159c6cc00adf6f75f9a43024f23509f5b8e5e commit 7ed159c6cc00adf6f75f9a43024f23509f5b8e5e Author: Robert Clausecker AuthorDate: 2024-10-25 15:05:20 +0000 Commit: Robert Clausecker CommitDate: 2024-10-26 18:11:02 +0000 contrib/mandoc: add -isoC-2024 and -svid1 to mdoc(7) C23 (ISO/IEC 9899:2024) is not out yet, but will be shortly. SVID1 is needed for the history section of memccpy(3). Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47284 --- contrib/mandoc/st.c | 2 ++ lib/libc/string/memccpy.3 | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/mandoc/st.c b/contrib/mandoc/st.c index 266df0081a95..cb6bf3303126 100644 --- a/contrib/mandoc/st.c +++ b/contrib/mandoc/st.c @@ -56,6 +56,7 @@ LINE("-isoC-tcor1", "ISO/IEC 9899/TCOR1:1994 (\\(lqISO\\~C90, Technical Corrigen LINE("-isoC-tcor2", "ISO/IEC 9899/TCOR2:1995 (\\(lqISO\\~C90, Technical Corrigendum 2\\(rq)") LINE("-isoC-99", "ISO/IEC 9899:1999 (\\(lqISO\\~C99\\(rq)") LINE("-isoC-2011", "ISO/IEC 9899:2011 (\\(lqISO\\~C11\\(rq)") +LINE("-isoC-2024", "ISO/IEC 9899:2024 (\\(lqISO\\~C23\\(rq)") LINE("-iso9945-1-90", "ISO/IEC 9945-1:1990 (\\(lqPOSIX.1\\(rq)") LINE("-iso9945-1-96", "ISO/IEC 9945-1:1996 (\\(lqPOSIX.1\\(rq)") LINE("-iso9945-2-93", "ISO/IEC 9945-2:1993 (\\(lqPOSIX.2\\(rq)") @@ -79,6 +80,7 @@ LINE("-susv1", "Version\\~1 of the Single UNIX Specification (\\(lqSUSv1\\(rq)" LINE("-susv2", "Version\\~2 of the Single UNIX Specification (\\(lqSUSv2\\(rq)") LINE("-susv3", "Version\\~3 of the Single UNIX Specification (\\(lqSUSv3\\(rq)") LINE("-susv4", "Version\\~4 of the Single UNIX Specification (\\(lqSUSv4\\(rq)") +LINE("-svid1", "System\\~V Interface Definition, First Edition (\\(lqSVID1\\(rq)") LINE("-svid4", "System\\~V Interface Definition, Fourth Edition (\\(lqSVID4\\(rq)") return NULL; diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3 index 3bdae24354c1..2de981449119 100644 --- a/lib/libc/string/memccpy.3 +++ b/lib/libc/string/memccpy.3 @@ -80,16 +80,14 @@ The function conforms to .St -p1003.1-2004 and -.\" St -isoC-2024 . -ISO/IEC 9899:2024 (\(lqISO\~C23\(rq). +.St -isoC-2024 . .Sh HISTORY The .Fn memccpy function first appeared in .Bx 4.4 and was first specified in the -.\" St -svid1 . -System\~V Interface Definition, First Edition (\(lqSVID1\(rq). +.St -svid1 . The .Ft restrict keyword was added to the prototype in From nobody Sat Oct 26 18:37: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 4XbT0P3v3Pz5b3mY for ; Sat, 26 Oct 2024 18:37:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbT0N4zldz4pq3 for ; Sat, 26 Oct 2024 18:37:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-37d4fd00574so1881800f8f.0 for ; Sat, 26 Oct 2024 11:37:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729967843; x=1730572643; 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=A/hlWYIHPwpcA7HNyV/d2YcCM9lSVI/oHti8Z/ymWro=; b=bUc9njrActV3ovxI7n1lm5Gk8EO2I8gZLKzQznUJfBHdGNl0WBzxGgL5vFeDj22Ulw 6Y/IKiPZ1mPkj1nvR9eCz5C0kXRPDgLQzBMTxC+7tbrgyu/Li1ao00tVDmfsUsPVaggG HvzD4InOeLEflG3pp4EgbGHGpmDvITKUw9gDZlq7xByV4s2/P2AHSYiCv+Ko620Tr9EH Ot1oqvWnY0goQ7C+ZTsk5eTAVIEA3HM15xs6FvlJPupKcv3HntieMnzW9oJhCCqkRqXk haj9FkYqcSFiHZPwVF5KHWEjbC4OPMizkyL3cbgB8ogTcqvsdrpedBqNeyje/WRAIDpH NTjA== X-Forwarded-Encrypted: i=1; AJvYcCVk63EYTHDWhAyh7rlUWSfyOqX2ggfpxdfCLNV7N20ZrJGWNJKW4UTkbjtwViV1dNZ++Y/1VvYet/OspkDuK3VMDpFQ@freebsd.org X-Gm-Message-State: AOJu0YzqvQGif52/gjhCImzVUTHb4gRitEWoX8TSsxl6r8UlU+FvvdTA BoiqH7PgXW6XVK+Anvil4gl2Fzlw8guPWUYCk5wFoOCFY9+GD0P3MzUPb9SfbcU= X-Google-Smtp-Source: AGHT+IHbftvCZo/+N5DLB2yPTiAzLHov/xvU08dQm2rA2ncsqb3BEFktO1E9IoQCzUNCqxQBeJUhqQ== X-Received: by 2002:a05:6000:e04:b0:37d:46ad:127f with SMTP id ffacd0b85a97d-38045883804mr7553491f8f.26.1729967842713; Sat, 26 Oct 2024 11:37:22 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38058b713fbsm4958558f8f.88.2024.10.26.11.37.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2024 11:37:22 -0700 (PDT) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: 87c2aab0a0b3 - main - lib/libcrypt: reinstate CFLAGS+=-I${SRCTOP}/sys/crypto/sha2 From: Jessica Clarke In-Reply-To: <202410261812.49QIC3hj047769@gitrepo.freebsd.org> Date: Sat, 26 Oct 2024 19:37:11 +0100 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: <202410261812.49QIC3hj047769@gitrepo.freebsd.org> To: Robert Clausecker X-Mailer: Apple Mail (2.3818.100.11.1.3) 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] X-Rspamd-Queue-Id: 4XbT0N4zldz4pq3 X-Spamd-Bar: ---- On 26 Oct 2024, at 19:12, Robert Clausecker wrote: >=20 > The branch main has been updated by fuz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D87c2aab0a0b3db2a4690773b869e8cfc= 8b3ac6c2 >=20 > commit 87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 > Author: Robert Clausecker > AuthorDate: 2024-10-26 14:16:10 +0000 > Commit: Robert Clausecker > CommitDate: 2024-10-26 18:11:02 +0000 >=20 > lib/libcrypt: reinstate CFLAGS+=3D-I${SRCTOP}/sys/crypto/sha2 >=20 > This is apparently needed for the cross-build from Linux to = succeed. Sounds like you need to add to SYSINCS in tools/build/Makefile like was done for md4.h? Jess From nobody Sat Oct 26 18:43: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 4XbT7K72pPz5b3XR for ; Sat, 26 Oct 2024 18:43:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbT7K2Nx7z4rX6 for ; Sat, 26 Oct 2024 18:43:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4314f38d274so40183415e9.1 for ; Sat, 26 Oct 2024 11:43:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729968204; x=1730573004; 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=GuGAupJw/rGAjPMGOgsvohO8vpjzyLWUIpg7TpDI13M=; b=R1jX2lYq5Kb+clx73skrA9dFqHtiQ2gHOTYTALNelaku+Xw2BlV0dm/Fwdm+y55SJU shiHa7qdts+uuBtX5VbXuNy6VEdO9+Dl4ote6KFlBZzTk2iKwWmk9FSFk6QS4fuomfVc eAkkR/P05izljaytMSNaDLVLxp/KPaGdnYPAXHLuFZUv99AQPdvqOKr6vLehmPzzeOA5 u4PLC4BpLvJZvZkjOqofIqHdnbCbFh3Jyxk/+vwVnzRS1LzyjzjF9OM2ovXkO/bGlbQ9 NagkHzxeqXKgumC3jGUAw8d2Xri2NCGekOqXUGyPffhPBFTp/2F8f/WbSocDvUVs6/Ik lVIw== X-Forwarded-Encrypted: i=1; AJvYcCV1LlV9OmlP2S6+HJ3Eelc9I8ZnxH1973NYMUe/8Zda75SQ0/Kk6uxybuR4Kz3BSqMKvtdOakBn1/0wJn6vzOI5akKS@freebsd.org X-Gm-Message-State: AOJu0YxuXMb/uN33xIYegF6HhufvMWlyS2XEsVQNPIlYIqfzAK9YUA7s ZFpVXPKkTVM4nnmkF+b2KwErpdm7ndJdvAqc3SogczDd+vQr0KkHp86e9M/UqiSXSTbu44ALJ48 6 X-Google-Smtp-Source: AGHT+IERA9LeMATMGERWUoWBeqzccC9/gNvbHwIux9tiegk1nMeOhRtmeWPmHmvMt+Z1eFSYH+Td6g== X-Received: by 2002:a05:600c:35c2:b0:431:5533:8f0d with SMTP id 5b1f17b1804b1-4319ad26eafmr30082955e9.30.1729968203764; Sat, 26 Oct 2024 11:43:23 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4318b579968sm84824185e9.39.2024.10.26.11.43.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2024 11:43:22 -0700 (PDT) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: 87c2aab0a0b3 - main - lib/libcrypt: reinstate CFLAGS+=-I${SRCTOP}/sys/crypto/sha2 From: Jessica Clarke In-Reply-To: Date: Sat, 26 Oct 2024 19:43:12 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5C127582-B561-4797-8862-D10CB93B87D9@freebsd.org> References: <202410261812.49QIC3hj047769@gitrepo.freebsd.org> To: Robert Clausecker X-Mailer: Apple Mail (2.3818.100.11.1.3) X-Spamd-Result: default: False [-1.21 / 15.00]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.99)[-0.987]; NEURAL_HAM_SHORT(-0.83)[-0.828]; 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:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEFALL_USER(0.00)[jrtc27]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; 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]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.46:from]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.46:from] X-Rspamd-Queue-Id: 4XbT7K2Nx7z4rX6 X-Spamd-Bar: - On 26 Oct 2024, at 19:37, Jessica Clarke wrote: >=20 > On 26 Oct 2024, at 19:12, Robert Clausecker wrote: >>=20 >> The branch main has been updated by fuz: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D87c2aab0a0b3db2a4690773b869e8cfc= 8b3ac6c2 >>=20 >> commit 87c2aab0a0b3db2a4690773b869e8cfc8b3ac6c2 >> Author: Robert Clausecker >> AuthorDate: 2024-10-26 14:16:10 +0000 >> Commit: Robert Clausecker >> CommitDate: 2024-10-26 18:11:02 +0000 >>=20 >> lib/libcrypt: reinstate CFLAGS+=3D-I${SRCTOP}/sys/crypto/sha2 >>=20 >> This is apparently needed for the cross-build from Linux to = succeed. >=20 > Sounds like you need to add to SYSINCS in tools/build/Makefile like = was > done for md4.h? Or INCS in fact, given the header is installed to /usr/include itself. Jess From nobody Sat Oct 26 19:00: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 4XbTWB5T5dz5b4XL; Sat, 26 Oct 2024 19:00: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbTWB4lstz4stp; Sat, 26 Oct 2024 19:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729969238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KABPsQRCWQADSrqOXtEdYaod39DnwutilWeGrG7b9lM=; b=MMHQRnHgR4ikM4gATWQSCZnim9WA++9aSg9Ru9YxlWG6LzwxlTp4c9ZndU3cBR/KUCCPLo YANsj3UMJz2V2rbonkQiwqp9jzT7F4FMnO++WZz6zx7sdZ0fvIU2+96eg7733aWCHIhQ6h NcWYyHB/YX1cMHSaKyjIQMTA6bjenhzQsL2n3pZzsir7CCaiu2c/w8s1ssB1Pneb8JBHOG 6BmqPyHwMSQPMIAHQMJyo5LT1H81wMDdO+4PamrhOUG6x8bE7MAex19o19lBSYHhTumVyM /DWPSpdemxluE5K0RkNeUCFXsx9faa5bngUzJi0YiMU7hyz44t0F5TkdXxX+Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729969238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KABPsQRCWQADSrqOXtEdYaod39DnwutilWeGrG7b9lM=; b=dL6hXl7g0uaSKX8HgdVICxaXlKo9b3tdRntCNSBZ45EdhVvZtAdQkwOo3S94OswQo67crK +OHR4f2ENZy0d8I9jBWMlcpVdS65ISPp4Z1WK/pakWXdB82RviUUbEIWg3oYq2SCC8Km3H txKZHtnTJXismEktBw6MmdFGdEBTa85k4mJEndVQ8+nc6m1qxV10CudVzBeO235deL4gIK d7VMNAguL2GPVF0HS2exqARKC8xLt8bdOAEn1MAEd3RuarpU7lnPxTdIde9PoEFbYhsJT1 ENMswacJb1yout607s4iVW80qrshbrzG0XEtaRWanDxG7JMwzFA2BWu4G3DNfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729969238; a=rsa-sha256; cv=none; b=wXsjUPWmpqW5jpII+ojTkxoepsAtDVWx7lED/W7y+bEjr6wlYXbOnqdRZsG+fHOupu01Xw GeryR/eoo4aXCWQwFTPN7fkHYU+Utwy90cDX9NXBoZnySPUgrPz90PPsyFg0EoGiRQ+lQh hhMrkkI3cBuAqVwPsUtk2URLlA1xHpqjj/9xPo8DkSNC//lyRHezvyG9x17Tp1oF1MceVY L6gKLlQANkH5wJa/UzMUVv1UO9WEMiAd0U6cz6VlVOv57tgP3MUxc33UD6lyCbqdoC7Uwf lU9vL1FlwrOw9+Clq59g7u9Fu8nMkvoEi9lueq97lPVmqZYSfhmR7PzwZmvoEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbTWB4MBLzML7; Sat, 26 Oct 2024 19:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QJ0cwA037736; Sat, 26 Oct 2024 19:00:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QJ0cLo037733; Sat, 26 Oct 2024 19:00:38 GMT (envelope-from git) Date: Sat, 26 Oct 2024 19:00:38 GMT Message-Id: <202410261900.49QJ0cLo037733@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: 152382e6613d - main - rc.d/kld: Print the kernel modules being loaded List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 152382e6613d7998fe6f5233767df54d3fdec329 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=152382e6613d7998fe6f5233767df54d3fdec329 commit 152382e6613d7998fe6f5233767df54d3fdec329 Author: Mark Felder AuthorDate: 2024-10-26 18:43:46 +0000 Commit: Mark Johnston CommitDate: 2024-10-26 18:43:46 +0000 rc.d/kld: Print the kernel modules being loaded PR: 282269 MFC after: 2 weeks --- libexec/rc/rc.d/kld | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index d9c45a05f7a6..729416323d6e 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,12 @@ kld_start() local _kld - echo 'Loading kernel modules:' + echo -n 'Loading kernel modules: ' for _kld in $kld_list ; do load_kld -e ${_kld}.ko $_kld + echo -n "${_kld} " done + echo } load_rc_config $name From nobody Sat Oct 26 19:02: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 4XbTYX1wMxz5b4Xd for ; Sat, 26 Oct 2024 19:02:40 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbTYX08TZz4tpj for ; Sat, 26 Oct 2024 19:02:40 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-37d4c482844so1953648f8f.0 for ; Sat, 26 Oct 2024 12:02:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729969358; x=1730574158; 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=DXjvjTGO6e8bbCW3sG9hLD/DfK3rCzu1ESM9INXIvBM=; b=d7kucvf+QGcTSLbw6cnJB4QnviaWtSGJ4auFFlaSREqZFGSvY00Y1Wipd8rAAiVuUz PNmipgL+2dxo7cshiIj6uHzHGlVYbFnE059Rp9worNrorodmGOjxamIsyiaamEIfk+nc 48tAi2CYPRtpkW6rodL3WRpH0672oyc06F8SBPCTgudoacHe8LWfnryVcj/TO+La0GZ4 Ff8WNjUDCeQkUnSDXkj3psA0eD9ps5X45GIVu1mu8gsxe2FzyCYagr5fO8Urr3/O13iY ybQcKrNxnDeE1gdxBsvt4lc0ouDeqllad+fl+bXrYzyNb465g5c86uJviFgoturaIAlK RLMw== X-Forwarded-Encrypted: i=1; AJvYcCWfzhfS/gG1HMK358BGVom8c5P6pwaDJdN3EnoY1e2VyGiRkNP915vblvVb/ePQdItJWRmRf1B9mrCVa+pp5+XBloed@freebsd.org X-Gm-Message-State: AOJu0YxA7KZtNnfekWEQLpfQUSpLe/VqpmNLBVrM0cWCLA+iP4Rj9bRl MefsPmRtd9IcSRS7vVccXp8ktb7ynqrc0vg8UwKUrMvtF1Hcmxrq0td//rgFnMs= X-Google-Smtp-Source: AGHT+IEul2guVjnkvrvObst8hDnXFznI44wgVP33njNWDnuHRj+6pxj6U+eT7Z2XwoZ2vtXRTlzDgQ== X-Received: by 2002:a05:6000:11cb:b0:37d:3f81:153e with SMTP id ffacd0b85a97d-380611282d9mr2627149f8f.14.1729969358565; Sat, 26 Oct 2024 12:02:38 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43193573ce2sm55168715e9.10.2024.10.26.12.02.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2024 12:02:38 -0700 (PDT) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: 152382e6613d - main - rc.d/kld: Print the kernel modules being loaded From: Jessica Clarke In-Reply-To: <202410261900.49QJ0cLo037733@gitrepo.freebsd.org> Date: Sat, 26 Oct 2024 20:02:27 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <08AA3DE1-0618-44A0-AE8C-7BDECD2BE933@freebsd.org> References: <202410261900.49QJ0cLo037733@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3818.100.11.1.3) 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] X-Rspamd-Queue-Id: 4XbTYX08TZz4tpj X-Spamd-Bar: ---- On 26 Oct 2024, at 20:00, Mark Johnston wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D152382e6613d7998fe6f5233767df54d= 3fdec329 >=20 > commit 152382e6613d7998fe6f5233767df54d3fdec329 > Author: Mark Felder > AuthorDate: 2024-10-26 18:43:46 +0000 > Commit: Mark Johnston > CommitDate: 2024-10-26 18:43:46 +0000 >=20 > rc.d/kld: Print the kernel modules being loaded >=20 > PR: 282269 > MFC after: 2 weeks > --- > libexec/rc/rc.d/kld | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) >=20 > diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld > index d9c45a05f7a6..729416323d6e 100755 > --- a/libexec/rc/rc.d/kld > +++ b/libexec/rc/rc.d/kld > @@ -44,10 +44,12 @@ kld_start() >=20 > local _kld >=20 > - echo 'Loading kernel modules:' > + echo -n 'Loading kernel modules: ' > for _kld in $kld_list ; do > load_kld -e ${_kld}.ko $_kld > + echo -n "${_kld} " This always prints a trailing space, whether the list is empty or not. Why not drop the space from the first echo and put it as a prefix in the second instead? Jess > done > + echo > } >=20 > load_rc_config $name From nobody Sat Oct 26 19:09: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 4XbTjC1rSJz5b56j; Sat, 26 Oct 2024 19:09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbTjC11Ltz4vFf; Sat, 26 Oct 2024 19:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729969759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3kJnC4x76G42PYg7NE0flQWo82DhhnrxAcC3IWb1h8=; b=kVf0jcwSQVkAY42B32d0yd1eekMpep/PegSmcpvlAGF6gM4uZFMfRrkVcPDXKgMwEo7WdH wkqwHGDRN2BJj9SZJSIm1a5u6TzG+Vgn9e/IhS7gHCZJElYMEsIBVSirmOsdmzyb6NXScB MF1XvyKKske8wTgtx1FDk2N6pziNafEZFUUWsSYlCs1PQsO/ZIaC3cTeSiVuOXVy6Lozvl 5BtW01n1IbmNSVTeCPAfHItbCFqi4Th2NFEm8Fb3HeYBrm6ext2c0WmHoi2de8OzImhfED 1xj+sH4oYmimI62bY9xa7HuYWqrGK5HaXdpHn8lS56ejU54YCcc4mw6wp7em4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729969759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3kJnC4x76G42PYg7NE0flQWo82DhhnrxAcC3IWb1h8=; b=wClMvjYfrJWJSl02SWQisKpnvjbp/KUcUviSGQy+XbV9z7yLDQmC+qO61vr2Uu6bPzUH+L vj6MfzpXm8L8YLTFoZR7nFUi1rotF/Xxy9BUNYXJg4SE3Hm4RMqWoqGjHUNUGH3KP/qPvv Z6lJ2KAkhSunhTXBw+opX7FWCd8tax4bTKQ8y93F8DNNIKpGhltBSdr76xONNUiSxoQlsT e0TjvBFqfbCKYuwjxKAGPk20y0SxrU/kUhAjZWf9AetqiQAetBjD/rKWzlvlVjmEdafow2 EujUWq64JZeNfvdrc+n1sTSDT81lMvniHM6zECLTiDYxIKz8SDkz9/Xd5kwneg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729969759; a=rsa-sha256; cv=none; b=oJ/eYu9MVq1fYVXcr0Sr7v3jep+1leHrOWHavlBtO0DsiCvdYL3gGbxlV/8zlPwGkUQQA4 buo1Yf0MheQNCUWoHy7aOsz4dKdTY2D8Bt+fRwHF7aKTILch7knM9J/oFMOqaw3cT+XYVh z58ZkwkIjpCMvkGAsvF1AVnjvItPs09XXPmMBgAB7oNF9jwNjmCUC4UtvphoIrLI6fLerh RwiO/vpDNaDYHYQ3t5Q6WUH04mkVMOG/8olXGk2MU4TTSbxBGCaI7796sWhDVwbUBZoqmf vEA3ei7bv3v1Dd5kCHRi1ZadkN0P5zd87RuBimPV4PFZE3mafTa1+ac0b5i7OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbTjC0W8FzLpR; Sat, 26 Oct 2024 19:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QJ9IwO047024; Sat, 26 Oct 2024 19:09:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QJ9IEx047021; Sat, 26 Oct 2024 19:09:18 GMT (envelope-from git) Date: Sat, 26 Oct 2024 19:09:18 GMT Message-Id: <202410261909.49QJ9IEx047021@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: cdb3cda6fd53 - main - rc.d/kld: Avoid printing a trailing space List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: cdb3cda6fd53b89c2bba0308d21aa8edf782dc34 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cdb3cda6fd53b89c2bba0308d21aa8edf782dc34 commit cdb3cda6fd53b89c2bba0308d21aa8edf782dc34 Author: Mark Johnston AuthorDate: 2024-10-26 19:07:22 +0000 Commit: Mark Johnston CommitDate: 2024-10-26 19:07:22 +0000 rc.d/kld: Avoid printing a trailing space Fixes: 152382e6613d ("rc.d/kld: Print the kernel modules being loaded") Reported by: jrtc27 --- libexec/rc/rc.d/kld | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index 729416323d6e..ac55c5cc97d8 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,12 +44,11 @@ kld_start() local _kld - echo -n 'Loading kernel modules: ' + echo -n 'Loading kernel modules:' for _kld in $kld_list ; do load_kld -e ${_kld}.ko $_kld - echo -n "${_kld} " + echo -n " ${_kld}" done - echo } load_rc_config $name From nobody Sat Oct 26 19:09: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 4XbTjq50flz5b51H; Sat, 26 Oct 2024 19:09:51 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbTjq3BnWz4vRd; Sat, 26 Oct 2024 19:09:51 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-83ac817aac3so123480139f.0; Sat, 26 Oct 2024 12:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729969789; x=1730574589; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=lylg5gDE40TqqiJ/dVE9+POPsVnYx0wSK5ZSXu1OQfM=; b=Pdeh5588Jakz8+3GO4I2GISV8k0UupSOTc2ih7OFf1TqlMFbLNbpBbHWTgDPTgAgba HaduSgazqOEZIuDYd70PWMsdTV/e5A+rt/qZ9mQ2Sq8T8f8Oz6n0zhJSClMhtaUNrSGR P9AavH4TqOr1eHb6WIJ9VXC28Pigg05ZJWXrPh8KUU1qxV3z0AtSRf0NfMQkpTdq2WsI cZ2feBLatYbzMgzNr1cYIm6BO1UqSLUBkg21z44GZm8LqM6iPiDwtUCb7XmceHbYOBme PYdt2jwKRuZTlqGY1+z/MrdGkVvQcfdKKafws8RVdxPXzUPgSQwslz8D4WzgSJmnu8cX DEeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729969789; x=1730574589; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lylg5gDE40TqqiJ/dVE9+POPsVnYx0wSK5ZSXu1OQfM=; b=gA8w9jXsHwdLAaTeG5aqgsKNjusortylgTCNxI1gSz+0axZ/YnfxJ4XpBeLkRXebta S93mF1oX1YKNhzjT2PEk/bNfNgHsycVwHaaWgw3X89g0lHoXCrxauHNVf9JTF2AFmyBr uH2wghG2s1TQemR2mUO7EMOwxrKWcIVR/59SzmdlLox8wKbOwnZ7+8gvaCSmUeGBexfv G3M8t6ghVeNW9biQq4n6dn+uuaaSWwEu5KMvrziUqnJaFJu6OfjdDlIumnRPpkj2YJP8 dy5SwAkjf8hrgsqLeLi1HMc89Dm68u2Dh7sbQDHp49hMnsSJZmu4xooWANZtozlbARKr /8WQ== X-Forwarded-Encrypted: i=1; AJvYcCUFhfTaqw8io0NriMSELJuXvBxk1iu8tb73Bzvd0F7Do04wvK8Vb6gYi1mWjwMX7t13Z6gCn+d+Sd6lqKCEhPQTYrV6B/0=@freebsd.org, AJvYcCUIIJGlFXC7Nq2chOipLQdAGrVTFrIJ6eFNRsg4EMb6VpWalJZsHe449tWbzoaOH+4c1y0NFv4pk5JiwBjvXpecuY0N@freebsd.org X-Gm-Message-State: AOJu0Yyh575lu/oaZWjXoliYgD7fTkvw08PDyzCVkC5l+oSdBfBBFdc7 mLX/NXZ60CLS+2nEWVFuGAUBrCDSvVqPtq3R2xeYQbHeWpba4ozyrnZ77A== X-Google-Smtp-Source: AGHT+IE34/NM9goLrGuf7ABjTinBq9QjVYvl0h4tvvDmQI+8wpbd7WUpMOXHHLHIXx0ndElrqtT9Ow== X-Received: by 2002:a05:6e02:20e8:b0:3a3:41cf:f594 with SMTP id e9e14a558f8ab-3a4ed2b06d5mr26252215ab.12.1729969789545; Sat, 26 Oct 2024 12:09:49 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dc725eb4efsm853649173.4.2024.10.26.12.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Oct 2024 12:09:48 -0700 (PDT) Date: Sat, 26 Oct 2024 15:09:45 -0400 From: Mark Johnston To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 152382e6613d - main - rc.d/kld: Print the kernel modules being loaded Message-ID: References: <202410261900.49QJ0cLo037733@gitrepo.freebsd.org> <08AA3DE1-0618-44A0-AE8C-7BDECD2BE933@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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <08AA3DE1-0618-44A0-AE8C-7BDECD2BE933@freebsd.org> X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4XbTjq3BnWz4vRd X-Spamd-Bar: ---- On Sat, Oct 26, 2024 at 08:02:27PM +0100, Jessica Clarke wrote: > On 26 Oct 2024, at 20:00, Mark Johnston wrote: > > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=152382e6613d7998fe6f5233767df54d3fdec329 > > > > commit 152382e6613d7998fe6f5233767df54d3fdec329 > > Author: Mark Felder > > AuthorDate: 2024-10-26 18:43:46 +0000 > > Commit: Mark Johnston > > CommitDate: 2024-10-26 18:43:46 +0000 > > > > rc.d/kld: Print the kernel modules being loaded > > > > PR: 282269 > > MFC after: 2 weeks > > --- > > libexec/rc/rc.d/kld | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld > > index d9c45a05f7a6..729416323d6e 100755 > > --- a/libexec/rc/rc.d/kld > > +++ b/libexec/rc/rc.d/kld > > @@ -44,10 +44,12 @@ kld_start() > > > > local _kld > > > > - echo 'Loading kernel modules:' > > + echo -n 'Loading kernel modules: ' > > for _kld in $kld_list ; do > > load_kld -e ${_kld}.ko $_kld > > + echo -n "${_kld} " > > This always prints a trailing space, whether the list is empty or not. If the list is empty, we won't get this far. > Why not drop the space from the first echo and put it as a prefix in > the second instead? That's a better way to handle it, thanks. From nobody Sat Oct 26 19:23: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 4XbV1g311Cz5b59t; Sat, 26 Oct 2024 19:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbV1g0f48z3xfG; Sat, 26 Oct 2024 19:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729970615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G6D1ct2qajrhm7ZdrqMAqHVJkyE3QfCLFqNcJ+I2MNA=; b=AUv+A08PPlK49Fl02tf05lyL8lAmIvuL6IyodtVSztF8ZaFcenjRdKvoPz78nhsts6rQLR d05Tqp4sQd1GTLJeGbzpFkJ47oPSRr2mrD3WCRqATnZib1MoSv0ngeZ0wbmM5KWYRswVg8 8KMlfGD4gfx8FTqbaeIm8K1zvnfKseE0/T3Vl71pFi+1ILJYzRx2xdeHws6b6srh9fY+mO BTbae3s7r4ekdsy2ED/9Km1s9dbSPPyzboMJnr/6LqrWvgT8yrjW7SpmEOm562HnhCTIOS QLsXZvcUcuA7cA6sIYHkW2gytAlgPbhkCHKUcMN0f/RPUYU3k3zr5ZgMs2SMZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729970615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G6D1ct2qajrhm7ZdrqMAqHVJkyE3QfCLFqNcJ+I2MNA=; b=uKuBz7hJkSvInblSAq+8EuE3oAXKo0trTXKW/e6j7QkzPRnXhxcl4ec4GLFfpRacdsaQzE p6oBt74az/lEwKI2eXfR2pkAu0bqVNIuHf51/vw1+2OnsjnQJSOiop/TBIO/trTZ8ftm2B fa+vlWL6mRb6mhzJi6Nb1wPQzk64hxqr9tNdL62p5gNbCZkvmYmqIZFf7W5u12F9Zg6avP WfASta3aSRvbKhK+Q+xZpk+Y4vFK0Ww1/OQVhjWWldWa+J7/Vn0Ue1FHOU/F46nHps9gHR fSLDToIgr38iWGCbU4dxMLVxdVLJuzJPFIxYcaUF0FnlDszEQiq3FxyWl4ipMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729970615; a=rsa-sha256; cv=none; b=GIq078q/f/ofYdxiEHjO4RhTvoJItxoxlbZlaoh8UkAnTGJXM4kZ4RlyC+WnlDM88pwpj1 bgZ/rJ11vHA8Hu+W7P3zojRApLGptPDAvQi62QX/xEV2ZJ/sQok3wl1hZR0A69bp24nPqe sXC1hZd6rqfkoebrT/yXxodMyZUNuayyLMz7wcf3is4IZPGwX3X78eNYMocGWqTszDMpb/ MHvVodKXqi0dH2MV5WZ0AVxpqFFUrfZu7IYifD6YDRcZxvIxbE3nC8cOnc8DlvZNe/TnpO wm2rJXoh+PDz1VJYd8SrtXA53sdS22BssoDwTYC57LhSpD3iST/ouLPsBAcaYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbV1g0FGFzN1C; Sat, 26 Oct 2024 19:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QJNYGQ081878; Sat, 26 Oct 2024 19:23:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QJNYH8081875; Sat, 26 Oct 2024 19:23:34 GMT (envelope-from git) Date: Sat, 26 Oct 2024 19:23:34 GMT Message-Id: <202410261923.49QJNYH8081875@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: 3e55170e0fa2 - main - rc.d/kld: Print modules being loaded, take three List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3e55170e0fa2695f6d662e3ab67201138a6f8698 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e55170e0fa2695f6d662e3ab67201138a6f8698 commit 3e55170e0fa2695f6d662e3ab67201138a6f8698 Author: Mark Johnston AuthorDate: 2024-10-26 19:18:50 +0000 Commit: Mark Johnston CommitDate: 2024-10-26 19:20:29 +0000 rc.d/kld: Print modules being loaded, take three Some kernel modules will print informative messages when they are loaded, making the output confusing. Print everything up front instead. Fixes: 152382e6613d ("rc.d/kld: Print the kernel modules being loaded") --- libexec/rc/rc.d/kld | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index ac55c5cc97d8..37b14255abb9 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,9 @@ kld_start() local _kld - echo -n 'Loading kernel modules:' + echo 'Loading kernel modules:' $kld_list for _kld in $kld_list ; do load_kld -e ${_kld}.ko $_kld - echo -n " ${_kld}" done } From nobody Sat Oct 26 19:36: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 4XbVJG3NMxz5b6Yr for ; Sat, 26 Oct 2024 19:36:14 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbVJG0H3Dz40mP for ; Sat, 26 Oct 2024 19:36:14 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4316a44d1bbso28228555e9.3 for ; Sat, 26 Oct 2024 12:36:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729971372; x=1730576172; 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=L7xbpph6T6x3wXrYk/20KVdquVWfmpnaNW0ub4gFdTc=; b=TlNceIAt8mGfSsvJ5XL5oLYN1mgPs/SmwAI03xEv0VkxPBm9X1vnXXSKdCTVbT/exu 2HjOmiyKJv7vWx0wJ7ATfw3bXpsb2GekR95ANjVkQRoYOV8ds0RyAovQl6N6bbaM2Yad AuPevdv/g7M3oxc2S2+PvSXO1BYyX/RkIlSL4OEleIc+iOsZ9vHQXL4sgpDoiuAlye3H Yz0YLXghu/uVTxfPL9H3sf7WcxCCN9nwAl3FSbVwEkCEY40t7na/0QglMqhvEx9hncj6 EtuhOcwRGOqqQvnbRsF9SfkBZlFFZijB7yaIZE/nuGyMCWMZWAIKGayYqD/z9/lF+Kyk L0fQ== X-Forwarded-Encrypted: i=1; AJvYcCX+sl5UyKoVPv9bYJvs8K+PdN89GcKy1Id8DeZhmgSZ3Fl7mhW+oNc5HkAQbq5x75o7uG7ODmOD/K9FaEH53kgxa/jt@freebsd.org X-Gm-Message-State: AOJu0YzMkI6juZnToQw8vCUWy3CTSp++GRlPPDifikkGOnHCErrgQBCG EkgAc/dCXUCPSTnoPFEtKvrU1aONxGjtyBBKDSbwjaHH/Mt0pTv0NOHlkiBMdT0= X-Google-Smtp-Source: AGHT+IEmcXPI0RCIzYES4+u2XfWbaRgi3taW+PjPfV5b4lR6Jbcc3ooY162sCR/qEKHJBjw32n4VRg== X-Received: by 2002:a05:600c:4e8b:b0:42c:b037:5f9d with SMTP id 5b1f17b1804b1-4319ac74268mr29689195e9.3.1729971372501; Sat, 26 Oct 2024 12:36:12 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4318b58b6bdsm85821035e9.45.2024.10.26.12.36.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2024 12:36:11 -0700 (PDT) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: 152382e6613d - main - rc.d/kld: Print the kernel modules being loaded From: Jessica Clarke In-Reply-To: Date: Sat, 26 Oct 2024 20:36:00 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <58A8DE4A-150D-45A8-8177-86534DB64025@freebsd.org> References: <202410261900.49QJ0cLo037733@gitrepo.freebsd.org> <08AA3DE1-0618-44A0-AE8C-7BDECD2BE933@freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3818.100.11.1.3) 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] X-Rspamd-Queue-Id: 4XbVJG0H3Dz40mP X-Spamd-Bar: ---- On 26 Oct 2024, at 20:09, Mark Johnston wrote: >=20 > On Sat, Oct 26, 2024 at 08:02:27PM +0100, Jessica Clarke wrote: >> On 26 Oct 2024, at 20:00, Mark Johnston wrote: >>>=20 >>> The branch main has been updated by markj: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D152382e6613d7998fe6f5233767df54d= 3fdec329 >>>=20 >>> commit 152382e6613d7998fe6f5233767df54d3fdec329 >>> Author: Mark Felder >>> AuthorDate: 2024-10-26 18:43:46 +0000 >>> Commit: Mark Johnston >>> CommitDate: 2024-10-26 18:43:46 +0000 >>>=20 >>> rc.d/kld: Print the kernel modules being loaded >>>=20 >>> PR: 282269 >>> MFC after: 2 weeks >>> --- >>> libexec/rc/rc.d/kld | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>>=20 >>> diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld >>> index d9c45a05f7a6..729416323d6e 100755 >>> --- a/libexec/rc/rc.d/kld >>> +++ b/libexec/rc/rc.d/kld >>> @@ -44,10 +44,12 @@ kld_start() >>>=20 >>> local _kld >>>=20 >>> - echo 'Loading kernel modules:' >>> + echo -n 'Loading kernel modules: ' >>> for _kld in $kld_list ; do >>> load_kld -e ${_kld}.ko $_kld >>> + echo -n "${_kld} " >>=20 >> This always prints a trailing space, whether the list is empty or = not. >=20 > If the list is empty, we won't get this far. Yes, but the echo above does the same. By =E2=80=9Cthis=E2=80=9D I meant = the combined effect, I just put the comment here as it was the last relevant line. >> Why not drop the space from the first echo and put it as a prefix in >> the second instead? >=20 > That's a better way to handle it, thanks. Thanks for the follow-up. Jess From nobody Sat Oct 26 20:38: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 4XbWh21d54z5b9J3; Sat, 26 Oct 2024 20:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbWh217XCz49hs; Sat, 26 Oct 2024 20:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729975106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7Yvu9XfCPawG8uSx2O4N7IieETWVUpHHVw7WRryunA=; b=M3Xgvc2iUCvlD8DiFduRqK79sQZxuZkaWbWWWJH7xiFEh6SNYA68jUXvAacbGNwjuB20l/ m9evyq0/cXOhS2bBXd6mq2ClQG+W1OnJXSTbtBfdxPhAzhDTSNZ178mPh0T9NaFbvAOmHx kgNH4JPQc28r/DKN+zhKhQ07kETn8kkLPxScSr2ipCpqWhwTrg/gdkIByy5J5uJHpqvGpn LkonbG7TYkqiK61C5M+0aqEnw/8O48H/azkSbl4RveW/9T19oNlpSbBg8nb81mxcn4Jq6E 95+QCpTzYYhgj/PRdvghdz51IGNkSqKrIaI+FyDGpfolO7jraj+ngwDqXrmKnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729975106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s7Yvu9XfCPawG8uSx2O4N7IieETWVUpHHVw7WRryunA=; b=U8WzvxfcogMsPmUEEVDqjALlv7oGjGElxSHTBP7f9UdxKCAm7XIW37coICz+GR2gBVocrU OeHpHdMgdDgrltyEFswsr5sCLYQnsCRT4+OTYQLx0XXZ+/sHDMV3iiirsu5m0EUl/YWnSH Qb35RSqjAKbLKknFctKui+RMOblQDAXreaHIZHUqM2vb+iSv2XpMFSaqd48hcVRlNizyVl omxuFZrmHtDgXH9pwl4HLlTr8KrVQcsWs8Xowu63AcgK3ReKPUiA9rrXlRewvkJiypvzpx GvGaL/3VScyBp18o5ADxNCi3cMmENxkMaUJBSk81YAkDvp+mFNLQFJ2/u23iEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729975106; a=rsa-sha256; cv=none; b=Uff3Ck1V4RQgMS254jSpgrcuzzdV9GTnMxIjaPg+VebbBrEy4NWDjHAdSuS+v9YVw6sunV vfWMXcX3SPAtUCPjQjKQQTZsurroFISGddL+v2ggs9ucPAyddYUjAgEHkYUIdoXBz/nc6n E6eDUKqLt8MV4KKAuAeSyaEqI+QtaVUiFwWOeSrYzxzAPKYod9BANVf4Pd4y7kjXXO7ag2 oyNnhYGxXlxeTYIi3CDZgPtwrbuc5rGxv/0lD7dISnd+pR5Pkz9m7FAnbwnR/4EkrDkIho 5+8kH8GYF7W2vKcDvLfPmVrDXgpzlnh6MPgp/uSZBOQjf5J6jlkVk9gSsuI91A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbWh20bdNzPmF; Sat, 26 Oct 2024 20:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QKcQJi011750; Sat, 26 Oct 2024 20:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QKcQ9F011747; Sat, 26 Oct 2024 20:38:26 GMT (envelope-from git) Date: Sat, 26 Oct 2024 20:38:26 GMT Message-Id: <202410262038.49QKcQ9F011747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 20b823a59bc7 - main - ixgbe.4: Add flow director CAVEAT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20b823a59bc7419a6f93ec5097bd5ee524c20981 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=20b823a59bc7419a6f93ec5097bd5ee524c20981 commit 20b823a59bc7419a6f93ec5097bd5ee524c20981 Author: Diego Casati AuthorDate: 2024-10-26 20:34:16 +0000 Commit: Kevin Bowling CommitDate: 2024-10-26 20:37:06 +0000 ixgbe.4: Add flow director CAVEAT Flow-director support is not fully implemented and will cause errors if enabled. Mention this in the ixgbe(4) manual. PR: 202663 MFC after: 3 days Co-authored-by: Alexander Ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/1493 --- share/man/man4/ixgbe.4 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/man/man4/ixgbe.4 b/share/man/man4/ixgbe.4 index b151d3466392..ccdf50cf9674 100644 --- a/share/man/man4/ixgbe.4 +++ b/share/man/man4/ixgbe.4 @@ -124,3 +124,11 @@ The .Nm driver was written by .An Intel Corporation Aq Mt freebsd@intel.com . +.Sh CAVEATS +Intel (R) Flow director support is not fully implemented in +.Fx +at this time and additional work is required +before those features can be supported. +.Pp +Enabling flow director may route traffic to the wrong RX queue of the NIC, +resulting in sub-optimal performance on the receive side. From nobody Sat Oct 26 21:06: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 4XbXHr2sf2z5bBLJ; Sat, 26 Oct 2024 21:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbXHr2KZxz4FRJ; Sat, 26 Oct 2024 21:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729976760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cc9nH8gNP4Sjujs30A8O0VzAwh6SV8s5jh//OrAuOs=; b=CYXUxKoMIdn1HaBLrxm7qHloP+UyXrJZjwvgFMugHIPD3/2mcNLKhhEA5QvcXk895cqnE/ NE5LiTztldMPpriEe0dzPF2EEEYNKzUszuCxDAVVsnkMKIsdi+usiKDDwAbvu0Xm1AABFy 2UXVa45zX+rdyCq4oJ3xJQeUFkPJV/Rn+sMGmSX3XHCCK9y79SrFMbMDCjt2dlbajB/hbm NB6IQJmeClXfLixqAptnmaBUSX/FOnQG6W5kbZAYkaCFPc5YrtY/2pOusaVgXZX97iT3m4 NPBCMhKJYGv+uqxZTzdt48OqV0LfvRhc3exLeOwe4hqDAro2Fw6DV0eiHzakRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729976760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1cc9nH8gNP4Sjujs30A8O0VzAwh6SV8s5jh//OrAuOs=; b=Ra2k4poGZ8MgPwgumJdJpU8mpsRzOGZ+CGTH9VfrQQKuDQwp1JId2VWpCJK7nk/xJVzZKl FLD8F4aVIkgrOpBoh0e+Ag+9QhajOcrw2118emMkWSMOSTHGt5QS/+BEeFxGUZv8nd5iMq u2PR7gSseRZ7TObp51P9T4nhWiFp+pLm0Y70dcYPe+Pyc0IRtVDmctBfaMHy2AAuvgkyU1 fY07i+1F+XKg98qoR5Qf78uQFbNBJoVxKCy198br7eL+KMQTnpVHGb0Bd64z9yWh5wZ0Ye 81sklwujTgyYfOFD6xBoj5b2P6lHUmzLLlWnXujTTGO7xD8ASqT7o4L/jA83Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729976760; a=rsa-sha256; cv=none; b=NoF/Y+VG6eKVZLTObCX4pEnrKn/3KCvcRjB1007JpXF3JK6e4gtdcQSCjiZjJbDAhfZXN9 VtN6qeRcpc/olI/yNtTpNpV8xnMdz4qEYEE2Wr5weEN2QFRtkPCk8fxwONnVnrEWt1PMWv QNdOefk3PIorq4sYVpcMqOdP5Vtj3/36QqSyyKO1eXJF1PKgtfKPvKSdBaTttGKXabgOyr a+uxVKKcM+2Kd8bVB5r9rQ82dkbhQ87PV698msOhZkMXCB9bx2SMOrAZskAnP3V7bPaOWj MulRBOxyL3iSVyr5oZR/Y0PvNKCYUYHX3nKo/o35Ude+GDamLyrSvefIerHfHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbXHr1nfvzQSN; Sat, 26 Oct 2024 21:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QL60EU067132; Sat, 26 Oct 2024 21:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QL60Fv067129; Sat, 26 Oct 2024 21:06:00 GMT (envelope-from git) Date: Sat, 26 Oct 2024 21:06:00 GMT Message-Id: <202410262106.49QL60Fv067129@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: 35d05a14ed7e - main - igc: Remove a bogus register write in igc_if_queues_free() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 35d05a14ed7e9935be1ed0fe965b91aaaa4c92ef Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=35d05a14ed7e9935be1ed0fe965b91aaaa4c92ef commit 35d05a14ed7e9935be1ed0fe965b91aaaa4c92ef Author: Mark Johnston AuthorDate: 2024-10-26 21:04:59 +0000 Commit: Mark Johnston CommitDate: 2024-10-26 21:05:40 +0000 igc: Remove a bogus register write in igc_if_queues_free() As explained in PR 277038, iflib calls IFDI_DETACH() and then IFDI_QUEUES_FREE(). With igc, the latter writes to a register after it has been unmapped. igc_if_detach() already calls igc_release_hw_control(), and looking at callers of igc_if_queues_free(), that appears to be sufficient. So, just remove the igc_release_hw_control() call. PR: 277038 Reported by: Mike Belanger Reviewed by: kbowling Tested by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47293 --- sys/dev/igc/if_igc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index dd89b27e134c..38fb1406b1c1 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2050,8 +2050,6 @@ igc_if_queues_free(if_ctx_t ctx) sc->rx_queues = NULL; } - igc_release_hw_control(sc); - if (sc->mta != NULL) { free(sc->mta, M_DEVBUF); } From nobody Sat Oct 26 21:09: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 4XbXMz6NhGz5bBlW; Sat, 26 Oct 2024 21:09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbXMz5t7Sz4G0t; Sat, 26 Oct 2024 21:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729976975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IDJe0QOPpzMAM+KEsa89iVlLvwTWTkN8TTKsZcfn7k=; b=eRz8WfFCLt8vVx/uQec5GC1jx1h8hyPikoc+IhDnPHfHOR52mx79fGq6R9aK4MC+svSMwc gUQBSe+h+AvM5jCYFV9aC5LY59poVmLlGAE4/lPxJPFj5Tj2y/w42IloR3wQPdVjwDoVcb hZ89Bv7c4xpK3WiPG5SxLCEkELcpEBZyPrddGX/pZMP8WF3UXPBQKK4aLvj94bt43wXniG Sef55LOKZ6osaPRRDOtNx6Lt0lX4w27Mtjbg6i75TK8fF4zjf2Z4kf/tIaIwr6b7y0LQzX Pq3LQDCUm5E7mortGFEcObzah7Dtzhv/NgJtfoCTQ7fPTtYOuhasXpnTnnNm5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729976975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IDJe0QOPpzMAM+KEsa89iVlLvwTWTkN8TTKsZcfn7k=; b=Knh+tOQ4W5GKGZVFxoYf0Vk6tpf2AP1CMigf1G1pa66z4qQ+QcwOhKn4P3upRgmv1arVFe ZI12vaYBtuE5lg9dIk04r3RCz++BIHBXu8uf4S0GxbliZAjpZe5ossr4Th6/7FUCP+KeH+ EhjWIwwLlQDqxK/W8yJof3CMrmDEZAdQnkafJN8wjsBrAJLRHIbvj0bHu1Dzegp6TNXIrE UnXdPeydzt09er2M07DWVlqzZQMzEpwj3+3Z9Hx6CCrTfFQu2d8MHAU8xjYQGYrmcZWD/2 jsOqT7WGn52uQm6cigcpM/M5G9RmmtaxWWrIfvyp5Hqg4sDJgTfb3IwnlI5zKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729976975; a=rsa-sha256; cv=none; b=IJ1Wq90DZ2I/uomJLJ3pWWpVaHdGl8AopAg6O5IgG9EkklpjTBdDjCa5YfCdxaDLt3Iqz0 LFe5l8zQm+7W48JcCe7Oxgf0eKfknfUb/Kti2HLm0BZXp5SDXQZKaUhuYUGbA5HnCzuue1 QADDLQdRjc/ukwQHFMRL8OLrfEP3cWiUvzKO7kTubC0C732WeittIQ5iOJrfzLGWUFV56L CYKExEkkqN+/+5aKVt1S5I7VjDZCR+vo1wqztzvr4z4dsfUGtv9/NnNH4/0yv67Hl7YKoU ibWkQyWikE9Oa1pqdNqm8EjtJ1a53MEeg3IsZjESiWLfjrY94mWJj+PpWiR/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 4XbXMz5TLLzQw8; Sat, 26 Oct 2024 21:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QL9Za4068275; Sat, 26 Oct 2024 21:09:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QL9ZUW068272; Sat, 26 Oct 2024 21:09:35 GMT (envelope-from git) Date: Sat, 26 Oct 2024 21:09:35 GMT Message-Id: <202410262109.49QL9ZUW068272@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: 5fa2e50ea438 - main - genl: fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 5fa2e50ea4386bf277bb840e821c63f314c9a431 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa2e50ea4386bf277bb840e821c63f314c9a431 commit 5fa2e50ea4386bf277bb840e821c63f314c9a431 Author: Gleb Smirnoff AuthorDate: 2024-10-26 21:09:20 +0000 Commit: Gleb Smirnoff CommitDate: 2024-10-26 21:09:20 +0000 genl: fix typo --- usr.bin/genl/genl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/genl/genl.c b/usr.bin/genl/genl.c index df2758c273f3..dd0c3af30c9c 100644 --- a/usr.bin/genl/genl.c +++ b/usr.bin/genl/genl.c @@ -263,7 +263,7 @@ monitor_mcast(int argc __unused, char **argv) } } if (!found) - errx(EXIT_FAILURE, "No such multicat group '%s'" + errx(EXIT_FAILURE, "No such multicast group '%s'" " in family '%s'", argv[1], argv[0]); for (size_t i= 0; i < nitems(mcast_parsers); i++) { if (strcmp(mcast_parsers[i].family, argv[0]) == 0) { From nobody Sat Oct 26 21:37: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 4XbY0T2qC4z5bCbc; Sat, 26 Oct 2024 21:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbY0T21d9z4Hrj; Sat, 26 Oct 2024 21:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729978665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vuPCSAepbSvQK8HmJxMh/3+v5ixpSNQdUbuVNMv2ihI=; b=RENLeM1cL6XKaePirTNNTv9ucy7AFZZuwruzblIxLRmtCe2QdyLLegssGwtN4h0611yZvQ p2qDNHDKJbBBapmyOG6FTd+W0yo0hAlKYcE2w1aoTe8vh0bq5tYPHbUlA75cRKM0EQzRfj wd9c3vChDGIBZqkzIy/DCyWWMnzUytv3pxWWaIrvILjqZZKnTGgyyQLFucBe0HYLc6tH9/ W+T15A9Liw6XvejsVpPOmBP/cp4fdkaOB1lCQH43s1VBZ8S2GAyuO1/43TvHOzy/Y6YkTF Q+GLTCvRx0eABfFCQqoGEulaZV2PXsQnOPJWScaWsYufDN/WR9WAllWQ/s067A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729978665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vuPCSAepbSvQK8HmJxMh/3+v5ixpSNQdUbuVNMv2ihI=; b=ef+nBRwbImasBhtmwHKE3Bl9S7xmA/Q5tBzQW6EjPxRy++XGUewlDBjc8CM+YF+PojGhrq qMbyF+kkv9rlJOGSXpQt9oLbCf13+knI2SR5tBHcUCxPPM7gRExhZBSRBf6ToCV8Shfg29 UhcwFV1IqsxvZElWpQJ5zWaDDswb0vYuXm/Z3JUb0emwVTTwfxNbbzExwbcWIzdWw+4c// 2ISS8DezXbY4Dddqbqjkc8q+Vr3T6Br1L60e4VnEcxKD+dAgpyWgPYiXOmxURqKSe7CJLk gtaQcLHhSVcnvGO+XH7m1MBa4kx24oCm8t6TVz3wd8gdk00orikKMudULCtrIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729978665; a=rsa-sha256; cv=none; b=UOghmg/ojHwpq1J9qJboQgYccimJFXsQn1j4d/x4mfu0aaXIRxZQ2lcKrvh/CTPX+KDqp9 c7BsZstjx3Xxqe8sn1o/ew4yWztMTA46r9dS4SeOx6yyrOHce2usys5QfL6x0sl1KzrDnZ NNUee0v6vPGZOAvJu53GhqEcZiSfiBFLMyS+J8yGcJzaBx8q3R2f/1d3GAA4Gvme9BsBp2 Vw0MVFYq8eI27Vv+gpJiEq82hqCl04j5JHTRKhwWYvSgVNbMHCAKJWFfNxSQvObt/TvfyF /MLiaxMcl/dhwuAG9bTd2JuAdmTQfU865dzs7JcmMXd1M6Dva1A0LXgcEsteZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbY0T1HvhzRbq; Sat, 26 Oct 2024 21:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QLbjNS022824; Sat, 26 Oct 2024 21:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QLbj0a022821; Sat, 26 Oct 2024 21:37:45 GMT (envelope-from git) Date: Sat, 26 Oct 2024 21:37:45 GMT Message-Id: <202410262137.49QLbj0a022821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: cdbe3de53837 - main - ixv: Dynamically size the receive packet 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdbe3de5383706da0f6d3c29f1ec2dcfed366bf1 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cdbe3de5383706da0f6d3c29f1ec2dcfed366bf1 commit cdbe3de5383706da0f6d3c29f1ec2dcfed366bf1 Author: Kevin Bowling AuthorDate: 2024-10-26 21:34:30 +0000 Commit: Kevin Bowling CommitDate: 2024-10-26 21:36:48 +0000 ixv: Dynamically size the receive packet size If MTU of the if_ixv VF driver is configured between 1501 and 2030, and if a peer box have bigger MTU and sends a packet bigger than MTU into this guest, kernel could crash. Dynamically calculate the receive packet size on rx_mbuf_sz as ix(4) does. PR: 268092 Reported by: Kumara Babu MFC after: 3 days Sponsored by: BBOX.io --- sys/dev/ixgbe/if_ixv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 66a1e4fe2df1..d5fe1a5c6b30 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -1363,7 +1363,7 @@ ixv_initialize_rss_mapping(struct ixgbe_softc *sc) IXGBE_WRITE_REG(hw, IXGBE_VFMRQC, mrqc); } /* ixv_initialize_rss_mapping */ - +#define BSIZEPKT_ROUNDUP ((1<rx_queues; u32 bufsz, psrtype; - if (if_getmtu(ifp) > ETHERMTU) - bufsz = 4096 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT; - else - bufsz = 2048 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT; + bufsz = (sc->rx_mbuf_sz + BSIZEPKT_ROUNDUP) >> + IXGBE_SRRCTL_BSIZEPKT_SHIFT; psrtype = IXGBE_PSRTYPE_TCPHDR | IXGBE_PSRTYPE_UDPHDR From nobody Sat Oct 26 23: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 4Xbbqv0gJGz5bK6r; Sat, 26 Oct 2024 23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbbqv08c0z4dgJ; Sat, 26 Oct 2024 23: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=1729986331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u5161lM8xXjHC8bu3aGQsW+EVqxjUo5Zyy5DqBj6Xv0=; b=vOQezOPb+DOugNWvTuSA8bJOKBcP95Qm9Jq56NqA84gwjeUR26YXv1lQ0izOxHRBTnrq5r aotpCJaMkjmkDO8THsafyOv6qWe5E85FxXc/PFT32FSvH61wqXdmdUf7s/F1MBfTjEmI5M zDfhXPsukJC/10Nk51CvbTC4MSEaXlKndLRS91iJ11mMao3iunRNk7IVzcwzlyixuKoyZH xQ6zx2F+m97GnUtxibTk9RsUPISv0uhjzR5prnp0I1Ck81wYj/US1MHzjiQNNUDlIQ7nqt f57/HbmoNHKcyXK3KTYZEh4JQpohftyvQj6bo7FuKJ0Pv5fPGCwMivCanrju6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729986331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u5161lM8xXjHC8bu3aGQsW+EVqxjUo5Zyy5DqBj6Xv0=; b=NxlkDZFll6+nB6u/zZrNj9O+hU6rhVgMCBYWnoaUl2olEaGqtt6djTMoWBl+S29iHFlLfD Htez3Nqz1Z8MUsF1bEDePDW1Y/rHDV5F01Xvct7Vxj/oSHEO+XgtX+CJLwBkHdkwqpqlVD yShG7VuM1c7ZBVV7LS3JsSKbaJfFUXD8P0+OKeh623iDlWO7mnrIKnBT24AYd2hoZytNYd wvu/Ha5i+2K1otcOO3s37Np49PSub9mDFXFQMs/4XkUAlqhpvm6ZOe0MhJIvTzm27kT5i9 9w/mNZAYcA++DPAWUycZuHfYa7p4osS/zbX+AdrzgQw5aLjqjjapZM0n6CKyBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729986331; a=rsa-sha256; cv=none; b=CBek5WlCZ8kZZN9LDVtAnZp0eSBhVY+mXWb1kMDMKEzQezhozTyK3ocyFPYjY3uQndrqDN zpmPV/Lzjecv1F+vTV1skve2wWDgoOFIb0XmJ/wcSQzmYIfPM6Xntm4teLjdOzwO0DibH1 2A/GS48E92uigvN9bQOpHzJ0MNkEbuV0zY6bnKL+CMiK4qgS4gq6cSEwe/A9XI9NVgFeMX i8tT4EVSPri/qTebvCdGCUITVXc4tIdVekzGb6LgdNdH6UoFt54NRXaKE39/OvlnXVw9VG ExovM+fQ9H7K4RFRLQ6Mts2AuH1VvVDwNT5cBYnCKQlY84Oj1BQrxUWjO4Qrdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xbbqt6kdWzX7d; Sat, 26 Oct 2024 23:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49QNjUrS067585; Sat, 26 Oct 2024 23:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49QNjUfc067582; Sat, 26 Oct 2024 23:45:30 GMT (envelope-from git) Date: Sat, 26 Oct 2024 23:45:30 GMT Message-Id: <202410262345.49QNjUfc067582@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: b0993e3bcaec - main - if_ixv: fix build without NETMAP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b0993e3bcaec60701f3ae56df255433eb4bcd091 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0993e3bcaec60701f3ae56df255433eb4bcd091 commit b0993e3bcaec60701f3ae56df255433eb4bcd091 Author: Konstantin Belousov AuthorDate: 2024-10-26 23:37:09 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-26 23:42:48 +0000 if_ixv: fix build without NETMAP Sponsored by: The FreeBSD Foundation --- sys/dev/ixgbe/if_ixv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index d5fe1a5c6b30..467a56e7269f 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -1373,7 +1373,9 @@ ixv_initialize_receive_units(if_ctx_t ctx) struct ixgbe_softc *sc = iflib_get_softc(ctx); if_softc_ctx_t scctx; struct ixgbe_hw *hw = &sc->hw; +#ifdef DEV_NETMAP if_t ifp = iflib_get_ifp(ctx); +#endif struct ix_rx_queue *que = sc->rx_queues; u32 bufsz, psrtype; From nobody Sun Oct 27 01:50: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 4XbfcM6FRSz5bRQF; Sun, 27 Oct 2024 01:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbfcM5RyRz415t; Sun, 27 Oct 2024 01:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729993843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZeNYO4a5o5oxJtvcKA3Jj/Qe+6xWjssdYxeN95LrUfI=; b=bc+UbhlEbmNWMeK3wbR4SKc0Y+T1kWwG2WuB8WlRV4Tswcn+HGvje9QFJ3zOrDMDd10tl0 c01izEi/wn/8n5BZizdzszZoykipliFEBDrUZVIhLU02iFxnJDxfJZGp1/cO0og33FiEvQ 8IgcOMm2EPlDTDU45He2FQKKI7QdSOmYJnho/GqwllrBIvZW4LrCF3qNQdu33gkvjbY7NU /0IogRNNr4QPpV6xX/R8DvnMkJy//piAFTBjOnYsz/A4lFwhyvkYJLuQaVRt8jqCWgDksm 0ipAW0Wgz2+qq8V4oHu2dZdM/VJrti0WgLIDMldABoFjABxIrMNI0fMV7u2SOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729993843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZeNYO4a5o5oxJtvcKA3Jj/Qe+6xWjssdYxeN95LrUfI=; b=sF3vNfzSJ36MWHuaDCvc02ZIq4zMjNpIOc8sWT/mzWag7RXMP0tE/rCwPTYAIolGxWQN12 kegf67gXyF9Qm32fWaSVP7Y1pc2MN788B+zKE/nGka1Sa7hn0RZODjKMDrw23FaPFCpRLO +9kKo/AjXsY1JBmQ2EVLrAQhe3oGrpExjjuZk4g6iFpScmFXBtt2RVmVujzB7ESAofuChw fgDxryzG8JG3/8pk/Fh+Y2a7E2/ukCtsTJBD1bzq3hh8NYEow1uMK1y7mqQH6cG7hblVn7 dLZzscO6itq3pzy6/lGIk8mHtFNu/PUHxFOqrTkJUu9XVvaTYtYhz1Qm4vulfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729993843; a=rsa-sha256; cv=none; b=xgVsCScRkb3mQrpS7IInyrNziIuXl3sg92muMMyOWKyiZsgpqwpobCHecA3K4KA6T2E5K+ uv8iGHl87ER2gYV5bzHLa6BtmNW0PoRvtGc5xg0JnGrsXN3q+DUk6z2rdKN5hRX4yW+sQQ onX9JcmYbStlWOMebwXoIHKG3pb4aEYa8aDNWjhMqX40KWs8CLU9WHaJujKOxwbxgE5ZuR q6F0tWxnP/4xr+fv9lsFzwDL7X8Vr7jD68Mpz6HNqIYp+zbx2hacHaceCOGYBWRuZI5pc7 3XYWhUmnZILma9X5k/PupMoB9lpKdf2JlXFWI1AsvDmmwdkSJk9Nmvhg60acng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbfcM4xgLzb10; Sun, 27 Oct 2024 01:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R1ohaJ099165; Sun, 27 Oct 2024 01:50:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R1ohgr099162; Sun, 27 Oct 2024 01:50:43 GMT (envelope-from git) Date: Sun, 27 Oct 2024 01:50:43 GMT Message-Id: <202410270150.49R1ohgr099162@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: 439fa16e1fd3 - main - x86: do not leak msi_lock in msix_alloc() on iommu remapping failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 439fa16e1fd35181898b61264b205bf3b7103a41 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=439fa16e1fd35181898b61264b205bf3b7103a41 commit 439fa16e1fd35181898b61264b205bf3b7103a41 Author: Konstantin Belousov AuthorDate: 2024-10-27 01:39:58 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-27 01:50:15 +0000 x86: do not leak msi_lock in msix_alloc() on iommu remapping failure Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/x86/msi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index c8e7db9469ed..9d5a51f9753c 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -723,6 +723,7 @@ again: if (error != 0) { msi->msi_dev = NULL; apic_free_vector(cpu, vector, i); + mtx_unlock(&msi_lock); return (error); } msi->msi_remap_cookie = cookie; From nobody Sun Oct 27 02:27: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 4XbgQc41lKz5bScN; Sun, 27 Oct 2024 02:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbgQc3Pdgz42tr; Sun, 27 Oct 2024 02:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729996040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M+cZcGp0BUBucfvC7BfNs9usstxD+iawqa+bpCahoXw=; b=dMgOjo7Gasfwkfr7YF8ySAKgShySMyRo2kfP9hY1w1TtCTnZBT6kSSGSRn7qmZBFn+6wUp iyobJ1vJXOiWvQbaL242oM25zMsa4F8qHlo5C9jBXJDNJ8mWkmuu28uJ2GV1UpoIBeBVwa dmdfXzv4/I+2lGqKV7v6j3q5MwCoPpnwTydT5K77jnStl+vSBANolBaWu3rCz8W9Xq+Hk3 dgsytizq3Y1ASuLv5MF/PLzMiiMcPpm56pnclZ0q46R+feUNp9JXE9QPGkD8nQ/pPChMjE 8SDJSQ6AC6ncCmI16WETdwLfRUduVRXs8FTVc1dPtRLLwQ/IKF+ISn5R/eTqGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729996040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M+cZcGp0BUBucfvC7BfNs9usstxD+iawqa+bpCahoXw=; b=LDKifh5pqCq4ZiGkxV1TPLMd64YpVFC4SIn3d/Bnegg+4TT5270A0ZWksmQ3BE1rOCh2Ga FdS5GqWCK+ADniuouaX5NQbJQkhWi0XsxTdV4f3DIwOb9XzChURjF5X/rbMWsDCCBJ5tqQ albwq/CEbb/Ot8HvPRzvTN7mxz7nqOUUNgVn9jEhc4f3i51VbzPTWOAxZwfdzbjPM/hC1T VtCniT7zm8jJcnHlVl6E0JCCXFENxJdpak3S9a4fopi80uVFnyeKgjH+vC9O3URcFqm5Pc GVCfJMQ5Pzau3XH8xMfCToQI584RcNQITTi4ZoK+WS13+iActLmgUTXjvFS8fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729996040; a=rsa-sha256; cv=none; b=vYeybROT4mqevtn6q3yBAqFtmYoW3MtAxX5xSt1vhKG1nOkKzaOXKPx6AvArgA4Yx4rLzh LTSVCrdes5fmaLdTRSZYWN1+QHtTBt/L3HzQ5chZ6ym9uwCK37KvVB+iZId2XfgtMzOQ8b bZrSGTRuGz6YC0dc+zEC0u/Fckhqc9eylYNshlZ5Zfoqc2fs5G/0PmL35ngN5AI5bYFC7b 0zBVqo8VSGyVG8nS9kaN2yZqJYfrmhp816orCw4xsHmi/8VZbDZZiCrwT3CjQpXPmhX465 HgzzjtZ0jMQahilg3cVcsKhOLHhEYzRCL06cNx0ZArCmNrfdaa6oTX6892ADWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbgQc2phdzbrd; Sun, 27 Oct 2024 02:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R2RKK7064914; Sun, 27 Oct 2024 02:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R2RKgI064911; Sun, 27 Oct 2024 02:27:20 GMT (envelope-from git) Date: Sun, 27 Oct 2024 02:27:20 GMT Message-Id: <202410270227.49R2RKgI064911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 02bddce58c71 - stable/14 - e1000: Move I219 LM19/V19 to ADL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 02bddce58c71f43a440e3c7df75e90889a460aed Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=02bddce58c71f43a440e3c7df75e90889a460aed commit 02bddce58c71f43a440e3c7df75e90889a460aed Author: Kevin Bowling AuthorDate: 2024-10-24 03:31:17 +0000 Commit: Kevin Bowling CommitDate: 2024-10-27 02:27:10 +0000 e1000: Move I219 LM19/V19 to ADL This roughly corresponds to Linux 9d9e5347b035412daa844f884b94a05bac94f864 For FreeBSD this is currently not expected to cause any difference in behavior because we do not have the MTP force smbus changes for modern standby. Sponsored by: BBOX.io (cherry picked from commit 77b70ad751dfe3b115112252a5b96f504fcc2e0a) --- sys/dev/e1000/e1000_api.c | 4 ++-- sys/dev/e1000/e1000_hw.h | 4 ++-- sys/dev/e1000/if_em.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c index cace8e563331..6c6cb999f29f 100644 --- a/sys/dev/e1000/e1000_api.c +++ b/sys/dev/e1000/e1000_api.c @@ -338,6 +338,8 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_ADL_I219_V16: case E1000_DEV_ID_PCH_ADL_I219_LM17: case E1000_DEV_ID_PCH_ADL_I219_V17: + case E1000_DEV_ID_PCH_ADL_I219_LM19: + case E1000_DEV_ID_PCH_ADL_I219_V19: case E1000_DEV_ID_PCH_RPL_I219_LM22: case E1000_DEV_ID_PCH_RPL_I219_V22: case E1000_DEV_ID_PCH_RPL_I219_LM23: @@ -346,8 +348,6 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) break; case E1000_DEV_ID_PCH_MTP_I219_LM18: case E1000_DEV_ID_PCH_MTP_I219_V18: - case E1000_DEV_ID_PCH_MTP_I219_LM19: - case E1000_DEV_ID_PCH_MTP_I219_V19: case E1000_DEV_ID_PCH_LNL_I219_LM20: case E1000_DEV_ID_PCH_LNL_I219_V20: case E1000_DEV_ID_PCH_LNL_I219_LM21: diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h index f17877f3e463..b4a9592cd89b 100644 --- a/sys/dev/e1000/e1000_hw.h +++ b/sys/dev/e1000/e1000_hw.h @@ -172,8 +172,8 @@ struct e1000_hw; #define E1000_DEV_ID_PCH_ADL_I219_V17 0x1A1D #define E1000_DEV_ID_PCH_MTP_I219_LM18 0x550A #define E1000_DEV_ID_PCH_MTP_I219_V18 0x550B -#define E1000_DEV_ID_PCH_MTP_I219_LM19 0x550C -#define E1000_DEV_ID_PCH_MTP_I219_V19 0x550D +#define E1000_DEV_ID_PCH_ADL_I219_LM19 0x550C +#define E1000_DEV_ID_PCH_ADL_I219_V19 0x550D #define E1000_DEV_ID_PCH_LNL_I219_LM20 0x550E #define E1000_DEV_ID_PCH_LNL_I219_V20 0x550F #define E1000_DEV_ID_PCH_LNL_I219_LM21 0x5510 diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 22578a3d8655..0b99f1b06130 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -193,8 +193,8 @@ static const pci_vendor_info_t em_vendor_info_array[] = PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V17, "Intel(R) I219-V ADL(17)"), PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM18, "Intel(R) I219-LM MTP(18)"), PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V18, "Intel(R) I219-V MTP(18)"), - PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_LM19, "Intel(R) I219-LM MTP(19)"), - PVID(0x8086, E1000_DEV_ID_PCH_MTP_I219_V19, "Intel(R) I219-V MTP(19)"), + PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_LM19, "Intel(R) I219-LM ADL(19)"), + PVID(0x8086, E1000_DEV_ID_PCH_ADL_I219_V19, "Intel(R) I219-V ADL(19)"), PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM20, "Intel(R) I219-LM LNL(20)"), PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_V20, "Intel(R) I219-V LNL(20)"), PVID(0x8086, E1000_DEV_ID_PCH_LNL_I219_LM21, "Intel(R) I219-LM LNL(21)"), From nobody Sun Oct 27 07:22: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 4XbnzM1rX2z5bhpT; Sun, 27 Oct 2024 07:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbnzM1NF3z4SDF; Sun, 27 Oct 2024 07:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730013759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dNf8J/KWQc4xbMNneoS/wQsxtQGYQzx+XlwsPFTC1wc=; b=oowAPEBfGo1KbioMCmmEZ7cLmRGSxN1nC2fTzKwmOERNPbBEaFoICCXWDG7xQ57Y3W82aB 4P+SY3+gukvmhw+Gl7yPm/rEcM9yGDWfZXJgLRyftiTvoLVySlHss8xBmrl/zWAko3g2v/ QRPsXtWHkiFoSohadfZhtIMrq0GL96WjQegW6vnMJgNwwy4KxMqp9Pg/HK/F7CxMISneBN t82O7ARSn5KRBLRXzFi+dEdBBKusSwICd6ThVmEq4NzocH5MfXArKj+9/AozWnpLfkcSoI Hz2FBPNh3fClN6QKFHJAWrRXM3+RRolFN0WA3nMOf8wPT9fd+xspdqjT6QSRfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730013759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dNf8J/KWQc4xbMNneoS/wQsxtQGYQzx+XlwsPFTC1wc=; b=A3k7aVol5E+E8GvBIvZ50afsmFY+pYvl0qbVm0w/D8WZA+7rx2y+M/5A729mkjYE6iFGZ/ ZYA8800yqmpbOwW0UOasFJxMpUsreoTDdB00Gnl/xW9Ms6nqIb2b73MJbI+chgsut2UE6k 8yhDVPXY5RuZgJ0Z/NG8vEx1/27SMED8HrX8MSJNdFE6STvTuyf4i9bEd4+8Xbn0yMvoO0 mZDnRlJD41ppKRPGNrUHeTNWKgPApu1MLWJ65l0OcRak3CUmiU3Ux+UonzRPp9dIaMeMQH DQosUyCe3RAkbiLIT4NhSNJ2Y57NuQrnpgOwbHnvI+vp1NmfcjC3iaM+yf3lnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730013759; a=rsa-sha256; cv=none; b=OolOsmAb8pmgN8su/0adUYc+MuOEXbDlVKzrZc4flzqqCwJ91evDloUZzM31Qb5v3SoeR5 joRdz3BIT2neblai2d/5yYsd0hzGSA8dypRK54a5aLTllCHb/sQwlmHv+dLto/PQ2Ylgs9 VJa8rW07wQ7JriUOyd03bP+RZdUTD6Zkx3divaCF8ZgXuK8TaJb0WASqkzNJ7OTqtd4fen yI9xZHI4rm2K12+jiA8WEtQ162VjlAxIa9+Y0G4hpetHKxjXdvJNLIwmg/CK+SOQSVRxAA sYyQEd9Gvk3TSwIACBMDeMtli9jDIy32we0BduZFM+PWH9EZPsWIDYIEH7HvAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbnzM0tnMzl5j; Sun, 27 Oct 2024 07:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R7MdqK018796; Sun, 27 Oct 2024 07:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R7Mdup018793; Sun, 27 Oct 2024 07:22:39 GMT (envelope-from git) Date: Sun, 27 Oct 2024 07:22:39 GMT Message-Id: <202410270722.49R7Mdup018793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: b87b3696c973 - main - ixv: Check cap return before MSI-X enable write List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b87b3696c973ef0a9df70143cd89f6b488531e93 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b87b3696c973ef0a9df70143cd89f6b488531e93 commit b87b3696c973ef0a9df70143cd89f6b488531e93 Author: Jeremiah Lott AuthorDate: 2024-10-27 07:18:54 +0000 Commit: Kevin Bowling CommitDate: 2024-10-27 07:18:54 +0000 ixv: Check cap return before MSI-X enable write In the QEMU workaround code in if_ixv.c, the ixv driver calls pci_find_cap(dev, PCIY_MSIX, &rid). It is not checking the return code from that function and the function appears to always be failing. This then causes the driver to use the rid variable uninitialized, which will mean setting a bit at an arbitrary offset in pci config space. For now, this seems to have no adverse impact, but it could easily cause very subtle problems. PR: 207037 MFC after: 3 days Sponsored by: BBOX.io --- sys/dev/ixgbe/if_ixv.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 467a56e7269f..58384af5eea7 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -1073,11 +1073,14 @@ ixv_if_msix_intr_assign(if_ctx_t ctx, int msix) */ if (sc->hw.mac.type == ixgbe_mac_82599_vf) { int msix_ctrl; - pci_find_cap(dev, PCIY_MSIX, &rid); - rid += PCIR_MSIX_CTRL; - msix_ctrl = pci_read_config(dev, rid, 2); - msix_ctrl |= PCIM_MSIXCTRL_MSIX_ENABLE; - pci_write_config(dev, rid, msix_ctrl, 2); + if (pci_find_cap(dev, PCIY_MSIX, &rid)) { + device_printf(dev, "Finding MSIX capability failed\n"); + } else { + rid += PCIR_MSIX_CTRL; + msix_ctrl = pci_read_config(dev, rid, 2); + msix_ctrl |= PCIM_MSIXCTRL_MSIX_ENABLE; + pci_write_config(dev, rid, msix_ctrl, 2); + } } return (0); From nobody Sun Oct 27 09:08: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 4XbrJz0py5z5ZXs0; Sun, 27 Oct 2024 09:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbrJz07GMz4Yym; Sun, 27 Oct 2024 09:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZVC8eonj4qZXbeAvIZVgQW93akaqF16mx1jOH9HFD8=; b=xvYhdu7EvfUkjJhEmPPycthPqGh/1mkkoE0diW39hHGS7BRKSi4vvz3H4MTzI6jT6ZYp+K Xnzh2R8oTP3leBHJwrueKX+4LRNW6uDVNWkT68rzd31yRF6ji2XluS+aoNDxfSGpjfuC0c 4GQsKITbioN3pzwBOUkwVFhStW94hxC5sBahd99LV0EVSQ4BXeXUNJeBfk02ZFOdV6CEJh m1AFLqByy4bVE8XKxRVMsnjZylQpH64Yi3TFjY9Rcqv3CjQ38WkHnBFAdohgmXEnxt/pWN J+EPnnAPMZXiBf7fH1IskfWO0CY/eS8sU+/dkPjt+/rvL3/BANrGWe4HdEcMQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZVC8eonj4qZXbeAvIZVgQW93akaqF16mx1jOH9HFD8=; b=NfGLj8dzceUr0brM0JXgb4YlhviC6Qa1ysoWa6Op2RaFlMWnCySM3vLoN8yzoVyR4fmvNY KkSgHcDS8XDnli+T5sksM0fSVPL8ljqYIuyD4QtHO55by5fc6CLhjzqGIFBJzRCRufL/fE vSgGNajR8Vi2kxTqPl5AaOG4y4A3tWCj87h9Ns49sis2JypIfbJ9L//gYmd/+WyTnteIbf UXTBiCDELYqYDJubo++Q6Xb/0j+Q5FP6PrqBQcE4vRRebdHQMS7hb8c+Lf37d6/XQtbq9A kmRvauPAJieM2cB8Sdrgm3XjT2/vqub0Rl/VtKKWNy9MdkJG8/6YcVil+r7BBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730020083; a=rsa-sha256; cv=none; b=aoC4o8BhNN6aqm849WfE1rARC1gc0Hn+sTz/6XILhpJdfNUzQFNCc1rnGu3NValMxIDe/u 9hbaTAavN2D9RsZsnZLIPYOyGGPDd2hObwqawCVhi5akr27h+j8Emyr3tqnOe8RlB23AUg y7Zs0waAw/CSKR+Ynq8YHFYoV8stnKOhuJUF6vjM/dpF/RveU9t7uiqbTvRU/dgM/89/4l +4mR+prAiwJXJiOs0T9U0r1bmYzexnlBHaXuVBI1XvVARSIGDwaVhYI0l38sKWXi1FwaIU F0QQd69V1Ezue0SudHpANGezk1HW5nseFPGFgJJOmGeP5FZayu7fGpA41PRRGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbrJy6XHbznSj; Sun, 27 Oct 2024 09:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R982FT004971; Sun, 27 Oct 2024 09:08:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R9829T004968; Sun, 27 Oct 2024 09:08:02 GMT (envelope-from git) Date: Sun, 27 Oct 2024 09:08:02 GMT Message-Id: <202410270908.49R9829T004968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: d8b48a267fc0 - main - ixgbe.4: rename to ix.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8b48a267fc0f737a13cb52dc1071981ecb1e003 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d8b48a267fc0f737a13cb52dc1071981ecb1e003 commit d8b48a267fc0f737a13cb52dc1071981ecb1e003 Author: Felix Johnson AuthorDate: 2024-10-27 00:26:34 +0000 Commit: Kevin Bowling CommitDate: 2024-10-27 09:00:43 +0000 ixgbe.4: rename to ix.4 PR: 213026 MFC after: 3 days Reported by: Sergey Akhmatov Co-authored-by: Alexander Ziaee --- share/man/man4/Makefile | 8 ++++---- share/man/man4/{ixgbe.4 => ix.4} | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 6f7eefe734f7..ad1cf5dd3785 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -269,7 +269,7 @@ MAN= aac.4 \ iwnfw.4 \ iwlwifi.4 \ iwlwififw.4 \ - ixgbe.4 \ + ix.4 \ ixl.4 \ jedec_dimm.4 \ jme.4 \ @@ -729,9 +729,9 @@ MLINKS+=iwi.4 if_iwi.4 MLINKS+=iwlwifi.4 if_iwlwifi.4 MLINKS+=iwm.4 if_iwm.4 MLINKS+=iwn.4 if_iwn.4 -MLINKS+=ixgbe.4 ix.4 -MLINKS+=ixgbe.4 if_ix.4 -MLINKS+=ixgbe.4 if_ixgbe.4 +MLINKS+=ix.4 if_ix.4 +MLINKS+=ix.4 if_ixgbe.4 +MLINKS+=ix.4 ixgbe.4 MLINKS+=ixl.4 if_ixl.4 MLINKS+=iavf.4 if_iavf.4 MLINKS+=jme.4 if_jme.4 diff --git a/share/man/man4/ixgbe.4 b/share/man/man4/ix.4 similarity index 95% rename from share/man/man4/ixgbe.4 rename to share/man/man4/ix.4 index ccdf50cf9674..32b5386ea7d4 100644 --- a/share/man/man4/ixgbe.4 +++ b/share/man/man4/ix.4 @@ -30,10 +30,10 @@ .\" * Other names and brands may be claimed as the property of others. .\" .Dd May 17, 2023 -.Dt IXGBE 4 +.Dt IX 4 .Os .Sh NAME -.Nm ixgbe +.Nm ix .Nd "Intel(R) 10Gb Ethernet driver for the FreeBSD operating system" .Sh SYNOPSIS To compile this driver into the kernel, @@ -41,14 +41,14 @@ place the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device iflib" -.Cd "device ixgbe" +.Cd "device ix" .Ed .Pp Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent -if_ixgbe_load="YES" +if_ix_load="YES" .Ed .Sh DESCRIPTION The @@ -88,11 +88,11 @@ Intel(R) 82598EB 10 Gigabit AT CX4 Network Connection .El .Sh DIAGNOSTICS .Bl -diag -.It "ixgbe%d: Unable to allocate bus resource: memory" +.It "ix%d: Unable to allocate bus resource: memory" A fatal initialization error has occurred. -.It "ixgbe%d: Unable to allocate bus resource: interrupt" +.It "ix%d: Unable to allocate bus resource: interrupt" A fatal initialization error has occurred. -.It "ixgbe%d: watchdog timeout -- resetting" +.It "ix%d: watchdog timeout -- resetting" The device has stopped responding to the network, or there is a problem with the network connection (cable). .El From nobody Sun Oct 27 09:08: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 4XbrK02V80z5bmWZ; Sun, 27 Oct 2024 09:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbrK00X1Lz4Z4q; Sun, 27 Oct 2024 09:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lRHeBKCizACD6oKoRjiaVkpenwj773KucjztwkwY36g=; b=yO6TNL/v+x2Fdz6dL8IukGTWSQXO2lyyjdrSXzwvi9W2Zj9eSjGPttYkoHInfY2hEPYR6h uDboeXD0lcd25KNqYzHVHkgyRBL7+Nx175xIpFgS3RKG9qOAgRTyfz3O1k3uUZKns/jEEv 4vro0xSCRfDIJJEFMXSsdrb7ROPHNGOmAjncxdjXIvQ547Emb1vmIOA88rR5uoCk5A87hM 14stAbk9ytu7K7aicsRohzU4SXs7Jl7xh6j9w8yLBunnk5d7Meca4WGGQJ3E8VdMiWnd+e 3d5sXYSlxLzt6M9iLqUUlkZe5IRwwQVodGY5bIo8OyG9G5OYwwHIVB84tO3BrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lRHeBKCizACD6oKoRjiaVkpenwj773KucjztwkwY36g=; b=gm45grfPMe3qcTW5iGm4+5chBOViLV1ztcmc9CH00boKHOIKNf8Jvrt69naZWZsWm184k7 7CdmobDPYnbeX4rTRvQB34BKlxbQwO0qLNB3WLMK3iw9QzvWze7XolOvORosm/rvvkuLoe H20BQX6jHWTxAKIQ441D2uhPVD+/cC/17UtgxitF5ia7GZKAGqRmOmFgEac+RT8kbLCgxg HIE6kM418LEYYIKjwXNoOmK2t87aiOjC2Xsi6FodDIgz6bMdxOTXdXLE6GaZWB28YsU/KM 5HYcX/VTCDYAlvv5zalbuar4eBlqNdI70cgAVpCO5gbbt9YAH6alWmXB6LHQvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730020084; a=rsa-sha256; cv=none; b=JuRPFKhIvsf19T/EXL8k41j2JS+FN0+mY5u25Bkb01zD+hyyuUk8/3xNZOqKqGv8AFLVNP npJ3UZBdsaG+YzMjgOOjBOaY9n4jJnUtBVsbBZlJFYH5OjEvMI9j0ZmT89fq4p32j8LSFp bkVSAVstfibocuIXRM2FvLRSoiFUh1W4yhMZ22XvNtnA1IbEJRR/A5nWRYozw3iueq4rd5 d/MFUdbtMC+sxiRpqd20Gy8GF7iw98PwSe3xrOkwMwzk8NY+ufJEVhIW+vsvgZYNHvSsDZ ObG0GSWQjNJh/0Dw8BY/ovYuVGB9fP+w7cyVdq80nkppefhT9SgYIsSnIfLpbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbrK003n4znxJ; Sun, 27 Oct 2024 09:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R983B2005019; Sun, 27 Oct 2024 09:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R983hx005016; Sun, 27 Oct 2024 09:08:03 GMT (envelope-from git) Date: Sun, 27 Oct 2024 09:08:03 GMT Message-Id: <202410270908.49R983hx005016@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: a340b4649621 - main - ix.4: document LOADER TUNABLES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a340b4649621f0dbc0607115217889909ce33bd1 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a340b4649621f0dbc0607115217889909ce33bd1 commit a340b4649621f0dbc0607115217889909ce33bd1 Author: Felix Johnson AuthorDate: 2024-10-27 00:46:41 +0000 Commit: Kevin Bowling CommitDate: 2024-10-27 09:01:35 +0000 ix.4: document LOADER TUNABLES PR: 213026 MFC after: 3 days Co-authored-by: Alexander Ziaee --- share/man/man4/ix.4 | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ix.4 b/share/man/man4/ix.4 index 32b5386ea7d4..4f90ded1e3ee 100644 --- a/share/man/man4/ix.4 +++ b/share/man/man4/ix.4 @@ -86,6 +86,42 @@ Intel(R) 82598EB 10 Gigabit AF Network Connection .It Intel(R) 82598EB 10 Gigabit AT CX4 Network Connection .El +.Sh LOADER TUNABLES +The +.Nm +driver supports the following loader tunables: +.Bl -tag -width "hw.ix.allow_unsupported_sfp" +.It Va hw.ix.max_interrupt_rate +Maximum interrupts per second. +.It Va hw.ix.flow_control +Default flow control used for all adapters. +.It Va hw.ix.advertise_speed +Default advertised speed for all adapters. +.It Va hw.ix.enable_msix +Enable Message Signalled Interrupts (MSI-X). +.It Va hw.ix.allow_unsupported_sfp +Allow unsupported small form-factor pluggable +.Pq SFP +modules. +Use at your own risk. +.It Va hw.ix.enable_fdir +Enable Flow Director. +Flow Director directs Ethernet packets to the core where the +packet consuming process, application, container, +or microservice is running. +.It Va hw.ix.enable_rss +Enable Receive-Side Scaling (RSS). +When RSS is enabled, all of the receive data processing for +a particular TCP connection is shared across multiple processors +or processor cores. +Without RSS, all of the processing is performed by a single +processor, resulting in inefficient system cache utilization. +This has no effect if your system has only one processing unit. +.It Va hw.ix.enable_aim +Enable Adaptive Interrupt Moderation (AIM). +Vary the interrupt rate over time based on the traffic for +that interrupt vector. +.El .Sh DIAGNOSTICS .Bl -diag .It "ix%d: Unable to allocate bus resource: memory" @@ -113,7 +149,8 @@ issue to .Xr ng_ether 4 , .Xr polling 4 , .Xr vlan 4 , -.Xr ifconfig 8 +.Xr ifconfig 8 , +.Xr sysctl 8 .Sh HISTORY The .Nm From nobody Sun Oct 27 09:08: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 4XbrK12Sc3z5ZYFd; Sun, 27 Oct 2024 09:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbrK11N1lz4Yw0; Sun, 27 Oct 2024 09:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NotzVhEnEN+1rrQ6mDMuFlBe9+o6VPhcS6S3FeJz/M8=; b=ph5i/CDi/IpdS9rt/4mSGd7SnhyDCjQOcR+pnDkmquoWp15V8gkrb6/cqRguvZ586TfMXL /CJXR/ZjB6aTVc2Qs3H/ZRyvqCtCliwvHURBh6F0lh2PdTx7S2yiofpYaVnQGwMkM1gXUk QnnJeGSa2VRx5p2UvGra4Wg7C1R3L1+gh0oX7jl6De5wP3ond7jEGMFdqMwBc0ybqbqRBB 4sCK2Zf/MMcM67LiNWI2xIrVTBhU21sIJejy/6FQ7A5qGPp4s3Zc7UDXo/SrKq6IOuVi7U EqOqcOP8WL3sQuUd2Ikqt3EzqRO0vURrS/5wKVt1+6fpHSUMkt5oLxgzkDDtJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NotzVhEnEN+1rrQ6mDMuFlBe9+o6VPhcS6S3FeJz/M8=; b=H5JlJvU9wJ8cAKC3NfH2bP003lMzd6SIQI6igKQvbqdTdlC+rpQ+NgZubUWvQqJR2oDXNI s8XQWlfwJICcnM6UAKfEWX+BZzhad9czbogB2QJuPsXezQcokfsTnMj8WlEJWbkl1nmZ+u dJLZMqw42czHK5IvP94zJWkDgUFrOLePWiCXIWA+5GhbFzzxdTbwD8rKm+UD0913zU8zcN Sx6xhAVnMiTGrKzw2bOhvaXG/v5XQpwrkHx9zYX4nNKoWzVl3LKBWr2ade+3dXYaGyOszG xV32Uet/vkqPAgmWCqSPOhzlf3mI8E5m9MNxyP3qd5oDYJKbqrHSLH8aoYZtCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730020085; a=rsa-sha256; cv=none; b=nRtOC9Mab36SndhYm/k5fa/nP5WvSCXU72I57dJ1MgnUL9xcWf5ld55xYeWBD+E9REXNZ8 f5ZtiaXxZpquAzlGlkszmG2JYGsJhbUbSe7lJrGrRaHrKO+bkSqTMGpW7IVdNK5e2ayjuk Uew2UwYID0oPzrqXXCRelN2s+Q2stmoBHhTQK6zsbGVb9RLKDJyTVpItrcPI4Rg9TqbdTi 7DeJ1+fRQ86HYwqD/C1sRMOaeh1d7Ij1bZrfKj0s3Xqe6jW1MxHzePU4ckbjnIPSsRxmkA 5fY2uzD4vd78r3hVRsvGaxlr9UxV1/pZackoLhq4aLeqLk431uiTyWcBPVBv8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbrK10jCYznSk; Sun, 27 Oct 2024 09:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R9859D005058; Sun, 27 Oct 2024 09:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R985hv005055; Sun, 27 Oct 2024 09:08:05 GMT (envelope-from git) Date: Sun, 27 Oct 2024 09:08:05 GMT Message-Id: <202410270908.49R985hv005055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 2d28fd51e5b9 - main - ix.4: describe better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d28fd51e5b9d8ef184445dfa204f6ba22d460a5 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2d28fd51e5b9d8ef184445dfa204f6ba22d460a5 commit 2d28fd51e5b9d8ef184445dfa204f6ba22d460a5 Author: Alexander Ziaee AuthorDate: 2024-10-27 00:55:59 +0000 Commit: Kevin Bowling CommitDate: 2024-10-27 09:06:53 +0000 ix.4: describe better + add controller name to title for search keywords - remove "for the freebsd operating system" from title/search keywords - remove `(R)` from the page title for consistency with other drivers - increase specificity of HARDWARE for inclusion in Release HW Notes - order HARDWARE in reverse chronological so non-eol appear first - s/PCI/PCIe/ MFC after: 3 days Reported by: kbowling (additional hardware supported) Pull Request: https://github.com/freebsd/freebsd-src/pull/1494 --- share/man/man4/ix.4 | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/share/man/man4/ix.4 b/share/man/man4/ix.4 index 4f90ded1e3ee..418b6e1188ab 100644 --- a/share/man/man4/ix.4 +++ b/share/man/man4/ix.4 @@ -29,12 +29,12 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd May 17, 2023 +.Dd October 26, 2024 .Dt IX 4 .Os .Sh NAME .Nm ix -.Nd "Intel(R) 10Gb Ethernet driver for the FreeBSD operating system" +.Nd Intel 10Gb Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -53,8 +53,7 @@ if_ix_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for PCI 10Gb Ethernet adapters based on -the Intel 82598EB Intel(R) Network Connections. +driver provides support for Intel(R) 10Gb Ethernet PCIe adapters. The driver supports Jumbo Frames, MSIX, TSO, and RSS. .Pp For questions related to hardware requirements, @@ -74,17 +73,26 @@ For information on enabling VLANs, see .Sh HARDWARE The .Nm -driver supports the following cards: +driver supports Intel 10Gb Ethernet PCIe adapters, +including: .Pp .Bl -bullet -compact .It -Intel(R) 10 Gigabit XF SR/AF Dual Port Server Adapter +Intel(R) Ethernet X553 .It -Intel(R) 10 Gigabit XF SR/LR Server Adapter +Intel(R) Ethernet X552 .It -Intel(R) 82598EB 10 Gigabit AF Network Connection +Intel(R) Ethernet X550 .It -Intel(R) 82598EB 10 Gigabit AT CX4 Network Connection +Intel(R) Ethernet X540 Bypass +.It +Intel(R) Ethernet X540 +.It +Intel(R) Ethernet X520 Bypass (82599) +.It +Intel(R) Ethernet X520 (82599) +.It +Intel(R) 10 Gigabit Server Adapter (82598EB) .El .Sh LOADER TUNABLES The From nobody Sun Oct 27 09:08: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 4XbrK26JB2z5bmS6; Sun, 27 Oct 2024 09:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbrK22bp0z4Z03; Sun, 27 Oct 2024 09:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uH+lYM15Z6I0HBJMg5B6lAlG3iuhdsCicN8OrOcgKT8=; b=XWKrAgKA8Z3EBL6e9BfOiCYRF5uKBGDLJcmYmwVdt0cV+20VtRBs+1DZasrtU9zYPggbpv 38wIpBxKDkuqvuMVenjAcmck332eKkgVIhkQsejvsqz0FWLBDBY8LKwaR+q5WTLpvTGQGO nHnpGrsh1/ko77JWpeNbXKZKY4PToyplSyMZIwH6iXBL10YuBEHdOPE8G0TD3A4x+1K74r oeeToItUPzawAZX8PIgGPGIcex/9ftjPr/HMQBz5IoAB0Bj65W8SfgrPnPnxFiGvm0urzn VdmAwbk0stMoSeki2VS9yPozX5hualO62CeeeRcx776WKsUogz+Bv+fs19cbOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730020086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uH+lYM15Z6I0HBJMg5B6lAlG3iuhdsCicN8OrOcgKT8=; b=ix1wjvb+wfHJ8v7Q6Vwzf4qLlFloQpCVuR/vJXeqDJtP9JhJqiYEv4TQ1MHV6gu2F0abLF sFZibvoeXnMZQNVAKlKZYmBRJLhhhBsMSqDG534jG25tCe6JEIaR3A6ZrD562VtjQ/l0pV xiiU3sEMj54rar0a87G8kj6XGx6IysJrm/80SvMVh71HjZaK08RYbHDwCfbAO/qcHGQr0v 9iI1nKGrA7grkpLqURfkf2UWFGrqhdPDU8cyalbIv5nOlNRYLiBIfuu5x4nySTl+w7YaWG lNyKUBk1wIAcniWjr+7ptOdbiMuug4I9fo5V3euQIf9pp4U2BNrSQmjJa82aUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730020086; a=rsa-sha256; cv=none; b=g9EvqY9Ed/Hpn7p8CeZoys8OgMQWBI5VDIEA2ytyeSlfPKQGuI99shu3Az/epx09+hnzXv yY5+W7mBs0SFKbm3mcw232M4Lx4bfv0Tz6l+vFA2G2GHpg1cFolw4fZ3lO04OLLj59/0w5 aTaO4M0HtPZsnuM5b3ki6/SOWFBa+baAPHxTR+vokiAwBd+aD3eWTMzNb54mVWRT4gBmhJ OzzsjX7vm5klhegyEkKB7XEgh87sRo1ZUPSEnkhvWpnImdy0YCGjwtRQ7i/cG96DeQSViB H0pq2mz9OEczRoFeWVqZ46K+0aR1QoL2kCwygIRtMMPnpqkajcXjZ3Jb5UdHeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbrK21xPCzpLJ; Sun, 27 Oct 2024 09:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R986Cq005100; Sun, 27 Oct 2024 09:08:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R986qA005097; Sun, 27 Oct 2024 09:08:06 GMT (envelope-from git) Date: Sun, 27 Oct 2024 09:08:06 GMT Message-Id: <202410270908.49R986qA005097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: cadb71e4b013 - main - ix.4: update crossreferences to ixgbe.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cadb71e4b013925c145dd5e0726a3594111410cb Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cadb71e4b013925c145dd5e0726a3594111410cb commit cadb71e4b013925c145dd5e0726a3594111410cb Author: Alexander Ziaee AuthorDate: 2024-10-27 01:54:00 +0000 Commit: Kevin Bowling CommitDate: 2024-10-27 09:07:27 +0000 ix.4: update crossreferences to ixgbe.4 MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1494 --- share/man/man4/altq.4 | 2 +- share/man/man4/ixl.4 | 2 +- share/man/man4/netmap.4 | 2 +- share/man/man4/vlan.4 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4 index 2a6acc96ed86..a613802248a4 100644 --- a/share/man/man4/altq.4 +++ b/share/man/man4/altq.4 @@ -142,7 +142,7 @@ They have been applied to the following hardware drivers: .Xr fxp 4 , .Xr gem 4 , .Xr igb 4 , -.Xr ixgbe 4 , +.Xr ix 4 , .Xr jme 4 , .Xr le 4 , .Xr liquidio 4 , diff --git a/share/man/man4/ixl.4 b/share/man/man4/ixl.4 index 8397bd99a5e7..bd183be48cd2 100644 --- a/share/man/man4/ixl.4 +++ b/share/man/man4/ixl.4 @@ -209,7 +209,7 @@ When the driver is finding the last TX descriptor processed by the hardware, use a value written to memory by the hardware instead of scanning the descriptor ring for completed descriptors. Enabled by default; disable to mimic the TX behavior found in -.Xr ixgbe 4 . +.Xr ix 4 . .El .Sh SYSCTL PROCEDURES .Bl -tag -width indent diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4 index 6c5737c9b1a0..6be0c8662d59 100644 --- a/share/man/man4/netmap.4 +++ b/share/man/man4/netmap.4 @@ -827,7 +827,7 @@ On .Xr em 4 , .Xr iflib 4 .Pq providing Xr igb 4 and Xr em 4 , -.Xr ixgbe 4 , +.Xr ix 4 , .Xr ixl 4 , .Xr re 4 , .Xr vtnet 4 . diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4 index 775eb3235c07..25405172ed62 100644 --- a/share/man/man4/vlan.4 +++ b/share/man/man4/vlan.4 @@ -130,7 +130,7 @@ in hardware: .Xr cxgbe 4 , .Xr em 4 , .Xr igb 4 , -.Xr ixgbe 4 , +.Xr ix 4 , .Xr jme 4 , .Xr liquidio 4 , .Xr msk 4 , From nobody Sun Oct 27 09:35: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 4Xbrwk4vQDz5ZZPc; Sun, 27 Oct 2024 09:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbrwk4dpZz4fJ2; Sun, 27 Oct 2024 09:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730021734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M+fhiBM2+v1tba9M02lIhDO6ZJQmrekgZ/IvjAOF7zg=; b=liNfPRCpO6xUEZCxiv0MmQZAqYQNQflxMTJPQyH/kQjNa+RZGpUiZo3caBsUzM9hcQwa0f sqPxobFbfXSxvy6pg5sx5Qv6JtLg70rsz96QSiyketsKwo9buwaD5+iuoUu1sqHpZxaZEs 1yg79AXfQUdY34B1mstkwrmmiV4mDnh5z/u/tRCjqnQgLQl//sx2f2Zr4rj/lrWQeWHdeo 1s97jHUPZtNRCNa9tHAEvyoBt8G8mJ5b+gMvRNtbIBppik25qFrrzLFmy3X3jJRwGWTIcu OcMIjxDdknIzR9Tz0TyNmxU72z66Q9SpAI96gCGxwRn/q6AN7ZkPAqjd2yJryA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730021734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M+fhiBM2+v1tba9M02lIhDO6ZJQmrekgZ/IvjAOF7zg=; b=ZyskgVKUkUQm7Su7quQVXsiFM59qSOCL2BgqVawcGytDy/YvuqI2DzqRlkysKhtTdE5ffH x1LFXjn+iHK+X6zqNf3LgNWyRdtPgTEc0jVdo9zQ/RTlwpoleoHOgtkwFey5yaAlipXQvv Gu4C/+uXLl4XGCJ7qi3+2joYTx/nXqzux/HYlqNNm0UO5ULTy+4WqIIMitZ772LaQe5vXD wQmTb5c8YwZ+u3gRSMJh88DG81ENxXYFaXASkbNICFKthWcUXyArRITIc4vv5l9G59D+HB s1RwvlyoJouNg9nhSQwVz2Q5HbDI1gRilElFEol2E3BoBl1b/ja8uBoTnP7PKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730021734; a=rsa-sha256; cv=none; b=fa4RdI5FaVM5Uub4iEXF0l3u7Rer9mq9ACKL4rfhlhxJWe9/wqMvguI1V1HqQ0DEN1OIXz fD/A6MVVN87R4ZT9xVmy9HYtfsbirP5XgDWjJagWI373jnJDEMHb6mBc3z1F5wj5GCae5N d8sYfmHZ73yoxBOvITsGL+zApua0mP8f//I0P9iWC2tbWKq0pDbhGY8cvPtCusy3yKKSMA nBF6MLcIhnDoO/2Dwxp6ocJcQBtxXQEkPRL7mvTCEqk6KyYgnoz9oH/j/EmPVDbtcbXtrA sXXtCGjKNVpvvjs/+F+1m7caG7UC/Ye7bnyAw3dz1Ij72iWssCPlhC9m1YFbRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xbrwk3wbNzq1B; Sun, 27 Oct 2024 09:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R9ZYLx059098; Sun, 27 Oct 2024 09:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R9ZYuu059095; Sun, 27 Oct 2024 09:35:34 GMT (envelope-from git) Date: Sun, 27 Oct 2024 09:35:34 GMT Message-Id: <202410270935.49R9ZYuu059095@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2ae238160f20 - stable/14 - libarchive: merge from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ae238160f205576f465cbbed2c397774bea3976 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae238160f205576f465cbbed2c397774bea3976 commit 2ae238160f205576f465cbbed2c397774bea3976 Author: Martin Matuska AuthorDate: 2024-10-20 08:22:09 +0000 Commit: Martin Matuska CommitDate: 2024-10-27 08:45:34 +0000 libarchive: merge from vendor branch Libarchive 3.7.7 Security fixes: #2158 rpm: calculate huge header sizes correctly #2160 util: fix out of boundary access in mktemp functions #2168 uu: stop processing if lines are too long #2174 lzop: prevent integer overflow #2172 rar4: protect copy_from_lzss_window_to_unp() (CVE-2024-20696) #2175 unzip: unify EOF handling #2179 rar4: fix out of boundary access with large files #2203 rar4: fix OOB access with unicode filenames #2210 rar4: add boundary checks to rgb filter #2248 rar4: fix OOB in delta filter #2249 rar4: fix OOB in audio filter #2256 fix multiple vulnerabilities identified by SAST #2258 cpio: ignore out-of-range gid/uid/size/ino and harden AFIO parsing #2265 rar5: clear 'data ready' cache on window buffer reallocs #2269 rar4: fix CVE-2024-26256 (CVE-2024-26256) #2330 iso: be more cautious about parsing ISO-9660 timestamps #2343 tar: clean up linkpath between entries #2364 tar: don't crash on truncated tar archives #2366 gzip: prevent a hang when processing a malformed gzip inside a gzip #2377 tar: fix two leaks in tar header parsing Important bugfixes: #2096 rar5: report encrypted entries #2150 xar: fix another infinite loop and expat error handling #2173 shar: check strdup return value #2161 lha: fix integer truncation on 32-bit systems #2338 tar: fix memory leaks when processing symlinks or parsing pax headers #2245 7zip: fix issue when skipping first file in 7zip archive that is a multiple of 65536 bytes #2252 7-zip: read/write symlink paths as UTF-8 #2259 rar5: don't try to read rediculously long names #2290 ar: fix archive entries having no type #2360 tar: fix truncation of entry pathnames in specific archives CVE: CVE-2024-20696, CVE-2024-26256 (cherry picked from commit bd66c1b43e33540205dbc1187c2f2a15c58b57ba) --- contrib/libarchive/NEWS | 6 + contrib/libarchive/cat/bsdcat.1 | 26 +- contrib/libarchive/cat/bsdcat.c | 22 +- contrib/libarchive/cat/bsdcat.h | 22 +- contrib/libarchive/cat/bsdcat_platform.h | 24 +- contrib/libarchive/cat/cmdline.c | 22 +- contrib/libarchive/cat/test/test.h | 22 +- contrib/libarchive/cat/test/test_0.c | 22 +- contrib/libarchive/cat/test/test_empty_gz.c | 22 +- contrib/libarchive/cat/test/test_empty_lz4.c | 22 +- contrib/libarchive/cat/test/test_empty_xz.c | 22 +- contrib/libarchive/cat/test/test_empty_zstd.c | 22 +- contrib/libarchive/cat/test/test_error.c | 22 +- contrib/libarchive/cat/test/test_error_mixed.c | 22 +- contrib/libarchive/cat/test/test_expand_Z.c | 22 +- contrib/libarchive/cat/test/test_expand_bz2.c | 22 +- contrib/libarchive/cat/test/test_expand_gz.c | 22 +- contrib/libarchive/cat/test/test_expand_lz4.c | 22 +- contrib/libarchive/cat/test/test_expand_mixed.c | 22 +- contrib/libarchive/cat/test/test_expand_plain.c | 22 +- contrib/libarchive/cat/test/test_expand_xz.c | 22 +- contrib/libarchive/cat/test/test_expand_zstd.c | 22 +- contrib/libarchive/cat/test/test_help.c | 22 +- contrib/libarchive/cat/test/test_stdin.c | 22 +- contrib/libarchive/cat/test/test_version.c | 22 +- contrib/libarchive/cpio/bsdcpio.1 | 24 +- contrib/libarchive/cpio/cmdline.c | 76 +- contrib/libarchive/cpio/cpio.c | 70 +- contrib/libarchive/cpio/cpio.h | 30 +- contrib/libarchive/cpio/cpio_platform.h | 22 +- contrib/libarchive/cpio/test/test.h | 22 +- contrib/libarchive/cpio/test/test_0.c | 22 +- contrib/libarchive/cpio/test/test_basic.c | 22 +- contrib/libarchive/cpio/test/test_cmdline.c | 22 +- contrib/libarchive/cpio/test/test_extract_cpio_Z.c | 22 +- .../cpio/test/test_extract_cpio_absolute_paths.c | 53 + .../libarchive/cpio/test/test_extract_cpio_bz2.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_grz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_gz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lrz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lz4.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lzma.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lzo.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_xz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_zstd.c | 22 +- contrib/libarchive/cpio/test/test_format_newc.c | 28 +- contrib/libarchive/cpio/test/test_gcpio_compat.c | 22 +- contrib/libarchive/cpio/test/test_missing_file.c | 22 +- contrib/libarchive/cpio/test/test_option_0.c | 22 +- contrib/libarchive/cpio/test/test_option_B_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_C_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_J_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_L_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_Z_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_a.c | 22 +- .../libarchive/cpio/test/test_option_b64encode.c | 22 +- contrib/libarchive/cpio/test/test_option_c.c | 30 +- contrib/libarchive/cpio/test/test_option_d.c | 24 +- contrib/libarchive/cpio/test/test_option_f.c | 22 +- contrib/libarchive/cpio/test/test_option_grzip.c | 22 +- contrib/libarchive/cpio/test/test_option_help.c | 22 +- contrib/libarchive/cpio/test/test_option_l.c | 22 +- contrib/libarchive/cpio/test/test_option_lrzip.c | 22 +- contrib/libarchive/cpio/test/test_option_lz4.c | 22 +- contrib/libarchive/cpio/test/test_option_lzma.c | 22 +- contrib/libarchive/cpio/test/test_option_lzop.c | 22 +- contrib/libarchive/cpio/test/test_option_m.c | 22 +- .../libarchive/cpio/test/test_option_passphrase.c | 22 +- contrib/libarchive/cpio/test/test_option_t.c | 29 +- contrib/libarchive/cpio/test/test_option_u.c | 22 +- .../libarchive/cpio/test/test_option_uuencode.c | 22 +- contrib/libarchive/cpio/test/test_option_version.c | 22 +- contrib/libarchive/cpio/test/test_option_xz.c | 22 +- contrib/libarchive/cpio/test/test_option_y.c | 22 +- contrib/libarchive/cpio/test/test_option_z.c | 22 +- contrib/libarchive/cpio/test/test_option_zstd.c | 22 +- contrib/libarchive/cpio/test/test_owner_parse.c | 112 +- .../libarchive/cpio/test/test_passthrough_dotdot.c | 22 +- .../cpio/test/test_passthrough_reverse.c | 22 +- contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_acl.c | 71 +- .../libarchive/libarchive/archive_acl_private.h | 2 + contrib/libarchive/libarchive/archive_crc32.h | 5 + contrib/libarchive/libarchive/archive_cryptor.c | 4 +- .../libarchive/archive_cryptor_private.h | 2 +- contrib/libarchive/libarchive/archive_entry.c | 300 ++- contrib/libarchive/libarchive/archive_entry.h | 8 +- .../libarchive/archive_entry_link_resolver.c | 15 + .../libarchive/libarchive/archive_entry_perms.3 | 1 + .../libarchive/libarchive/archive_entry_private.h | 4 +- .../libarchive/libarchive/archive_entry_sparse.c | 2 +- .../libarchive/libarchive/archive_entry_xattr.c | 2 +- contrib/libarchive/libarchive/archive_hmac.c | 2 +- .../libarchive/libarchive/archive_hmac_private.h | 2 +- contrib/libarchive/libarchive/archive_match.c | 2 +- .../libarchive/archive_openssl_evp_private.h | 2 +- .../libarchive/archive_openssl_hmac_private.h | 2 +- contrib/libarchive/libarchive/archive_ppmd7.c | 2 +- contrib/libarchive/libarchive/archive_ppmd8.c | 7 +- contrib/libarchive/libarchive/archive_private.h | 6 +- contrib/libarchive/libarchive/archive_read.c | 8 +- .../libarchive/archive_read_append_filter.c | 8 +- .../libarchive/archive_read_disk_entry_from_file.c | 1 + .../libarchive/archive_read_disk_posix.c | 2 +- .../libarchive/libarchive/archive_read_extract2.c | 2 +- .../libarchive/libarchive/archive_read_open_fd.c | 2 +- .../libarchive/libarchive/archive_read_open_file.c | 2 +- .../libarchive/archive_read_open_filename.c | 4 +- .../libarchive/archive_read_open_memory.c | 2 +- .../libarchive/archive_read_support_filter_bzip2.c | 4 +- .../archive_read_support_filter_compress.c | 2 +- .../libarchive/archive_read_support_filter_gzip.c | 18 +- .../libarchive/archive_read_support_filter_lz4.c | 6 +- .../libarchive/archive_read_support_filter_lzop.c | 5 +- .../archive_read_support_filter_program.c | 6 +- .../libarchive/archive_read_support_filter_rpm.c | 45 +- .../libarchive/archive_read_support_filter_uu.c | 16 +- .../libarchive/archive_read_support_filter_xz.c | 4 +- .../libarchive/archive_read_support_filter_zstd.c | 4 +- .../libarchive/archive_read_support_format_7zip.c | 93 +- .../libarchive/archive_read_support_format_ar.c | 10 +- .../libarchive/archive_read_support_format_cab.c | 12 +- .../libarchive/archive_read_support_format_cpio.c | 32 +- .../archive_read_support_format_iso9660.c | 305 ++- .../libarchive/archive_read_support_format_lha.c | 11 +- .../libarchive/archive_read_support_format_mtree.c | 2 +- .../libarchive/archive_read_support_format_rar.c | 128 +- .../libarchive/archive_read_support_format_rar5.c | 171 +- .../libarchive/archive_read_support_format_raw.c | 2 +- .../libarchive/archive_read_support_format_tar.c | 2221 +++++++++++++------- .../libarchive/archive_read_support_format_xar.c | 32 +- .../libarchive/archive_read_support_format_zip.c | 45 +- contrib/libarchive/libarchive/archive_string.c | 86 +- contrib/libarchive/libarchive/archive_util.c | 16 +- contrib/libarchive/libarchive/archive_write.c | 19 +- .../archive_write_add_filter_b64encode.c | 6 +- .../libarchive/archive_write_add_filter_bzip2.c | 5 +- .../libarchive/archive_write_add_filter_compress.c | 4 +- .../libarchive/archive_write_add_filter_gzip.c | 3 +- .../libarchive/archive_write_add_filter_uuencode.c | 2 +- .../libarchive/archive_write_add_filter_xz.c | 5 +- .../libarchive/archive_write_add_filter_zstd.c | 3 +- .../libarchive/archive_write_disk_posix.c | 16 +- .../libarchive/libarchive/archive_write_open_fd.c | 2 +- .../libarchive/archive_write_open_file.c | 2 +- .../libarchive/archive_write_open_filename.c | 2 +- .../libarchive/archive_write_open_memory.c | 2 +- .../libarchive/archive_write_set_format_7zip.c | 16 +- .../libarchive/archive_write_set_format_ar.c | 6 +- .../archive_write_set_format_cpio_binary.c | 5 +- .../archive_write_set_format_cpio_newc.c | 2 +- .../libarchive/archive_write_set_format_cpio_odc.c | 5 +- .../libarchive/archive_write_set_format_gnutar.c | 6 +- .../libarchive/archive_write_set_format_iso9660.c | 2 +- .../libarchive/archive_write_set_format_pax.c | 24 +- .../libarchive/archive_write_set_format_raw.c | 2 +- .../libarchive/archive_write_set_format_shar.c | 10 +- .../libarchive/archive_write_set_format_ustar.c | 8 +- .../libarchive/archive_write_set_format_v7tar.c | 4 +- .../libarchive/archive_write_set_format_xar.c | 26 +- .../libarchive/archive_write_set_format_zip.c | 10 +- .../libarchive/test/test_7zip_filename_encoding.c | 100 + contrib/libarchive/libarchive/test/test_ar_mode.c | 40 + .../libarchive/test/test_archive_match_time.c | 60 +- .../libarchive/libarchive/test/test_archive_read.c | 63 + .../test/test_archive_read_multiple_data_objects.c | 23 +- .../libarchive/test/test_archive_string.c | 2 +- .../test/test_archive_string_conversion.c | 135 ++ .../test/test_archive_write_add_filter_by_name.c | 2 +- .../libarchive/libarchive/test/test_compat_lzip.c | 2 +- .../test/test_compat_solaris_pax_sparse.c | 2 +- contrib/libarchive/libarchive/test/test_entry.c | 14 +- .../test/test_gnutar_filename_encoding.c | 102 + .../libarchive/test/test_link_resolver.c | 45 + .../libarchive/test/test_pax_filename_encoding.c | 152 ++ .../test/test_read_filter_gzip_recursive.c | 50 + .../test/test_read_filter_gzip_recursive.gz.uu | 19 + .../libarchive/test/test_read_format_7zip.c | 44 + .../test_read_format_7zip_extract_second.7z.uu | 11 + .../libarchive/test/test_read_format_cpio_afio.c | 30 +- .../libarchive/test/test_read_format_huge_rpm.c | 50 + .../test/test_read_format_huge_rpm.rpm.uu | 244 +++ .../test/test_read_format_iso_3.iso.Z.uu | 40 + .../libarchive/test/test_read_format_iso_Z.c | 122 +- .../libarchive/test/test_read_format_mtree.c | 2 +- .../test/test_read_format_rar4_encrypted.rar.uu | 10 + ...est_read_format_rar4_encrypted_filenames.rar.uu | 14 + .../test_read_format_rar4_solid_encrypted.rar.uu | 11 + ...ad_format_rar4_solid_encrypted_filenames.rar.uu | 13 + .../libarchive/test/test_read_format_rar5.c | 39 +- ...read_format_rar5_data_ready_pointer_leak.rar.uu | 28 + .../test/test_read_format_rar5_encrypted.rar.uu | 12 + ...est_read_format_rar5_encrypted_filenames.rar.uu | 19 + .../test_read_format_rar5_solid_encrypted.rar.uu | 14 + ...ad_format_rar5_solid_encrypted_filenames.rar.uu | 18 + .../test/test_read_format_rar_encryption.c | 176 ++ .../libarchive/test/test_read_format_tar.c | 2 +- .../test/test_read_format_tar_pax_large_attr.c | 65 + .../test_read_format_tar_pax_large_attr.tar.Z.uu | 149 ++ .../libarchive/test/test_read_format_xar.c | 37 +- ..._read_format_xar_duplicate_filename_node.xar.uu | 14 + .../libarchive/test/test_read_format_zip_nested.c | 2 +- ...t_read_format_zip_traditional_encryption_data.c | 2 +- .../test/test_read_format_zip_winzip_aes.c | 2 +- .../test/test_read_format_zip_winzip_aes_large.c | 2 +- .../libarchive/test/test_read_truncated_filter.c | 4 +- .../libarchive/libarchive/test/test_sparse_basic.c | 17 +- .../libarchive/libarchive/test/test_tar_large.c | 2 +- .../libarchive/test/test_ustar_filename_encoding.c | 102 + .../test/test_write_disk_secure_noabsolutepaths.c | 88 + .../libarchive/test/test_write_filter_b64encode.c | 4 +- .../libarchive/test/test_write_filter_bzip2.c | 4 +- .../libarchive/test/test_write_filter_compress.c | 4 +- .../libarchive/test/test_write_filter_gzip.c | 4 +- .../test/test_write_filter_gzip_timestamp.c | 4 +- .../libarchive/test/test_write_filter_lrzip.c | 4 +- .../libarchive/test/test_write_filter_lz4.c | 8 +- .../libarchive/test/test_write_filter_lzip.c | 4 +- .../libarchive/test/test_write_filter_lzma.c | 4 +- .../libarchive/test/test_write_filter_lzop.c | 4 +- .../libarchive/test/test_write_filter_uuencode.c | 4 +- .../libarchive/test/test_write_filter_xz.c | 4 +- .../libarchive/test/test_write_filter_zstd.c | 12 +- .../test/test_write_format_iso9660_filename.c | 2 +- .../libarchive/test/test_write_format_zip.c | 6 +- .../test/test_write_format_zip_entry_size_unset.c | 2 +- .../libarchive/test/test_write_format_zip_large.c | 2 +- .../libarchive/test/test_write_format_zip_stream.c | 5 + .../test/test_write_format_zip_windows_path.c | 100 + .../libarchive/test/test_zip_filename_encoding.c | 95 + contrib/libarchive/tar/bsdtar.1 | 24 +- contrib/libarchive/tar/bsdtar.c | 25 +- contrib/libarchive/tar/bsdtar.h | 22 +- contrib/libarchive/tar/bsdtar_platform.h | 24 +- contrib/libarchive/tar/cmdline.c | 22 +- contrib/libarchive/tar/creation_set.c | 24 +- contrib/libarchive/tar/read.c | 22 +- contrib/libarchive/tar/subst.c | 22 +- contrib/libarchive/tar/test/test.h | 22 +- contrib/libarchive/tar/test/test_0.c | 22 +- contrib/libarchive/tar/test/test_basic.c | 22 +- contrib/libarchive/tar/test/test_copy.c | 58 +- contrib/libarchive/tar/test/test_empty_mtree.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_Z.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_bz2.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_grz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_gz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lrz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lz4.c | 22 +- .../libarchive/tar/test/test_extract_tar_lzma.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lzo.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_xz.c | 22 +- .../libarchive/tar/test/test_extract_tar_zstd.c | 22 +- contrib/libarchive/tar/test/test_format_newc.c | 22 +- contrib/libarchive/tar/test/test_help.c | 22 +- contrib/libarchive/tar/test/test_leading_slash.c | 22 +- contrib/libarchive/tar/test/test_missing_file.c | 22 +- contrib/libarchive/tar/test/test_option_C_mtree.c | 30 +- contrib/libarchive/tar/test/test_option_C_upper.c | 22 +- contrib/libarchive/tar/test/test_option_H_upper.c | 40 +- contrib/libarchive/tar/test/test_option_L_upper.c | 40 +- contrib/libarchive/tar/test/test_option_O_upper.c | 22 +- contrib/libarchive/tar/test/test_option_P.c | 82 + contrib/libarchive/tar/test/test_option_T_upper.c | 22 +- contrib/libarchive/tar/test/test_option_U_upper.c | 22 +- contrib/libarchive/tar/test/test_option_X_upper.c | 22 +- contrib/libarchive/tar/test/test_option_a.c | 22 +- contrib/libarchive/tar/test/test_option_acls.c | 22 +- contrib/libarchive/tar/test/test_option_b.c | 22 +- .../libarchive/tar/test/test_option_b64encode.c | 22 +- contrib/libarchive/tar/test/test_option_exclude.c | 22 +- .../libarchive/tar/test/test_option_exclude_vcs.c | 24 +- contrib/libarchive/tar/test/test_option_fflags.c | 24 +- .../libarchive/tar/test/test_option_gid_gname.c | 22 +- contrib/libarchive/tar/test/test_option_group.c | 22 +- contrib/libarchive/tar/test/test_option_grzip.c | 22 +- .../libarchive/tar/test/test_option_ignore_zeros.c | 31 +- contrib/libarchive/tar/test/test_option_j.c | 22 +- contrib/libarchive/tar/test/test_option_k.c | 22 +- .../tar/test/test_option_keep_newer_files.c | 22 +- contrib/libarchive/tar/test/test_option_lrzip.c | 22 +- contrib/libarchive/tar/test/test_option_lz4.c | 22 +- contrib/libarchive/tar/test/test_option_lzma.c | 22 +- contrib/libarchive/tar/test/test_option_lzop.c | 22 +- contrib/libarchive/tar/test/test_option_n.c | 22 +- .../libarchive/tar/test/test_option_newer_than.c | 22 +- contrib/libarchive/tar/test/test_option_nodump.c | 22 +- .../libarchive/tar/test/test_option_older_than.c | 22 +- contrib/libarchive/tar/test/test_option_owner.c | 22 +- .../libarchive/tar/test/test_option_passphrase.c | 22 +- contrib/libarchive/tar/test/test_option_q.c | 22 +- contrib/libarchive/tar/test/test_option_r.c | 22 +- contrib/libarchive/tar/test/test_option_s.c | 22 +- .../libarchive/tar/test/test_option_safe_writes.c | 22 +- .../libarchive/tar/test/test_option_uid_uname.c | 22 +- contrib/libarchive/tar/test/test_option_uuencode.c | 22 +- contrib/libarchive/tar/test/test_option_xattrs.c | 24 +- contrib/libarchive/tar/test/test_option_xz.c | 22 +- contrib/libarchive/tar/test/test_option_z.c | 22 +- contrib/libarchive/tar/test/test_option_zstd.c | 22 +- contrib/libarchive/tar/test/test_patterns.c | 22 +- contrib/libarchive/tar/test/test_print_longpath.c | 22 +- contrib/libarchive/tar/test/test_stdio.c | 22 +- .../libarchive/tar/test/test_strip_components.c | 22 +- contrib/libarchive/tar/test/test_symlink_dir.c | 22 +- contrib/libarchive/tar/test/test_version.c | 22 +- contrib/libarchive/tar/util.c | 42 +- contrib/libarchive/tar/write.c | 35 +- contrib/libarchive/test_utils/test_common.h | 5 +- contrib/libarchive/test_utils/test_main.c | 101 +- contrib/libarchive/unzip/bsdunzip.1 | 25 +- contrib/libarchive/unzip/bsdunzip.c | 49 +- contrib/libarchive/unzip/bsdunzip.h | 22 +- contrib/libarchive/unzip/bsdunzip_platform.h | 24 +- contrib/libarchive/unzip/cmdline.c | 22 +- contrib/libarchive/unzip/la_getline.c | 26 +- contrib/libarchive/unzip/test/test.h | 22 +- contrib/libarchive/unzip/test/test_0.c | 22 +- contrib/libarchive/unzip/test/test_C.c | 23 +- contrib/libarchive/unzip/test/test_I.c | 40 +- contrib/libarchive/unzip/test/test_L.c | 23 +- contrib/libarchive/unzip/test/test_P_encryption.c | 25 +- contrib/libarchive/unzip/test/test_Z1.c | 23 +- contrib/libarchive/unzip/test/test_basic.c | 23 +- contrib/libarchive/unzip/test/test_d.c | 23 +- contrib/libarchive/unzip/test/test_doubledash.c | 23 +- contrib/libarchive/unzip/test/test_glob.c | 23 +- contrib/libarchive/unzip/test/test_j.c | 23 +- contrib/libarchive/unzip/test/test_n.c | 25 +- contrib/libarchive/unzip/test/test_not_exist.c | 25 +- contrib/libarchive/unzip/test/test_o.c | 25 +- contrib/libarchive/unzip/test/test_p.c | 23 +- contrib/libarchive/unzip/test/test_q.c | 23 +- contrib/libarchive/unzip/test/test_singlefile.c | 23 +- contrib/libarchive/unzip/test/test_t.c | 23 +- contrib/libarchive/unzip/test/test_t_bad.c | 23 +- contrib/libarchive/unzip/test/test_version.c | 22 +- contrib/libarchive/unzip/test/test_x.c | 23 +- lib/libarchive/tests/Makefile | 24 + usr.bin/cpio/tests/Makefile | 1 + usr.bin/tar/tests/Makefile | 1 + 343 files changed, 5857 insertions(+), 5333 deletions(-) diff --git a/contrib/libarchive/NEWS b/contrib/libarchive/NEWS index ebdbb2a978ec..6af50e4e4033 100644 --- a/contrib/libarchive/NEWS +++ b/contrib/libarchive/NEWS @@ -1,3 +1,9 @@ +Oct 13, 2024: libarchive 3.7.7 released + +Sep 23, 2024: libarchive 3.7.6 released + +Sep 13, 2024: libarchive 3.7.5 released + Apr 26, 2024: libarchive 3.7.4 released Apr 08, 2024: libarchive 3.7.3 released diff --git a/contrib/libarchive/cat/bsdcat.1 b/contrib/libarchive/cat/bsdcat.1 index 9fa66d60e1e6..b34a0c1c988d 100644 --- a/contrib/libarchive/cat/bsdcat.1 +++ b/contrib/libarchive/cat/bsdcat.1 @@ -1,26 +1,8 @@ -.\" Copyright (c) 2011-2014, Mike Kazantsev -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" 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. +.\" Copyright (c) 2011-2014, Mike Kazantsev +.\" All rights reserved. .\" .Dd March 1, 2014 .Dt BSDCAT 1 @@ -39,7 +21,7 @@ expands files to standard output. .Nm typically takes a filename as an argument or reads standard input when used in a pipe. -In both cases decompressed data it written to standard output. +In both cases decompressed data is written to standard output. .Sh EXAMPLES To decompress a file: .Pp diff --git a/contrib/libarchive/cat/bsdcat.c b/contrib/libarchive/cat/bsdcat.c index 19d3de65cea4..731621fa9b75 100644 --- a/contrib/libarchive/cat/bsdcat.c +++ b/contrib/libarchive/cat/bsdcat.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2011-2014, Mike Kazantsev * 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(S) ``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(S) 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 "bsdcat_platform.h" diff --git a/contrib/libarchive/cat/bsdcat.h b/contrib/libarchive/cat/bsdcat.h index 504757a44040..6726f78e8453 100644 --- a/contrib/libarchive/cat/bsdcat.h +++ b/contrib/libarchive/cat/bsdcat.h @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014, Mike Kazantsev * 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(S) ``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(S) 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. */ #ifndef BSDCAT_H_INCLUDED diff --git a/contrib/libarchive/cat/bsdcat_platform.h b/contrib/libarchive/cat/bsdcat_platform.h index 78a6113e6f01..940214f2ecd6 100644 --- a/contrib/libarchive/cat/bsdcat_platform.h +++ b/contrib/libarchive/cat/bsdcat_platform.h @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2007 Tim Kientzle * 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(S) ``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(S) 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. */ /* @@ -58,7 +40,7 @@ #define __LA_NORETURN __attribute__((__noreturn__)) #elif defined(_MSC_VER) #define __LA_NORETURN __declspec(noreturn) -#else +#else #define __LA_NORETURN #endif diff --git a/contrib/libarchive/cat/cmdline.c b/contrib/libarchive/cat/cmdline.c index 851b63de06e5..8ecd74aa95e4 100644 --- a/contrib/libarchive/cat/cmdline.c +++ b/contrib/libarchive/cat/cmdline.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2008 Tim Kientzle * 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(S) ``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(S) 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. */ /* diff --git a/contrib/libarchive/cat/test/test.h b/contrib/libarchive/cat/test/test.h index ec83d476b6b8..b852437ca430 100644 --- a/contrib/libarchive/cat/test/test.h +++ b/contrib/libarchive/cat/test/test.h @@ -1,26 +1,8 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2006 Tim Kientzle * 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(S) ``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(S) 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. */ /* Every test program should #include "test.h" as the first thing. */ diff --git a/contrib/libarchive/cat/test/test_0.c b/contrib/libarchive/cat/test/test_0.c index c806c24356c0..07f5fc60cf35 100644 --- a/contrib/libarchive/cat/test/test_0.c +++ b/contrib/libarchive/cat/test/test_0.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2007 Tim Kientzle * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_gz.c b/contrib/libarchive/cat/test/test_empty_gz.c index 6181f93b4d28..0ca835627bf5 100644 --- a/contrib/libarchive/cat/test/test_empty_gz.c +++ b/contrib/libarchive/cat/test/test_empty_gz.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Sebastian Freundt * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_lz4.c b/contrib/libarchive/cat/test/test_empty_lz4.c index 9d98e9cfd390..ed4f2894fb4f 100644 --- a/contrib/libarchive/cat/test/test_empty_lz4.c +++ b/contrib/libarchive/cat/test/test_empty_lz4.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Sebastian Freundt * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_xz.c b/contrib/libarchive/cat/test/test_empty_xz.c index 368ffb574e50..591ab2410ce4 100644 --- a/contrib/libarchive/cat/test/test_empty_xz.c +++ b/contrib/libarchive/cat/test/test_empty_xz.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Sebastian Freundt * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_zstd.c b/contrib/libarchive/cat/test/test_empty_zstd.c index c2d5ea106fa1..b0f25bf1cacd 100644 --- a/contrib/libarchive/cat/test/test_empty_zstd.c +++ b/contrib/libarchive/cat/test/test_empty_zstd.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Sean Purcell * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_error.c b/contrib/libarchive/cat/test/test_error.c index 918af01be2dc..3e1a74a38820 100644 --- a/contrib/libarchive/cat/test/test_error.c +++ b/contrib/libarchive/cat/test/test_error.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_error_mixed.c b/contrib/libarchive/cat/test/test_error_mixed.c index 7d94fce467aa..01cb9f0520dd 100644 --- a/contrib/libarchive/cat/test/test_error_mixed.c +++ b/contrib/libarchive/cat/test/test_error_mixed.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_Z.c b/contrib/libarchive/cat/test/test_expand_Z.c index d48d4972ebee..f34f38ce0385 100644 --- a/contrib/libarchive/cat/test/test_expand_Z.c +++ b/contrib/libarchive/cat/test/test_expand_Z.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_bz2.c b/contrib/libarchive/cat/test/test_expand_bz2.c index 82f074b341c8..8f3bb3f24a46 100644 --- a/contrib/libarchive/cat/test/test_expand_bz2.c +++ b/contrib/libarchive/cat/test/test_expand_bz2.c @@ -1,27 +1,9 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * Copyright (c) 2012 Michihiro NAKAJIMA * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_gz.c b/contrib/libarchive/cat/test/test_expand_gz.c index 18b715c66ebb..1f6f1cfddbac 100644 --- a/contrib/libarchive/cat/test/test_expand_gz.c +++ b/contrib/libarchive/cat/test/test_expand_gz.c @@ -1,27 +1,9 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * Copyright (c) 2012 Michihiro NAKAJIMA * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_lz4.c b/contrib/libarchive/cat/test/test_expand_lz4.c index 1b1d2106459d..efc2baad59ed 100644 --- a/contrib/libarchive/cat/test/test_expand_lz4.c +++ b/contrib/libarchive/cat/test/test_expand_lz4.c @@ -1,27 +1,9 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * Copyright (c) 2012, 2014 Michihiro NAKAJIMA * 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(S) ``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(S) BE LIABLE FOR ANY DIRECT, INDIRECT, *** 18475 LINES SKIPPED *** From nobody Sun Oct 27 09:35: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 4Xbrwl5qrfz5ZZTJ; Sun, 27 Oct 2024 09:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbrwl5JK8z4fJ3; Sun, 27 Oct 2024 09:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730021735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzXM5kupzPHOrv/JudvBWl5ZOngrOeBqtES1Er3Kbcc=; b=TT7Tzv9Lf2leWw2xkGodg4IBwg/Xa+H+Ukhinx/Cu1803tc9yrJldOU6i4a2s3VaVQsJ6m InebUn2uvkVti7ll/YSI8Y2fOsJA6V4gW1oaWXA1BVb2uegQRanWTBW2VfaYLYjfwYBNxX fRS6b7KKCIKeOSIZs7fyWlStq3c13SgCaR6OCfFgerPuyitBjhJcITiaF8WfS5+ddXYJfB x7FibDblnBMNyO1mEMs4GS5oRQ5dBYzELRn1znbxjMrhBd6XdffqSc+kWki3pXUqYOCfRS w3wVROMBoJk6mYOYohwIaeGWBfLejBcIIb9kJYB+8RfpCV7pjoRNNnxsBwiezQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730021735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzXM5kupzPHOrv/JudvBWl5ZOngrOeBqtES1Er3Kbcc=; b=Db1AVs3j6P9f1i1HXpPhQAESUfKThkL4MVy9bOtLVyXhuYEXJAQNVYTONCiyA+yd/zyCIQ j/5rSnV+asdUgkfVLKQ4zyWi3TcnTMXUNKKHkFnjRDnQnDhusgAD0gJOCSOhQ7VXVIF1Kx rej8gumSUf873vjRNeVj1GQJFI/M4NejIt9g0t5CvrQ2CL6hNjCNrQXJmpktVGlhiKwG0G 0uQTqmMeiMXXTo5TzqV7lCTbXAKMw2aPslzl0+r82uvROYiZ+76sQZ+lIedZoCoehV2zaA 8j5Du+aJVKqZAOJ/z0IgHrJ0WY51iSEUT8MkL2D2N3Hq/8gBapaRkCk94AsPqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730021735; a=rsa-sha256; cv=none; b=edmvojO/AYIOnPPrc3IcMkYnwfKCBBFdjOAx71edkYghT9TyPFsltNeEIP7OEV6+XCqc6u rxEvGo6qeVCLswugdpMemw0YyKEdIgq6QdJlTWlwQ2uY+vTkHZU26zpvumVly3z3e93bEJ QVNbHQAX7vpaP8JdDS0tKeLFSKNM+t70z7KNLMc/A7szSZtsVqOT1htZitoUh4RdOzaFo/ XhIF5UMldCykmtBciGxZqJ+8Srd1yxAXWYIy4xs6mnP511b9qR5Byp/yP95wXo6qKTcpUS 3xrp9Q3LzsbmTF/x4JHTXgwk6y53ZSLqy952ikuJ3/+Jqx5Aa9mN4+TaktFb/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 4Xbrwl4vGYzpdM; Sun, 27 Oct 2024 09:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49R9ZZgN059167; Sun, 27 Oct 2024 09:35:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49R9ZZg0059164; Sun, 27 Oct 2024 09:35:35 GMT (envelope-from git) Date: Sun, 27 Oct 2024 09:35:35 GMT Message-Id: <202410270935.49R9ZZg0059164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: b21c677ed28a - stable/14 - libarchive: backport PR #2386 (fixes output of one 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: b21c677ed28a8e4c0be2fb0e114ea902fa3271c2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b21c677ed28a8e4c0be2fb0e114ea902fa3271c2 commit b21c677ed28a8e4c0be2fb0e114ea902fa3271c2 Author: Martin Matuska AuthorDate: 2024-10-21 12:35:18 +0000 Commit: Martin Matuska CommitDate: 2024-10-27 08:45:56 +0000 libarchive: backport PR #2386 (fixes output of one test) (cherry picked from commit 6c40282284d6eab20256914648cdec39acb2c52a) --- contrib/libarchive/tar/test/test_option_P.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libarchive/tar/test/test_option_P.c b/contrib/libarchive/tar/test/test_option_P.c index e63da3e0875c..953d9f58991c 100644 --- a/contrib/libarchive/tar/test/test_option_P.c +++ b/contrib/libarchive/tar/test/test_option_P.c @@ -55,7 +55,7 @@ DEFINE_TEST(test_extract_tar_absolute_paths) UNLINK(temp_absolute_file_name); // Extracting the archive without -P / --absolute-paths should strip leading drive letter or slash - r = systemf("%s -xf test.tar", testprog); + r = systemf("%s -xf test.tar 2>test.err", testprog); assertEqualInt(r, 0); assertFileNotExists(temp_absolute_file_name); From nobody Sun Oct 27 10:51: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 4Xbtcl4vTsz5ZfCj; Sun, 27 Oct 2024 10:51: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbtcl4dWGz4lm2; Sun, 27 Oct 2024 10:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOHerBpzJfb9ASx/Z2XgFJ622tVe4ek4JE+z569agf0=; b=haMPg3QG11JGDyhzcF2RaZpFvVXw7Ou/cYJQJekMdxRYQWQf99y1Q3TFtmxWEdCMwTZgN3 sROrjbKPzqoAs1k1MFJyx8rduynpTKJCoUVficXSZLUkFFCFdtQy56oq4k7yqUWFULFdzq XXhJ2YKyybWxvx9zq3XIi9ABIHAD3Swe4Zj1Tbi6dRkz8OymNR/p38t2mlmIE1NJ+YU84v MZ+PrDLsznUiqKtxK5v/KTTWU5Kifk08idSdeVa0lSGZ9XoEI9dtsZIZxWcc+zVExlsdYG e+KEf3cMnRWVaN6u7V7mafgjv7usulDfjL8xeAFH926zhC7l8aLY58D0b+iZgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOHerBpzJfb9ASx/Z2XgFJ622tVe4ek4JE+z569agf0=; b=s7lJlKZ5p0jUNwFvJVCrNGywW1kJMi1vZ4zVeTh8LckiYZyksRS6Guq41dKZe5fyuJINeN FfqoMmPyUDt+NHu9f2de6AAQICtCI3JPigthp/1vZa+YkQ5XXxnRNjbg9bjGU1mHFd+7Fq mMwX1rM7j9C+NZefOC170mR8J5qO6JYhAKNtU384CogsDrvapc/hM1BhT0Hrp8kbsCnm2x 86RVWojHjtA27+s2q3x1fJSpC/6Mw+M0BUmCWQFGrShxqlPLolCER9HjDxyf1tg/zUarbj tZXG/HNLkMZoqPEjnjryEay1T9hObWqiNoY6Cgul90FMErrO+zxJNlSYVEv4Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026311; a=rsa-sha256; cv=none; b=duNB4wxO01u9XMdXU4dIjhjZMZU/xPyzxqaSanS4cgCk0wwbJXVvADwr57oRWicob+5RSV uS3fiwJBWX74TenElq32AJpDU8TTdh9zijcE6CDJBR3fjsmv5d5O9Zz75WldfzY2WXzfQz //zj4PBqUkJ+5xhAOYB6S8mbM39pkUxdpc126EWGIMIGze01iR0Y3Gpl/+slcxfTDoqM9o +uiL/QGWTpeXSggj6tS1Wx7jlKGPBK9CxpYesiCPWHHhRcAzeHvSbYwBs54PF+9eHcpjHL ADhlYJa9tVx7Lp9gQNSSf4I5StZ0zgOdb8jMoqRi5A84Avk7pQzwCKxJn8pXPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xbtcl4D46zrgd; Sun, 27 Oct 2024 10:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RAppok002117; Sun, 27 Oct 2024 10:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RAppC5002114; Sun, 27 Oct 2024 10:51:51 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:51:51 GMT Message-Id: <202410271051.49RAppC5002114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 6c7993ffba96 - stable/13 - libarchive: merge from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6c7993ffba96f56e5416a2726e5f2de209fecec7 Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6c7993ffba96f56e5416a2726e5f2de209fecec7 commit 6c7993ffba96f56e5416a2726e5f2de209fecec7 Author: Martin Matuska AuthorDate: 2024-10-20 08:22:09 +0000 Commit: Martin Matuska CommitDate: 2024-10-27 09:43:05 +0000 libarchive: merge from vendor branch Libarchive 3.7.7 Security fixes: #2158 rpm: calculate huge header sizes correctly #2160 util: fix out of boundary access in mktemp functions #2168 uu: stop processing if lines are too long #2174 lzop: prevent integer overflow #2172 rar4: protect copy_from_lzss_window_to_unp() (CVE-2024-20696) #2175 unzip: unify EOF handling #2179 rar4: fix out of boundary access with large files #2203 rar4: fix OOB access with unicode filenames #2210 rar4: add boundary checks to rgb filter #2248 rar4: fix OOB in delta filter #2249 rar4: fix OOB in audio filter #2256 fix multiple vulnerabilities identified by SAST #2258 cpio: ignore out-of-range gid/uid/size/ino and harden AFIO parsing #2265 rar5: clear 'data ready' cache on window buffer reallocs #2269 rar4: fix CVE-2024-26256 (CVE-2024-26256) #2330 iso: be more cautious about parsing ISO-9660 timestamps #2343 tar: clean up linkpath between entries #2364 tar: don't crash on truncated tar archives #2366 gzip: prevent a hang when processing a malformed gzip inside a gzip #2377 tar: fix two leaks in tar header parsing Important bugfixes: #2096 rar5: report encrypted entries #2150 xar: fix another infinite loop and expat error handling #2173 shar: check strdup return value #2161 lha: fix integer truncation on 32-bit systems #2338 tar: fix memory leaks when processing symlinks or parsing pax headers #2245 7zip: fix issue when skipping first file in 7zip archive that is a multiple of 65536 bytes #2252 7-zip: read/write symlink paths as UTF-8 #2259 rar5: don't try to read rediculously long names #2290 ar: fix archive entries having no type #2360 tar: fix truncation of entry pathnames in specific archives CVE: CVE-2024-20696, CVE-2024-26256 (cherry picked from commit bd66c1b43e33540205dbc1187c2f2a15c58b57ba) --- contrib/libarchive/NEWS | 6 + contrib/libarchive/cat/bsdcat.1 | 26 +- contrib/libarchive/cat/bsdcat.c | 22 +- contrib/libarchive/cat/bsdcat.h | 22 +- contrib/libarchive/cat/bsdcat_platform.h | 24 +- contrib/libarchive/cat/cmdline.c | 22 +- contrib/libarchive/cat/test/test.h | 22 +- contrib/libarchive/cat/test/test_0.c | 22 +- contrib/libarchive/cat/test/test_empty_gz.c | 22 +- contrib/libarchive/cat/test/test_empty_lz4.c | 22 +- contrib/libarchive/cat/test/test_empty_xz.c | 22 +- contrib/libarchive/cat/test/test_empty_zstd.c | 22 +- contrib/libarchive/cat/test/test_error.c | 22 +- contrib/libarchive/cat/test/test_error_mixed.c | 22 +- contrib/libarchive/cat/test/test_expand_Z.c | 22 +- contrib/libarchive/cat/test/test_expand_bz2.c | 22 +- contrib/libarchive/cat/test/test_expand_gz.c | 22 +- contrib/libarchive/cat/test/test_expand_lz4.c | 22 +- contrib/libarchive/cat/test/test_expand_mixed.c | 22 +- contrib/libarchive/cat/test/test_expand_plain.c | 22 +- contrib/libarchive/cat/test/test_expand_xz.c | 22 +- contrib/libarchive/cat/test/test_expand_zstd.c | 22 +- contrib/libarchive/cat/test/test_help.c | 22 +- contrib/libarchive/cat/test/test_stdin.c | 22 +- contrib/libarchive/cat/test/test_version.c | 22 +- contrib/libarchive/cpio/bsdcpio.1 | 24 +- contrib/libarchive/cpio/cmdline.c | 76 +- contrib/libarchive/cpio/cpio.c | 70 +- contrib/libarchive/cpio/cpio.h | 30 +- contrib/libarchive/cpio/cpio_platform.h | 22 +- contrib/libarchive/cpio/test/test.h | 22 +- contrib/libarchive/cpio/test/test_0.c | 22 +- contrib/libarchive/cpio/test/test_basic.c | 22 +- contrib/libarchive/cpio/test/test_cmdline.c | 22 +- contrib/libarchive/cpio/test/test_extract_cpio_Z.c | 22 +- .../cpio/test/test_extract_cpio_absolute_paths.c | 53 + .../libarchive/cpio/test/test_extract_cpio_bz2.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_grz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_gz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lrz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lz4.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lzma.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_lzo.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_xz.c | 22 +- .../libarchive/cpio/test/test_extract_cpio_zstd.c | 22 +- contrib/libarchive/cpio/test/test_format_newc.c | 28 +- contrib/libarchive/cpio/test/test_gcpio_compat.c | 22 +- contrib/libarchive/cpio/test/test_missing_file.c | 22 +- contrib/libarchive/cpio/test/test_option_0.c | 22 +- contrib/libarchive/cpio/test/test_option_B_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_C_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_J_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_L_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_Z_upper.c | 22 +- contrib/libarchive/cpio/test/test_option_a.c | 22 +- .../libarchive/cpio/test/test_option_b64encode.c | 22 +- contrib/libarchive/cpio/test/test_option_c.c | 30 +- contrib/libarchive/cpio/test/test_option_d.c | 24 +- contrib/libarchive/cpio/test/test_option_f.c | 22 +- contrib/libarchive/cpio/test/test_option_grzip.c | 22 +- contrib/libarchive/cpio/test/test_option_help.c | 22 +- contrib/libarchive/cpio/test/test_option_l.c | 22 +- contrib/libarchive/cpio/test/test_option_lrzip.c | 22 +- contrib/libarchive/cpio/test/test_option_lz4.c | 22 +- contrib/libarchive/cpio/test/test_option_lzma.c | 22 +- contrib/libarchive/cpio/test/test_option_lzop.c | 22 +- contrib/libarchive/cpio/test/test_option_m.c | 22 +- .../libarchive/cpio/test/test_option_passphrase.c | 22 +- contrib/libarchive/cpio/test/test_option_t.c | 29 +- contrib/libarchive/cpio/test/test_option_u.c | 22 +- .../libarchive/cpio/test/test_option_uuencode.c | 22 +- contrib/libarchive/cpio/test/test_option_version.c | 22 +- contrib/libarchive/cpio/test/test_option_xz.c | 22 +- contrib/libarchive/cpio/test/test_option_y.c | 22 +- contrib/libarchive/cpio/test/test_option_z.c | 22 +- contrib/libarchive/cpio/test/test_option_zstd.c | 22 +- contrib/libarchive/cpio/test/test_owner_parse.c | 112 +- .../libarchive/cpio/test/test_passthrough_dotdot.c | 22 +- .../cpio/test/test_passthrough_reverse.c | 22 +- contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_acl.c | 71 +- .../libarchive/libarchive/archive_acl_private.h | 2 + contrib/libarchive/libarchive/archive_crc32.h | 5 + contrib/libarchive/libarchive/archive_cryptor.c | 4 +- .../libarchive/archive_cryptor_private.h | 2 +- contrib/libarchive/libarchive/archive_entry.c | 300 ++- contrib/libarchive/libarchive/archive_entry.h | 8 +- .../libarchive/archive_entry_link_resolver.c | 15 + .../libarchive/libarchive/archive_entry_perms.3 | 1 + .../libarchive/libarchive/archive_entry_private.h | 4 +- .../libarchive/libarchive/archive_entry_sparse.c | 2 +- .../libarchive/libarchive/archive_entry_xattr.c | 2 +- contrib/libarchive/libarchive/archive_hmac.c | 2 +- .../libarchive/libarchive/archive_hmac_private.h | 2 +- contrib/libarchive/libarchive/archive_match.c | 2 +- .../libarchive/archive_openssl_evp_private.h | 2 +- .../libarchive/archive_openssl_hmac_private.h | 2 +- contrib/libarchive/libarchive/archive_ppmd7.c | 2 +- contrib/libarchive/libarchive/archive_ppmd8.c | 7 +- contrib/libarchive/libarchive/archive_private.h | 6 +- contrib/libarchive/libarchive/archive_read.c | 8 +- .../libarchive/archive_read_append_filter.c | 8 +- .../libarchive/archive_read_disk_entry_from_file.c | 1 + .../libarchive/archive_read_disk_posix.c | 2 +- .../libarchive/libarchive/archive_read_extract2.c | 2 +- .../libarchive/libarchive/archive_read_open_fd.c | 2 +- .../libarchive/libarchive/archive_read_open_file.c | 2 +- .../libarchive/archive_read_open_filename.c | 4 +- .../libarchive/archive_read_open_memory.c | 2 +- .../libarchive/archive_read_support_filter_bzip2.c | 4 +- .../archive_read_support_filter_compress.c | 2 +- .../libarchive/archive_read_support_filter_gzip.c | 18 +- .../libarchive/archive_read_support_filter_lz4.c | 6 +- .../libarchive/archive_read_support_filter_lzop.c | 5 +- .../archive_read_support_filter_program.c | 6 +- .../libarchive/archive_read_support_filter_rpm.c | 45 +- .../libarchive/archive_read_support_filter_uu.c | 16 +- .../libarchive/archive_read_support_filter_xz.c | 4 +- .../libarchive/archive_read_support_filter_zstd.c | 4 +- .../libarchive/archive_read_support_format_7zip.c | 93 +- .../libarchive/archive_read_support_format_ar.c | 10 +- .../libarchive/archive_read_support_format_cab.c | 12 +- .../libarchive/archive_read_support_format_cpio.c | 32 +- .../archive_read_support_format_iso9660.c | 305 ++- .../libarchive/archive_read_support_format_lha.c | 11 +- .../libarchive/archive_read_support_format_mtree.c | 2 +- .../libarchive/archive_read_support_format_rar.c | 128 +- .../libarchive/archive_read_support_format_rar5.c | 171 +- .../libarchive/archive_read_support_format_raw.c | 2 +- .../libarchive/archive_read_support_format_tar.c | 2221 +++++++++++++------- .../libarchive/archive_read_support_format_xar.c | 32 +- .../libarchive/archive_read_support_format_zip.c | 45 +- contrib/libarchive/libarchive/archive_string.c | 86 +- contrib/libarchive/libarchive/archive_util.c | 16 +- contrib/libarchive/libarchive/archive_write.c | 19 +- .../archive_write_add_filter_b64encode.c | 6 +- .../libarchive/archive_write_add_filter_bzip2.c | 5 +- .../libarchive/archive_write_add_filter_compress.c | 4 +- .../libarchive/archive_write_add_filter_gzip.c | 3 +- .../libarchive/archive_write_add_filter_uuencode.c | 2 +- .../libarchive/archive_write_add_filter_xz.c | 5 +- .../libarchive/archive_write_add_filter_zstd.c | 3 +- .../libarchive/archive_write_disk_posix.c | 16 +- .../libarchive/libarchive/archive_write_open_fd.c | 2 +- .../libarchive/archive_write_open_file.c | 2 +- .../libarchive/archive_write_open_filename.c | 2 +- .../libarchive/archive_write_open_memory.c | 2 +- .../libarchive/archive_write_set_format_7zip.c | 16 +- .../libarchive/archive_write_set_format_ar.c | 6 +- .../archive_write_set_format_cpio_binary.c | 5 +- .../archive_write_set_format_cpio_newc.c | 2 +- .../libarchive/archive_write_set_format_cpio_odc.c | 5 +- .../libarchive/archive_write_set_format_gnutar.c | 6 +- .../libarchive/archive_write_set_format_iso9660.c | 2 +- .../libarchive/archive_write_set_format_pax.c | 24 +- .../libarchive/archive_write_set_format_raw.c | 2 +- .../libarchive/archive_write_set_format_shar.c | 10 +- .../libarchive/archive_write_set_format_ustar.c | 8 +- .../libarchive/archive_write_set_format_v7tar.c | 4 +- .../libarchive/archive_write_set_format_xar.c | 26 +- .../libarchive/archive_write_set_format_zip.c | 10 +- .../libarchive/test/test_7zip_filename_encoding.c | 100 + contrib/libarchive/libarchive/test/test_ar_mode.c | 40 + .../libarchive/test/test_archive_match_time.c | 60 +- .../libarchive/libarchive/test/test_archive_read.c | 63 + .../test/test_archive_read_multiple_data_objects.c | 23 +- .../libarchive/test/test_archive_string.c | 2 +- .../test/test_archive_string_conversion.c | 135 ++ .../test/test_archive_write_add_filter_by_name.c | 2 +- .../libarchive/libarchive/test/test_compat_lzip.c | 2 +- .../test/test_compat_solaris_pax_sparse.c | 2 +- contrib/libarchive/libarchive/test/test_entry.c | 14 +- .../test/test_gnutar_filename_encoding.c | 102 + .../libarchive/test/test_link_resolver.c | 45 + .../libarchive/test/test_pax_filename_encoding.c | 152 ++ .../test/test_read_filter_gzip_recursive.c | 50 + .../test/test_read_filter_gzip_recursive.gz.uu | 19 + .../libarchive/test/test_read_format_7zip.c | 44 + .../test_read_format_7zip_extract_second.7z.uu | 11 + .../libarchive/test/test_read_format_cpio_afio.c | 30 +- .../libarchive/test/test_read_format_huge_rpm.c | 50 + .../test/test_read_format_huge_rpm.rpm.uu | 244 +++ .../test/test_read_format_iso_3.iso.Z.uu | 40 + .../libarchive/test/test_read_format_iso_Z.c | 122 +- .../libarchive/test/test_read_format_mtree.c | 2 +- .../test/test_read_format_rar4_encrypted.rar.uu | 10 + ...est_read_format_rar4_encrypted_filenames.rar.uu | 14 + .../test_read_format_rar4_solid_encrypted.rar.uu | 11 + ...ad_format_rar4_solid_encrypted_filenames.rar.uu | 13 + .../libarchive/test/test_read_format_rar5.c | 39 +- ...read_format_rar5_data_ready_pointer_leak.rar.uu | 28 + .../test/test_read_format_rar5_encrypted.rar.uu | 12 + ...est_read_format_rar5_encrypted_filenames.rar.uu | 19 + .../test_read_format_rar5_solid_encrypted.rar.uu | 14 + ...ad_format_rar5_solid_encrypted_filenames.rar.uu | 18 + .../test/test_read_format_rar_encryption.c | 176 ++ .../libarchive/test/test_read_format_tar.c | 2 +- .../test/test_read_format_tar_pax_large_attr.c | 65 + .../test_read_format_tar_pax_large_attr.tar.Z.uu | 149 ++ .../libarchive/test/test_read_format_xar.c | 37 +- ..._read_format_xar_duplicate_filename_node.xar.uu | 14 + .../libarchive/test/test_read_format_zip_nested.c | 2 +- ...t_read_format_zip_traditional_encryption_data.c | 2 +- .../test/test_read_format_zip_winzip_aes.c | 2 +- .../test/test_read_format_zip_winzip_aes_large.c | 2 +- .../libarchive/test/test_read_truncated_filter.c | 4 +- .../libarchive/libarchive/test/test_sparse_basic.c | 17 +- .../libarchive/libarchive/test/test_tar_large.c | 2 +- .../libarchive/test/test_ustar_filename_encoding.c | 102 + .../test/test_write_disk_secure_noabsolutepaths.c | 88 + .../libarchive/test/test_write_filter_b64encode.c | 4 +- .../libarchive/test/test_write_filter_bzip2.c | 4 +- .../libarchive/test/test_write_filter_compress.c | 4 +- .../libarchive/test/test_write_filter_gzip.c | 4 +- .../test/test_write_filter_gzip_timestamp.c | 4 +- .../libarchive/test/test_write_filter_lrzip.c | 4 +- .../libarchive/test/test_write_filter_lz4.c | 8 +- .../libarchive/test/test_write_filter_lzip.c | 4 +- .../libarchive/test/test_write_filter_lzma.c | 4 +- .../libarchive/test/test_write_filter_lzop.c | 4 +- .../libarchive/test/test_write_filter_uuencode.c | 4 +- .../libarchive/test/test_write_filter_xz.c | 4 +- .../libarchive/test/test_write_filter_zstd.c | 12 +- .../test/test_write_format_iso9660_filename.c | 2 +- .../libarchive/test/test_write_format_zip.c | 6 +- .../test/test_write_format_zip_entry_size_unset.c | 2 +- .../libarchive/test/test_write_format_zip_large.c | 2 +- .../libarchive/test/test_write_format_zip_stream.c | 5 + .../test/test_write_format_zip_windows_path.c | 100 + .../libarchive/test/test_zip_filename_encoding.c | 95 + contrib/libarchive/tar/bsdtar.1 | 24 +- contrib/libarchive/tar/bsdtar.c | 25 +- contrib/libarchive/tar/bsdtar.h | 22 +- contrib/libarchive/tar/bsdtar_platform.h | 24 +- contrib/libarchive/tar/cmdline.c | 22 +- contrib/libarchive/tar/creation_set.c | 24 +- contrib/libarchive/tar/read.c | 22 +- contrib/libarchive/tar/subst.c | 22 +- contrib/libarchive/tar/test/test.h | 22 +- contrib/libarchive/tar/test/test_0.c | 22 +- contrib/libarchive/tar/test/test_basic.c | 22 +- contrib/libarchive/tar/test/test_copy.c | 58 +- contrib/libarchive/tar/test/test_empty_mtree.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_Z.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_bz2.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_grz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_gz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lrz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lz.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lz4.c | 22 +- .../libarchive/tar/test/test_extract_tar_lzma.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_lzo.c | 22 +- contrib/libarchive/tar/test/test_extract_tar_xz.c | 22 +- .../libarchive/tar/test/test_extract_tar_zstd.c | 22 +- contrib/libarchive/tar/test/test_format_newc.c | 22 +- contrib/libarchive/tar/test/test_help.c | 22 +- contrib/libarchive/tar/test/test_leading_slash.c | 22 +- contrib/libarchive/tar/test/test_missing_file.c | 22 +- contrib/libarchive/tar/test/test_option_C_mtree.c | 30 +- contrib/libarchive/tar/test/test_option_C_upper.c | 22 +- contrib/libarchive/tar/test/test_option_H_upper.c | 40 +- contrib/libarchive/tar/test/test_option_L_upper.c | 40 +- contrib/libarchive/tar/test/test_option_O_upper.c | 22 +- contrib/libarchive/tar/test/test_option_P.c | 82 + contrib/libarchive/tar/test/test_option_T_upper.c | 22 +- contrib/libarchive/tar/test/test_option_U_upper.c | 22 +- contrib/libarchive/tar/test/test_option_X_upper.c | 22 +- contrib/libarchive/tar/test/test_option_a.c | 22 +- contrib/libarchive/tar/test/test_option_acls.c | 22 +- contrib/libarchive/tar/test/test_option_b.c | 22 +- .../libarchive/tar/test/test_option_b64encode.c | 22 +- contrib/libarchive/tar/test/test_option_exclude.c | 22 +- .../libarchive/tar/test/test_option_exclude_vcs.c | 24 +- contrib/libarchive/tar/test/test_option_fflags.c | 24 +- .../libarchive/tar/test/test_option_gid_gname.c | 22 +- contrib/libarchive/tar/test/test_option_group.c | 22 +- contrib/libarchive/tar/test/test_option_grzip.c | 22 +- .../libarchive/tar/test/test_option_ignore_zeros.c | 31 +- contrib/libarchive/tar/test/test_option_j.c | 22 +- contrib/libarchive/tar/test/test_option_k.c | 22 +- .../tar/test/test_option_keep_newer_files.c | 22 +- contrib/libarchive/tar/test/test_option_lrzip.c | 22 +- contrib/libarchive/tar/test/test_option_lz4.c | 22 +- contrib/libarchive/tar/test/test_option_lzma.c | 22 +- contrib/libarchive/tar/test/test_option_lzop.c | 22 +- contrib/libarchive/tar/test/test_option_n.c | 22 +- .../libarchive/tar/test/test_option_newer_than.c | 22 +- contrib/libarchive/tar/test/test_option_nodump.c | 22 +- .../libarchive/tar/test/test_option_older_than.c | 22 +- contrib/libarchive/tar/test/test_option_owner.c | 22 +- .../libarchive/tar/test/test_option_passphrase.c | 22 +- contrib/libarchive/tar/test/test_option_q.c | 22 +- contrib/libarchive/tar/test/test_option_r.c | 22 +- contrib/libarchive/tar/test/test_option_s.c | 22 +- .../libarchive/tar/test/test_option_safe_writes.c | 22 +- .../libarchive/tar/test/test_option_uid_uname.c | 22 +- contrib/libarchive/tar/test/test_option_uuencode.c | 22 +- contrib/libarchive/tar/test/test_option_xattrs.c | 24 +- contrib/libarchive/tar/test/test_option_xz.c | 22 +- contrib/libarchive/tar/test/test_option_z.c | 22 +- contrib/libarchive/tar/test/test_option_zstd.c | 22 +- contrib/libarchive/tar/test/test_patterns.c | 22 +- contrib/libarchive/tar/test/test_print_longpath.c | 22 +- contrib/libarchive/tar/test/test_stdio.c | 22 +- .../libarchive/tar/test/test_strip_components.c | 22 +- contrib/libarchive/tar/test/test_symlink_dir.c | 22 +- contrib/libarchive/tar/test/test_version.c | 22 +- contrib/libarchive/tar/util.c | 42 +- contrib/libarchive/tar/write.c | 35 +- contrib/libarchive/test_utils/test_common.h | 5 +- contrib/libarchive/test_utils/test_main.c | 101 +- contrib/libarchive/unzip/bsdunzip.1 | 25 +- contrib/libarchive/unzip/bsdunzip.c | 49 +- contrib/libarchive/unzip/bsdunzip.h | 22 +- contrib/libarchive/unzip/bsdunzip_platform.h | 24 +- contrib/libarchive/unzip/cmdline.c | 22 +- contrib/libarchive/unzip/la_getline.c | 26 +- contrib/libarchive/unzip/test/test.h | 22 +- contrib/libarchive/unzip/test/test_0.c | 22 +- contrib/libarchive/unzip/test/test_C.c | 23 +- contrib/libarchive/unzip/test/test_I.c | 40 +- contrib/libarchive/unzip/test/test_L.c | 23 +- contrib/libarchive/unzip/test/test_P_encryption.c | 25 +- contrib/libarchive/unzip/test/test_Z1.c | 23 +- contrib/libarchive/unzip/test/test_basic.c | 23 +- contrib/libarchive/unzip/test/test_d.c | 23 +- contrib/libarchive/unzip/test/test_doubledash.c | 23 +- contrib/libarchive/unzip/test/test_glob.c | 23 +- contrib/libarchive/unzip/test/test_j.c | 23 +- contrib/libarchive/unzip/test/test_n.c | 25 +- contrib/libarchive/unzip/test/test_not_exist.c | 25 +- contrib/libarchive/unzip/test/test_o.c | 25 +- contrib/libarchive/unzip/test/test_p.c | 23 +- contrib/libarchive/unzip/test/test_q.c | 23 +- contrib/libarchive/unzip/test/test_singlefile.c | 23 +- contrib/libarchive/unzip/test/test_t.c | 23 +- contrib/libarchive/unzip/test/test_t_bad.c | 23 +- contrib/libarchive/unzip/test/test_version.c | 22 +- contrib/libarchive/unzip/test/test_x.c | 23 +- lib/libarchive/tests/Makefile | 24 + usr.bin/cpio/tests/Makefile | 1 + usr.bin/tar/tests/Makefile | 1 + 343 files changed, 5857 insertions(+), 5333 deletions(-) diff --git a/contrib/libarchive/NEWS b/contrib/libarchive/NEWS index ebdbb2a978ec..6af50e4e4033 100644 --- a/contrib/libarchive/NEWS +++ b/contrib/libarchive/NEWS @@ -1,3 +1,9 @@ +Oct 13, 2024: libarchive 3.7.7 released + +Sep 23, 2024: libarchive 3.7.6 released + +Sep 13, 2024: libarchive 3.7.5 released + Apr 26, 2024: libarchive 3.7.4 released Apr 08, 2024: libarchive 3.7.3 released diff --git a/contrib/libarchive/cat/bsdcat.1 b/contrib/libarchive/cat/bsdcat.1 index 9fa66d60e1e6..b34a0c1c988d 100644 --- a/contrib/libarchive/cat/bsdcat.1 +++ b/contrib/libarchive/cat/bsdcat.1 @@ -1,26 +1,8 @@ -.\" Copyright (c) 2011-2014, Mike Kazantsev -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" 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. +.\" Copyright (c) 2011-2014, Mike Kazantsev +.\" All rights reserved. .\" .Dd March 1, 2014 .Dt BSDCAT 1 @@ -39,7 +21,7 @@ expands files to standard output. .Nm typically takes a filename as an argument or reads standard input when used in a pipe. -In both cases decompressed data it written to standard output. +In both cases decompressed data is written to standard output. .Sh EXAMPLES To decompress a file: .Pp diff --git a/contrib/libarchive/cat/bsdcat.c b/contrib/libarchive/cat/bsdcat.c index 19d3de65cea4..731621fa9b75 100644 --- a/contrib/libarchive/cat/bsdcat.c +++ b/contrib/libarchive/cat/bsdcat.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2011-2014, Mike Kazantsev * 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(S) ``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(S) 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 "bsdcat_platform.h" diff --git a/contrib/libarchive/cat/bsdcat.h b/contrib/libarchive/cat/bsdcat.h index 504757a44040..6726f78e8453 100644 --- a/contrib/libarchive/cat/bsdcat.h +++ b/contrib/libarchive/cat/bsdcat.h @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014, Mike Kazantsev * 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(S) ``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(S) 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. */ #ifndef BSDCAT_H_INCLUDED diff --git a/contrib/libarchive/cat/bsdcat_platform.h b/contrib/libarchive/cat/bsdcat_platform.h index 78a6113e6f01..940214f2ecd6 100644 --- a/contrib/libarchive/cat/bsdcat_platform.h +++ b/contrib/libarchive/cat/bsdcat_platform.h @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2007 Tim Kientzle * 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(S) ``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(S) 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. */ /* @@ -58,7 +40,7 @@ #define __LA_NORETURN __attribute__((__noreturn__)) #elif defined(_MSC_VER) #define __LA_NORETURN __declspec(noreturn) -#else +#else #define __LA_NORETURN #endif diff --git a/contrib/libarchive/cat/cmdline.c b/contrib/libarchive/cat/cmdline.c index 851b63de06e5..8ecd74aa95e4 100644 --- a/contrib/libarchive/cat/cmdline.c +++ b/contrib/libarchive/cat/cmdline.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2008 Tim Kientzle * 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(S) ``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(S) 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. */ /* diff --git a/contrib/libarchive/cat/test/test.h b/contrib/libarchive/cat/test/test.h index ec83d476b6b8..b852437ca430 100644 --- a/contrib/libarchive/cat/test/test.h +++ b/contrib/libarchive/cat/test/test.h @@ -1,26 +1,8 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2006 Tim Kientzle * 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(S) ``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(S) 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. */ /* Every test program should #include "test.h" as the first thing. */ diff --git a/contrib/libarchive/cat/test/test_0.c b/contrib/libarchive/cat/test/test_0.c index c806c24356c0..07f5fc60cf35 100644 --- a/contrib/libarchive/cat/test/test_0.c +++ b/contrib/libarchive/cat/test/test_0.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2003-2007 Tim Kientzle * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_gz.c b/contrib/libarchive/cat/test/test_empty_gz.c index 6181f93b4d28..0ca835627bf5 100644 --- a/contrib/libarchive/cat/test/test_empty_gz.c +++ b/contrib/libarchive/cat/test/test_empty_gz.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Sebastian Freundt * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_lz4.c b/contrib/libarchive/cat/test/test_empty_lz4.c index 9d98e9cfd390..ed4f2894fb4f 100644 --- a/contrib/libarchive/cat/test/test_empty_lz4.c +++ b/contrib/libarchive/cat/test/test_empty_lz4.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Sebastian Freundt * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_xz.c b/contrib/libarchive/cat/test/test_empty_xz.c index 368ffb574e50..591ab2410ce4 100644 --- a/contrib/libarchive/cat/test/test_empty_xz.c +++ b/contrib/libarchive/cat/test/test_empty_xz.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Sebastian Freundt * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_empty_zstd.c b/contrib/libarchive/cat/test/test_empty_zstd.c index c2d5ea106fa1..b0f25bf1cacd 100644 --- a/contrib/libarchive/cat/test/test_empty_zstd.c +++ b/contrib/libarchive/cat/test/test_empty_zstd.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Sean Purcell * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_error.c b/contrib/libarchive/cat/test/test_error.c index 918af01be2dc..3e1a74a38820 100644 --- a/contrib/libarchive/cat/test/test_error.c +++ b/contrib/libarchive/cat/test/test_error.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_error_mixed.c b/contrib/libarchive/cat/test/test_error_mixed.c index 7d94fce467aa..01cb9f0520dd 100644 --- a/contrib/libarchive/cat/test/test_error_mixed.c +++ b/contrib/libarchive/cat/test/test_error_mixed.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_Z.c b/contrib/libarchive/cat/test/test_expand_Z.c index d48d4972ebee..f34f38ce0385 100644 --- a/contrib/libarchive/cat/test/test_expand_Z.c +++ b/contrib/libarchive/cat/test/test_expand_Z.c @@ -1,26 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_bz2.c b/contrib/libarchive/cat/test/test_expand_bz2.c index 82f074b341c8..8f3bb3f24a46 100644 --- a/contrib/libarchive/cat/test/test_expand_bz2.c +++ b/contrib/libarchive/cat/test/test_expand_bz2.c @@ -1,27 +1,9 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * Copyright (c) 2012 Michihiro NAKAJIMA * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_gz.c b/contrib/libarchive/cat/test/test_expand_gz.c index 18b715c66ebb..1f6f1cfddbac 100644 --- a/contrib/libarchive/cat/test/test_expand_gz.c +++ b/contrib/libarchive/cat/test/test_expand_gz.c @@ -1,27 +1,9 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * Copyright (c) 2012 Michihiro NAKAJIMA * 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(S) ``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(S) 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 "test.h" diff --git a/contrib/libarchive/cat/test/test_expand_lz4.c b/contrib/libarchive/cat/test/test_expand_lz4.c index 1b1d2106459d..efc2baad59ed 100644 --- a/contrib/libarchive/cat/test/test_expand_lz4.c +++ b/contrib/libarchive/cat/test/test_expand_lz4.c @@ -1,27 +1,9 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Mike Kazantsev * Copyright (c) 2012, 2014 Michihiro NAKAJIMA * 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(S) ``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(S) BE LIABLE FOR ANY DIRECT, INDIRECT, *** 18475 LINES SKIPPED *** From nobody Sun Oct 27 10:51: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 4Xbtcm6C8mz5Zf8G; Sun, 27 Oct 2024 10:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbtcm59Srz4m7b; Sun, 27 Oct 2024 10:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHyhjGTFKg1sMh18Rak5wL8Alzsi3N5WWbIqoYL7NzM=; b=IsulLeGmQQZr8aDyYyZ+zQRgs9olm7+7bToS1umwXDhMwShv95KS0vaZGpU/45zQur/0h9 mh5kF/R90NDuQVBTvbpg9MB2+8dNoQiecFtH0p1wg4ISL84CwNS872yp61Q8Gh2TclPKrh GW5c72WYOwTDY29q6wHj1amnQkJ+IRQKKgn2SO4SyCYRpkDrMii6tBSjttKBVkE2gFyvR4 xMjj4yG/yGLQ05DQ0SZNHAf2b3y82o+HbU3M7TsdorC6udOrM7/4HmdvwTC7Izs9B5HKeO j+jdxYCBUC29b4xK2X6LVv30J+QsxaVRHzmcH3BzsU8o2qUvM+cdAqynFlJg9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHyhjGTFKg1sMh18Rak5wL8Alzsi3N5WWbIqoYL7NzM=; b=nXygpekQatn8YYcR+Oz1yFgbyFYGpeoY/EESFRC4ZUYAcij4LSaxg1qBskyunE62YFUK3x FoJ13ZYoyCKCFj9gEsrtcR+X7wf1/DHSJF3qhLkHnossR63yq6SLsEYxJ+PFFBSxSpDklK aLCTeONXlbY5lyp+jLvibqCPoEB/CA0ew6ZCE6n3e/2rOzT+hnpkszd45Ww34D+nDfw3+d l1VgNr4OkUQyWj8IUdR+FnAhfcdtHCDRmPFF/+H9vsJUgLkRhaExxpxS1sd1fYpiV15giG wMGTuerOnY41dIzJj+PUL0DD9cqpLq/tZnEmEvZBUW2HEJt1lKPqQV10d9Rj7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026312; a=rsa-sha256; cv=none; b=QBlWT4ydxWIjW/QathkrpU4SoI1DwR3KEQd7Xw/H1NgIoqwHE/4EhsZUot1U2tt7tyBO6v qNiS3fdW3U0T+EEVsFHBVXQi3SYEsyPgCSMjLapouKUrA4m+K0pmkTX9Pn7wxC2G8ZDYBT iLEi/RO+QIxyyDXWx5Po6dXD1SPogFaRFq95wwQXIiADqN40580lBCqG+W9KYoYjEztUxW YgkNCogh59FTmpJk24kVsKhAYUo7gRcUk0ARZHAlkvxgPuUUF9r8M6UC97MLF6BmCXHOrq 9tWCFrOK2fxq5WDMFIdSFKyg3mcPP3Wmsz1l1QXGSKfMHHFm3G68Y5jY6HZf1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xbtcm4mJ3zrgf; Sun, 27 Oct 2024 10:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RApqsf002331; Sun, 27 Oct 2024 10:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RApqAI002317; Sun, 27 Oct 2024 10:51:52 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:51:52 GMT Message-Id: <202410271051.49RApqAI002317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 120e685333d8 - stable/13 - libarchive: backport PR #2386 (fixes output of one 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 120e685333d806d184bb2c7b33420c5fed6cd13e Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=120e685333d806d184bb2c7b33420c5fed6cd13e commit 120e685333d806d184bb2c7b33420c5fed6cd13e Author: Martin Matuska AuthorDate: 2024-10-21 12:35:18 +0000 Commit: Martin Matuska CommitDate: 2024-10-27 09:43:16 +0000 libarchive: backport PR #2386 (fixes output of one test) (cherry picked from commit 6c40282284d6eab20256914648cdec39acb2c52a) --- contrib/libarchive/tar/test/test_option_P.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libarchive/tar/test/test_option_P.c b/contrib/libarchive/tar/test/test_option_P.c index e63da3e0875c..953d9f58991c 100644 --- a/contrib/libarchive/tar/test/test_option_P.c +++ b/contrib/libarchive/tar/test/test_option_P.c @@ -55,7 +55,7 @@ DEFINE_TEST(test_extract_tar_absolute_paths) UNLINK(temp_absolute_file_name); // Extracting the archive without -P / --absolute-paths should strip leading drive letter or slash - r = systemf("%s -xf test.tar", testprog); + r = systemf("%s -xf test.tar 2>test.err", testprog); assertEqualInt(r, 0); assertFileNotExists(temp_absolute_file_name); From nobody Sun Oct 27 10:56: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 4XbtkF0sBxz5ZfDc; Sun, 27 Oct 2024 10:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbtkF08YVz4mdq; Sun, 27 Oct 2024 10:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Ua9qc9eL8lzNN8I15ODUWJxtTCiqjXfC+5aa+nT6cs=; b=GziNZK2ZSgtLa3FQsRJ2LznHf68IeAyLCX0pRmVBEDyXKg3ps4/h7MhnOK80w6L4BZChL4 VaKt9oTk4tQ9vcCBhgZ2MN2zS9iHha2n/nc49TLdwXl6omwvzpPZZv4DgTynC/W/qoQ7M6 546fj77+T1+9Zd6T6k9IHGME7WhQovI2KB6RCELNA63t2OuNK0UWf8yiTqNiipE7iM+4+N Tmd0sSJVYwI0Xe/oPA8bqKi4361Bj2Vq6OG/fG6tPGjd+AbsUC57SdhrjLQLK/21MjZv16 LWOvlLXnATrS+nU0amWmMu+f332fk+fRgjQbsk7GTGMUo0qBOJc1Q6T3vEYiyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Ua9qc9eL8lzNN8I15ODUWJxtTCiqjXfC+5aa+nT6cs=; b=cwm+lP2iJMy/rgTB2Y/n9UMTeD/L1nPMltuGWeP4HHDvht03Vxygmalku7jflRsHXb0mXx 3X/jhMQR/+M3AQIktHdOZNbcOlZLbTT2HRnxurpWm3oZ8gn6uy/3thEyO5n58/gh0k4cPx koh3BKjkQveLwDbQQdDh901q61319uRplCHxcuV/2WRP1BWNZCj8Km1Sezp7HXaZh1ZREe gVxrf/ZXvC/OQZEgUMICRMDwxcZrmZdjTUNLyBg+nO7l0Re7B6ooh2LKI3IrY7qEWaY9qm QCJhB1WfER9Uy02ZdWMnKukNQ5cixJ42BSmeuwm0bmAE/T9o0LHej+Z+8zrzGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026597; a=rsa-sha256; cv=none; b=bjeNsnnDehidfnH0UaKnPHQJYZb3Lh6Ky9Xx1BZ7jCOaC91XdSqQ6xos8zbqAWNS2dADF9 UoiubX7TMZRjLufqQATdtnvow8uBgQFg8xl4HQw+6RukQXry48uFCY3P3zoplVPcgvdAIN TiuCWBU3qiHoYEL+0BW80i85th2Yw6CSTld0wEDEGrd1VYpJNvXYwqcWQC7YlEnNN5uyUy klAXByGMhbzp7M7wATgnV0roUH5U/o7FkgVWTp17ZZa0guQtiHoPA58UTwOUOs7/c6kWZU OryfaE6pVXJMCD0bRYwUXV8rEzXQN8X04WY6uZ/t/4iGYonNeFDiZRdD9bNsiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbtkD6jjtzrf7; Sun, 27 Oct 2024 10:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RAuaUF008060; Sun, 27 Oct 2024 10:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RAuaFi008058; Sun, 27 Oct 2024 10:56:36 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:56:36 GMT Message-Id: <202410271056.49RAuaFi008058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7905f6f1c7e9 - stable/14 - Fix enum warning in ath_hal's ar9002 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7905f6f1c7e948350fab2195ddf64f37fc3e1d5e Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7905f6f1c7e948350fab2195ddf64f37fc3e1d5e commit 7905f6f1c7e948350fab2195ddf64f37fc3e1d5e Author: Dimitry Andric AuthorDate: 2024-07-31 09:43:50 +0000 Commit: Dimitry Andric CommitDate: 2024-10-27 10:53:01 +0000 Fix enum warning in ath_hal's ar9002 This fixes a clang 19 warning: sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare] 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is set to `AH_TRUE` whenever the related field `ah_antControl` is set to `HAL_ANT_VARIABLE`. It is not entirely clear to me what the intended statement is here: the test as it is written now compares the enum value 0 to `ah_diversity`, so in effect it enables the following block whenever `ah_diversity` is `AH_TRUE`. Write it like that, to avoid the compiler warning. MFC after: 3 days (cherry picked from commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822) --- sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c index 01a224cbbfe9..fb2700771ffa 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c @@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || - (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { + (AH5212(ah)->ah_diversity == AH_TRUE)) { if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { /* Enable antenna diversity */ From nobody Sun Oct 27 10:56: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 4XbtkG2Lpwz5ZfvS; Sun, 27 Oct 2024 10:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XbtkG1rGVz4msp; Sun, 27 Oct 2024 10:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZTSE4xiITkFBFKM96lycZIpNLZc1ws2a/mJ4aeRRGI=; b=oS8YgHIiFWD3xiAdrpPdLjZe8AHVoF9FOr+6+lQpMsUO+1VDRU+cvzmdWqHVt+uW+zRi6v GKhw/345zhZGwwYl2T+niIXpTQQqHLGFvb5VpcXAId79Sb0+rF/OCguGUNlIZrlhxDG0pu N/XoKQmjFNmSskyHD5BlRk4N6V99Ex7PmY7S8qm+0z0h5QKraU8cCHs4zTz6a+g+mljiEB b9CN8ZkvU27rDtFTN4vmouOkCCWA0eVagU0Zf53P/E/gMYYN3PtWVSDt9DJGVB0YUeZY05 xT065zabbZiu2gciwgAe51nCnCiLiphCCRCcLxO47Rb8YFyYJsXNECPX2ysBPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZTSE4xiITkFBFKM96lycZIpNLZc1ws2a/mJ4aeRRGI=; b=oGlWLUWWW745uCcxDpnAl6t1dqV1DHQAR8UyR9Axh5Tax0n+YlmYjliX9zHagfnJN1zyPJ mtpZOg4k10J6INogqN8tFo7uOvoPq+piq/omTJIteh5jLTIxh3lduLr7hqKk/WDkTWAIpW M9f+xl/Uqn7rAm6GwG3KI3da4IKqQEsk63/X4nPnW2cWUYzm64uk42Gr3RNKjHnhQhzysf betUQy0MylLugVdqwegGsmpYW11fafb7utygifXwv+1sEe12Iui7yUpWHlaMcgTTFJzmw0 qPX2al5WVFkKpiRzKIV0x9iKhFkN7F52RbRb3mpNmyNj4OcZXdiJ0cvZ5Hdf3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026598; a=rsa-sha256; cv=none; b=InUKsSjIS0dGtinyHhbkKkeTLZlJqng4ooTqLV8DxRsCKi/uAKE9JOjFcNLfOZ+Ty1+Fjn GCnYFIhqX0YpSlueMy/RXcdTVBwGRq+0CnOsJH/fiX3tdjGVKyHMF/FF7vHP2kF5FZrpzN eKwzYRbIXSHW9wCcsllrlcs3frPboAcr2kzPg0kWDQnGAKEp7yD8aXdeYI/28WRW7WdKFR fzDNd6d+HUGhpz1fnTiEULOFCiHE9jGwDpW6bG3jUjnL4q6wV5pI9WEM8TQft2KgPoi1px JJ3U7iNTRQmLoBgzDpxRCxY50FAciAiDwxLMpKKo6GtAYkB6uXrhXK2v7Yp6Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XbtkG0Zvkzrw1; Sun, 27 Oct 2024 10:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RAubBr008118; Sun, 27 Oct 2024 10:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RAubt3008115; Sun, 27 Oct 2024 10:56:37 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:56:37 GMT Message-Id: <202410271056.49RAubt3008115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 6fb9a8e75844 - stable/14 - Fix buildworld with gcc 13 after llvm-19 import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6fb9a8e758449b2b5502b18a1c43f54688830bc8 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6fb9a8e758449b2b5502b18a1c43f54688830bc8 commit 6fb9a8e758449b2b5502b18a1c43f54688830bc8 Author: Dimitry Andric AuthorDate: 2024-10-24 21:42:36 +0000 Commit: Dimitry Andric CommitDate: 2024-10-27 10:53:18 +0000 Fix buildworld with gcc 13 after llvm-19 import It turns out the new libc++ 19 headers result in a -Werror warning from gcc 13: In file included from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/shared_ptr.h:31: /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/uninitialized_algorithms.h: In instantiation of 'constexpr void std::__1::__uninitialized_allocator_relocate(_Alloc&, _Tp*, _Tp*, _Tp*) [with _Alloc = allocator >; _Tp = basic_string]': /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/vector:1052:42: required from 'void std::__1::vector<_Tp, _Alloc>::__swap_out_circular_buffer(std::__1::__split_buffer<_Tp, _Allocator&>&) [with _Tp = std::__1::basic_string; _Allocator = std::__1::allocator >]' /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/vector:1469:31: required from 'void std::__1::vector<_Tp, _Alloc>::reserve(size_type) [with _Tp = std::__1::basic_string; _Allocator = std::__1::allocator >; size_type = long unsigned int]' /usr/src/freebsd/src/contrib/googletest/googletest/src/gtest.cc:795:27: required from here /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/uninitialized_algorithms.h:645:21: error: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing to an object of type 'std::__1::__remove_const_t >' {aka 'class std::__1::basic_string'} with no trivial copy-assignment; use copy-assignment or copy-initialization instead o[-Werror=class-memaccess] 645 | __builtin_memcpy(const_cast<__remove_const_t<_Tp>*>(__result), __first, sizeof(_Tp) * (__last - __first)); | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__system_error/error_category.h:15, from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__system_error/error_code.h:18, from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:16: /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/string:752:7: note: 'std::__1::__remove_const_t >' {aka 'class std::__1::basic_string'} declared here 752 | class basic_string { | ^~~~~~~~~~~~ Since this is all benign, turn off errors for -Wclass-memaccess. PR: 280562 MFC after: 3 days (cherry picked from commit a3a88aa132605c5d42153a419c0e129296dec467) --- share/mk/bsd.sys.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 7d0e632973e4..a1be8a8a2225 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -217,6 +217,7 @@ CWARNFLAGS+= -Wno-error=aggressive-loop-optimizations \ -Wno-error=restrict \ -Wno-error=sizeof-pointer-memaccess \ -Wno-error=stringop-truncation +CXXWARNFLAGS+= -Wno-error=class-memaccess .endif # GCC 9.2.0 From nobody Sun Oct 27 10:59: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 4Xbtn45R76z5ZfsC; Sun, 27 Oct 2024 10:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbtn44qCDz4nN6; Sun, 27 Oct 2024 10:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zg7/CWe0LMso/9Bj5xiHwyLXvpYMFKhMnaytlLXcx+U=; b=ZmlKYA5KAxxhDfdapPYlEdYW88Y4I3a1uhjIcM2ItbMJrBYG34rvXoO9KIkesR/q4ACyNV et1y+2dwCyNBOiFxjCRX4RAXCMUgcGt/IkQNxS9PLrUI0DhHtq7VztjpuQHB1wznzcBrfx zDRb/8t8PMUIYbNoXrvmxhGmMCVQtkt0U4Bh7vLUPq4DLtByMVizk694reJ6ouO1DxpaDi jQKDiNjbIv3M4jYbZDpJMeZT5C0cac6+ejeBviu/0wqWmpEGAwougJPM3ZTHUHZoi25OoY 71Jt/rdJdrwd35dR06sTUkPW3kMihBNK7oSBQw1bic2/jkHPZUGTRHo/x5Sstg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zg7/CWe0LMso/9Bj5xiHwyLXvpYMFKhMnaytlLXcx+U=; b=jSaCfhh/T/m8MPZFYw/mgNKAdbPJQMVrCvzvBFEuHpouBjTgwDoe0JbVQxEsZU5Z7YM0PQ FVCbLH6v/Ps95R3YBuhhJme2X0mRiSwhm73ya2Dt8jp2XaCw51rzOA7OEIJPKY0zaylJWq TJiMHLmen9zo6XY/lXRUqUSxfaYnh6a3F0Tl+ONni9wmsCFTYwFMW4cxJa53EKDXhr3UYh yKlpg3Kl5yfjyH9dtdXb5a55cbE8deVbXZsUPdj4CKOX3m7Sld/ZO6Nxgd9pXTYBEg38bm 61SlNnK+2JsFpOth/Ejty+AnuxrVVGD9BWQ7AWjqtGngeYoQu1n9rGR8zRGoYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026744; a=rsa-sha256; cv=none; b=Ks75pCFf3sgAS0GCAHYq1QSY6JPoZinBcol1vhftRqovXG4Xzz0QGRWEZUKC0FBHYVhNtx NN3DZ2Or51ugVo/o6v0i/C9vFPs28Qxlyvl3mHXyVt/C2uigBuI1Vm7aQU2olmvrXYxqMA ewyu73YlnogGl/t/OxaHxmaulH+m0hGFxmWRvSLw2agPJzQKo5vyvtPg7Pmr/W8xIe/4Ck ZZnDzLT895B/aWzxoXH/k65hOki562qP+HpSFJkHjx995n9z6vubc8LRePv7JZjl5ax9f6 4zriEzuH8NSJ8OR9ZT/p1SUuXN3ByaFykYYgRQEZj9AKPbQFbwBrmaYvAPmzJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xbtn44DpLzr9l; Sun, 27 Oct 2024 10:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RAx4x4008981; Sun, 27 Oct 2024 10:59:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RAx4Y3008978; Sun, 27 Oct 2024 10:59:04 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:59:04 GMT Message-Id: <202410271059.49RAx4Y3008978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3ecf2aa39a5a - stable/13 - Fix enum warning in ath_hal's ar9002 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ecf2aa39a5a3fc32012d4cfc3da45a97ce94c91 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3ecf2aa39a5a3fc32012d4cfc3da45a97ce94c91 commit 3ecf2aa39a5a3fc32012d4cfc3da45a97ce94c91 Author: Dimitry Andric AuthorDate: 2024-07-31 09:43:50 +0000 Commit: Dimitry Andric CommitDate: 2024-10-27 10:58:36 +0000 Fix enum warning in ath_hal's ar9002 This fixes a clang 19 warning: sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare] 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is set to `AH_TRUE` whenever the related field `ah_antControl` is set to `HAL_ANT_VARIABLE`. It is not entirely clear to me what the intended statement is here: the test as it is written now compares the enum value 0 to `ah_diversity`, so in effect it enables the following block whenever `ah_diversity` is `AH_TRUE`. Write it like that, to avoid the compiler warning. MFC after: 3 days (cherry picked from commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822) --- sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c index 01a224cbbfe9..fb2700771ffa 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c @@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || - (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { + (AH5212(ah)->ah_diversity == AH_TRUE)) { if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { /* Enable antenna diversity */ From nobody Sun Oct 27 10:59: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 4Xbtn60Jtdz5ZfpQ; Sun, 27 Oct 2024 10:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbtn5689Nz4nLJ; Sun, 27 Oct 2024 10:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gykHNhzQP2jn/VPj3/8Ki2i9TP0tIt3rEqaJIX6BfjI=; b=liwyIEyRXGbW0rBgV4FWtay69jYzdPpEDM2+OVSbpa6RHs0TmeG2N4f06dEMb//dO/FppX WLJRWGJdxSpP7k021W3sf0bwWDjfCr3enNs/aYyMufy7xlmKGa5qTLkkb6lfj2r8eOTPVQ +fKbRJM848CVd6oah9lRZNwwi0IrsLn9FRtHCABz3wQ+HJUUGLMTRpxGeU4txaqSLFJ8eo TaDSMqIDulDZ4m4XMQtIgFeP0eEyO3Pddy5By4BfvWBw7tbJHMuXE2agI9aj65LHyY/t5Z CpJYv49HshOSIyVuQ5qCE55tuSghYu6zwjp2GZoS4dsLzmyU6gkYyR2KoXSVwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730026745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gykHNhzQP2jn/VPj3/8Ki2i9TP0tIt3rEqaJIX6BfjI=; b=lNWVy6hatXhLb+stfcCSqbS1q2iQ0RQ6gxBDVaGKqsdrUDgrOZdAexW6Z+KHjf9NB5jSbx KmIpkInvtDicN/OpENnqjWpEVR+ujnZuUt9NihXkHsWpt8yAmiG4pdqDnLyLREZh8pC/Pw ZWFJtFjw2FLYT99ReSAFn34vLoDLuOxcgaod8i9xos0TexZtUPqZj7gm0zmoEHYaelHtru vBBlrlehYzqm8CmWpde2ixvyFQI6V4HkYPJUlMFNAEiDbBn8xpPUWUIbXyvc7fBIP1PFa0 1dySR6iSf55/ncrPv/RxIyct3GKejJ7ILgODHU/eE/xI/Vdz5v6jA2l+lt1WFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730026745; a=rsa-sha256; cv=none; b=dPrEHaGSEZbFtZVL20RwjhOMwgySAEluK31pvY40a0jgfDNJBheQYxZxE9vPggeucZWwKQ 1IsWMBYcEwBxau2PoaBuenmdMR/qcAcxQ4AkXs5wnIPm2NRYsybg+w37Muzr469mQaV+PR ZoERw7fi05R1X2dI2u2R7Uie7S+ze1wycu36mBa+/HYtr5OwLz7o/w1hynSXYLlfGgG8mz OjGWCwVgzb/IPvVS4aszjBuCUY81xiH3yqjPHTpLToOMIt5Z5OMTYuekQ38Fd7T8Hl1fDI 9NUPmS+sVak8WrRj7tT/2XQMCfpNuM3kA6p0tG2GC0/BbLL5Uuf+Hma6QXPDOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xbtn55Ykpzrc6; Sun, 27 Oct 2024 10:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RAx5ha009033; Sun, 27 Oct 2024 10:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RAx5ZA009030; Sun, 27 Oct 2024 10:59:05 GMT (envelope-from git) Date: Sun, 27 Oct 2024 10:59:05 GMT Message-Id: <202410271059.49RAx5ZA009030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 737111920ce3 - stable/13 - Fix buildworld with gcc 13 after llvm-19 import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 737111920ce3ccd82d93af765e38e51f3a2d359d Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=737111920ce3ccd82d93af765e38e51f3a2d359d commit 737111920ce3ccd82d93af765e38e51f3a2d359d Author: Dimitry Andric AuthorDate: 2024-10-24 21:42:36 +0000 Commit: Dimitry Andric CommitDate: 2024-10-27 10:58:37 +0000 Fix buildworld with gcc 13 after llvm-19 import It turns out the new libc++ 19 headers result in a -Werror warning from gcc 13: In file included from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/shared_ptr.h:31: /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/uninitialized_algorithms.h: In instantiation of 'constexpr void std::__1::__uninitialized_allocator_relocate(_Alloc&, _Tp*, _Tp*, _Tp*) [with _Alloc = allocator >; _Tp = basic_string]': /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/vector:1052:42: required from 'void std::__1::vector<_Tp, _Alloc>::__swap_out_circular_buffer(std::__1::__split_buffer<_Tp, _Allocator&>&) [with _Tp = std::__1::basic_string; _Allocator = std::__1::allocator >]' /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/vector:1469:31: required from 'void std::__1::vector<_Tp, _Alloc>::reserve(size_type) [with _Tp = std::__1::basic_string; _Allocator = std::__1::allocator >; size_type = long unsigned int]' /usr/src/freebsd/src/contrib/googletest/googletest/src/gtest.cc:795:27: required from here /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__memory/uninitialized_algorithms.h:645:21: error: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' writing to an object of type 'std::__1::__remove_const_t >' {aka 'class std::__1::basic_string'} with no trivial copy-assignment; use copy-assignment or copy-initialization instead o[-Werror=class-memaccess] 645 | __builtin_memcpy(const_cast<__remove_const_t<_Tp>*>(__result), __first, sizeof(_Tp) * (__last - __first)); | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__system_error/error_category.h:15, from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__system_error/error_code.h:18, from /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:16: /usr/obj/usr/src/freebsd/src/amd64.amd64/tmp/usr/include/c++/v1/string:752:7: note: 'std::__1::__remove_const_t >' {aka 'class std::__1::basic_string'} declared here 752 | class basic_string { | ^~~~~~~~~~~~ Since this is all benign, turn off errors for -Wclass-memaccess. PR: 280562 MFC after: 3 days (cherry picked from commit a3a88aa132605c5d42153a419c0e129296dec467) --- share/mk/bsd.sys.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index e1afc641cdaa..83d3004adf90 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -221,6 +221,7 @@ CWARNFLAGS+= -Wno-error=aggressive-loop-optimizations \ -Wno-error=restrict \ -Wno-error=sizeof-pointer-memaccess \ -Wno-error=stringop-truncation +CXXWARNFLAGS+= -Wno-error=class-memaccess .endif # GCC 9.2.0 From nobody Sun Oct 27 14:02: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 4Xbyrj73rMz5b4rK; Sun, 27 Oct 2024 14:02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xbyrj6M1lz45cF; Sun, 27 Oct 2024 14:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730037749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m50Xj3/UDWJaXQQDYiUzqzGnXLxSkEYVsVGbY1CCeNA=; b=Zdrywr+cQyP6x1ICEEVOuqxV68HGPZobFaXm18FIkTOTK6ikv64J0F4ebOkB5OLLDr2y5f u3Dcbr6jaLCnPXkHxv7+dG2soqjtzgX9ah/Ir3p8K+EdHTAtTkqRWN07yI+p6up+EyHzVf kMeq78epjuQVi3+sghy8GOCdzFj4Cifnyj5irWvjoExXRcwGHPiILN5cETLdhtEwE9MvGi OD74srgslWlBLJysAU6VgLyFdlRH36lce2QmZXXcsspex6RzmNNDecWrzriOxtfUWjiAer ohkTeTjABgVM6iR3bOnvhY2P5pAfek2SaRVQO5i8kNW5nmxp7/f5FUN5a/AR9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730037749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m50Xj3/UDWJaXQQDYiUzqzGnXLxSkEYVsVGbY1CCeNA=; b=a/2nAdG9+A4S6eD6dNY6nmRm2RqszIqXJ6K3TysXXwOW6olq28stTpRzQ9W9d/sCn4lZcO J8xnQ7j5gpttAdwRZ1wrezaouvzDux7rW/WWHra8VYupDSWxxNDl96ZS2cO5DD7SbRveRU WJ3WC7igJAZz5d0+iL6BEWh4/yJmgJpmuD5tXjMCsOZlZkTUUmWFObDRwEQ2a0us5722DW KnJIhOM35sFlOLz8GccJZT5Y0lGeC/NCc46xw4m5M/70Iq0nMb8LghtopbbB7fMd50BzFA pLSgbD2fm1vJHLmJXWNsVpW1bJy0c2HK7w5SaiBbf+4aP5gvOSlbNJC3RNP5Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730037749; a=rsa-sha256; cv=none; b=hgJKaTShqZWh3g0eul/fKZPWPRvMof3Y0X7C3Wa7jUkTk/H/oV+3L+wJV2BgLpXDg7ICAo Xx2MMtPHYVxWRobc+gJ81MjYeCNoeiinMV97l1k9jIp0KU8pIcK2wOGThgPG6OQVwFawsf IRa6id8EtDIloSjrsBjfAmi8X/8437rlfdrFzL2AQ9I6ey6YSzlBgpN1ymhnfFpZ7niK03 YRp/WcUCnPqwTBz9sdY8A3g8TRNYM1OW9i1qdC51wIzRnOTm7KRCxkzz/HbkTGBCo6aye6 0kuSvVSMnJui7O9eek94nTqjPODIBXywvghSfe6y5lHJRfKB3xZbSxwZMYWEBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xbyrj5yvyzxny; Sun, 27 Oct 2024 14:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RE2TGA058874; Sun, 27 Oct 2024 14:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RE2T9Q058871; Sun, 27 Oct 2024 14:02:29 GMT (envelope-from git) Date: Sun, 27 Oct 2024 14:02:29 GMT Message-Id: <202410271402.49RE2T9Q058871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d08713dcdb15 - main - sctp: another cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d08713dcdb158b2f55a885e7cfbbe410272c55a2 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d08713dcdb158b2f55a885e7cfbbe410272c55a2 commit d08713dcdb158b2f55a885e7cfbbe410272c55a2 Author: Michael Tuexen AuthorDate: 2024-10-27 14:01:45 +0000 Commit: Michael Tuexen CommitDate: 2024-10-27 14:01:45 +0000 sctp: another cleanup No functional change intended. MFC after: 3 days --- sys/netinet/sctp_pcb.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index b69e7d764330..e2248adfdfb6 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -543,7 +543,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, } else { /* * The last IFN gets the address, remove the - * old one + * old one. */ SCTPDBG(SCTP_DEBUG_PCB4, "Moving ifa %p from %s (0x%x) to %s (0x%x)\n", @@ -691,13 +691,14 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, uint32_t ifn_index, const char *if_name) { struct sctp_vrf *vrf; - struct sctp_ifa *sctp_ifap = NULL; + struct sctp_ifa *sctp_ifap; SCTP_IPI_ADDR_WLOCK(); vrf = sctp_find_vrf(vrf_id); if (vrf == NULL) { SCTPDBG(SCTP_DEBUG_PCB4, "Can't find vrf_id 0x%x\n", vrf_id); - goto out_now; + SCTP_IPI_ADDR_WUNLOCK(); + return; } #ifdef SCTP_DEBUG @@ -705,10 +706,10 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, SCTPDBG_ADDR(SCTP_DEBUG_PCB4, addr); #endif sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap) { + if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - int valid = 0; + bool valid = false; /*- * The name has priority over the ifn_index @@ -717,13 +718,13 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (if_name) { if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { /* They match its a correct delete */ - valid = 1; + valid = true; } } if (!valid) { /* last ditch check ifn_index */ if (ifn_index == sctp_ifap->ifn_p->ifn_index) { - valid = 1; + valid = true; } } if (!valid) { @@ -757,9 +758,8 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, } #endif -out_now: SCTP_IPI_ADDR_WUNLOCK(); - if (sctp_ifap) { + if (sctp_ifap != NULL) { struct sctp_laddr *wi; wi = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_laddr), struct sctp_laddr); From nobody Sun Oct 27 16:33: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 4Xc2BY1QLcz5bBxx; Sun, 27 Oct 2024 16:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2BY0fGgz4PLH; Sun, 27 Oct 2024 16:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kg1YLQpvbHbq3R+P4C1frPNcvbeyusBwZem1z0R1fHc=; b=Rwj+cHGD5c9fkjrb4wbYxT1PFyBFpcEmaq475ANDyp8YzpgXbUg/mMv+AZJR7GIgekOPP7 Qz70U8JT8sB8tqyCezykfN5+k+6gKAnjLXfDb0n2RrazkDGB16eZ0R5Ui8YFhRP5V78GSu FKFv6yGbXNT164rgmmQ5UJYVlS+b/8Edg+VT0uFqkiaSzsmsMI54E91BEM9dV7lB0kbk8D Y2GhoOA42lqdmn6dgDKk0ESOdz/tRJc9XJW6K4kCTDCTRLpQfTaUK2dPveopL8Cwg72AE7 dmA/IUJsI10rnlLO6yvjtV4SeKUdIvoGqNwXl3hTv9m580QaL4HOoB6l7F6IRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kg1YLQpvbHbq3R+P4C1frPNcvbeyusBwZem1z0R1fHc=; b=C8KR9vOiaovO32omsnezxvM/dv3rQoIbEBPhuo77McWoBrqAfZn68ffbwwpU4M18o4157O TAb37NORrSg1eMnyPZHMF61iZz5ksZstfx9Nvm4j5Y2ucBz0mfFPejv1J/q1ZerefThMuJ oUdl9lxrKUhNbWlyB9Fw0OXkCgm98RP0RKTKiKtnTkyKBr6W2ZaT6PgXvK++Wm9XRh124l LgLjZkL6ZGl+gc5SAhInY8tl0aNcxJnUGct6Niz82mC0mR9Q1AqhenAnq34Q6kYU+PRl9/ dzYUtpv4C1sBJ35qRUc0aEYD5RbTfSA8UyNo14QXV0VOfShqV4lylz0QLQ/5uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730046789; a=rsa-sha256; cv=none; b=EhxH/YrSko3BVyK5/3ck82TI+kobMcT5M90M49XwgpuUM5yG5bpsVSCJyujj4JlOoRQo5t ixz+OI6qPSrh3zAvPQupNoT3+jxOimjzRe1aFOIcWW6YUfRelMnXLvdqjuPMhk+wjO45jM l39LXTs8IAiC60Z5MnYyjXB/weBFjou0SZ260q9+hB32ts0BY3u6OvQvp4sVvShbUiqWoL 7MzXW62DWQAuQn7y/zqIPilpNiaAAn4jJ9HUCumJuQHoKOBmlezjM0b5erbujssDzz8KKm +cl7WfJooHIyRT54Cqls4GQlaOjJy3m8rjoVJe3UAOPohXzPNcB06EV15um8FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2BX71c3z12mL; Sun, 27 Oct 2024 16:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGX8Ie035323; Sun, 27 Oct 2024 16:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGX8gX035319; Sun, 27 Oct 2024 16:33:08 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:33:08 GMT Message-Id: <202410271633.49RGX8gX035319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ace5484e48c9 - stable/14 - sound: Call DSP_REGISTERED before PCM_DETACHING List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: ace5484e48c9c8585cf914963912ee1ebf35327a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ace5484e48c9c8585cf914963912ee1ebf35327a commit ace5484e48c9c8585cf914963912ee1ebf35327a Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:01 +0000 Commit: Christos Margiolis CommitDate: 2024-10-27 16:32:16 +0000 sound: Call DSP_REGISTERED before PCM_DETACHING DSP_REGISTERED first checks if the softc is not null, through PCM_REGISTERED, which in turn calls PCM_ALIVE, whereas PCM_DETACHING accesses the softc flags directly. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj, emaste Differential Revision: https://reviews.freebsd.org/D47195 (cherry picked from commit 9693241188aa6882166b091d9006f9d0affeda7e) --- sys/dev/sound/pcm/dsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d4f7e3d6e63f..6573dfaabf2f 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -196,7 +196,7 @@ dsp_close(void *data) d = priv->sc; /* At this point pcm_unregister() will destroy all channels anyway. */ - if (PCM_DETACHING(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) goto skip; PCM_GIANT_ENTER(d); @@ -301,7 +301,7 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) return (ENODEV); d = i_dev->si_drv1; - if (PCM_DETACHING(d) || !PCM_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); priv = malloc(sizeof(*priv), M_DEVBUF, M_WAITOK | M_ZERO); @@ -485,7 +485,7 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) ("%s(): io train wreck!", __func__)); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -704,7 +704,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EBADF); PCM_GIANT_ENTER(d); @@ -1823,7 +1823,7 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) { + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) { /* XXX many clients don't understand POLLNVAL */ return (events & (POLLHUP | POLLPRI | POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM)); @@ -1905,7 +1905,7 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) return (err); d = priv->sc; - if (PCM_DETACHING(d) || !DSP_REGISTERED(d)) + if (!DSP_REGISTERED(d) || PCM_DETACHING(d)) return (EINVAL); PCM_GIANT_ENTER(d); From nobody Sun Oct 27 16:33: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 4Xc2BZ2h2hz5bBb1; Sun, 27 Oct 2024 16:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2BZ1F42z4PCr; Sun, 27 Oct 2024 16:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sZlTP04RjlbeG+Xr9fEnBuGXhFs/W3jTr8znqtR+svk=; b=dYZMwZx7HHMwzLRDq1Jl0n6nLxqf23R7IEL1xMQ5EHT1vJffsuPmjt1YvvsOi2iJLlrZQU TUy/ik4IQK/8pYFte0sgBvni/BNZjs61ia43AEigkgsGw3CswGvXxfhqweFt9jN8XHdHHi D2SWIpsTnghlQV+tMTiPQBGo6P+pgOk1lFLqzFW2zWGDAMipTwBaJ/Na7xZSGONKiN72cu o8BzsX+gWgGKCfSjoY6Q8DaS2/32aLJ1boJEA75DR64jo0o2BqlnRjT6nRnzPWyyF9soy3 /0/MA6eHe6+zIAziIwCunm2OAINGJK6Te6Rx7qK7PpzZBaxCUAZ5K1Ira1t5fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sZlTP04RjlbeG+Xr9fEnBuGXhFs/W3jTr8znqtR+svk=; b=x2xeHieYU2Z8GIkKGKwDrykIM+Ptg9k2ZJUUe96CYe7+gKhm/az12aKAiW2VdzQQOoLzqd 9ahhsX30UpxrxVhK9WcfzShjHuN4PvQYscpEPl3xwSTUH1D8cIjojsFq2Zd1Um4Q8aKTPk ai7nfFwfb1HBF3XA+zst9UH9I/aWAG0arkdV4fC10gyvh4DD6EFpX4Zx35Gw8R51HxqbNJ AilssQmp2RahiZXIu+ufK5PYYdiNSSoaJUgNTRXYMqBywvdhySltz2bMK/6dMuhoqOmpup ktmmy8GweHxnyA+yOLnGdwFQtjUB5w7SskYkzITw9NgXE4Y59r99X/kJuBXvBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730046790; a=rsa-sha256; cv=none; b=eaTPvqxKegf+JgglWV8tzlSFLI0PhRA/jmXTmBfHmebPcqsnX+2GxgVSi0cRA1LSjpdA3g yaxRTU/JvySoFeckWDoLAs7/7WOut8cVCtvbTi6Bf/ZpSOX+hhkbIzHfxsBFEYrGHTRhkr eszB9J/eRfVYA24ECRlqZAWJ9q1XlVJ98zJTt4e31F1LUgJrhP8toRBoaycm2likuocSoh dSwaG93DkdPmJMARwNVjD0lGeLOXhP185uqSNb5t9UFQuaU3sACEA8rffUmp+gXjniM0rw hWmFej5QV/aoCMgtlV2PFSG8alkbkTAEP5FfcBhc6AGX9ZHuvendZ2l3vgeNRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2BZ0rGyz12K9; Sun, 27 Oct 2024 16:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGXATH035366; Sun, 27 Oct 2024 16:33:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGXAfj035363; Sun, 27 Oct 2024 16:33:10 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:33:10 GMT Message-Id: <202410271633.49RGXAfj035363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 32a2994b4487 - stable/14 - sound: Use DSP_REGISTERED in dsp_clone() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 32a2994b4487d9de5190982fd88cbc6d57414cdb Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=32a2994b4487d9de5190982fd88cbc6d57414cdb commit 32a2994b4487d9de5190982fd88cbc6d57414cdb Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:10 +0000 Commit: Christos Margiolis CommitDate: 2024-10-27 16:32:16 +0000 sound: Use DSP_REGISTERED in dsp_clone() DSP_REGISTERED calls PCM_REGISTERED, and already contains all the checks we are doing. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47196 (cherry picked from commit bb5e3ac1a7b71480a50fc0c813c916a3d058336c) --- sys/dev/sound/pcm/dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 6573dfaabf2f..92bfb4d58b86 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1967,7 +1967,7 @@ found: * have returned already, meaning it will have set snd_unit to -1, and * thus devclass_get_softc() will return NULL here. */ - if (d != NULL && PCM_REGISTERED(d) && d->dsp_dev != NULL) { + if (DSP_REGISTERED(d)) { *dev = d->dsp_dev; dev_ref(*dev); } From nobody Sun Oct 27 16:33: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 4Xc2Bb5BPQz5bC1P; Sun, 27 Oct 2024 16:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2Bb2Hp0z4PbJ; Sun, 27 Oct 2024 16:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zakRV+kbWkTpPmYd1v+VacJb3hIqBBBUHqMbFvB9aEM=; b=GjoRyeMUuDuEDAiU9/KMlBAd0P+kM9BuZ6fkh/3dOLTuMHimxHMTMBGuEEm5d/aCtInVmj 6VKYm+J2iSVh+gDEBoiKBakNQ2XXU+LUqb1ntEvXhfZtEIdLXrPBJbQ5lDUAHvv5utrOyY TRypbSSzJKTk01l/YNWSUr0JNneDKzOM++Tbqzus1LMaLQLKbJ//HvvykKjuPgiYttT5OE yR32zzI/QppaRadBmrXWzrm8BCPz90aOEZLfIyZ9gHzpvRGuGAI7NwcP0GSYyBCJQXcDXp +89XdJcrLJ3Nx0kbe+0ZdtJQVlrDwRbzsS3iJ6BR8EN5mlkR1RosDwe0rKvCaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zakRV+kbWkTpPmYd1v+VacJb3hIqBBBUHqMbFvB9aEM=; b=b86kDKuhlyruIAVEotUQWv4SERbbTCrbSYGx7IgbJIYQY10v8XWeton3onxnvz09tTk4tR 710ZMMFyLaw12JqgEFGm6l4QJQh/WOQCY29s1/jFt0ybUYefphffZ2UoEXd15vtTOSMp8B HqIXLkGlJkiJSkie74cmvu9kPuIBrQ/EgXSwEvh9oG+esPkCFtfVENT9+gpQs1Ljsgg7/q XifG03czrhOsKiSMMbceNeIMkbk6ZMcSPaCV2Gsf4vZrJFxbZPY6bm1gJ8dOQO0diiKCqW ZvBwUwedQwY2lNVXMRemt7Ip/RqRnhZ1yih3nZ5u2Vl2bW3MnxC1M5f6ohA40w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730046791; a=rsa-sha256; cv=none; b=X6ZkEZg/vwJRaiND6ibru18DPRJAR4YMhZpLkUqusoyCItjeuaMnbHckWKgWjWUBm7iWri 8BgFHLTQZsD/vgilvW2fgCd/Jkc7PH1nA629a/3Fs5mVeQWCdTn00bR68lenXiyBF8aguI udMtVHhyv95Ai409eUqwT583eHtR02Wy0UPFW34FBacIEVDmCYIz16MavOkpJ/ku7VmJDH u5nvvRSw4fijefCeqJhfkke2xR/mJVHOse39qZv4knlFyYiGTMC6n4AxTUjkK6NBTvEyjW s+Ob38Vaw1ZY8XGAOLM2xLpMP22GqsNfjjA3jHgMks3I+5XAktruAsZhCpAKUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2Bb1sskz12Xv; Sun, 27 Oct 2024 16:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGXB1I035406; Sun, 27 Oct 2024 16:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGXBwc035403; Sun, 27 Oct 2024 16:33:11 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:33:11 GMT Message-Id: <202410271633.49RGXBwc035403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 26524f063fca - stable/14 - sound: Change PCMDIR_* numbering List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 26524f063fca6d6ab981e08911078f6e59f00f14 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=26524f063fca6d6ab981e08911078f6e59f00f14 commit 26524f063fca6d6ab981e08911078f6e59f00f14 Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:17 +0000 Commit: Christos Margiolis CommitDate: 2024-10-27 16:32:17 +0000 sound: Change PCMDIR_* numbering Needed by a follow-up patch, so that channels can be sorted properly. This change does not affect the behavior of any subsystem. While here, change to an enum. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47198 (cherry picked from commit a4111e9dc7225618fa8d2af64d866cf0b0aebd56) --- sys/dev/sound/pcm/channel.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index d146f51120d8..13efbef15d8b 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -335,10 +335,12 @@ extern int chn_latency_profile; extern int report_soft_formats; extern int report_soft_matrix; -#define PCMDIR_PLAY 1 -#define PCMDIR_PLAY_VIRTUAL 2 -#define PCMDIR_REC -1 -#define PCMDIR_REC_VIRTUAL -2 +enum { + PCMDIR_PLAY = 1, + PCMDIR_PLAY_VIRTUAL, + PCMDIR_REC, + PCMDIR_REC_VIRTUAL, +}; #define PCMTRIG_START 1 #define PCMTRIG_EMLDMAWR 2 From nobody Sun Oct 27 16:33: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 4Xc2Bc5Ydfz5bBsV; Sun, 27 Oct 2024 16:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2Bc2yxzz4P9q; Sun, 27 Oct 2024 16:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CmRCF/GzF4+J9eDKYU2XJsq+6Vafijum3XmcpdaBkQ=; b=xXe67/l+qMHAK86BdPIjCS8fzaZfOxhwYcIDGN9jnm4nPRiFqUmRicaUn950b8z8AZaf8t nTGrOalxI2hVpN47Dhh4/KMlBoLle3aH5ONy2whsj399zlxjySnB1spdrE5zR3mB66URvl rh9LXlkLpU5NZqXlo00UkLYw4RR68KyA8gLkwR5rTzNfAse9dIjpoeKWdRMg/jLjNhvGCd S8omQuBpo/Y5d2zP9+k4sZnOnOPhy3gClYtwjxpb//0h5Ik6mFww2CbSi9uvFov20F4L4k SHQ4Z46hXpSIqHGpjBYpcB22VIcUyzG3AzZVtQict15FswSwr4FYDByxsEeoqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CmRCF/GzF4+J9eDKYU2XJsq+6Vafijum3XmcpdaBkQ=; b=ExeBhX4d24xGamK5hf5qlH8PDCcjOiieAhXWaIhFd7lVhU7rhRm0PuUoT5R8RErnNiT+A8 6LEcWx2HhGUCA/TBMRVpSV0yKEjeUFaEc2KzdrhNXmZRN/USh30AwPrsU42+F5KUuOS9eE 0ZUB3ACGcBkgi38oyCck5wf+pNKhDOs7Azakvv/C2qfEQa9QjSkoM4GL+lgB5jBI62DcsS GZ2GtpHsCCg2cdbM+rvvRBm6Va9bGgmMob28L4tkdueSlSt0ZClzNzLb93q0pM7JhiN7ZK MWtq4TV74QA66Ew0gizVdU7FLtWwxMQt2YJtZI5zfH2MHXW/xSVotIDO4k531A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730046792; a=rsa-sha256; cv=none; b=C+gQLgQr7UPykkkRTvS4lPvrI7ihDWcr8l9xtbuMnMaiOf8fXMCJW0/QR9mI3nAxTnBdkH 6F70TCATPE8v3w/4eT7fXsq48MTU+XKYlT/l1FK+UKWo3ZRzh+mSM0vWLQt9FCOw5BLzgZ jEmmJSVo2DeA6oHB6ULYoTEvsAu6bu0cxgqcWs9psE4r6nlGzx1PhAbRDmTEaEVYZfNIHl PBGPDGZt4ueoyXkdrx/HdeihtvJAKzFG0EsbKFosKyMumZyzLgjATyrr8LBfch7nz5W3rA q8TA22p5BziP+fVeoOZ9tORLlWdNgCP7sJs904WitV39i+nUHDgsx4ac1zAbVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2Bc2Zkmz12Xw; Sun, 27 Oct 2024 16:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGXCMF035459; Sun, 27 Oct 2024 16:33:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGXCcu035456; Sun, 27 Oct 2024 16:33:12 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:33:12 GMT Message-Id: <202410271633.49RGXCcu035456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f3449b1a2115 - stable/14 - sound: Untangle dsp_cdevs[] and dsp_unit2name() confusion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: f3449b1a2115ed0f680568b8e0d647b8595f5a92 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f3449b1a2115ed0f680568b8e0d647b8595f5a92 commit f3449b1a2115ed0f680568b8e0d647b8595f5a92 Author: Christos Margiolis AuthorDate: 2024-10-24 11:37:23 +0000 Commit: Christos Margiolis CommitDate: 2024-10-27 16:32:23 +0000 sound: Untangle dsp_cdevs[] and dsp_unit2name() confusion Before de8c0d15a64fa ("sound: Get rid of snd_clone and use DEVFS_CDEVPRIV(9)"), sound(4) would create one device for each allocated channel. The device names would be chosen from dsp_cdevs[], and created with dsp_unit2name(). Additionally, dsp_cdevs[] was also used to match these devices names, as well as OSSv4 aliases in dsp_clone(). Since sound(4) does not create separate devices for each channel anymore, the meaning and use dsp_cdevs[] has changed. Part of it no longer corresponds to devices at all, but instead is used to create channel names, and another part is used to match only OSSv4 aliases in dsp_clone(). To address this confusion, separate dsp_cdevs[] into a dsp_aliases[] array, and move dsp_unit2name() to pcm/channel.c and rename it to chn_mkname(). While here, get rid of the SND_DEV_DSPHW_* channel types, and simply use the existing PCMDIR_* constants as the channel types. There is no need to duplicate the same meaning twice. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47199 (cherry picked from commit 802c78f5194e4524faa30ea57adbf00f28fc72c6) (cherry picked from commit b1bb6934bb8774dd96be76d88e6824e49b613549) --- sys/dev/sound/pcm/channel.c | 70 +++++++---- sys/dev/sound/pcm/channel.h | 1 + sys/dev/sound/pcm/dsp.c | 290 +++++++++++++++++++------------------------- sys/dev/sound/pcm/dsp.h | 1 - sys/dev/sound/pcm/sound.h | 4 - sys/dev/sound/pcm/vchan.c | 11 +- 6 files changed, 175 insertions(+), 202 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 6b8f00f9aa83..7bcd841d541f 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1161,13 +1161,13 @@ static struct unrhdr * chn_getunr(struct snddev_info *d, int type) { switch (type) { - case SND_DEV_DSPHW_PLAY: + case PCMDIR_PLAY: return (d->p_unr); - case SND_DEV_DSPHW_VPLAY: + case PCMDIR_PLAY_VIRTUAL: return (d->vp_unr); - case SND_DEV_DSPHW_REC: + case PCMDIR_REC: return (d->r_unr); - case SND_DEV_DSPHW_VREC: + case PCMDIR_REC_VIRTUAL: return (d->vr_unr); default: __assert_unreachable(); @@ -1175,6 +1175,37 @@ chn_getunr(struct snddev_info *d, int type) } +char * +chn_mkname(char *buf, size_t len, struct pcm_channel *c) +{ + const char *str; + + KASSERT(buf != NULL && len != 0, + ("%s(): bogus buf=%p len=%zu", __func__, buf, len)); + + switch (c->type) { + case PCMDIR_PLAY: + str = "play"; + break; + case PCMDIR_PLAY_VIRTUAL: + str = "virtual_play"; + break; + case PCMDIR_REC: + str = "record"; + break; + case PCMDIR_REC_VIRTUAL: + str = "virtual_record"; + break; + default: + __assert_unreachable(); + } + + snprintf(buf, len, "dsp%d.%s.%d", + device_get_unit(c->dev), str, c->unit); + + return (buf); +} + struct pcm_channel * chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, void *devinfo) @@ -1183,27 +1214,19 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, struct feeder_class *fc; struct snd_dbuf *b, *bs; char buf[CHN_NAMELEN]; - int i, direction, type; + int i, direction; PCM_BUSYASSERT(d); PCM_LOCKASSERT(d); switch (dir) { case PCMDIR_PLAY: - direction = PCMDIR_PLAY; - type = SND_DEV_DSPHW_PLAY; - break; case PCMDIR_PLAY_VIRTUAL: direction = PCMDIR_PLAY; - type = SND_DEV_DSPHW_VPLAY; break; case PCMDIR_REC: - direction = PCMDIR_REC; - type = SND_DEV_DSPHW_REC; - break; case PCMDIR_REC_VIRTUAL: direction = PCMDIR_REC; - type = SND_DEV_DSPHW_VREC; break; default: device_printf(d->dev, @@ -1222,7 +1245,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, CHN_INIT(c, children); CHN_INIT(c, children.busy); c->direction = direction; - c->type = type; + c->type = dir; c->unit = alloc_unr(chn_getunr(d, c->type)); c->format = SND_FORMAT(AFMT_U8, 1, 0); c->speed = DSP_DEFAULT_SPEED; @@ -1234,8 +1257,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, c->parentchannel = parent; c->dev = d->dev; c->trigger = PCMTRIG_STOP; - - strlcpy(c->name, dsp_unit2name(buf, sizeof(buf), c), sizeof(c->name)); + strlcpy(c->name, chn_mkname(buf, sizeof(buf), c), sizeof(c->name)); c->matrix = *feeder_matrix_id_map(SND_CHN_MATRIX_1_0); c->matrix.id = SND_CHN_MATRIX_PCMCHANNEL; @@ -1303,16 +1325,16 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, CHN_INSERT_SORT_ASCEND(d, c, channels.pcm); switch (c->type) { - case SND_DEV_DSPHW_PLAY: + case PCMDIR_PLAY: d->playcount++; break; - case SND_DEV_DSPHW_VPLAY: + case PCMDIR_PLAY_VIRTUAL: d->pvchancount++; break; - case SND_DEV_DSPHW_REC: + case PCMDIR_REC: d->reccount++; break; - case SND_DEV_DSPHW_VREC: + case PCMDIR_REC_VIRTUAL: d->rvchancount++; break; default: @@ -1354,16 +1376,16 @@ chn_kill(struct pcm_channel *c) CHN_REMOVE(d, c, channels.pcm); switch (c->type) { - case SND_DEV_DSPHW_PLAY: + case PCMDIR_PLAY: d->playcount--; break; - case SND_DEV_DSPHW_VPLAY: + case PCMDIR_PLAY_VIRTUAL: d->pvchancount--; break; - case SND_DEV_DSPHW_REC: + case PCMDIR_REC: d->reccount--; break; - case SND_DEV_DSPHW_VREC: + case PCMDIR_REC_VIRTUAL: d->rvchancount--; break; default: diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 13efbef15d8b..6c6692fa8bc2 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -260,6 +260,7 @@ int chn_sync(struct pcm_channel *c, int threshold); int chn_flush(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); +char *chn_mkname(char *buf, size_t len, struct pcm_channel *c); struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, void *devinfo); void chn_kill(struct pcm_channel *c); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 92bfb4d58b86..7d80a82d31c8 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -164,25 +164,6 @@ dsp_unlock_chans(struct dsp_cdevpriv *priv, uint32_t prio) #define DSP_F_READ(x) ((x) & FREAD) #define DSP_F_WRITE(x) ((x) & FWRITE) -static const struct { - int type; - char *name; - char *sep; - char *alias; -} dsp_cdevs[] = { - { SND_DEV_DSP, "dsp", ".", NULL }, - { SND_DEV_DSPHW_PLAY, "dsp", ".play.", NULL }, - { SND_DEV_DSPHW_VPLAY, "dsp", ".virtual_play.", NULL }, - { SND_DEV_DSPHW_REC, "dsp", ".record.", NULL }, - { SND_DEV_DSPHW_VREC, "dsp", ".virtual_record.", NULL }, - /* Low priority, OSSv4 aliases. */ - { SND_DEV_DSP, "dsp_ac3", ".", "dsp" }, - { SND_DEV_DSP, "dsp_mmap", ".", "dsp" }, - { SND_DEV_DSP, "dsp_multich", ".", "dsp" }, - { SND_DEV_DSP, "dsp_spdifout", ".", "dsp" }, - { SND_DEV_DSP, "dsp_spdifin", ".", "dsp" }, -}; - static void dsp_close(void *data) { @@ -1941,6 +1922,14 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, return (0); } +static const char *dsp_aliases[] = { + "dsp_ac3", + "dsp_mmap", + "dsp_multich", + "dsp_spdifout", + "dsp_spdifin", +}; + static void dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev) @@ -1952,9 +1941,8 @@ dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, return; if (strcmp(name, "dsp") == 0 && dsp_basename_clone) goto found; - for (i = 0; i < nitems(dsp_cdevs); i++) { - if (dsp_cdevs[i].alias != NULL && - strcmp(name, dsp_cdevs[i].name) == 0) + for (i = 0; i < nitems(dsp_aliases); i++) { + if (strcmp(name, dsp_aliases[i]) == 0) goto found; } return; @@ -1994,26 +1982,6 @@ dsp_sysuninit(void *p) SYSINIT(dsp_sysinit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysinit, NULL); SYSUNINIT(dsp_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysuninit, NULL); -char * -dsp_unit2name(char *buf, size_t len, struct pcm_channel *ch) -{ - size_t i; - - KASSERT(buf != NULL && len != 0, - ("bogus buf=%p len=%ju", buf, (uintmax_t)len)); - - for (i = 0; i < nitems(dsp_cdevs); i++) { - if (ch->type != dsp_cdevs[i].type || dsp_cdevs[i].alias != NULL) - continue; - snprintf(buf, len, "%s%d%s%d", - dsp_cdevs[i].name, device_get_unit(ch->dev), - dsp_cdevs[i].sep, ch->unit); - return (buf); - } - - return (NULL); -} - static void dsp_oss_audioinfo_unavail(oss_audioinfo *ai, int unit) { @@ -2233,7 +2201,6 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) struct snddev_info *d; uint32_t fmts; int i, nchan, *rates, minch, maxch, unit; - char *devname, buf[CHN_NAMELEN]; /* * If probing the device that received the ioctl, make sure it's a @@ -2244,9 +2211,7 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) return (EINVAL); ch = NULL; - devname = NULL; nchan = 0; - bzero(buf, sizeof(buf)); /* * Search for the requested audio device (channel). Start by @@ -2267,147 +2232,142 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai) CHN_FOREACH(ch, d, channels.pcm) { CHN_UNLOCKASSERT(ch); CHN_LOCK(ch); - if (ai->dev == -1) { - if (devfs_foreach_cdevpriv(i_dev, - dsp_oss_engineinfo_cb, ch) != 0) { - devname = dsp_unit2name(buf, - sizeof(buf), ch); - } - } else if (ai->dev == nchan) - devname = dsp_unit2name(buf, sizeof(buf), ch); - if (devname != NULL) + if ((ai->dev == -1 && devfs_foreach_cdevpriv( + i_dev, dsp_oss_engineinfo_cb, ch) != 0) || + ai->dev == nchan) break; CHN_UNLOCK(ch); ++nchan; } - if (devname != NULL) { - /* - * At this point, the following synchronization stuff - * has happened: - * - a specific PCM device is locked. - * - a specific audio channel has been locked, so be - * sure to unlock when exiting; - */ + if (ch == NULL) { + PCM_UNLOCK(d); + continue; + } - caps = chn_getcaps(ch); + /* + * At this point, the following synchronization stuff + * has happened: + * - a specific PCM device is locked. + * - a specific audio channel has been locked, so be + * sure to unlock when exiting; + */ - /* - * With all handles collected, zero out the user's - * container and begin filling in its fields. - */ - bzero((void *)ai, sizeof(oss_audioinfo)); + caps = chn_getcaps(ch); - ai->dev = nchan; - strlcpy(ai->name, ch->name, sizeof(ai->name)); + /* + * With all handles collected, zero out the user's + * container and begin filling in its fields. + */ + bzero((void *)ai, sizeof(oss_audioinfo)); - if ((ch->flags & CHN_F_BUSY) == 0) - ai->busy = 0; - else - ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ; + ai->dev = nchan; + strlcpy(ai->name, ch->name, sizeof(ai->name)); - ai->pid = ch->pid; - strlcpy(ai->cmd, ch->comm, sizeof(ai->cmd)); + if ((ch->flags & CHN_F_BUSY) == 0) + ai->busy = 0; + else + ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ; - /* - * These flags stolen from SNDCTL_DSP_GETCAPS handler. - * Note, however, that a single channel operates in - * only one direction, so PCM_CAP_DUPLEX is out. - */ - /** - * @todo @c SNDCTL_AUDIOINFO::caps - Make drivers keep - * these in pcmchan::caps? - */ - ai->caps = PCM_CAP_REALTIME | PCM_CAP_MMAP | PCM_CAP_TRIGGER | - ((ch->flags & CHN_F_VIRTUAL) ? PCM_CAP_VIRTUAL : 0) | - ((ch->direction == PCMDIR_PLAY) ? PCM_CAP_OUTPUT : PCM_CAP_INPUT); + ai->pid = ch->pid; + strlcpy(ai->cmd, ch->comm, sizeof(ai->cmd)); - /* - * Collect formats supported @b natively by the - * device. Also determine min/max channels. - */ - minch = INT_MAX; - maxch = 0; - fmts = 0; - for (i = 0; caps->fmtlist[i]; i++) { - fmts |= AFMT_ENCODING(caps->fmtlist[i]); - minch = min(AFMT_CHANNEL(caps->fmtlist[i]), minch); - maxch = max(AFMT_CHANNEL(caps->fmtlist[i]), maxch); - } + /* + * These flags stolen from SNDCTL_DSP_GETCAPS handler. + * Note, however, that a single channel operates in + * only one direction, so PCM_CAP_DUPLEX is out. + */ + /** + * @todo @c SNDCTL_AUDIOINFO::caps - Make drivers keep + * these in pcmchan::caps? + */ + ai->caps = PCM_CAP_REALTIME | PCM_CAP_MMAP | PCM_CAP_TRIGGER | + ((ch->flags & CHN_F_VIRTUAL) ? PCM_CAP_VIRTUAL : 0) | + ((ch->direction == PCMDIR_PLAY) ? PCM_CAP_OUTPUT : PCM_CAP_INPUT); - if (ch->direction == PCMDIR_PLAY) - ai->oformats = fmts; - else - ai->iformats = fmts; - - /** - * @note - * @c magic - OSSv4 docs: "Reserved for internal use - * by OSS." - * - * @par - * @c card_number - OSSv4 docs: "Number of the sound - * card where this device belongs or -1 if this - * information is not available. Applications - * should normally not use this field for any - * purpose." - */ - ai->card_number = unit; - /** - * @todo @c song_name - depends first on - * SNDCTL_[GS]ETSONG @todo @c label - depends - * on SNDCTL_[GS]ETLABEL - * @todo @c port_number - routing information? - */ - ai->port_number = unit; - ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; - /** - * @note - * @c legacy_device - OSSv4 docs: "Obsolete." - */ - ai->legacy_device = unit; - snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); - ai->enabled = device_is_attached(d->dev) ? 1 : 0; - /** - * @note - * @c flags - OSSv4 docs: "Reserved for future use." - * - * @note - * @c binding - OSSv4 docs: "Reserved for future use." - * - * @todo @c handle - haven't decided how to generate - * this yet; bus, vendor, device IDs? - */ + /* + * Collect formats supported @b natively by the + * device. Also determine min/max channels. + */ + minch = INT_MAX; + maxch = 0; + fmts = 0; + for (i = 0; caps->fmtlist[i]; i++) { + fmts |= AFMT_ENCODING(caps->fmtlist[i]); + minch = min(AFMT_CHANNEL(caps->fmtlist[i]), minch); + maxch = max(AFMT_CHANNEL(caps->fmtlist[i]), maxch); + } - if ((ch->flags & CHN_F_EXCLUSIVE) || - (pcm_getflags(d->dev) & SD_F_BITPERFECT)) { - ai->min_rate = caps->minspeed; - ai->max_rate = caps->maxspeed; - } else { - ai->min_rate = feeder_rate_min; - ai->max_rate = feeder_rate_max; - } + if (ch->direction == PCMDIR_PLAY) + ai->oformats = fmts; + else + ai->iformats = fmts; + + /** + * @note + * @c magic - OSSv4 docs: "Reserved for internal use + * by OSS." + * + * @par + * @c card_number - OSSv4 docs: "Number of the sound + * card where this device belongs or -1 if this + * information is not available. Applications + * should normally not use this field for any + * purpose." + */ + ai->card_number = unit; + /** + * @todo @c song_name - depends first on + * SNDCTL_[GS]ETSONG @todo @c label - depends + * on SNDCTL_[GS]ETLABEL + * @todo @c port_number - routing information? + */ + ai->port_number = unit; + ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; + /** + * @note + * @c legacy_device - OSSv4 docs: "Obsolete." + */ + ai->legacy_device = unit; + snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); + ai->enabled = device_is_attached(d->dev) ? 1 : 0; + /** + * @note + * @c flags - OSSv4 docs: "Reserved for future use." + * + * @note + * @c binding - OSSv4 docs: "Reserved for future use." + * + * @todo @c handle - haven't decided how to generate + * this yet; bus, vendor, device IDs? + */ - ai->min_channels = minch; - ai->max_channels = maxch; + if ((ch->flags & CHN_F_EXCLUSIVE) || + (pcm_getflags(d->dev) & SD_F_BITPERFECT)) { + ai->min_rate = caps->minspeed; + ai->max_rate = caps->maxspeed; + } else { + ai->min_rate = feeder_rate_min; + ai->max_rate = feeder_rate_max; + } - ai->nrates = chn_getrates(ch, &rates); - if (ai->nrates > OSS_MAX_SAMPLE_RATES) - ai->nrates = OSS_MAX_SAMPLE_RATES; + ai->min_channels = minch; + ai->max_channels = maxch; - for (i = 0; i < ai->nrates; i++) - ai->rates[i] = rates[i]; - - ai->next_play_engine = 0; - ai->next_rec_engine = 0; + ai->nrates = chn_getrates(ch, &rates); + if (ai->nrates > OSS_MAX_SAMPLE_RATES) + ai->nrates = OSS_MAX_SAMPLE_RATES; - CHN_UNLOCK(ch); - } + for (i = 0; i < ai->nrates; i++) + ai->rates[i] = rates[i]; + + ai->next_play_engine = 0; + ai->next_rec_engine = 0; + CHN_UNLOCK(ch); PCM_UNLOCK(d); - if (devname != NULL) - return (0); + return (0); } /* Exhausted the search -- nothing is locked, so return. */ diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h index 7559e855d4e1..1eab42ca91c8 100644 --- a/sys/dev/sound/pcm/dsp.h +++ b/sys/dev/sound/pcm/dsp.h @@ -35,7 +35,6 @@ extern struct cdevsw dsp_cdevsw; int dsp_make_dev(device_t); void dsp_destroy_dev(device_t); -char *dsp_unit2name(char *, size_t, struct pcm_channel *); int dsp_oss_audioinfo(struct cdev *, oss_audioinfo *, bool); int dsp_oss_engineinfo(struct cdev *, oss_audioinfo *); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index f96638081cb9..126b3411b035 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -225,10 +225,6 @@ enum { SND_DEV_MIDIN, /* Raw midi access */ SND_DEV_DSP, /* Digitized voice /dev/dsp */ SND_DEV_STATUS, /* /dev/sndstat */ - SND_DEV_DSPHW_PLAY, /* specific playback channel */ - SND_DEV_DSPHW_VPLAY, /* specific virtual playback channel */ - SND_DEV_DSPHW_REC, /* specific record channel */ - SND_DEV_DSPHW_VREC, /* specific virtual record channel */ }; #define DSP_DEFAULT_SPEED 8000 diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 4da6f83dc0a2..c9db9d79847b 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -886,14 +886,9 @@ vchan_sync(struct pcm_channel *c) c->flags |= CHN_F_DIRTY; #ifdef SND_DEBUG - if (snd_passthrough_verbose != 0) { - char *devname, buf[CHN_NAMELEN]; - - devname = dsp_unit2name(buf, sizeof(buf), c); - device_printf(c->dev, - "%s(%s/%s) %s() -> re-sync err=%d\n", - __func__, (devname != NULL) ? devname : "dspX", c->comm, - caller, ret); + if (snd_passthrough_verbose) { + device_printf(c->dev, "%s(%s/%s) %s() -> re-sync err=%d\n", + __func__, c->name, c->comm, caller, ret); } #endif From nobody Sun Oct 27 16:33: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 4Xc2Bd65DNz5bBSH; Sun, 27 Oct 2024 16:33: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2Bd3w9cz4PgB; Sun, 27 Oct 2024 16:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLqrpQE/wtTsFHEEdgl1cVqUU/XXIVZl4Wt8tWtnG3k=; b=qa7F2JT77Nfcp5zvYGISrQmgrPXOyxvmhRvT0qBa7xNh9PvDxSl26bjYIsjN9P4Kt1N2Tp SkAeTtFhVuccN+3ISXWL9Rh7nS2TA7Hshg3tpM0qzmbfR4Zx/T5PcffSYIPNu1OfW0N9K3 TbHspS1kqxepelW3lxeRb2bmelLKZ49B42wgtpeBWlyHVWEP1kYDyhy//b3WAUBFUYjJ83 3TxR+h1ra5/1gZljY5u1Miii2klgObqrAhuztQKknTDnWPlMJiH2nhW8a88jAxIwSJMEZQ jInxpnbKpmXEoAg7hD2Awi4Pe25xydLxGIuF/kzHUvN27kRugcpH0XMRne9uOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLqrpQE/wtTsFHEEdgl1cVqUU/XXIVZl4Wt8tWtnG3k=; b=K1Gafbe99LiV+4RWe+X5AEnTwZuym3EzkRDsIzC7RUYqLtbSKTQDlSfUo1pQjrF9DbC+MV qTVFoX4aDNzT5eqbRI4LWjv0qQss5V8q5c4fR4mrXJ6bjY+YTaL3StlaFS8q22VZ0ZywGB 6pGLN8klslvcV1OK++jNTzmhHe++FKQSYteTgFn9TvT1n5BnMnYGJ4YhobtLBBssmwtudS n0YVPbdDZGeoHOD/LCGQKYWf8pvf+qcEpWKT4bXaFv4jc3ppl8y4xsb2c3lk4bo0fP8d0i zrbdD+p3p0kND76SkKKRT1SrXj0pxM31h+xYTnQr2o9h3Hhum3cNJM3RKc1LiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730046793; a=rsa-sha256; cv=none; b=pIJBeWgMg01/7CCOmqVp6ZDyX4d40F776gAT5zzS/s9NG3ey1W1+juHbA0BBMsRqccjhGm 5p0RkuC+6ErC3xeAUyCu4XpLJZTbI04p8DhqENJrD4vEcheA9uRvnBfBdcDK7ElIPx+6H1 005sodYGLvky63LUbCnaK+zb2F83XV9/WyJ1KOrasb/DDaZzK7aRpnprZ8ega3+6W7mEy+ 1Ym1AqfkWC1tqZDgLaD6EM8wx/bm4p0vd+osfjncDiv2W0ERCEBSA2r7tyATANkFqFOsFu j0xDHHRTplFhCq2HCP3cCwAzLwMgOOuA0G9gPe9zOJaT78y4Eh8+VzxhGOYFiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2Bd3XY7z12kJ; Sun, 27 Oct 2024 16:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGXDvx035516; Sun, 27 Oct 2024 16:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGXDrr035513; Sun, 27 Oct 2024 16:33:13 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:33:13 GMT Message-Id: <202410271633.49RGXDrr035513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: bf3a355a874a - stable/14 - sound: Remove redundant refcount checks in vchan_setnew() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: bf3a355a874abfcf7ab77bff84bc355ef79ef0a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bf3a355a874abfcf7ab77bff84bc355ef79ef0a6 commit bf3a355a874abfcf7ab77bff84bc355ef79ef0a6 Author: Christos Margiolis AuthorDate: 2024-10-25 11:36:51 +0000 Commit: Christos Margiolis CommitDate: 2024-10-27 16:32:30 +0000 sound: Remove redundant refcount checks in vchan_setnew() When adding a new vchan, we are looking for a parent channel which either already has vchans (i.e CHN_F_HAS_VCHAN), or does not, but is also not being used (i.e !CHN_F_BUSY). Since CHN_F_BUSY essentially tells us if the channel is currently being used or not, there is no need to check if the channel's refcount is 0 as well. When removing a vchan, we first check if we have only 1 vchan allocated that is also being used (so we cannot remove it at the moment), and then we check if the vchan is not busy and remove it. Again, checking CHN_F_BUSY is enough. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47268 (cherry picked from commit 43c0b593c2c3b2c07009c031a0e7e8190a45b31a) --- sys/dev/sound/pcm/vchan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index c9db9d79847b..ed13a3c55961 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -928,7 +928,6 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt) CHN_LOCK(c); if (c->direction == direction && ((c->flags & CHN_F_HAS_VCHAN) || (vcnt == 0 && - c->refcount < 1 && !(c->flags & (CHN_F_BUSY | CHN_F_VIRTUAL))))) { /* * Reuse hw channel with vchans already @@ -987,12 +986,11 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt) } CHN_FOREACH_SAFE(ch, c, nch, children) { CHN_LOCK(ch); - if (vcnt == 1 && c->refcount > 0) { + if (vcnt == 1 && ch->flags & CHN_F_BUSY) { CHN_UNLOCK(ch); break; } - if (!(ch->flags & CHN_F_BUSY) && - ch->refcount < 1) { + if (!(ch->flags & CHN_F_BUSY)) { err = vchan_destroy(ch); if (err == 0) vcnt--; From nobody Sun Oct 27 16:33: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 4Xc2Bf5xxZz5bBsX; Sun, 27 Oct 2024 16:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2Bf4c1sz4PPk; Sun, 27 Oct 2024 16:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fdS7wGyZHhNCWMUjx2RMsZGddYQUiwVEei2JlZ5lMQ=; b=W7jfEDwYF+8pqCj6EZggZROuAUuSm9ARDaO89B/rTbD4miTin2h7Deea9WBl40BlfvY3Kj XvWgW4Qq5GjSWCwPIs2YarldzAi2Ua0bjWibk2Gg2nL4fgMK5MTSjgcbUur2Qv8m3ajwZq PA8quZOdhJKEBUFeld2D4gp+FBV4S3cEktwCQ5Ayef2sX+Hku/lcCuXdvduhU+0ykYan5j WolrkgkK1rcf4TWCQcDeW1+0gHxQV9hW1QtfW71VJYIc9ZBO+7bRJ2F+7AR5MSOylf3f4o FFsewdGn1UzkCY2roqxHTbtM323DL25nlRAxxQMNbuW9Fs39Xsc5JZtyb37aGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730046794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fdS7wGyZHhNCWMUjx2RMsZGddYQUiwVEei2JlZ5lMQ=; b=E4CyjxEEoTELRZhizrR/dB+PfSrJzUsyWM5IVIIwbqUUOMCs3Stgaw57K1U5AGuGpiMwWU kamDxhYZsMsHCq9cnnBG+zCbRKaK7pBgx7AxCWyDlo9mIDfKNXI4Zj2+A0/G6L6UWSOESL b+V6gNaQhl8eIGggIAMk+uhfhBjxj+3HnHn9uFUXZEjS/OP0Eju3Gvvkz2vv7MGAGVz+cV dY2duc3gv+tgZUz62ajMk0sDxid0h49tnf/B7sf4cC2nh0xfoxA8DyX05GoKynlEiOAroO Xbs294dv+O930xBdtfLhkJjwiO+8G4cTSnREXuNk52g3vBpR38FRoTPAa7eLpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730046794; a=rsa-sha256; cv=none; b=bZWUM36UYpvTJaUAdzpS3KVBKpHwaGv3S+2r0mP2J8JOVf2xoSWabUNH1UwVuL+0LaRhTJ a/FKLuMUfQNtWMhIEtnMSL0vzhCZ7YnLMIfWsC1GrQsmqtDCOuubhjUh3JcK0NaHAihWPa FkQEB2z6DsXWBLmYohuPjxSGWp+cxxNJ7xloC+Tp1oIfkb3j3HrQH9x4Ckp+9sK7lYM6om mXFYyO6HUYetGRG38v/TOvR7gZ0KF4iCyVR7fDKiWLKA4sv7dqHe+wltNfCV436iqHi396 OnRgHnndhjSKfeH8WTejCniZ0soNiIWTN8Gxjy7YHZZQpLEMFOGcS4u0PtZO8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2Bf4Cc6z12KB; Sun, 27 Oct 2024 16:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGXEBl035567; Sun, 27 Oct 2024 16:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGXEwX035564; Sun, 27 Oct 2024 16:33:14 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:33:14 GMT Message-Id: <202410271633.49RGXEwX035564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 6bfac3b2a335 - stable/14 - sound: Retire channel refcount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6bfac3b2a335c4fb133f670e7b484ea13072882c Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6bfac3b2a335c4fb133f670e7b484ea13072882c commit 6bfac3b2a335c4fb133f670e7b484ea13072882c Author: Christos Margiolis AuthorDate: 2024-10-25 11:36:59 +0000 Commit: Christos Margiolis CommitDate: 2024-10-27 16:32:30 +0000 sound: Retire channel refcount No longer used. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47269 (cherry picked from commit 9a6cf27583ffc13bb0a7c5be0704ba0d2f3b834d) --- sys/dev/sound/pcm/channel.c | 13 ------------- sys/dev/sound/pcm/channel.h | 2 -- sys/dev/sound/pcm/dsp.c | 29 ++++------------------------- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 7bcd841d541f..eb70e910f51d 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1435,19 +1435,6 @@ chn_release(struct pcm_channel *c) return (0); } -int -chn_ref(struct pcm_channel *c, int ref) -{ - PCM_BUSYASSERT(c->parentsnddev); - CHN_LOCKASSERT(c); - KASSERT((c->refcount + ref) >= 0, - ("%s(): new refcount will be negative", __func__)); - - c->refcount += ref; - - return (c->refcount); -} - int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 6c6692fa8bc2..0788fbe42a5a 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -84,7 +84,6 @@ struct pcm_channel { kobj_t methods; pid_t pid; - int refcount; struct pcm_feeder *feeder; u_int32_t align; @@ -266,7 +265,6 @@ struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent, void chn_kill(struct pcm_channel *c); void chn_shutdown(struct pcm_channel *c); int chn_release(struct pcm_channel *c); -int chn_ref(struct pcm_channel *c, int ref); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 7d80a82d31c8..6a59bcfc1ade 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -168,9 +168,9 @@ static void dsp_close(void *data) { struct dsp_cdevpriv *priv = data; - struct pcm_channel *rdch, *wrch, *volch; + struct pcm_channel *rdch, *wrch; struct snddev_info *d; - int sg_ids, rdref, wdref; + int sg_ids; if (priv == NULL) return; @@ -188,22 +188,6 @@ dsp_close(void *data) rdch = priv->rdch; wrch = priv->wrch; - volch = priv->volch; - - rdref = -1; - wdref = -1; - - if (volch != NULL) { - if (volch == rdch) - rdref--; - else if (volch == wrch) - wdref--; - else { - CHN_LOCK(volch); - chn_ref(volch, -1); - CHN_UNLOCK(volch); - } - } if (rdch != NULL) CHN_REMOVE(d, rdch, channels.pcm.opened); @@ -231,7 +215,6 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(rdch); - chn_ref(rdch, rdref); chn_abort(rdch); /* won't sleep */ rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); @@ -249,7 +232,6 @@ dsp_close(void *data) free_unr(pcmsg_unrhdr, sg_ids); CHN_LOCK(wrch); - chn_ref(wrch, wdref); chn_flush(wrch); /* may sleep */ wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | CHN_F_DEAD | CHN_F_EXCLUSIVE); @@ -382,7 +364,6 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) rdch->flags |= CHN_F_NBIO; if (flags & O_EXCL) rdch->flags |= CHN_F_EXCLUSIVE; - chn_ref(rdch, 1); chn_vpc_reset(rdch, SND_VOL_C_PCM, 0); CHN_UNLOCK(rdch); } @@ -402,11 +383,10 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (!DSP_F_DUPLEX(flags)) { if (rdch != NULL) { /* - * Lock, deref and release previously - * created record channel + * Lock, and release previously created + * record channel */ CHN_LOCK(rdch); - chn_ref(rdch, -1); chn_release(rdch); } PCM_RELEASE_QUICK(d); @@ -419,7 +399,6 @@ dsp_open(struct cdev *i_dev, int flags, int mode, struct thread *td) wrch->flags |= CHN_F_NBIO; if (flags & O_EXCL) wrch->flags |= CHN_F_EXCLUSIVE; - chn_ref(wrch, 1); chn_vpc_reset(wrch, SND_VOL_C_PCM, 0); CHN_UNLOCK(wrch); } From nobody Sun Oct 27 16:37: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 4Xc2HM0v37z5bByN; Sun, 27 Oct 2024 16:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2HL70jHz4R63; Sun, 27 Oct 2024 16:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730047039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SF873R3JgL6jtFrSvsFSnlF58mpgOjonGTGhwTCDJeA=; b=FkeIHzeVE5+N3CtWLO04S23iQ642YPc031t9++JD6wOnv5rlE9o5gMya89nunzQ8u249yi wQ252UmvLqMmp8y8eOIxnUu0vqwv6YpsJsSv0zwfWFchuD1MhbXoQy1bdFf6waAPlGkYSp ourqKbrlY8xUFckAoSpb6wQeu3eZMdRVFkmTj5XgwMmhTtRoSU+xGy1HHsDUrM4N04ieYH lYmgRhQwlVKznHi453APKg55pF3rjGORpASIYFPoW9ME+jYA5k6yLs4LDgm5Y9z+3MyKwJ 40PKcAxUOhTVbXG7LavFSNyeWdYZC86CHYBr3G7c8duSZu3FYK9Q/zCGwwy91A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730047039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SF873R3JgL6jtFrSvsFSnlF58mpgOjonGTGhwTCDJeA=; b=TlmQx4/lapRGSN94wwioA96/F51yt8HxjOwu+zNqtYs4E2hUj+V3rfSu6PY9uxsA8juP8n R2BjqnmBUi5MxSok2dNUFgZOvAFNdwrF14gg0ZJELgYWGXVGQ0DiXRzuMprsur5iWQx8l4 v20ZE1Qs+eRqhMTC4nHy1HsfAe4Ra8jffJG2zCe9wYso1Pas9MLQQPn3mG8r+R3j6H7EUT WU48TacUXy6SnkpZXj02pm/mwEsyGziUmLvoxiLUnpZ0ZjlhMOHFNxpiRjq4FwXKXQZowm WssgmurHeWqJF9oc9lwnXARjD0IdFp8gDhJDshyvBjl+3xUtBiu8W1pvjEh+Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730047039; a=rsa-sha256; cv=none; b=CMMREIwDrg75noOdFyh4BDKJlJIs+LEfLB0fYJ4SZKpG1WFOHyU32j6O7dyDmCIj4TPaV1 XnR97X/IVOxsFOyVCsBpJm7kYJ1j4k8V0PHXLeUFmO9d/iIHPWVCKNGeFpl65nJusr4oQr MtGhHtnn6itedPGbbzp34CTlavm3J4KvYkarvtZrZb5rTNndxIAmRHd09Eqti7DaWf5ur4 Fz1kzxEr9J2w7LRVZJ+uKwW54gu67NTL9u3hPhFi2+LGiwHX2x1KqN6lGnZFenqoEIFxsH T+IWK/mWYBQsAygCVXzX1eezPrXcFY+h85+kSEdjHAg6ik1K9WjHmdjijRSyDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2HL6V2Xz12MM; Sun, 27 Oct 2024 16:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGbIuo037116; Sun, 27 Oct 2024 16:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGbIXQ037113; Sun, 27 Oct 2024 16:37:18 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:37:18 GMT Message-Id: <202410271637.49RGbIXQ037113@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: 93181e38342f - main - mktemp(1): bring the documentation up to date with best practice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 93181e38342fc48eb95f83842156be478a4a6f01 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=93181e38342fc48eb95f83842156be478a4a6f01 commit 93181e38342fc48eb95f83842156be478a4a6f01 Author: Wolfram Schneider AuthorDate: 2024-10-27 16:33:39 +0000 Commit: Wolfram Schneider CommitDate: 2024-10-27 16:36:31 +0000 mktemp(1): bring the documentation up to date with best practice Using short temp filenames as /tmp/temp.XXXX (4 or 6 X) was probably ok 20 years ago, but not anymore. Best practice is to use 10 X. Given that our users often copy & paste examples from our manual pages we need to update the documentation. PR: 261437 --- usr.bin/mktemp/mktemp.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1 index 68a5a54aa5c5..063f25f216dc 100644 --- a/usr.bin/mktemp/mktemp.1 +++ b/usr.bin/mktemp/mktemp.1 @@ -59,7 +59,7 @@ any file name with some number of .Ql X Ns s appended to it, for example -.Pa /tmp/temp.XXXX . +.Pa /tmp/temp.XXXXXXXXXX . The trailing .Ql X Ns s are replaced with the current process number and/or a @@ -196,7 +196,7 @@ where the script should quit if it cannot get a safe temporary file. .Bd -literal -offset indent tempfoo=`basename $0` -TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || exit 1 +TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXXXXXX` || exit 1 echo "program output" >> $TMPFILE .Ed .Pp @@ -210,7 +210,7 @@ echo "program output" >> $TMPFILE In this case, we want the script to catch the error itself. .Bd -literal -offset indent tempfoo=`basename $0` -TMPFILE=`mktemp -q /tmp/${tempfoo}.XXXXXX` +TMPFILE=`mktemp -q /tmp/${tempfoo}.XXXXXXXXXX` if [ $? -ne 0 ]; then echo "$0: Can't create temp file, exiting..." exit 1 From nobody Sun Oct 27 16:43: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 4Xc2Q60dK6z5bChP; Sun, 27 Oct 2024 16:43: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2Q607pZz4T9Y; Sun, 27 Oct 2024 16:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730047390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30RxdBvG2Z9wJaeYLOfVMOqIGHPjcs+uVFlpun/hW+8=; b=sbkznlFBLP6O6+7WCtkB5J8DVyY837ZiKaF4lphQ9XVGeZXnl00763xAIbXyig1NujCNKb DzAn644F5+Ur82T3o9r36ggu8HxQx68+wPh9kvEvHlg+5BdSB1XUPr3qO2V8wy11PUGkoh 57ycGbIA/wKgjel7p5xYi3VzVJu12EkhNmGhjnrSeNMxEn2eiAGMpT7luNE66H5B6q1nEi RtKl3Z23RhrlC9M5z0pgqS8oYfqHZ/mK7waYEz/ssTq5/sg1UsSEXEzQuZ+dLIzRd1LWBR CI41kXsw+RHVX/MzYXidJP6aBXJJcsxC6ZR9DH/lrsYwF+wv6exNMQ8CF96fug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730047390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30RxdBvG2Z9wJaeYLOfVMOqIGHPjcs+uVFlpun/hW+8=; b=t8ennqwf+uGjw7w8aagTkbF2uNZGu4a5JyOGBcY0xXaHISt6L18AAwWbiX+d14QZNCE3OE u2/OpVgYodQ4j6Fyt15bb4SsGI8lTE0NkPxP3xh7IdEBLP31GMBnm31sw77NwtjevmZXjL owVfal35V0z7Q8SbShQhZETqZZ2iptlDRxcA3z1HSXucyHSj0ehP9MpaG38TYNYPnTG6ip +/NpfCVAaqtYnHBBEw5pTYmnf6AeEHsAoQ8qNBAThgR1+GncPUTjYMvfXW1vaW+U7Xy8IK +AmRcaOi1R40NAqdL194LmLltX74BGMSXOt5tpE0qSUkT3hnlpEBx9nKigX/Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730047390; a=rsa-sha256; cv=none; b=w+aVOfvV/k3LiIKAIEWDFgQ5HZLgxQtD2w/iUAib+Q3CN/vyS5wPlM8KuxlMenu9r20yxK 9ViidH0TiR/kIUt9ArNBpjva0oe3nZRDMDjmn6giUO3Ut/iNCWiVyjq0GyRhpOQc7BKUb4 w0pB8C15AlnImBPZ4r0QrjIEXKQ4wv1VNtjq429o0tXUw8WiUPmN/VYHyDn+Ue6iDgp2ZB mrTv0kxLXhUgR/4oJ2YXStzcAXjblAsWZaoBoOV+djK7SYtwc6YIt1cN+zzh34kjhrs/zf +9+XeCZnDiOeob/6Vl4zED+HfvAMOoVb/qt1NceJ8R1c5mCNZWx0FaMW6oDVIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc2Q56s1Zz12ys; Sun, 27 Oct 2024 16:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RGh975053798; Sun, 27 Oct 2024 16:43:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RGh9Us053795; Sun, 27 Oct 2024 16:43:09 GMT (envelope-from git) Date: Sun, 27 Oct 2024 16:43:09 GMT Message-Id: <202410271643.49RGh9Us053795@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: 95b17d3b1c51 - main - mktemp(3): bring the documentation up to date with best practice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 95b17d3b1c5187d2630556eaa0f2107378ca3b4f Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=95b17d3b1c5187d2630556eaa0f2107378ca3b4f commit 95b17d3b1c5187d2630556eaa0f2107378ca3b4f Author: Wolfram Schneider AuthorDate: 2024-10-27 16:41:01 +0000 Commit: Wolfram Schneider CommitDate: 2024-10-27 16:41:01 +0000 mktemp(3): bring the documentation up to date with best practice Using short temp filenames as /tmp/temp.XXXX (4 or 6 X) was probably ok 20 years ago, but not anymore. Best practice is to use 10 X. Given that our users often copy & paste examples from our manual pages we need to update the documentation. PR: 261437 --- lib/libc/stdio/mktemp.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3 index d00d3d4f61fb..93870f3865de 100644 --- a/lib/libc/stdio/mktemp.3 +++ b/lib/libc/stdio/mktemp.3 @@ -63,7 +63,7 @@ The template may be any file name with some number of .Ql X Ns s appended to it, for example -.Pa /tmp/temp.XXXXXX . +.Pa /tmp/temp.XXXXXXXXXX . The trailing .Ql X Ns s are replaced with a @@ -116,7 +116,7 @@ and respectively, except they permit a suffix to exist in the template. The template should be of the form -.Pa /tmp/tmpXXXXXXsuffix . +.Pa /tmp/tmpXXXXXXXXXXsuffix . The .Fn mkstemps and @@ -243,7 +243,7 @@ compilers were common. For example, calling .Fn mkstemp with an argument of -.Qq /tmp/tempfile.XXXXXX +.Qq /tmp/tempfile.XXXXXXXXXX will result in a core dump due to .Fn mkstemp attempting to modify the string constant that was given. From nobody Sun Oct 27 19:07: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 4Xc5cT4CGkz5bKsK; Sun, 27 Oct 2024 19:07: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc5cT3jZXz4hKv; Sun, 27 Oct 2024 19:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730056041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rq8y5K1L2MMFgfHoojggPeI5qZHah43JohCpm1n8TEU=; b=t/sM+3pTaDba1OzsDK/MIh4XsZj9LH4ZAgajjaoyb3ut6PzDhQU8DZG7gT18Uk9IGgIGFo AS/8JVHgUwFxWrzst59sQ7Qay7aVnr6+RLQuC97J1VzuKpBX9ZM8+Fw6X6EsX5F0Hklm6R FmwGexyMCDJWuHSjem36tLTq1TOb8Texqs4oKPhJVbPLBaReBhRW1U2gz7kd3uGjPXx+dt N6/OQS7EZDvgJ5jM6k+mXOQl18KTHVrQbISQpG/OP7IStPTNywHU8J9NxpdRZfoq+OsDnM lnsb3C/r/A/250Qf4uYvTdih0Oxg4oX5LmFNWBgZIxyo66jCLWRdUZeqbiJkcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730056041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rq8y5K1L2MMFgfHoojggPeI5qZHah43JohCpm1n8TEU=; b=Xjz0nU7O2fN1teYUtvr5f4KH/V9yyQmIn1cSX7Up0wlkA5WEowGwVbyOL5/5+/N6Pwly2w 5az+EmSBsHYYUJNzmvGye+l0Dcck3E7Ll+yTKWOQTYpl+KO/wy+9BXTy7wcj3l3CY8Ox+M t14rXMnr1Jyh1vNLwyATtxGmzfsZ0AJ+ZIKE1an4VbqSk0U3k8eiDixyPGcPKUDRNleDK7 PY4fd0q/c1e1XtJg4VmusyoF5mc6qirSu87NmslfRWYho4waY7nz0g6OD8Jlvp5yEQFl2v 59CSyAJ/NBZ8clLPWda7jEzyCITDtK3jfyf4EqlKP4uAaYcURVNtIuiEMCy21w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730056041; a=rsa-sha256; cv=none; b=xsSjalvesWhXjZ/0lxJS4ecWXINeSg2gm5AzqWlJVSOhrr4JEAMsom7IrBSAhp2iho/OuA xWm8+k6l/bQ5rpPt/lNg/bUpW1IyBPw8fpRbyKX5sh0ZmQnDz16A7y1nvAZ6T2JLDDW2Wy lX/Lqf4PDKg8sL6j7SMhOT9As8KSsPYL3OQVs8ftKRFf/7mj4CTzzfZevyTvqwiTSFnE0u 4IqFxl3vzIqwOoHpcPYuXg62d0B95hB1kAGneZjpWX72ZosWh0JLe12SsFsSccj/T/c0JF 8u9tTZ1UDAGDSCM+OjO7d9t0O7X91C77uzSlboU7y+MikrW5rd7yvkeWF04iIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xc5cT3Jscz16WR; Sun, 27 Oct 2024 19:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RJ7L3d014901; Sun, 27 Oct 2024 19:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RJ7LHG014898; Sun, 27 Oct 2024 19:07:21 GMT (envelope-from git) Date: Sun, 27 Oct 2024 19:07:21 GMT Message-Id: <202410271907.49RJ7LHG014898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 2001bef84ba6 - main - vm: Eliminate unnecessary lock asserts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2001bef84ba64cee51abf91b5ad3aca071e75788 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=2001bef84ba64cee51abf91b5ad3aca071e75788 commit 2001bef84ba64cee51abf91b5ad3aca071e75788 Author: Alan Cox AuthorDate: 2024-10-27 17:40:43 +0000 Commit: Alan Cox CommitDate: 2024-10-27 19:03:52 +0000 vm: Eliminate unnecessary lock asserts There is no actual need for the VM object to be locked when initializing a VM page iterator. Reviewed by: dougm Differential Revision: https://reviews.freebsd.org/D47298 --- sys/vm/vm_page.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 054832e3f19a..57e5684b3178 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1715,7 +1715,6 @@ void vm_page_iter_init(struct pctrie_iter *pages, vm_object_t object) { - VM_OBJECT_ASSERT_LOCKED(object); vm_radix_iter_init(pages, &object->rtree); } @@ -1729,7 +1728,6 @@ vm_page_iter_limit_init(struct pctrie_iter *pages, vm_object_t object, vm_pindex_t limit) { - VM_OBJECT_ASSERT_LOCKED(object); vm_radix_iter_limit_init(pages, &object->rtree, limit); }