From nobody Sun Nov 5 01:55:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNHc649qhz4yGHn; Sun, 5 Nov 2023 01:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNHc63M23z3fT4; Sun, 5 Nov 2023 01:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699149302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hnFllxxz+sJsJRO7YNVUClYsWCSBFXmZP7Ww5OS+wzc=; b=p5Jnge+W873g6viMIhvT8hJmxxlXWFHyTRCkOZUjvDYsSbNsogeeDFgClrZ4PDoWdlv4Vx G2Yw+1vppueMoxgBJVjB9qRgK3/LkgTS/MLQI+Fw+R94jepq3z+IHsyySnCBI8LQqt4Llr 1n2+LyvSTwTmoeQ/xtKAQjTy+uJ4asfJY3O3GaUx67YL5sofsO5bza5WvZm0Mt0EpNAzH6 Dn561XGCWCT33tBJC+wGvMnsYAUN4w7OwZVMMHvGuk8anbZDx/2OP3FCHOfZSzVZEQwOcb yyfkH5anzTuiJu+JfZrz7rDiqdz0WJ9D403fTB1Dzqlzb+70D6EHgjIvL/rA9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699149302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hnFllxxz+sJsJRO7YNVUClYsWCSBFXmZP7Ww5OS+wzc=; b=aNFZqvIsGuflZSpNodqDvED/dJZwaSGaPkP5mG0gKP9D9tac8Fl5JAmmaa7pNiBjPo1N13 Dsq9OgIEm1shTDnEzt5ZD1wgRHbOaUlJLVbmua0Iq707m3s02nI6gVFj0G/VrpRda1WTuY zqe/nphO8otGS94YDAkRnwSWW/q8tIPoqPbVw1boiOXlMJbXnUFUpICPrCAYJDyFfZf4gJ sBwSpqRnn9f/ysELCyjedph3BXtcr5s8GYFwXLSw2flUh7vxEZblEDHkRCV3OMdoSdKl9P jF6Bspa9LqvEbHeRm1nLruPP/b00jFHhbZhuBDBisCE60fUzPRkG2k7wAFMV8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699149302; a=rsa-sha256; cv=none; b=GFtAgpTN6p+VZqR3KYhrjlNnf3u+zS4AYI03y0QlEWFfbFmbr+oWqTwPn8Zp6GbP3TYKtL MbDYukRnthOfijBbOCFEM9gYovFdJz+rGqZezJOkmsB/95LQbIlpAEJLLSw8ec5ErAivbW ddgsPVibUh109BZ0bTN4gnBc7bZLKsN4DSNsM4CfZWgAqlT3PBs9VbMpon5AKzTxFWAcoQ LND7hY0zyRqPMvvGIbSKzC9bpWvMAQ2SZOAltKHaq5zu4kMHt9VmrP8F739C7EAKYdi8Jg tdputvGPszLukixH0Vcl+Poyjrsf3e+BuIIGIeLFc7IYWlghPgWOt6vvA76HIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNHc62JJfz1KsJ; Sun, 5 Nov 2023 01:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A51t20v069959; Sun, 5 Nov 2023 01:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A51t22J069956; Sun, 5 Nov 2023 01:55:02 GMT (envelope-from git) Date: Sun, 5 Nov 2023 01:55:02 GMT Message-Id: <202311050155.3A51t22J069956@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: 13a974574670 - main - crashinfo: remove unused /usr/bin/gdb 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 13a974574670cc85a7db60bae6620631ad756f2a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=13a974574670cc85a7db60bae6620631ad756f2a commit 13a974574670cc85a7db60bae6620631ad756f2a Author: Ed Maste AuthorDate: 2022-03-08 14:32:24 +0000 Commit: Ed Maste CommitDate: 2023-11-05 01:45:15 +0000 crashinfo: remove unused /usr/bin/gdb support We have not had gdb 6.1 in the base system for some time; there is no need to check for it. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34478 --- usr.sbin/crashinfo/crashinfo.sh | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh index 8a6981ba883c..0482d41804f2 100755 --- a/usr.sbin/crashinfo/crashinfo.sh +++ b/usr.sbin/crashinfo/crashinfo.sh @@ -44,19 +44,6 @@ cleanup() [ -e $VMCORE ] && rm -f $VMCORE } -# Find a gdb binary to use and save the value in GDB. -find_gdb() -{ - local binary - - for binary in /usr/local/bin/gdb /usr/libexec/gdb; do - if [ -x ${binary} ]; then - GDB=${binary} - return - fi - done -} - # Run a single gdb command against a kernel file in batch mode. # The kernel file is specified as the first argument and the command # is given in the remaining arguments. @@ -66,11 +53,7 @@ gdb_command() k=$1 ; shift - if [ ${GDB} = /usr/local/bin/gdb ]; then - ${GDB} -batch -ex "$@" $k - else - echo -e "$@" | ${GDB} -x /dev/stdin -batch $k - fi + ${GDB} -batch -ex "$@" $k } find_kernel() @@ -173,8 +156,8 @@ if $BATCH; then exec > $FILE 2>&1 fi -find_gdb -if [ -z "$GDB" ]; then +GDB=/usr/local/bin/gdb +if [ ! -x "$GDB" ]; then echo "Unable to find a kernel debugger." echo "Please install the devel/gdb port or gdb package." exit 1 From nobody Sun Nov 5 02:19:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNJ8l0wg9z4yMC4; Sun, 5 Nov 2023 02:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNJ8l0SqDz4F90; Sun, 5 Nov 2023 02:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699150791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+2R1hz8Xcx25Z+wj6faPkNw//hwC1+k3enk+s4ndfB0=; b=n1jCFwARiYqVOPW9QE0oqSWwAl35UcrWelNBeTp+bQqzwh7rJGM/QcGEYvu7jfD+k2+Zau +aXGtpAUH8bg5GoF/Z/Hmz971oQewDgjLtV3xVQDmn/s1LfRfdebOyKfXro+sFJb2XPc5u zX/WLLhZO1qjDnmT72o7ARLwtaIWYj99++qoMrJR68fzFqq0UcoWkKjGzLzLcN1x8dk4fJ uxTpylAz22DWjsUhAC5W25LIsz6hmz/7XlCHY0uyanYvyR/Am5VxFRrS6G/JYkAN4OizXm qgcmYw2s4KMWaV6geNqNua8CpFPVh3lLa7FN1lpLuveCsip7XolYVaaZmdtlvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699150791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+2R1hz8Xcx25Z+wj6faPkNw//hwC1+k3enk+s4ndfB0=; b=bPWmS4ccbcZHXAHH0xkurwD5K2kvk2ONdRxBG8UtOTTMYwJbF19jh/3Y0H/RUx2d8g2Ja2 OxosVNJdrjRJoyJ8aD992Sm6yfdG4lcEJPavscAgmpd00+RdXCeIrQsTCf6T9BGrQWJOQM 4CenKU0rPGI1U+Kw5B+1vN2akqXIKkmuLqqkUB4MBgdbgwuF8JT9Dh6mWw+MdGE/AQxFef jho4L4zBxuBFJK/vTPBkufr50DLRumC4CZe+CBY1mtC0+pgRBYcl4n9FRZc/wKXT17etpk 4EUU3+RDY8SQFHOqzjHHgg01eZMUigRuRirOJm1WU9kKKnKZKMQpfLFTBmvbBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699150791; a=rsa-sha256; cv=none; b=qE6oR7XKth1KhFc4VmXp81MV8Y9MHMcxmWUDGgP8YUZqlpKdqMGP5XbUFJ4cOGjz3rZf51 nXcOhKRLWJnFNTas7RdJa6mpuFXjLntVXXrMGalFNI7JcleRr4R4AXbmEApl2WLNz5jIDP e7tOIMiOj7c3qNlCK7aK3mc4zGkLHaH/NOLKEWyYDQ17b1kdTr7O8ziy74uPaeeuAE2lyF kQXNEL+6YaLzFJTiz6yjsDU307AqoyXBFNN8yoRSbdkSTch+Mv4xxTKeaM7I36dvc+8Vf+ qsT0SqKhVRgO69c3wOLdRRiA88TFssMu+qOnjLvuiTXomXxaPJ74ASsX89juLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNJ8k6fLhz1M1V; Sun, 5 Nov 2023 02:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A52Jovl005405; Sun, 5 Nov 2023 02:19:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A52JolT005402; Sun, 5 Nov 2023 02:19:50 GMT (envelope-from git) Date: Sun, 5 Nov 2023 02:19:50 GMT Message-Id: <202311050219.3A52JolT005402@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: e116e040f309 - main - grep: don't rely on implementation-defined malloc(0) behavior List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e116e040f3091eca914a06dcd0bdd9f1aea23add Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e116e040f3091eca914a06dcd0bdd9f1aea23add commit e116e040f3091eca914a06dcd0bdd9f1aea23add Author: Kyle Evans AuthorDate: 2023-11-05 02:08:36 +0000 Commit: Kyle Evans CommitDate: 2023-11-05 02:19:12 +0000 grep: don't rely on implementation-defined malloc(0) behavior The very few places that rely on malloc/calloc of a zero-size region won't attempt to dereference it, so just return NULL rather than rolling the dice with the underlying malloc implementation. Reported by: brooks, Shawn Webb --- usr.bin/grep/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 1805cc74bfc6..936abc41b3ef 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -650,6 +650,8 @@ grep_malloc(size_t size) { void *ptr; + if (size == 0) + return (NULL); if ((ptr = malloc(size)) == NULL) err(2, "malloc"); return (ptr); @@ -663,6 +665,8 @@ grep_calloc(size_t nmemb, size_t size) { void *ptr; + if (nmemb == 0 || size == 0) + return (NULL); if ((ptr = calloc(nmemb, size)) == NULL) err(2, "calloc"); return (ptr); From nobody Sun Nov 5 14:23:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNcDB4c1Tz50JTy; Sun, 5 Nov 2023 14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNcDB3gYZz4Ps0; Sun, 5 Nov 2023 14:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699194234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uouq+tUKFFfBUkVIwf8d2OLuJRIj+ySjwy6C61/yV4Q=; b=BdNENV8YKZwm6Gr4PnwR7em9YEDMtXwrqPeE3SYZkiRXnRX1+roWYbdEMqYeQnJddqbbKR moz4Ab7g1bHYAhMAGhOSQ0XEOb9+yu8ANRYta/JnUkCBTi4tnmYc7Ci0hg9VAn+hESlnXZ tB8S22S01d9ogF90Ck0FY55+ZafP+6LjeuVqWcb/KIV0d5c978WUtP40I5NtOvVCSv5d+Z k2FXnRR4zVBp1Wfzz2dGgsqcgTm7OseEbV7/ofzIaqVagzxl3a0WAO6bZh471BbqViocfD gPVlstJAyX50KqYcc96kZiju9sUqxMCX4r+pFuyY9PupZnYBc5tsP1zvaLjQsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699194234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uouq+tUKFFfBUkVIwf8d2OLuJRIj+ySjwy6C61/yV4Q=; b=XR69vP3hJwuY4yOJsMGc1Ftci88rhfrjdiaDDeaA/H5mzuw3rA0rxHiZfxdv7rO34srohD wGBmiCkOjYZPPHXhjJXXuwFhlBSHx/u/7hOXVJD0eKZflDMQPCjoVX11jORaw2Jv6JiN+V gIou4WRtJfJP+jBfEvTJ0UMTSkYKjxvzOX6CO7VJDPD7dEcwySa0IUR3mYkkI8oMYKtYiM yFMoEkK+Pv4YfEYgteL0vEjIjxZnDA8VT4f/HE7qJGljrNRg9LQFxSZBllfL/Fjk1AcmSD LFm9p6KCI6pyBK5FqrkSRapdumHSrTSq4LToKPuzjcGVxNErljU1y/Gim4taDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699194234; a=rsa-sha256; cv=none; b=hYfEFuwWX2BPxRNuNvfwVKjV77INMwIuriOm3feaaHhJX5e/zlQsOvOr4d3Bp9O84azHEt bZHRwqLzAVJNwEYKZMc0jRL/k7WXmGCdvsdK4nIxw4+bgNpjkzq3dTXVOWen5GLZL6XfWJ 2L00Ao/SGOCtgy7+uTh1ZJJxy2QDkWVdjIbzrlCMWsc+1sglZuuWokKoaoongi6HWpGqHx fxkECJJW5cwd4XJ3iP0mCGp8aN4nIMqPCif1IT9ZiF6sowMajgBQHGpEToDRzCLBx0geJO zIC2RslwflyQkFeQXxHdcRxpsbmMOcGqRaBF6VjQPsvJ4EXYJVjJ/WGL7kk+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 4SNcDB2PwQzCLh; Sun, 5 Nov 2023 14:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A5ENs8w020138; Sun, 5 Nov 2023 14:23:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A5ENsLB020135; Sun, 5 Nov 2023 14:23:54 GMT (envelope-from git) Date: Sun, 5 Nov 2023 14:23:54 GMT Message-Id: <202311051423.3A5ENsLB020135@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: b10ae5a9b21a - main - tcp rack: remove references to rb trees List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 commit b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 Author: Michael Tuexen AuthorDate: 2023-11-05 14:21:06 +0000 Commit: Michael Tuexen CommitDate: 2023-11-05 14:21:06 +0000 tcp rack: remove references to rb trees The references should have been removed in https://cgit.freebsd.org/src/commit/?id=030434acaf4631c4e205f8bccedcc7f845cbfcbf Reviewed by: rscheff, zlei MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42386 --- sys/netinet/tcp_stacks/rack.c | 24 ++++++++++++------------ sys/netinet/tcp_stacks/tcp_rack.h | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 5c16cb9ed23b..5df188aae52c 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -7472,7 +7472,7 @@ need_retran: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -7692,8 +7692,8 @@ rack_remxt_tmr(struct tcpcb *tp) * order. This way we send in the proper order and any * sacks that come floating in will "re-ack" the data. * To do this we zap the tmap with an INIT and then - * walk through and place every rsm in the RB tree - * back in its seq ordered place. + * walk through and place every rsm in the tail queue + * hash table back in its seq ordered place. */ TAILQ_INIT(&rack->r_ctl.rc_tmap); @@ -8355,7 +8355,7 @@ rack_update_entry(struct tcpcb *tp, struct tcp_rack *rack, (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -8545,7 +8545,7 @@ again: (void)tqhash_insert(rack->r_ctl.tqh, rsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -8619,7 +8619,7 @@ refind: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -9776,7 +9776,7 @@ do_rest_ofb: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -9897,7 +9897,7 @@ do_rest_ofb: } /* * There is more not coverend by this rsm move on - * to the next block in the RB tree. + * to the next block in the tail queue hash table. */ nrsm = tqhash_next(rack->r_ctl.tqh, rsm); start = rsm->r_end; @@ -10138,7 +10138,7 @@ do_rest_ofb: (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:% rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:% rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -12478,7 +12478,7 @@ rack_un_collapse_window(struct tcp_rack *rack, int line) (void)tqhash_insert(rack->r_ctl.tqh, nrsm); #else if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) { - panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p", nrsm, insret, rack, rsm); } #endif @@ -14808,7 +14808,7 @@ rack_init_outstanding(struct tcpcb *tp, struct tcp_rack *rack, uint32_t us_cts, } #ifdef INVARIANTS if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) { - panic("Insert in rb tree fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash fails ret:%d rack:%p rsm:%p", insret, rack, rsm); } #else @@ -14868,7 +14868,7 @@ rack_init_outstanding(struct tcpcb *tp, struct tcp_rack *rack, uint32_t us_cts, } #ifdef INVARIANTS if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) { - panic("Insert in rb tree fails ret:%d rack:%p rsm:%p", + panic("Insert in tailq_hash fails ret:%d rack:%p rsm:%p", insret, rack, rsm); } #else diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index 38239ef97b4d..4152a1a5d7ba 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -120,7 +120,6 @@ rack_ts_to_msec(uint64_t ts) } -RB_HEAD(rack_rb_tree_head, rack_sendmap); TAILQ_HEAD(rack_head, rack_sendmap); TAILQ_HEAD(def_opt_head, deferred_opt_list); From nobody Sun Nov 5 14:31:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNcPJ1wfZz50KbH; Sun, 5 Nov 2023 14:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNcPJ1CWHz4Rgs; Sun, 5 Nov 2023 14:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699194708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1EW02lM3cjNUJpVsAwhjLkb25N6hy977HbVfXoKncE=; b=l6LjQuxA9efJQvSrcRxZ29/tyVVGTyMLNJRts5zD8xa9rPiAQO/UzSxUL/FXDhfUmljQXx o0lKZDTWIOwnaFjB2cAo00K52ZyvobBPe7+g2PwNz1kJpgtYYR7VRrIhtYqdiQcYltjXWk nMqNUtCksiFZ40egkHGcMQ+cww4DgsddCzDLuNO+5W6+1kv+F9mnO9WrHCeRIWRmzauYhl srI+mMeM4UVyj4iJ5R8enCvgOXpQa8QBRqj19w+bokgEpAJcr8SvHT404RikgFr/IGQ3fN hETXLcue3w5MT9coMDfMzyRj3dB5tzXIRbYT9WFIQshYFkwoGMnVFnN53BOQtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699194708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1EW02lM3cjNUJpVsAwhjLkb25N6hy977HbVfXoKncE=; b=xW0We1Ekq8ZeimFkr1EpLajfeB8uJovxbAuZ9YBjfBagnyUUuvNOkk6HYBVqTydIcHfzlg vAaVhR6BnBZ8wBbI76Recs1AP0RNSwIKEG1wB8A9b+d8IPZtBbyHfueYLfOzdAPj9ZLN4f QzO4iqG/67N9T5gQA70BiGGMxpom/I64kDC0lbcvLugXyHvnu1Wy+dyOz2JVqT1ten/V0j qK0X2p3ukVkHpU85iDzvSU3RK75Y6I3/8+xnk8+nfENMyAerVoszKqFbaJoDZa6sLYnSrb WE1kdCbJmfSnXLwv8gpw4EWwCdlzQnleLr9putBJS57PoQ6T9MvJswQPqCQLoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699194708; a=rsa-sha256; cv=none; b=au8TyG4YZyf58pCHlq+b32kzTyOloM8+JnjTqfbwzJk8dT8JIwaoyiaUG+mEUXJXs0PdeK /drDxn9CQncJfRUtaOIEFqX2aK7Xt39qWhUXUvo/Ly0QNkR2dc0Tr3C7Qrv5ucsGipsmQH ntt2bVJijNiNHaO780gmgPdmNid/8mkwT8yjIbP+fFpMQdwxCEXvYs0Ty/rihLKA9MkieJ 7F/N3w8f/R1oDYFHtL+8QRPSC4wcvuhCIcMUyhhgsYahqgDof8UZ9ZMtsb5KOA9HKDBa7t 80Y3dKawxw99e0ymmhRe2Ufu+Lk0wbQmwHsarjJ7OQfODLgBgQ/y40L9PAABGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNcPJ0HGqzDQc; Sun, 5 Nov 2023 14:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A5EVl4Q035324; Sun, 5 Nov 2023 14:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A5EVlMp035321; Sun, 5 Nov 2023 14:31:47 GMT (envelope-from git) Date: Sun, 5 Nov 2023 14:31:47 GMT Message-Id: <202311051431.3A5EVlMp035321@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: 03c3a70abe5e - main - udplite: make socketoption available on IPv6 sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 03c3a70abe5e9fa259b954de78ae69229fa9c99f Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=03c3a70abe5e9fa259b954de78ae69229fa9c99f commit 03c3a70abe5e9fa259b954de78ae69229fa9c99f Author: Michael Tuexen AuthorDate: 2023-11-05 14:28:54 +0000 Commit: Michael Tuexen CommitDate: 2023-11-05 14:28:54 +0000 udplite: make socketoption available on IPv6 sockets This patch allows the IPPROTO_UDPLITE-level socket options UDPLITE_SEND_CSCOV and UDPLITE_RECV_CSCOV to be used on AF_INET6 sockets in addition to AF_INET sockets. Reviewed by: ae, rscheff MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42430 --- sys/netinet/udp_usrreq.c | 8 ++++++++ sys/netinet6/udp6_usrreq.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index a96ec22c5992..069cd8623464 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -897,6 +897,10 @@ udp_ctloutput(struct socket *so, struct sockopt *sopt) #if defined(IPSEC) || defined(IPSEC_SUPPORT) #ifdef INET case UDP_ENCAP: + if (!INP_CHECK_SOCKAF(so, AF_INET)) { + INP_WUNLOCK(inp); + return (EINVAL); + } if (!IPSEC_ENABLED(ipv4)) { INP_WUNLOCK(inp); return (ENOPROTOOPT); @@ -944,6 +948,10 @@ udp_ctloutput(struct socket *so, struct sockopt *sopt) #if defined(IPSEC) || defined(IPSEC_SUPPORT) #ifdef INET case UDP_ENCAP: + if (!INP_CHECK_SOCKAF(so, AF_INET)) { + INP_WUNLOCK(inp); + return (EINVAL); + } if (!IPSEC_ENABLED(ipv4)) { INP_WUNLOCK(inp); return (ENOPROTOOPT); diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 4e69608b71de..068b9e7095a9 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1244,7 +1244,7 @@ udp6_disconnect(struct socket *so) #define UDP6_PROTOSW \ .pr_type = SOCK_DGRAM, \ .pr_flags = PR_ATOMIC|PR_ADDR|PR_CAPATTACH, \ - .pr_ctloutput = ip6_ctloutput, \ + .pr_ctloutput = udp_ctloutput, \ .pr_abort = udp6_abort, \ .pr_attach = udp6_attach, \ .pr_bind = udp6_bind, \ From nobody Sun Nov 5 18:28:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNjf91sxxz4ysrx; Sun, 5 Nov 2023 18:28:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNjf900rkz3W1W; Sun, 5 Nov 2023 18:28:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-507973f3b65so4945277e87.3; Sun, 05 Nov 2023 10:28:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699208894; x=1699813694; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bCKMDlGzNvhirG4SkKwcXqLuL97vXyEDS0F7KM3gfpI=; b=RLsoMHXJeeILuCsQZX9PpNRi8yrglTn24gpfZY2k2SajnT7tgtS3EZziwOas4IhJZq bAimBvSoyt+K+X3wYdAIhC69/MTns+/UIMqs79gr1NQ5Oqd34HCxVHiuMs+6nesKUCGA Czl28yt3R+QY7yFEZrGumRzV5TTpRpIifegUCCt9AmtylU3N/QrhJxaVFEP13V8m+Sjc psgQVZkNa20Ikcj/gFWs+bISoSvwwDP4j6Kc7DB5oox0aj55tuETPLFEOlT8A8/oySFe JDZAgYQUd/Ddg7JrxIcJ8OI+8RGnyvtYBjGyZgYCo81ctXpRnEtiFOCCEroT7lf8Rwop 4oig== X-Gm-Message-State: AOJu0Yw+pmI5V+5dEWnSziKo2mDXlfrtnim4HLe7S23vIhZn+dRzgr+N OFRlru27fLeiFGfhuW5vWG8m8Hi2sV9C2RjZ+CITgFAqQRY= X-Google-Smtp-Source: AGHT+IHb2XA/t5LxEHPbeAKyL3U5IQXluYAMJuow3x99YIHQM6YdccVVy9j5E4yTkSV+XTXc2JCDNIYQtXYarwA6ocw= X-Received: by 2002:ac2:4c43:0:b0:509:4aae:f2b1 with SMTP id o3-20020ac24c43000000b005094aaef2b1mr9162843lfk.8.1699208893863; Sun, 05 Nov 2023 10:28:13 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202311051423.3A5ENsLB020135@gitrepo.freebsd.org> In-Reply-To: <202311051423.3A5ENsLB020135@gitrepo.freebsd.org> From: Ed Maste Date: Sun, 5 Nov 2023 13:28:01 -0500 Message-ID: Subject: Re: git: b10ae5a9b21a - main - tcp rack: remove references to rb trees To: Michael Tuexen Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-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: 4SNjf900rkz3W1W On Sun, 5 Nov 2023 at 09:24, Michael Tuexen wrote: > > The branch main has been updated by tuexen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 > > commit b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 > Author: Michael Tuexen > AuthorDate: 2023-11-05 14:21:06 +0000 > Commit: Michael Tuexen > CommitDate: 2023-11-05 14:21:06 +0000 > > tcp rack: remove references to rb trees > > The references should have been removed in > https://cgit.freebsd.org/src/commit/?id=030434acaf4631c4e205f8bccedcc7f845cbfcbf Note that there's a `Fixes` commit message trailer that can be used for this purpose, e.g. Fixes: 030434acaf46 ("Update rack to the latest code used at NF.") The benefit of using this format is that there are tools to a repository to find commits with "Fixes" entries that have not been cherry-picked - e.g. https://github.com/joergroedel/git-fixes. Also, having the original commit message subject line (in addition to the hash) may be useful if we migrate from Git to something else in the future. From nobody Sun Nov 5 19:36:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNl975Q3hz507j0; Sun, 5 Nov 2023 19:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNl974zT8z3fvr; Sun, 5 Nov 2023 19:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699213003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W1Ub0TboH5r+zMACH8+ty8gW21dc3o1L4nNF3uNt4d8=; b=mOWrtiIP/7rXb3P4Dnk5LjLfNVyQvng/m0lmOYzMR28qrtE4V6nkqYXef657jqUBhjuj70 lmRJvyo9BQzwq1E7/4HbiVjbtsKIMt3DshVkJHd1qiO2zfXKm9W3VV63VGafsaUhioO3zJ r/ein2dGBjlusIciALroGGVSZd0aWKI04M4aYhkfGJlSr5NBPA505V8l2UdwQm1Xr/GsZq 57MFRJ2LGawrzbFEXkF2iBvPQLfbwoF5Jqi/lZupJeofRwmT1FebAxrJtKJZqtemD05Cvn We5GPxfNsOnf+oS2Yb4LFvxu0yQIhIkjEw7ZGmrHZ3/IRYD4gffMrMHOA354wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699213003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W1Ub0TboH5r+zMACH8+ty8gW21dc3o1L4nNF3uNt4d8=; b=W0Y7lu895EPKIqs1AjhuwgidtAkrkb2rvbbzmpxt3WMWBtQZgW2N0vMv8r9bjj6s3w1AC0 F8CdF+S9BMwx81grJ3NPr1Ud9C+fBwWPfb/ifGTOMikRRUxY6PyH0+71v/FZ/aHr6USKOR hJ+YM7YBPp89JlhJsAmZY8IEX/F8wA3ynSUKtYwg/+usbgP/rJ12dO4zHQ75Wil+wOqDUl m8kQGf6/X6Xc79WbyB18ZjaBJbNvrfQQitMuiUl4zV0dY7OvMHT8AFRXz8wGNm6I9cX1Iz wv8fLUnAK24JkW2VIvTlMTwvdDiw6ppbN4xsVBumtWij8mKrrYzqQek7LT0R1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699213003; a=rsa-sha256; cv=none; b=L9F3Y+pk4mIAsyVpkB0wOSc7Fe/3th5UK/ZJMKKWAo47nso0ReBeSdmRtYOqT65VYg8BV1 QPV/G+pHz6/twgHHpKeEJwnQaNyBvViQovd8AeTpIYJtertdRaKQoDHDrnCHwnbqgJ8E4X Tu1FvQ+0pxBqO+S1fDdfhrP4R/TzZGT40OwvlaXuAYSYUCRQOKCEcU+LADMSZS3SsKk8gh OEp5Liozf2IfSQPEsi/GeYbs5Nc08CHW5YxqBck9MJU4oyyL9fWEucpero7xsPZXgnELNb ImVyG+gYx2zZuDUecm5vwTylmmGUrwW5TbF0UyMjSo/mA52vONPnPRkyXaBJjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNl973kNgzdG9; Sun, 5 Nov 2023 19:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A5JahR6039290; Sun, 5 Nov 2023 19:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A5Jahbi039287; Sun, 5 Nov 2023 19:36:43 GMT (envelope-from git) Date: Sun, 5 Nov 2023 19:36:43 GMT Message-Id: <202311051936.3A5Jahbi039287@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: 35af22ac986c - main - if_tuntap: trigger the bpf hook on transmitting for the tap interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 35af22ac986c4f3e8160c943a478492e748b6f23 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=35af22ac986c4f3e8160c943a478492e748b6f23 commit 35af22ac986c4f3e8160c943a478492e748b6f23 Author: Michael Tuexen AuthorDate: 2023-11-05 19:32:46 +0000 Commit: Michael Tuexen CommitDate: 2023-11-05 19:32:46 +0000 if_tuntap: trigger the bpf hook on transmitting for the tap interface The tun interface triggers the bpf hook when a packet is transmitted, the tap interface triggers it when the packet is read from the character device. This is inconsistent. So fix the tap device such that it behaves like the tun device. This is needed for adding support for the tap device to packetdrill. Reviewed by: kevans, rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42467 --- sys/net/if_tuntap.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 3eeaadb83a20..a865c23cb372 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -933,6 +933,16 @@ tunstart_l2(struct ifnet *ifp) TUN_UNLOCK(tp); } /* tunstart_l2 */ +static int +tap_transmit(struct ifnet *ifp, struct mbuf *m) +{ + int error; + + BPF_MTAP(ifp, m); + IFQ_HANDOFF(ifp, m, error); + return (error); +} + /* XXX: should return an error code so it can fail. */ static void tuncreate(struct cdev *dev) @@ -972,6 +982,8 @@ tuncreate(struct cdev *dev) if ((tp->tun_flags & TUN_L2) != 0) { ifp->if_init = tunifinit; ifp->if_start = tunstart_l2; + ifp->if_transmit = tap_transmit; + ifp->if_qflush = if_qflush; ether_gen_addr(ifp, &eaddr); ether_ifattach(ifp, eaddr.octet); @@ -1713,9 +1725,6 @@ tunread(struct cdev *dev, struct uio *uio, int flag) } TUN_UNLOCK(tp); - if ((tp->tun_flags & TUN_L2) != 0) - BPF_MTAP(ifp, m); - len = min(tp->tun_vhdrlen, uio->uio_resid); if (len > 0) { struct virtio_net_hdr_mrg_rxbuf vhdr; From nobody Sun Nov 5 19:37:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNlB64PKjz507yy; Sun, 5 Nov 2023 19:37:34 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNlB61vF8z3glN; Sun, 5 Nov 2023 19:37:34 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2001:67c:1232:144:549e:c316:25d8:505e]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id 9981D73453091; Sun, 5 Nov 2023 20:37:29 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: b10ae5a9b21a - main - tcp rack: remove references to rb trees From: tuexen@freebsd.org In-Reply-To: Date: Sun, 5 Nov 2023 20:37:28 +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: <202311051423.3A5ENsLB020135@gitrepo.freebsd.org> To: Ed Maste X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE] X-Rspamd-Queue-Id: 4SNlB61vF8z3glN > On Nov 5, 2023, at 19:28, Ed Maste wrote: >=20 > On Sun, 5 Nov 2023 at 09:24, Michael Tuexen = wrote: >>=20 >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db10ae5a9b21aa11e96a1951ccc4525dd= 1fdb60b3 >>=20 >> commit b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3 >> Author: Michael Tuexen >> AuthorDate: 2023-11-05 14:21:06 +0000 >> Commit: Michael Tuexen >> CommitDate: 2023-11-05 14:21:06 +0000 >>=20 >> tcp rack: remove references to rb trees >>=20 >> The references should have been removed in >> = https://cgit.freebsd.org/src/commit/?id=3D030434acaf4631c4e205f8bccedcc7f8= 45cbfcbf >=20 > Note that there's a `Fixes` commit message trailer that can be used > for this purpose, e.g. > Fixes: 030434acaf46 ("Update rack to the latest code used at NF.") >=20 > The benefit of using this format is that there are tools to a > repository to find commits with "Fixes" entries that have not been > cherry-picked - e.g. https://github.com/joergroedel/git-fixes. >=20 > Also, having the original commit message subject line (in addition to > the hash) may be useful if we migrate from Git to something else in > the future. Hi Ed, thanks for pointing this out. We use that method in the future. Best regards Michael From nobody Sun Nov 5 21:28:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNnfG2k5Pz50XrT; Sun, 5 Nov 2023 21:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNnfG1WRwz4W3Q; Sun, 5 Nov 2023 21:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699219718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJENHoBRSaNb9vddm9XrtD3tMUhQhIfSwhJlp121LoA=; b=ru5dNf1lWp1ECUDfgVOrx68eQpMnJI6Xr97mqVkKS50irMzNMqnMt0qStio1JzVYtIMMJe fuIyRy7So8XSR52rTy7ScjxTRloW0p78aebLmaiN+ih7rwU32FtqpGTyLjkRP20h3noc9s wdtumnLiNh/jacoXmjD9t8aLa4Z2GGPKciazzhVAswbGPV9n6ZwjxcUglaseyHqaiCe1rq EgBCKAnWtzXig4OggcQOGB8m6hqUnxlp3ydqOyFoVXub8IpY/i31zi+0/x2kGGE/nZ5j3y FLxLTDooifGLp8c3pwj3fHUlwSUIeUhAAF0rLf0kaapsCUzfq33Hkqxtntw8+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699219718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJENHoBRSaNb9vddm9XrtD3tMUhQhIfSwhJlp121LoA=; b=OFXhtyhF0YQ1qZ2nZvyeo10cYuBClsDehikJk/qpoYiKrpiszCs8O/TV4pb0tJ4oLuNgc7 +8dbriUgS7PtxyWVKxYO3YTH+GK48HEc/BHVG5TT0lTfUMn9tnq9OTv/NC3tr4/HwfaWTz lV14St+Ri0I4oOhlY4vFg6kRGTTwblOcsEodmXuKzgRIbOsBBW+lWLPukpQnIPX3Uqg3GQ 6MSUXBsmM39rodo1RdKJe5fbUy5HJC2yAiK8fxjl2pAPizaZnEQtDgk0YeEiYU7IRfeILa vBdb6xNTcO2myXgZFbcIg5DutPUnLHSJgrYZO880iKzLUvfQ1/b/khcPyfknTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699219718; a=rsa-sha256; cv=none; b=OL4liVGmtqNcDCoIMLQpxE6tBV+Lqdxl4GhsIjDzBQWqJyZlLrEDQEeaNCepBiOABDTbmA 6uT5vgLHkqZNyp+/fAISBhIqyUf4G2VpYbDXzupYST22sJYM5BIPKotcFX7m3pmlGhHeJD T7zX8msSCoPLKXPK0xT69CNjh5rCN/93KSqyLkDjFf3syoKman1R/uwX/iUQNRkAiMyHpk ZVa7YadEdnfxYxq9evrR1FlrmOssy26QB7N4sQZir/Chk8ZZ0Z6xRUQN6NGWl4U/kEXVkh vfg6ycRlQn8ICGXkvMkTHB9LOlglJGYUbD2P3eJgdcVkRM6PHd4ekX9eA14cKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNnfG0bbgzh9X; Sun, 5 Nov 2023 21:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A5LSbul022818; Sun, 5 Nov 2023 21:28:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A5LSbFT022815; Sun, 5 Nov 2023 21:28:37 GMT (envelope-from git) Date: Sun, 5 Nov 2023 21:28:37 GMT Message-Id: <202311052128.3A5LSbFT022815@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: 475fa8980008 - main - share/mk: Fix .TARGET override documentation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 475fa89800086718bd9249fd4dc3f862549f1f78 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=475fa89800086718bd9249fd4dc3f862549f1f78 commit 475fa89800086718bd9249fd4dc3f862549f1f78 Author: Ka Ho Ng AuthorDate: 2023-11-05 21:27:59 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-05 21:28:34 +0000 share/mk: Fix .TARGET override documentation Fixes: 48da57b47ff14 Sponsored by: Juniper Networks, Inc. MFC after: 3 days Reviewed by: imp, delphij, emaste Differential Revision: https://reviews.freebsd.org/D42469 --- share/mk/bsd.README | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 24acc355b9b5..cff6ff35961c 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -125,15 +125,15 @@ The following variables are common: AFLAGS.${SRC} Flags dependent on source file name. -AFLAGS.${TARGET} +AFLAGS.${.TARGET:T} Flags dependent on output file name. ACFLAGS.${SRC} Flags dependent on source file name. -ACFLAGS.${TARGET} +ACFLAGS.${.TARGET:T} Flags dependent on output file name. CFLAGS.${SRC} Flags dependent on source file name. -CFLAGS.${TARGET} +CFLAGS.${.TARGET:T} Flags dependent on output file name. CFLAGS.${COMPILER_TYPE} Flags dependent on compiler added to CFLAGS. @@ -148,7 +148,7 @@ CXXFLAGS.${MACHINE_ARCH} Architectural flags added to CXXFLAGS. CXXFLAGS.${SRC} Flags dependent on source file name. -CXXFLAGS.${TARGET} +CXXFLAGS.${.TARGET:T} Flags dependent on output file name. COMPILER_FEATURES A list of features that the compiler supports. Zero or @@ -344,21 +344,21 @@ LDADD Additional loader objects. Usually used for libraries. LDADD=-lutil -lcompat -LDADD.${TARGET} +LDADD.${.TARGET:T} Loader objects dependent on output file name. LDFLAGS Additional loader flags. Passed to the loader via CC, since that's used to link programs as well, so loader specific flags need to be prefixed with -Wl, to work. -LDFLAGS.${TARGET} +LDFLAGS.${.TARGET:T} Flags dependent on output file name. LIBADD Additional libraries. This is for base system libraries and is only valid inside of the /usr/src tree. Use LIBADD=name instead of LDADD=-lname. -LIBADD.${TARGET} +LIBADD.${.TARGET:T} Libraries dependent on output file name. LINKS The list of binary links; should be full pathnames, the From nobody Mon Nov 6 02:43:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNwdt17N4z50kCZ; Mon, 6 Nov 2023 02:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNwds5zL3z4KSt; Mon, 6 Nov 2023 02:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699238625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=imagOhhcoalM1BIXXonGglA2Ki+cwQf5BggDBxFj2uw=; b=DZAVj5+lxIHssRXmvNG4KhByQUcNMCzpKY0vgDSCqtJVX53ItWfnEJrpK908sjMSql4BYD Cv7R6l41Ecxlm0EMAr/uyMFX82i9xlF8U3mBxzH8m6shpemw14PMUABO1SRFYVQ5iclnC/ llY5RMjQ7cTtoikoxh1UlVIVsdwnCl7vX/nD8aJvg7m3Z+vX4bT7PC6ZLG7UOM9SUU154Z Pzp3A1Kdo8zUec0gHyh4NPmAN2XbtDXpsyRtOyYssntO0+uY2/CPCGvCokhSksYEMqVPbL I5xZYP/yIHlEDgpg88u9vLbox3JMWOIfjlKxo1R7FZWdeXEiPNu6gwyVAIoq0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699238625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=imagOhhcoalM1BIXXonGglA2Ki+cwQf5BggDBxFj2uw=; b=u8Mw0XqZC2wgX1iVhjix08Y4URvm/4zCh2Y/Ia6YChGOZWiEscfs8d/p9+ZBOVDJJeiwqD i87K5N+y1mc34iLxiz07YEgm6RSFS7hnmlsBQOOX13Eclz8YVF3M+evzCmSG26ZzCZ9whS hRVRPAdEldkxXL0jqjp8ZJEq0NxTQNscEbPFKmLXgFOltH5Ec2na25mSDSHVtdVRWJk2N5 qcGpZheq1SA81b9PWh8WWqv6MV/oeKPJL9GfLcgIb5DYbLsB99jfzNfQB4XxlPKmXkVs/p LS9WphI0JbuqJsYLlvKCpJ4WMbC4sqxSp7V1lZULB+C6uD3XE8VxLEvAyT/2kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699238625; a=rsa-sha256; cv=none; b=o44l+2dQdBzyyjhTKymnN+EFhgvT3fFkD3xdAIBqV5GtUw7nAp8jHz0u+Owqdy+e+BAtEx g66DuQYCNrup7e97HdqZR0lKlre2MoKJ7Vqrb1v+D09YZG1jMvJjTL8a7mCGs5FxiwHSm+ U8e3Ybbdsa7pBXCKtrdRO56NAhOiwE48H++hs3agzVv++QQ8Ib6ahg8/ykeedt7/jEFycz A2vBVUGcU0mC3ehA26MA+wQsExH5PVBLn3djdBtHAujETo1VuVAH9IpbhrHXvaoAamQmuK VZnPcUfEjrbMblm5A9LFT/xXUhzZfxJPKyMh5na23iaghd6qpyLZPFSAPR0cAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNwds53vdzqkh; Mon, 6 Nov 2023 02:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A62hjSO053949; Mon, 6 Nov 2023 02:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A62hjAI053946; Mon, 6 Nov 2023 02:43:45 GMT (envelope-from git) Date: Mon, 6 Nov 2023 02:43:45 GMT Message-Id: <202311060243.3A62hjAI053946@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: d98193f093ea - stable/14 - ASan: Add asan_static to build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d98193f093ea4c4b44d22228f6ddd2abd80b339b Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=d98193f093ea4c4b44d22228f6ddd2abd80b339b commit d98193f093ea4c4b44d22228f6ddd2abd80b339b Author: SHENG-YI HONG AuthorDate: 2023-11-03 07:02:26 +0000 Commit: Li-Wen Hsu CommitDate: 2023-11-06 02:43:18 +0000 ASan: Add asan_static to build This is a partial fix for building with -DWITH_ASAN. Reviewed by: Fangrui Song, dim, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42388 (cherry picked from commit 5c783a0b2826d1c6bbaa7d4b01a46d1dcdb39e8c) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 01d3328726bd..4f564547bc84 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2994,6 +2994,7 @@ _prereq_libs+= lib/libssp_nonshared _prereq_libs+= lib/libclang_rt/asan _prereq_libs+= lib/libclang_rt/asan-preinit _prereq_libs+= lib/libclang_rt/asan_cxx +_prereq_libs+= lib/libclang_rt/asan_static .endif .if ${MK_UBSAN} != "no" _prereq_libs+= lib/libclang_rt/ubsan_minimal From nobody Mon Nov 6 10:05:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SP6R15cyQz506W2; Mon, 6 Nov 2023 10: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SP6R159klz4QTn; Mon, 6 Nov 2023 10: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=1699265101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9wYEqCD22VAeRsIPY/2o0Attriumj3m3b6+8mYvb2U=; b=sBt9BmoyfrKp12+cwKiDsRhkwbX42VwSXUUAqBbCfXI/WAf7UXH63cORf9JHXsbzBJ7tXJ xmtPa/ioS3i30l4Gn6P9JRxvMtQOUPUcr9IHNWkb3WHWN/xGN7VHFa/6F/OIPHMg2PEwvu BnZ40m6LADGmPraCl1JGDNOLmVNjpzLP22EWZtpBLsnFq2IyinH9JqwF+ba0OvykG2FFBD dpA0WcBU992YGxeBUBJ1/cTu1wzKqeGF8k/hzlz3ytPmjtBsb8dRJVXByPlNapu2A4JJbV lYWCDzcHa08mAy1jsc2h573jP1DU7d7e/cFIGpoZAUDGi30DnxT6jlt13N321Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699265101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9wYEqCD22VAeRsIPY/2o0Attriumj3m3b6+8mYvb2U=; b=ZvHw1qcwr7zZya6qghbg1ZoodYvb0Fl2lyQIzPdY5FqCBv0wujParVKtL9EEF2CAPqG29f iqXb6D5qYUQCj4EFCzh0fcnkkVkpRByVjRVKdZhqMmjO/3Jv3ONJjoLvxrtmYBd1HMrtIR EZf9T7xAoEEQUDi+k5CbxugDbVrlteHQGgn2cJqUedRwKz4d9PDV8uWaE2AiqVgjJ9HlG8 ptaCQ/ZaqxoHRp22pIIS8aQ1oqq33SFhDe3l+YLBAojISkrY4t7R5BOwkkxz8LXaXtCNO4 R5sUtZr9AnsTZE0NHiwfxx7IMRSdvz5a6FrHt8OemU4k6p0Gnf2VeHegO2iHtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699265101; a=rsa-sha256; cv=none; b=Z8Mlcez82/FgZU36z9X4ekZCF60ccoG1iAXuYb2iPnax7TN+v9KDkE9QGhBw0EAxCjMDZ8 rk8u+EWiahnY7XsjjmSC+yLjZRvInXUVVThfLUYWw9MyIqVu6TWemqGi61BVJK/5Jm9neT OcDM1kYF5BDCngw+zB3KO6X2DTNiDMwE275621GYTpCtXiu12qXYBY3xyNg815BbdF6xuM uY5M5qIwuuRC+5+b0HH6/BYqBWO+wqwci8iJm5GkEKdHhfQE0Ca2mSEyCvAIfX9omvptnL rXIqi9rr3qE2WGHhloRfPX3EUyt26RoIWph9T5uf+fKFHFwJmV3o5vZ6d/uU/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SP6R146lsz137c; Mon, 6 Nov 2023 10:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6A51jo088477; Mon, 6 Nov 2023 10:05:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6A5110088474; Mon, 6 Nov 2023 10:05:01 GMT (envelope-from git) Date: Mon, 6 Nov 2023 10:05:01 GMT Message-Id: <202311061005.3A6A5110088474@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: 3bbbfc8dcd36 - main - sctp: minor clean List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3bbbfc8dcd3622b49907e359c8e9682def0bae25 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3bbbfc8dcd3622b49907e359c8e9682def0bae25 commit 3bbbfc8dcd3622b49907e359c8e9682def0bae25 Author: Michael Tuexen AuthorDate: 2023-11-06 10:04:15 +0000 Commit: Michael Tuexen CommitDate: 2023-11-06 10:04:15 +0000 sctp: minor clean No functional change intended. MFC after: 1 week --- sys/netinet/sctp_sysctl.c | 147 +++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index 2c2cc58ee086..a4be3471e2fd 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -868,11 +868,11 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) #define SCTP_UINT_SYSCTL(mib_name, var_name, prefix) \ SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ - CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW); + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW) #define SCTP_UINT_SYSCTL_TUN(mib_name, var_name, prefix) \ SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ - CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RWTUN|CTLFLAG_NOFETCH); + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RWTUN|CTLFLAG_NOFETCH) #define SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, flags) \ static int \ @@ -893,75 +893,76 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) } \ return (error); \ } \ - SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, flags, \ - NULL, 0, sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC) + SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, flags, NULL, 0, \ + sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC) #define SCTP_UINT_SYSCTL_RDTUN(mib_name, var_name, prefix) \ SYSCTL_UINT(_net_inet_sctp, OID_AUTO, mib_name, \ CTLFLAG_VNET|CTLFLAG_RDTUN|CTLFLAG_NOFETCH, \ - &VNET_NAME(system_base_info.sctpsysctl.var_name), 0, prefix##_DESC); + &VNET_NAME(system_base_info.sctpsysctl.var_name), 0, \ + prefix##_DESC) /* * sysctl definitions */ -SCTP_UINT_SYSCTL(sendspace, sctp_sendspace, SCTPCTL_MAXDGRAM) -SCTP_UINT_SYSCTL(recvspace, sctp_recvspace, SCTPCTL_RECVSPACE) -SCTP_UINT_SYSCTL(auto_asconf, sctp_auto_asconf, SCTPCTL_AUTOASCONF) -SCTP_UINT_SYSCTL(ecn_enable, sctp_ecn_enable, SCTPCTL_ECN_ENABLE) -SCTP_UINT_SYSCTL(pr_enable, sctp_pr_enable, SCTPCTL_PR_ENABLE) +SCTP_UINT_SYSCTL(sendspace, sctp_sendspace, SCTPCTL_MAXDGRAM); +SCTP_UINT_SYSCTL(recvspace, sctp_recvspace, SCTPCTL_RECVSPACE); +SCTP_UINT_SYSCTL(auto_asconf, sctp_auto_asconf, SCTPCTL_AUTOASCONF); +SCTP_UINT_SYSCTL(ecn_enable, sctp_ecn_enable, SCTPCTL_ECN_ENABLE); +SCTP_UINT_SYSCTL(pr_enable, sctp_pr_enable, SCTPCTL_PR_ENABLE); SYSCTL_PROC(_net_inet_sctp, OID_AUTO, auth_enable, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, NULL, 0, sctp_sysctl_handle_auth, "IU", SCTPCTL_AUTH_ENABLE_DESC); SYSCTL_PROC(_net_inet_sctp, OID_AUTO, asconf_enable, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, NULL, 0, sctp_sysctl_handle_asconf, "IU", SCTPCTL_ASCONF_ENABLE_DESC); -SCTP_UINT_SYSCTL(reconfig_enable, sctp_reconfig_enable, SCTPCTL_RECONFIG_ENABLE) -SCTP_UINT_SYSCTL(nrsack_enable, sctp_nrsack_enable, SCTPCTL_NRSACK_ENABLE) -SCTP_UINT_SYSCTL(pktdrop_enable, sctp_pktdrop_enable, SCTPCTL_PKTDROP_ENABLE) -SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH) -SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST) -SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST) -SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS) -SCTP_UINT_SYSCTL_RDTUN(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) -SCTP_UINT_SYSCTL_TUN(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) -SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT) -SCTP_UINT_SYSCTL_RDTUN(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) -SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME) -SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ) -SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE) -SCTP_UINT_SYSCTL(asoc_resource, sctp_asoc_free_resc_limit, SCTPCTL_ASOC_RESOURCE) -SCTP_UINT_SYSCTL(heartbeat_interval, sctp_heartbeat_interval_default, SCTPCTL_HEARTBEAT_INTERVAL) -SCTP_UINT_SYSCTL(pmtu_raise_time, sctp_pmtu_raise_time_default, SCTPCTL_PMTU_RAISE_TIME) -SCTP_UINT_SYSCTL(shutdown_guard_time, sctp_shutdown_guard_time_default, SCTPCTL_SHUTDOWN_GUARD_TIME) -SCTP_UINT_SYSCTL(secret_lifetime, sctp_secret_lifetime_default, SCTPCTL_SECRET_LIFETIME) -SCTP_UINT_SYSCTL(rto_max, sctp_rto_max_default, SCTPCTL_RTO_MAX) -SCTP_UINT_SYSCTL(rto_min, sctp_rto_min_default, SCTPCTL_RTO_MIN) -SCTP_UINT_SYSCTL(rto_initial, sctp_rto_initial_default, SCTPCTL_RTO_INITIAL) -SCTP_UINT_SYSCTL(init_rto_max, sctp_init_rto_max_default, SCTPCTL_INIT_RTO_MAX) -SCTP_UINT_SYSCTL(valid_cookie_life, sctp_valid_cookie_life_default, SCTPCTL_VALID_COOKIE_LIFE) -SCTP_UINT_SYSCTL(init_rtx_max, sctp_init_rtx_max_default, SCTPCTL_INIT_RTX_MAX) -SCTP_UINT_SYSCTL(assoc_rtx_max, sctp_assoc_rtx_max_default, SCTPCTL_ASSOC_RTX_MAX) -SCTP_UINT_SYSCTL(path_rtx_max, sctp_path_rtx_max_default, SCTPCTL_PATH_RTX_MAX) -SCTP_UINT_SYSCTL(path_pf_threshold, sctp_path_pf_threshold, SCTPCTL_PATH_PF_THRESHOLD) -SCTP_UINT_SYSCTL(add_more_on_output, sctp_add_more_threshold, SCTPCTL_ADD_MORE_ON_OUTPUT) -SCTP_UINT_SYSCTL(incoming_streams, sctp_nr_incoming_streams_default, SCTPCTL_INCOMING_STREAMS) -SCTP_UINT_SYSCTL(outgoing_streams, sctp_nr_outgoing_streams_default, SCTPCTL_OUTGOING_STREAMS) -SCTP_UINT_SYSCTL(cmt_on_off, sctp_cmt_on_off, SCTPCTL_CMT_ON_OFF) -SCTP_UINT_SYSCTL(cmt_use_dac, sctp_cmt_use_dac, SCTPCTL_CMT_USE_DAC) -SCTP_UINT_SYSCTL(cwnd_maxburst, sctp_use_cwnd_based_maxburst, SCTPCTL_CWND_MAXBURST) -SCTP_UINT_SYSCTL(nat_friendly, sctp_nat_friendly, SCTPCTL_NAT_FRIENDLY) -SCTP_UINT_SYSCTL(abc_l_var, sctp_L2_abc_variable, SCTPCTL_ABC_L_VAR) -SCTP_UINT_SYSCTL(max_chained_mbufs, sctp_mbuf_threshold_count, SCTPCTL_MAX_CHAINED_MBUFS) -SCTP_UINT_SYSCTL(do_sctp_drain, sctp_do_drain, SCTPCTL_DO_SCTP_DRAIN) -SCTP_UINT_SYSCTL(hb_max_burst, sctp_hb_maxburst, SCTPCTL_HB_MAX_BURST) -SCTP_UINT_SYSCTL(abort_at_limit, sctp_abort_if_one_2_one_hits_limit, SCTPCTL_ABORT_AT_LIMIT) -SCTP_UINT_SYSCTL(min_residual, sctp_min_residual, SCTPCTL_MIN_RESIDUAL) -SCTP_UINT_SYSCTL(max_retran_chunk, sctp_max_retran_chunk, SCTPCTL_MAX_RETRAN_CHUNK) -SCTP_UINT_SYSCTL(log_level, sctp_logging_level, SCTPCTL_LOGGING_LEVEL) -SCTP_UINT_SYSCTL(default_cc_module, sctp_default_cc_module, SCTPCTL_DEFAULT_CC_MODULE) -SCTP_UINT_SYSCTL(default_ss_module, sctp_default_ss_module, SCTPCTL_DEFAULT_SS_MODULE) -SCTP_UINT_SYSCTL(default_frag_interleave, sctp_default_frag_interleave, SCTPCTL_DEFAULT_FRAG_INTERLEAVE) -SCTP_UINT_SYSCTL(mobility_base, sctp_mobility_base, SCTPCTL_MOBILITY_BASE) -SCTP_UINT_SYSCTL(mobility_fasthandoff, sctp_mobility_fasthandoff, SCTPCTL_MOBILITY_FASTHANDOFF) +SCTP_UINT_SYSCTL(reconfig_enable, sctp_reconfig_enable, SCTPCTL_RECONFIG_ENABLE); +SCTP_UINT_SYSCTL(nrsack_enable, sctp_nrsack_enable, SCTPCTL_NRSACK_ENABLE); +SCTP_UINT_SYSCTL(pktdrop_enable, sctp_pktdrop_enable, SCTPCTL_PKTDROP_ENABLE); +SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH); +SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST); +SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST); +SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS); +SCTP_UINT_SYSCTL_RDTUN(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE); +SCTP_UINT_SYSCTL_TUN(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE); +SCTP_UINT_SYSCTL_RDTUN(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE); +SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT); +SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME); +SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ); +SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE); +SCTP_UINT_SYSCTL(asoc_resource, sctp_asoc_free_resc_limit, SCTPCTL_ASOC_RESOURCE); +SCTP_UINT_SYSCTL(heartbeat_interval, sctp_heartbeat_interval_default, SCTPCTL_HEARTBEAT_INTERVAL); +SCTP_UINT_SYSCTL(pmtu_raise_time, sctp_pmtu_raise_time_default, SCTPCTL_PMTU_RAISE_TIME); +SCTP_UINT_SYSCTL(shutdown_guard_time, sctp_shutdown_guard_time_default, SCTPCTL_SHUTDOWN_GUARD_TIME); +SCTP_UINT_SYSCTL(secret_lifetime, sctp_secret_lifetime_default, SCTPCTL_SECRET_LIFETIME); +SCTP_UINT_SYSCTL(rto_max, sctp_rto_max_default, SCTPCTL_RTO_MAX); +SCTP_UINT_SYSCTL(rto_min, sctp_rto_min_default, SCTPCTL_RTO_MIN); +SCTP_UINT_SYSCTL(rto_initial, sctp_rto_initial_default, SCTPCTL_RTO_INITIAL); +SCTP_UINT_SYSCTL(init_rto_max, sctp_init_rto_max_default, SCTPCTL_INIT_RTO_MAX); +SCTP_UINT_SYSCTL(valid_cookie_life, sctp_valid_cookie_life_default, SCTPCTL_VALID_COOKIE_LIFE); +SCTP_UINT_SYSCTL(init_rtx_max, sctp_init_rtx_max_default, SCTPCTL_INIT_RTX_MAX); +SCTP_UINT_SYSCTL(assoc_rtx_max, sctp_assoc_rtx_max_default, SCTPCTL_ASSOC_RTX_MAX); +SCTP_UINT_SYSCTL(path_rtx_max, sctp_path_rtx_max_default, SCTPCTL_PATH_RTX_MAX); +SCTP_UINT_SYSCTL(path_pf_threshold, sctp_path_pf_threshold, SCTPCTL_PATH_PF_THRESHOLD); +SCTP_UINT_SYSCTL(add_more_on_output, sctp_add_more_threshold, SCTPCTL_ADD_MORE_ON_OUTPUT); +SCTP_UINT_SYSCTL(incoming_streams, sctp_nr_incoming_streams_default, SCTPCTL_INCOMING_STREAMS); +SCTP_UINT_SYSCTL(outgoing_streams, sctp_nr_outgoing_streams_default, SCTPCTL_OUTGOING_STREAMS); +SCTP_UINT_SYSCTL(cmt_on_off, sctp_cmt_on_off, SCTPCTL_CMT_ON_OFF); +SCTP_UINT_SYSCTL(cmt_use_dac, sctp_cmt_use_dac, SCTPCTL_CMT_USE_DAC); +SCTP_UINT_SYSCTL(cwnd_maxburst, sctp_use_cwnd_based_maxburst, SCTPCTL_CWND_MAXBURST); +SCTP_UINT_SYSCTL(nat_friendly, sctp_nat_friendly, SCTPCTL_NAT_FRIENDLY); +SCTP_UINT_SYSCTL(abc_l_var, sctp_L2_abc_variable, SCTPCTL_ABC_L_VAR); +SCTP_UINT_SYSCTL(max_chained_mbufs, sctp_mbuf_threshold_count, SCTPCTL_MAX_CHAINED_MBUFS); +SCTP_UINT_SYSCTL(do_sctp_drain, sctp_do_drain, SCTPCTL_DO_SCTP_DRAIN); +SCTP_UINT_SYSCTL(hb_max_burst, sctp_hb_maxburst, SCTPCTL_HB_MAX_BURST); +SCTP_UINT_SYSCTL(abort_at_limit, sctp_abort_if_one_2_one_hits_limit, SCTPCTL_ABORT_AT_LIMIT); +SCTP_UINT_SYSCTL(min_residual, sctp_min_residual, SCTPCTL_MIN_RESIDUAL); +SCTP_UINT_SYSCTL(max_retran_chunk, sctp_max_retran_chunk, SCTPCTL_MAX_RETRAN_CHUNK); +SCTP_UINT_SYSCTL(log_level, sctp_logging_level, SCTPCTL_LOGGING_LEVEL); +SCTP_UINT_SYSCTL(default_cc_module, sctp_default_cc_module, SCTPCTL_DEFAULT_CC_MODULE); +SCTP_UINT_SYSCTL(default_ss_module, sctp_default_ss_module, SCTPCTL_DEFAULT_SS_MODULE); +SCTP_UINT_SYSCTL(default_frag_interleave, sctp_default_frag_interleave, SCTPCTL_DEFAULT_FRAG_INTERLEAVE); +SCTP_UINT_SYSCTL(mobility_base, sctp_mobility_base, SCTPCTL_MOBILITY_BASE); +SCTP_UINT_SYSCTL(mobility_fasthandoff, sctp_mobility_fasthandoff, SCTPCTL_MOBILITY_FASTHANDOFF); #if defined(SCTP_LOCAL_TRACE_BUF) SYSCTL_PROC(_net_inet_sctp, OID_AUTO, log, CTLFLAG_VNET | CTLTYPE_STRUCT | CTLFLAG_RD, NULL, 0, sctp_sysctl_handle_trace_log, "S,sctplog", "SCTP logging (struct sctp_log)"); @@ -970,22 +971,22 @@ SYSCTL_PROC(_net_inet_sctp, OID_AUTO, clear_trace, CTLFLAG_VNET | CTLTYPE_UINT | #endif SYSCTL_PROC(_net_inet_sctp, OID_AUTO, udp_tunneling_port, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, NULL, 0, sctp_sysctl_handle_udp_tunneling, "IU", SCTPCTL_UDP_TUNNELING_PORT_DESC); -SCTP_UINT_SYSCTL(enable_sack_immediately, sctp_enable_sack_immediately, SCTPCTL_SACK_IMMEDIATELY_ENABLE) -SCTP_UINT_SYSCTL(nat_friendly_init, sctp_inits_include_nat_friendly, SCTPCTL_NAT_FRIENDLY_INITS) -SCTP_UINT_SYSCTL(vtag_time_wait, sctp_vtag_time_wait, SCTPCTL_TIME_WAIT) -SCTP_UINT_SYSCTL(buffer_splitting, sctp_buffer_splitting, SCTPCTL_BUFFER_SPLITTING) -SCTP_UINT_SYSCTL(initial_cwnd, sctp_initial_cwnd, SCTPCTL_INITIAL_CWND) -SCTP_UINT_SYSCTL(rttvar_bw, sctp_rttvar_bw, SCTPCTL_RTTVAR_BW) -SCTP_UINT_SYSCTL(rttvar_rtt, sctp_rttvar_rtt, SCTPCTL_RTTVAR_RTT) -SCTP_UINT_SYSCTL(rttvar_eqret, sctp_rttvar_eqret, SCTPCTL_RTTVAR_EQRET) -SCTP_UINT_SYSCTL(rttvar_steady_step, sctp_steady_step, SCTPCTL_RTTVAR_STEADYS) -SCTP_UINT_SYSCTL(use_dcccecn, sctp_use_dccc_ecn, SCTPCTL_RTTVAR_DCCCECN) -SCTP_UINT_SYSCTL(blackhole, sctp_blackhole, SCTPCTL_BLACKHOLE) -SCTP_UINT_SYSCTL(sendall_limit, sctp_sendall_limit, SCTPCTL_SENDALL_LIMIT) -SCTP_UINT_SYSCTL(diag_info_code, sctp_diag_info_code, SCTPCTL_DIAG_INFO_CODE) -SCTP_UINT_SYSCTL(ootb_with_zero_cksum, sctp_ootb_with_zero_cksum, SCTPCTL_OOTB_WITH_ZERO_CKSUM) +SCTP_UINT_SYSCTL(enable_sack_immediately, sctp_enable_sack_immediately, SCTPCTL_SACK_IMMEDIATELY_ENABLE); +SCTP_UINT_SYSCTL(nat_friendly_init, sctp_inits_include_nat_friendly, SCTPCTL_NAT_FRIENDLY_INITS); +SCTP_UINT_SYSCTL(vtag_time_wait, sctp_vtag_time_wait, SCTPCTL_TIME_WAIT); +SCTP_UINT_SYSCTL(buffer_splitting, sctp_buffer_splitting, SCTPCTL_BUFFER_SPLITTING); +SCTP_UINT_SYSCTL(initial_cwnd, sctp_initial_cwnd, SCTPCTL_INITIAL_CWND); +SCTP_UINT_SYSCTL(rttvar_bw, sctp_rttvar_bw, SCTPCTL_RTTVAR_BW); +SCTP_UINT_SYSCTL(rttvar_rtt, sctp_rttvar_rtt, SCTPCTL_RTTVAR_RTT); +SCTP_UINT_SYSCTL(rttvar_eqret, sctp_rttvar_eqret, SCTPCTL_RTTVAR_EQRET); +SCTP_UINT_SYSCTL(rttvar_steady_step, sctp_steady_step, SCTPCTL_RTTVAR_STEADYS); +SCTP_UINT_SYSCTL(use_dcccecn, sctp_use_dccc_ecn, SCTPCTL_RTTVAR_DCCCECN); +SCTP_UINT_SYSCTL(blackhole, sctp_blackhole, SCTPCTL_BLACKHOLE); +SCTP_UINT_SYSCTL(sendall_limit, sctp_sendall_limit, SCTPCTL_SENDALL_LIMIT); +SCTP_UINT_SYSCTL(diag_info_code, sctp_diag_info_code, SCTPCTL_DIAG_INFO_CODE); +SCTP_UINT_SYSCTL(ootb_with_zero_cksum, sctp_ootb_with_zero_cksum, SCTPCTL_OOTB_WITH_ZERO_CKSUM); #ifdef SCTP_DEBUG -SCTP_UINT_SYSCTL(debug, sctp_debug_on, SCTPCTL_DEBUG) +SCTP_UINT_SYSCTL(debug, sctp_debug_on, SCTPCTL_DEBUG); #endif SYSCTL_PROC(_net_inet_sctp, OID_AUTO, stats, CTLFLAG_VNET | CTLTYPE_STRUCT | CTLFLAG_RW, NULL, 0, sctp_sysctl_handle_stats, "S,sctpstat", "SCTP statistics (struct sctp_stat)"); From nobody Mon Nov 6 10:17:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SP6jm0yB4z508lp; Mon, 6 Nov 2023 10:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SP6jm0BBbz4Sbt; Mon, 6 Nov 2023 10:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699265868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0pwrYnFwrU+m3ZENbiUh0JrgtnpiP2xojXecnuHCm4=; b=AqFq9vAFjeqMbenk3PGGR2j7F50y5CfGmxiaoTByjyCBduh6OEILReOpnorLOOl6Mza/5n ODdn2PBcucSBQP2/Teigvb6qmGYNYHE+RJpp7ESVjEKIz+NVVQCviIXOiCElDlzaq/k8r0 UXq1nYsEj9Lez+XFK8zayEnZXWKh2ehsX8gY90A4Cooh545velOG+pQWHYW+DzhJgUNHuV QFAZLn+Si6kIuHB+xyXMREnAubTKjmVID3nwTMmHiBB7kCFBlev7F9nxR8sHy+TGYMO3BR xRXc5nUfOSA3MkBfhX/dbmSWsV9IWHenboIZZ3PSc7JdHLsrUq4BZmmbSpfyzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699265868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0pwrYnFwrU+m3ZENbiUh0JrgtnpiP2xojXecnuHCm4=; b=Sr9CL9kX9mgb7Fk4T1A5JTR0A4B4vs+21X7vQNb3rONEMAeieNIZ6A3Su9e/WWqE5GbQZV JN7c7u6vR43Yjobf7RDOaPpyRNLcJAkMX1xoXlWHy1YRkpG14SXFheF9mxznTSznXPrjfa E3fTODxDr4ndtybgom/Z9JIPiLTBnZj/ZEATN6D0ctZD5qD8ELW1lLVfIhwTOBYap0sZbR 1vCEgLNLMCpD1mcZ4FweKUQB7ZjJmrU31EMuz7SNKjzxGsjv95HOnonXOQEAyqjefdHl/z 2WbASp71wt2fdADrMYn7dSyl0Z8kMKh/oGQjR+rIGXTTxCtXuRooJ3H57X7woA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699265868; a=rsa-sha256; cv=none; b=pwTUeLgUiuzMDctr6mZJY8yCnpXgzJUjWcvWxWWfb5jejRBRk5QTksL3vFYHTaNFfzPmlb 74D5VY4HiUrlOIrwuh4cw57vW1b/UgIAnjgYux3VmYN3prOfWEeFtARaQMvyZfBeEZOMb2 kzgBVozHfo3Q1alriGd5+AXk4lAmJXAK/95RcBPc+klkIcVmkCh2GkRk8YDixBeGLqORCc 5+j5MmvhvOb6YVk+0wwoOOX47KbrvlVsocrm/Z8M2Rfzjr3v+ngevjA9HFJkhkjmCkYCkz huReRjfYN8HLY2rLgx7EV2AFBcQfch9EYybuaBA8Oz86P3AcMurfQyaRPa62lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SP6jl6G1Wz13cF; Mon, 6 Nov 2023 10:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6AHl9Z007394; Mon, 6 Nov 2023 10:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6AHleg007391; Mon, 6 Nov 2023 10:17:47 GMT (envelope-from git) Date: Mon, 6 Nov 2023 10:17:47 GMT Message-Id: <202311061017.3A6AHleg007391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 1a12f0aea81b - main - xen: fix initialization of grant table frame 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a12f0aea81b57d0dd2374047b8f4c97a037a8df Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=1a12f0aea81b57d0dd2374047b8f4c97a037a8df commit 1a12f0aea81b57d0dd2374047b8f4c97a037a8df Author: Roger Pau Monné AuthorDate: 2023-11-02 17:23:25 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-06 10:17:39 +0000 xen: fix initialization of grant table frame array The current sizing of the array used to store grant table frames is broken, as the calculation: max_nr_glist_frames = (boot_max_nr_grant_frames * GREFS_PER_GRANT_FRAME / (PAGE_SIZE / sizeof(grant_ref_t))); Is plain bogus, for once grant_ref_t is the type of the grant reference, but not the entry used to store such references in the grant frames. But even if the above calculation is switched to use grant_entry_v1_t, it would end up as: max_nr_glist_frames = (boot_max_nr_grant_frames * (PAGE_SIZE / sizeof(grant_entry_v1_t)) / (PAGE_SIZE / sizeof(grant_entry_v1_t))); Which is pointless (note GREFS_PER_GRANT_FRAME has been expanded to (PAGE_SIZE / sizeof(grant_entry_v1_t))). Just use boot_max_nr_grant_frames directly to size the grant table frames array. Fixes: 30d1eefe3937 ("Import OS interfaces to Xen services.") Sponsored by: Citrix Systems R&D --- sys/dev/xen/grant_table/grant_table.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/xen/grant_table/grant_table.c b/sys/dev/xen/grant_table/grant_table.c index 13ca966c1f90..1cf9fe5e339a 100644 --- a/sys/dev/xen/grant_table/grant_table.c +++ b/sys/dev/xen/grant_table/grant_table.c @@ -610,20 +610,12 @@ static int granttable_attach(device_t dev) { int i; - unsigned int max_nr_glist_frames; unsigned int nr_init_grefs; nr_grant_frames = 1; boot_max_nr_grant_frames = __max_nr_grant_frames(); - /* Determine the maximum number of frames required for the - * grant reference free list on the current hypervisor. - */ - max_nr_glist_frames = (boot_max_nr_grant_frames * - GREFS_PER_GRANT_FRAME / - (PAGE_SIZE / sizeof(grant_ref_t))); - - gnttab_list = malloc(max_nr_glist_frames * sizeof(grant_ref_t *), + gnttab_list = malloc(boot_max_nr_grant_frames * sizeof(grant_ref_t *), M_DEVBUF, M_NOWAIT); if (gnttab_list == NULL) From nobody Mon Nov 6 10:17:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SP6jn17RMz508jq; Mon, 6 Nov 2023 10:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SP6jn0Z01z4SqM; Mon, 6 Nov 2023 10:17:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699265869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIDARx0cXawpUvAaP99PkDhMLeJw0036NqQ7xId8XQc=; b=U6x5O2A34RgvEvHc0JXcw+MO2p2K/ghaMtWk8stpfaZub8LdKcNfwCdKkHo6txEEYSdQTh 4h2hb7h2j9iJUftKREOnVUZLrYJ+R2g8yHOy39u+jX007wbVTM7sxyCHqMjU8UF/fc/IH3 JqWKP2bn2W6DpBh+9tVI9l6FNGiOAjOHLNcn76tQpxf3V7UtimbNbJH3AhFw2pL+PEpyoQ HegHOh6iw+5mNJdvlBT4iOJrTFUtRFRI3X/u1O2+CuWGC40Kbp6vu8/kqmU/wSXmV0T1pT tExuAHY4ilrq1Lihwmw89hffhluY1ZT9KiW6xPo+lT2q0kLD5jPpWgy/3GTJxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699265869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIDARx0cXawpUvAaP99PkDhMLeJw0036NqQ7xId8XQc=; b=Jhn/cg9JsrijjEDWTW7LzPJMI6ty/adNdeK91VHLWELk/02x2bmMWlmHdrmKlYRDwexsIc viAUTvazwxg/uUVFy20vyb3GLRwAz30YKQ/Xbv31Jha7AGGbiQHrvf9dEMfwSk90vE/Q5b yIvJKRhhd/a1iHd8inIHRNWCjdIFEkK38kTAREYtIXtV9HQ7OsDXFMIepGo9Ieb0mSGcTA pq989njjWVTpGNzR9/WaDUWkviQD51xajUXIdIoeYfptmZscOEVp9paDzY5VACZhF1R+vB +IkeOuM9POpGQc9QWzSixrI2/oZGfuyZ8Iic1tjvJrJC8ppxOXrGVwEpovMZDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699265869; a=rsa-sha256; cv=none; b=ZgWP04jZSBxP7J4Z0x+7odiftGiV7OAVgGtPDZXjikxnUdKdw7+alI5FsFyF3/zpnh1tYY sOEbaZ5GT7SjzvggCTnNsxRW1AQMZVJyGERaoqc6wHq/9GVK26fe0a+JisI1/1o81tSkK+ EOPupAFfCHUVXIGqS2mfajZpfQdEC/J2iylAnyLhcASbEmbHpecC0dn9OzMmFi0KDQc3AQ AJ1JQt/SlkOTkXnMMRjYiZsxnmYnJD8BxBeYMzGRkjdVb+XLBuRvK7TLzLrYJMs05DMXxe 1eCMBTO8Ydj3ouQtRyr9DJmbneMZBzjEAzd6n/qCFSuEZ81ESmIYmcnUBsU8+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 4SP6jm6ZlSz13fj; Mon, 6 Nov 2023 10:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6AHmq7007450; Mon, 6 Nov 2023 10:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6AHmpL007447; Mon, 6 Nov 2023 10:17:48 GMT (envelope-from git) Date: Mon, 6 Nov 2023 10:17:48 GMT Message-Id: <202311061017.3A6AHmpL007447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 318bbb6d5a1e - main - xen-netfront: attempt to make cleanup idempotent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 318bbb6d5a1eae77eb5dc687bcc63c0f99558e21 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=318bbb6d5a1eae77eb5dc687bcc63c0f99558e21 commit 318bbb6d5a1eae77eb5dc687bcc63c0f99558e21 Author: Roger Pau Monné AuthorDate: 2023-11-03 09:28:16 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-06 10:17:40 +0000 xen-netfront: attempt to make cleanup idempotent Current cleanup code assumes that all the fields are allocated and/or setup by the time cleanup is called, but this is not always true: a failure in mid-setup of the device will cause the functions to be called with possibly uninitialized fields. Fix the functions to cope with such sate, while also attempting to make the cleanup idempotent. Finally fix an error path during setup that would not mark the device as closed, and hence prevents the kernel from finishing booting. Fixes: 96375eac945c ("xen-netfront: add multiqueue support") Sponsored by: Citrix Systems R&D --- sys/dev/xen/netfront/netfront.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index dafb838cf328..6ac6ecc3bdb7 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -589,8 +589,10 @@ talk_to_backend(device_t dev, struct netfront_info *info) num_queues = max_queues; err = setup_device(dev, info, num_queues); - if (err != 0) + if (err != 0) { + xenbus_dev_fatal(dev, err, "setup device"); goto out; + } again: err = xs_transaction_start(&xst); @@ -717,7 +719,10 @@ disconnect_rxq(struct netfront_rxq *rxq) xn_release_rx_bufs(rxq); gnttab_free_grant_references(rxq->gref_head); - gnttab_end_foreign_access(rxq->ring_ref, NULL); + if (rxq->ring_ref != GRANT_REF_INVALID) { + gnttab_end_foreign_access(rxq->ring_ref, NULL); + rxq->ring_ref = GRANT_REF_INVALID; + } /* * No split event channel support at the moment, handle will * be unbound in tx. So no need to call xen_intr_unbind here, @@ -732,6 +737,7 @@ destroy_rxq(struct netfront_rxq *rxq) callout_drain(&rxq->rx_refill); free(rxq->ring.sring, M_DEVBUF); + rxq->ring.sring = NULL; } static void @@ -763,6 +769,8 @@ setup_rxqs(device_t dev, struct netfront_info *info, rxq->id = q; rxq->info = info; + + rxq->gref_head = GNTTAB_LIST_END; rxq->ring_ref = GRANT_REF_INVALID; rxq->ring.sring = NULL; snprintf(rxq->name, XN_QUEUE_NAME_LEN, "xnrx_%u", q); @@ -819,7 +827,10 @@ disconnect_txq(struct netfront_txq *txq) xn_release_tx_bufs(txq); gnttab_free_grant_references(txq->gref_head); - gnttab_end_foreign_access(txq->ring_ref, NULL); + if (txq->ring_ref != GRANT_REF_INVALID) { + gnttab_end_foreign_access(txq->ring_ref, NULL); + txq->ring_ref = GRANT_REF_INVALID; + } xen_intr_unbind(&txq->xen_intr_handle); } @@ -829,9 +840,14 @@ destroy_txq(struct netfront_txq *txq) unsigned int i; free(txq->ring.sring, M_DEVBUF); + txq->ring.sring = NULL; buf_ring_free(txq->br, M_DEVBUF); - taskqueue_drain_all(txq->tq); - taskqueue_free(txq->tq); + txq->br = NULL; + if (txq->tq) { + taskqueue_drain_all(txq->tq); + taskqueue_free(txq->tq); + txq->tq = NULL; + } for (i = 0; i <= NET_TX_RING_SIZE; i++) { bus_dmamap_destroy(txq->info->dma_tag, @@ -870,6 +886,7 @@ setup_txqs(device_t dev, struct netfront_info *info, txq->id = q; txq->info = info; + txq->gref_head = GNTTAB_LIST_END; txq->ring_ref = GRANT_REF_INVALID; txq->ring.sring = NULL; From nobody Mon Nov 6 12:22:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SP9TM5H2fz50b0t; Mon, 6 Nov 2023 12:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SP9TM4pvjz4jlr; Mon, 6 Nov 2023 12:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699273335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xR3JuTd0SMJGZnj7ua6+hq87+/NSN/legMg9L+fMA9U=; b=UeFGorQe1BSNQdIh0zErVLwd8OWkl7RYtnek8WkChUmQVrVMNhRZ27i182CEB81QWfrqIC UVX7y3XuxTWCxbXvpJRiaD2jt+eGjMJsemNVphrurd4whMYJyLIpPcScaP38o4JkJ2btOO /fX2WX4HloePo0C0P4uD6HG3Jduk2h2/vhO1s9/+2NnvbHJU2mcrMCFQqUTig5Ft1FDkEX TBER1qiGFihfiXLMHTKhuChcS3SSohmyVFo2Qgj6wIGodIiAIc/MClyWtimx/FXhg4ZBqa Mo58rlFTezlMs0nNk7bilVDtgABekWL3FNonPOZJG5d6+fMiW4Li//rYG6zV7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699273335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xR3JuTd0SMJGZnj7ua6+hq87+/NSN/legMg9L+fMA9U=; b=PTH9qf8m6jlya4kqLSwmuFvOcJsihM1QpAbUWo+9TJKkYyJgcBPpOayFLDrnd+3giRCeDK ZzGmc24jcNN4fuZ5wEZp+Yk14wcOyCSHooIQTCTbQVlJtabfgwOVpR4uQbJRNvVy65GWkS P3fgti33A6o/DT5PD7BIuMB04nSWKVpGucpPUPFkm/v7gtDcTOeidg9kg0cyvJNXwd39Lu Ls7gLcZ883cqCbnc4E2LhXTRPtRrcIqS4RiU+OgcURCybMbyePcH7juQn6gzuhGifltc+I dP7RpkAbZI1A2go5h3iH5F32B0ylc8WUs+Mzlgmb0jA5Et9N9LRu1yLAsGWh8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699273335; a=rsa-sha256; cv=none; b=Zd21XVL8Q2+KjV6iiFB1fmkp8g2HogC9y3yL09yoT/Jfi3i4VwEH/t56GNeWQ5wheIlo4R hPj/tdsY/l8Q50gQwwM6lzJAPqMeK999SCtJeaNOP2Ru+y7e37pzyS9Ef6xg/zm334yEod ze5pU44jf2YO7x2VblaOXyz8upZeHtTrhEWqzKtAzeQbndw2ctljzHwL4V+uRLfCTU6x2I VlEwcL28oQokUNazo7YAlsGI3N41i/j1h0qFaaqu22VfBiIrogWJrW80vMZRm7dx9T4SuR bzZ083EbiqULl74aDXZgTVsZlEenG4Fs5eceEUslAyrAB/S8mS40gif3Qv3UfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SP9TM3sdJz16L2; Mon, 6 Nov 2023 12:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6CMFBr021620; Mon, 6 Nov 2023 12:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6CMFuR021617; Mon, 6 Nov 2023 12:22:15 GMT (envelope-from git) Date: Mon, 6 Nov 2023 12:22:15 GMT Message-Id: <202311061222.3A6CMFuR021617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Guido Falsi Subject: git: bce728719e7f - main - Add paragraph documenting loader.env functionlity List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce728719e7f57272d99b6d039f10b4c636fa024 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=bce728719e7f57272d99b6d039f10b4c636fa024 commit bce728719e7f57272d99b6d039f10b4c636fa024 Author: Guido Falsi AuthorDate: 2023-11-06 12:11:26 +0000 Commit: Guido Falsi CommitDate: 2023-11-06 12:21:53 +0000 Add paragraph documenting loader.env functionlity Approved by: docs (carlavilla) Differential Revision: https://reviews.freebsd.org/D42476 --- stand/man/loader.efi.8 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 37f56cf7be3f..16165c68556b 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -205,6 +205,14 @@ does not implement the probe .Fl P functionality where we use the video console if a keyboard is connected and a serial console otherwise. +.Ss Additional Environment Variables +.Nm +loads some extra variables early in startup from +.Pa /efi/freebsd/loader.env +from the EFI partition. Only simple variables can be set here. It can be useful to specify the root filesystem: +.Bd -literal -offset indent +rootdev=disk0s1a +.Ed .Ss Staging Slop The kernel must parse the firmware memory map tables to know what memory it can use. From nobody Mon Nov 6 13:52:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPCTP0Qqsz50tMK; Mon, 6 Nov 2023 13:52:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPCTN729Rz4tdV; Mon, 6 Nov 2023 13:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699278745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xt+ua9Ng88vlamPov+kRH/VlB+wAdghUdkLvSBSzVLQ=; b=o23SdNQ07h6BQHm+ACmFp9I6vKbF57OsZijs+ivnW6h1136sjT6ApYRO8VZk1cednLk6Nt L1fVVx2aPrgkUJO5wVo48uzLmo1qTapHT/FFNiZRgNwPOkA8r7Px8f7ExZFbXuI6vZQxNg fSJEg+KMzUJ1ntlYu687SLswNEFgtXoyCHDZhvoLwzLhY1WK/fLUDmGMRzlsw2VlEH7EEv fFz1eydFYK1aRFlcTxPNanwf43UO8INu+WembmSNNMBeOWXn4qbWQf4hHrDZCB+4ZkY2AZ YeVTZJdgfE/YdhwoSjFYBmTARgdOvs6qrSEnt1HZ4luLJi05DleHyLkTgPYECw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699278745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xt+ua9Ng88vlamPov+kRH/VlB+wAdghUdkLvSBSzVLQ=; b=DfYC04bks+erL+FJGiqfOhjqhFWm3mJVUPJzwhfnEtfobuQfivxzaVnYCa2YXXo/g5mDdO yookHUAgzyCEZ19f2ywvxET2MFtb+GtROZwGX8CJgMz8CmaV8U019N4t5JyZ8yjNaIr163 uj3oAOcEopoezQh5k4H38rlOc0TyQRUSUEbUqQJX9jtWM6IjppWJsOoY2enTg2QEi0tK59 Aw+zxpRDWi/iH7+0dLiFPPzhmU2N+slinGsJX893nwM2pKKzfRRhzD0V6tCR/VgOftI+QJ EB6B6mLQhhhs7idSy90bEsxPNILVK8HLyIFT6lO/shrn3S+MqJkYV1Fe5t7UZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699278745; a=rsa-sha256; cv=none; b=KZZenWv3AZllggdIXaXzRNf8yEwLfhn4QmB22bb6rTbLNR/dlKtg8owijT69cdAmI+wjgS 7wQTjVv6ZK3Xmoli2E27IJhtI+XAR/nHVdJHpus57PRNHHTX0LJVlDOcyquuNN5GQRmYrD Sm9JUhtRJEJUtIIVCVCZ8F4WBJs8N7U9LWjdA5wXNY9KhZ7D3s+C9/Fnk3L0IuykSc8rqU 1tE60vtX14QgKKG1ej+T9CfT2BrrJTBG9L+5Efm3c0uD+5VoEaIdcUKElAWNoawCoBHqNp nv9f4ODHFuYEA+SC9zaD1kOJ5VME36pmBiG8eYZcvBpF+WFR9vmnozia5KhqPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPCTN67Chz18Jp; Mon, 6 Nov 2023 13:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6DqOV5070883; Mon, 6 Nov 2023 13:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6DqOsx070880; Mon, 6 Nov 2023 13:52:24 GMT (envelope-from git) Date: Mon, 6 Nov 2023 13:52:24 GMT Message-Id: <202311061352.3A6DqOsx070880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 497ccc21ef93 - main - libpfctl: handle the 'pfctl' netlink family not being supported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 497ccc21ef9378f92e30867fa2b473759fd64b45 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=497ccc21ef9378f92e30867fa2b473759fd64b45 commit 497ccc21ef9378f92e30867fa2b473759fd64b45 Author: Kristof Provost AuthorDate: 2023-11-06 10:57:35 +0000 Commit: Kristof Provost CommitDate: 2023-11-06 12:53:56 +0000 libpfctl: handle the 'pfctl' netlink family not being supported If we fail to find the pfctl family we should not attempt to make the call. That means that either pf is not loaded, or it's a very old (i.e. pre-netlink) version. Reported by: manu Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 1554b81acf59..12b7c1df7ee8 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -189,6 +189,8 @@ pfctl_startstop(int start) snl_init(&ss, NETLINK_GENERIC); family_id = snl_get_genl_family(&ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); snl_init_writer(&ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, @@ -1077,6 +1079,8 @@ pfctl_add_rule(int dev __unused, const struct pfctl_rule *r, const char *anchor, snl_init(&ss, NETLINK_GENERIC); family_id = snl_get_genl_family(&ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); snl_init_writer(&ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_ADDRULE); @@ -1213,6 +1217,9 @@ pfctl_get_creators_nl(struct snl_state *ss, uint32_t *creators, size_t *len) struct nlmsghdr *hdr; struct snl_writer nw; + if (family_id == 0) + return (ENOTSUP); + snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETCREATORS); hdr->nlmsg_flags |= NLM_F_DUMP; @@ -1363,6 +1370,9 @@ pfctl_get_states_nl(struct pfctl_state_filter *filter, struct snl_state *ss, pfc struct nlmsghdr *hdr; struct snl_writer nw; + if (family_id == 0) + return (ENOTSUP); + snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETSTATES); hdr->nlmsg_flags |= NLM_F_DUMP; From nobody Mon Nov 6 13:54:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPCX43cyBz50tcJ; Mon, 6 Nov 2023 13:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPCX437Xzz4v0K; Mon, 6 Nov 2023 13:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699278884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7OTzTRAth0poxuYwyEQyTiBBNvAtHNhwLJnaY14VOg=; b=uEdzPPQi1tB7ifudLjTS36IC16BJ52AqCfxsLaw7izLwwoG8S0ZWaAO2ne5dZsLNbQFr7q VFENnn1m4Zyezt8htt/jj8Kw67f5+BXggpsyq8lxbjsH5stkTkI2Mc/nycSOiMNTr0+5mq cbV/CtIq6R+Xfnkh6WSU5GPTltJh2K0/3bM9ML7ebPXaQeIER75Ik/nKa7UkxuP+yxaGcJ MtTUWKx6dP/mNyT+EezRyYZBXjZGtB9tcPPUoT03r1daCbCwHwKMzDVy5tz+wow7KY1sv0 As0pRsTdlwAw20rbznF4NxLgzcXQDVtxuTD2nnDLcY/LbXSshtwyu4K+DiALGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699278884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7OTzTRAth0poxuYwyEQyTiBBNvAtHNhwLJnaY14VOg=; b=w5rFVU67Rd2S4A/86z1q44LPB9SJDfq1zVVoknQcKyzk3WSapqTkyXEwrCqgliW2pwk3dZ qp9HUSpeh5xQuqbbuSvB6ee1xAD/R/DpPF8mvU7Dtdlc55GnSFpn9AzrKxK2N3b+sjeIgA cLj87q3hXSKS94f7nt3qdDz/yZ9b/CjUuKILBXJWidFiegamQ8+NKVxwikJ7VH2V9U8i6r m0W1Uj2yABqYgidv/51uLVVcmZgY2aUrjMYNmeXYsTqMvlD96VuJ9ox8JqoPmUSJghv9Mt 72N3ERXqzWquDNTeVu+qu3wSV6VFec6UDeowa5Z+AhZ/OEatbrFRvsPfP5PC4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699278884; a=rsa-sha256; cv=none; b=CRPvYLPK9T8bEqeW5+gXzjof4yNPV621+7GNP3ah1VgZ2ZDkWuc9kMVUo5YrOmssRkQnGm YLDlTr6XCx0380BiX2RmxewdhpJyDu/KuvNV+qreJ0hHF7bfLrzZI2CEL2kaBJkcpWgKa9 ZW7c/1rTJmNQKGEveoDVHZt2tc34oOnLUtFVhhljMUKXxUHg80jVdLjClyalkljMqkj3qw LZ+LeAdWqaAZreW8PU9JWc5zeKUPIY48mLTTSNt24a+2+FAnN96RtbMqijbFjoGBVlK21k 4KENCn6gRv5HHSFbd4/X0PvmuPtT4YoBcz+0P4Mbw65GGuyCuunteLR3SuQUAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPCX4250Wz18hQ; Mon, 6 Nov 2023 13:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6DsiQO072513; Mon, 6 Nov 2023 13:54:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6DsixI072510; Mon, 6 Nov 2023 13:54:44 GMT (envelope-from git) Date: Mon, 6 Nov 2023 13:54:44 GMT Message-Id: <202311061354.3A6DsixI072510@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: 52415bfc0adf - stable/14 - bhyve(8): fix manpage formatting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 52415bfc0adf29a4d600a5a55b5f6b7c5f93fa4a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=52415bfc0adf29a4d600a5a55b5f6b7c5f93fa4a commit 52415bfc0adf29a4d600a5a55b5f6b7c5f93fa4a Author: Dan McGregor AuthorDate: 2023-11-02 14:50:10 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 13:54:14 +0000 bhyve(8): fix manpage formatting In commit 67c26eb2a57 a stray ".El" was introduced, breaking formatting of options. Reviewed by: corvink, markj Fixes: 67c26eb2a57c ("bhyve: add cmdline option for TPM emulation") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42434 (cherry picked from commit d7f9a421dfb250e016e3d29b17e2b6a6ae3bc40c) --- usr.sbin/bhyve/bhyve.8 | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 21313e0fcad4..6afe37bcd58e 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -563,7 +563,6 @@ Version of the TPM device according to the TCG specification. Defaults to .Cm 2.0 .El -.El .Pp Boot ROM device backends: .Bl -tag -width 10n From nobody Mon Nov 6 14:42:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPDZq6KqTz4yqjv; Mon, 6 Nov 2023 14:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPDZq5q7mz3Ld3; Mon, 6 Nov 2023 14:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699281731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1oGjSvpVWvKAW0O7OjuEJ7s+70t0ODqg5jlvVC6JO8=; b=dxpjmDFkSa6IrWi4XSCCb6h1LApNkhULkpjvSvo/E2HDzf6oM9h+uek9CF6vTYMQ8JP94t F/tFu9rvgEmkOtAkh6h24GCO9qwn94mnHOqh0QyrthbVHz/4nevEgRI+/znOKjNNZQpXdU E3I0KWBE6AoipEnl0YkhoBzNQ+Xji4v3fSTqQ1C7jDVxorx8DQfglHVuXkx//pUX+R85t9 X3DHu7haTnLy4VvUKoGWmDHCQLW0ts2VCwcmSBGv9c7q4UNSZpHxfIF9tu6AlljaICpks5 2LqFboAloS/jJ+ehLJZd9VBIDRKFaC3sQbz0n/xIZhHU8IjfPudfuBWfSCWsEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699281731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1oGjSvpVWvKAW0O7OjuEJ7s+70t0ODqg5jlvVC6JO8=; b=cCRBcJ8kx0JZlt81hzorrnFysf5pXgy5fsYKANCBDcbMFKg6H6QENhjMU4LSbovA/ui1zi YM45Pc4q+KKdBu/pflnJAuDB0PT2Q6KG9xqV5ez2+M7fXlxBwu33kGMVDaF1B1WdwKCcBv AkivwZ7LLjcCwxiRMz+jEgECg5K0JVxEC5C6MYmexZMFlxqIuiV1ee4a6BCL0N0cC45GIk 35l0MYrNhD9DZkBk47YOsxVT0/6AztVJzRni1jx+fRNxe1+CLd1HXeYWfCRhqqJXyhP3VR CioVFZEVhf5iV0cDOV8j56RwSmLB1cOjL2Ag8Qaiz9e1gEmwXm2PrTBuF+k4eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699281731; a=rsa-sha256; cv=none; b=K6FAund9HGMwuYpsFmB/sRSOT1Vy2HdqvAo56/GG9AWmzEblOG0SaniolK1WWRBpzLyAqm d0CWjR6rKdsmdHCkr0S/FU8GLD4MpXT8nkPF+RlohqL8P/6m6e6fYXcqCC3hfNkfM5lBSf AylIcc6FSv78qtuItw9iqg3o5NJs/28hz9Ip4wcSk+TNuq5icRB2x0vgPOwCFKrhMGvf+R zL+nD93U1M0uuy3AMzeFTSVJuJB3JOc8SAhNZGblBbl1qAyDju8cUqZU0zgXZhdUJflncQ 1L1ipBmTbfPZ8SfnX5rt79D22b7a1fEYq9PLRUNgbOPm1OBUp2Ungmzge3rRDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPDZq4tPZz19Rr; Mon, 6 Nov 2023 14:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6EgB4d055762; Mon, 6 Nov 2023 14:42:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6EgBKk055759; Mon, 6 Nov 2023 14:42:11 GMT (envelope-from git) Date: Mon, 6 Nov 2023 14:42:11 GMT Message-Id: <202311061442.3A6EgBKk055759@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: 1e99535be2ea - stable/14 - fflush: Split a temporary variable in two. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd commit 1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:08:03 +0000 Commit: Ed Maste CommitDate: 2023-11-06 14:41:54 +0000 fflush: Split a temporary variable in two. It is clearer to avoid reusing temporary variables for different purposes. Sponsored by: Klara, Inc. (cherry picked from commit 1f90b4edffe815aebb35e74b79e10593b31f6b75) --- lib/libc/stdio/fflush.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index a7f9348def50..7ad6adedf53f 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -104,10 +104,10 @@ int __sflush(FILE *fp) { unsigned char *p, *old_p; - int n, t, old_w; + int n, f, t, old_w; - t = fp->_flags; - if ((t & __SWR) == 0) + f = fp->_flags; + if ((f & __SWR) == 0) return (0); if ((p = fp->_bf._base) == NULL) @@ -122,7 +122,7 @@ __sflush(FILE *fp) old_p = fp->_p; fp->_p = p; old_w = fp->_w; - fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size; + fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); From nobody Mon Nov 6 14:44:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPDdR1vCGz4yrPn; Mon, 6 Nov 2023 14:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPDdR17Xmz3MKH; Mon, 6 Nov 2023 14:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699281867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zSsVDjN7I0NxkBz6ziQfbWJ9knUwJ/fQMUl5o9MjSlI=; b=VlMXxziCWiOkdOHS2n3lgkMRs80CSKWc9OsmoG1BurXudeIPOLkC4uaqq5SduLSqNWs4Z4 WGUw8vdyXislngSWr+ClNyRSrfim7NWA1oG8YxVz8QAYb954Hqulq1bp8tjMMArVcBWQ+C b2gbH4l7vrCYBnFPKO6Q1hZpv2tqr/+KQ57+Q1x5bpjPXJXsoxQxeCg/apNQD5GMoEBxWf EF3Gdt5t2hk5b5Om6z9E0KQVzaHi6wGKigO7CqQXK/N58ddxS9bJmYrREAFxoLvjThLJHs mqxDGXKON37qzS5J9YKJPLKRZzdX3aXGgvgU436whYBj+zZ86NiG9edx1lfDxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699281867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zSsVDjN7I0NxkBz6ziQfbWJ9knUwJ/fQMUl5o9MjSlI=; b=TiGcH2i4G/NCvg1fndJI6+higbbMgTvE65TBNmdlGF6WABjfRi70mMuD05NH+83EE4itgg C5v0Agf/b2o2Y98RkdP62/3iBpqfr+bhJM5dEhMD3o2QQ9eJxwWLWQq3HGDAHtooeVbeHn j+itMrUcjeEEuNtc8/A1CQqlIyPnrShAYaMpA8a1JJcrnPiLJEylWw0geH9DC+Vxvqo+ZS tA6RAqI46y31n5Tg4Gz7mYGAcgVjF3cfIw47KErUBUXsKXDDGCCPuacXK72W3vAoR/dOFA IWtRwrHiyCBsme+8w9SAMHx1YTCmKLHS1HgyyUw97+E7mR4UtAZgDfRllwtaIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699281867; a=rsa-sha256; cv=none; b=M9IUCQTSP5el19dPs6VnrZDzgnZo+HRd714Jq5dgwtgSspABESrCBzPkVpiXdy8iG7sWJW LCO8uK3a9YCaE6eo2OdyD4duthRgONDE78fVnfN6X/iZr76njZMpeBiGHZv+B1tuI4hPiR jd72iglxpkN6wkW4jRvvcoSZxSW0dSegV9Xtn7w+Pg7LIqTiwm0D1JpSk1zXKuvECFQzrs VPQeU/IT5gDJhdaCUyEdCe+NJ2J6b0+qwzyhDblvP2J6cc/CjD3/XsbjQ1IKU/hSMKRcmz wq711nSdZicSFHKnNCOD9NNrjfHAJFK3HCXwJofX2J+oKY/lWcHEQ6HD8aPyrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPDdR0BZDz19xx; Mon, 6 Nov 2023 14:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6EiQXp057403; Mon, 6 Nov 2023 14:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6EiQqi057400; Mon, 6 Nov 2023 14:44:26 GMT (envelope-from git) Date: Mon, 6 Nov 2023 14:44:26 GMT Message-Id: <202311061444.3A6EiQqi057400@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: ccdd8337f9cb - stable/13 - fflush: Split a temporary variable in two. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ccdd8337f9cbd7d34e2e95df1440dd5f7225d0b4 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ccdd8337f9cbd7d34e2e95df1440dd5f7225d0b4 commit ccdd8337f9cbd7d34e2e95df1440dd5f7225d0b4 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:08:03 +0000 Commit: Ed Maste CommitDate: 2023-11-06 14:43:41 +0000 fflush: Split a temporary variable in two. It is clearer to avoid reusing temporary variables for different purposes. Sponsored by: Klara, Inc. (cherry picked from commit 1f90b4edffe815aebb35e74b79e10593b31f6b75) (cherry picked from commit 1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd) --- lib/libc/stdio/fflush.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index a7f9348def50..7ad6adedf53f 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -104,10 +104,10 @@ int __sflush(FILE *fp) { unsigned char *p, *old_p; - int n, t, old_w; + int n, f, t, old_w; - t = fp->_flags; - if ((t & __SWR) == 0) + f = fp->_flags; + if ((f & __SWR) == 0) return (0); if ((p = fp->_bf._base) == NULL) @@ -122,7 +122,7 @@ __sflush(FILE *fp) old_p = fp->_p; fp->_p = p; old_w = fp->_w; - fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size; + fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); From nobody Mon Nov 6 14:45:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPDfP401vz4yrbq; Mon, 6 Nov 2023 14:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPDfP3S18z3MhL; Mon, 6 Nov 2023 14:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699281917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNu1eEb6i85voRuXWx7FH4lTpT7jkwa43/Fl9+jL4WE=; b=xDHyPrE1xH8Dgj0wn3AyghuPA32Tp2oCO/KLzPwKvuXBsudwxa1omQ3JXt4W4rSFm9o/Rr q6JKtUlQRa+Xvl6xCoe5998hCkoxXeaxGoXacK+cYu9MIFT63TWzhf3rE5SoNKVf7ArJf7 HLDhTa2medz8xglLaJsw/u5joJz3M5aKXKkQhOqlCCSAhVsKydqBfmHtw7PjB5MeFcqBXy PTOWCKeL5A1rClyS6rTitlfReQJbmCpSv+0TBBsRjjrwXEaTsRDDVMcln859Jxib+DZ27w ygLErYNofwulLxBGMRL1fqWi6ZER+7lvXNR9tZZazuxmD79v4EIwZUYePB3vNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699281917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNu1eEb6i85voRuXWx7FH4lTpT7jkwa43/Fl9+jL4WE=; b=gCvfmvqZ5BDyLc/N09N4MzheJDvGdjtpgzGMex6sz0i52rmM7wymf7WZZjr6tnhvALzGKT uiWbyClgkXL4znCFegacVTnDNYFPoHMjNr3KPRYQMZtscU7VqLkW72t+1VKK9YvEjUtyL8 tNiL34abplrEooFnRExd2LEfJzjsLuB4b/LTQtj4HTF3IgjlYCe36i4RxcgNLyqkX0hB7j ND0ZfC4PzpWklJEjIYn7ii1PKveNQUBFrV7/JVPtjBS0NLfRBiANdwjpf9GgQGLm47lTji 4YTOGYJq2N5E2KVrjCsyODWZeGXGsgwLOo0ChkuBmPjseNGdJqNcEx6tCx1LeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699281917; a=rsa-sha256; cv=none; b=o1+S82wXhpI5Vc7nKuQTyzBbdidIy+MAJyguBFYShD2dOpJ4an1i7TupnDzGWF8PY+6YEl bqRUoL8Qpu37KHrnB1KZaTkZvSgm9/SPhyzMkixsCKFmWJwa/r6LmGKv1Hltgug3IoS8Lm ++IJcrtpn8uWV+u8TXrC40fweZiBQaiwlewr8N4pxcNQdANNRrm15vKrws6bHaiFrW1UDA 95JRXiGabvtQ8pkmWki94umncW98Hi/KQ/3JPbDKnuCYpM0WmtA/E5lqNe4OLW1pL6UEOg CJXlKyTI8HMSh57aOXfXH0JSi4Zm/4KpNKahxvCtD483e+HkXQi0VFNEy/g8MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPDfP2Xfpz19xy; Mon, 6 Nov 2023 14:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6EjH3M057778; Mon, 6 Nov 2023 14:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6EjHrq057775; Mon, 6 Nov 2023 14:45:17 GMT (envelope-from git) Date: Mon, 6 Nov 2023 14:45:17 GMT Message-Id: <202311061445.3A6EjHrq057775@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: 95fbce59c9f4 - stable/12 - fflush: Split a temporary variable in two. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 95fbce59c9f4ed4015b19a88491a37dac9d4e7d5 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=95fbce59c9f4ed4015b19a88491a37dac9d4e7d5 commit 95fbce59c9f4ed4015b19a88491a37dac9d4e7d5 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:08:03 +0000 Commit: Ed Maste CommitDate: 2023-11-06 14:43:45 +0000 fflush: Split a temporary variable in two. It is clearer to avoid reusing temporary variables for different purposes. Sponsored by: Klara, Inc. (cherry picked from commit 1f90b4edffe815aebb35e74b79e10593b31f6b75) (cherry picked from commit 1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd) (cherry picked from commit ccdd8337f9cbd7d34e2e95df1440dd5f7225d0b4) --- lib/libc/stdio/fflush.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index f7d2fbdc28e5..05e587ecec66 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -106,10 +106,10 @@ int __sflush(FILE *fp) { unsigned char *p; - int n, t; + int n, f, t; - t = fp->_flags; - if ((t & __SWR) == 0) + f = fp->_flags; + if ((f & __SWR) == 0) return (0); if ((p = fp->_bf._base) == NULL) @@ -122,7 +122,7 @@ __sflush(FILE *fp) * exchange buffering (via setvbuf) in user write function. */ fp->_p = p; - fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size; + fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); From nobody Mon Nov 6 14:47:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPDhh1QTtz4ys6c; Mon, 6 Nov 2023 14:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPDhh0tFJz3MvH; Mon, 6 Nov 2023 14:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699282036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esoDDZ3AWVOUGIvxNbCOMueNlzENKxM0MnZkYu7Hs9M=; b=rhsj9ApY5v3sh6ashZ6ca2iBj6cfQ3b1LFqZXcPofJ5Zl5Qjxa9Kgn5pJKNiuA+tY6BBrL u3jtLAFA97LO59LeTkOE9PzEIJ+hzinWc3pDZAR7DoAIlcMSiXkJQO9w/rdXvQ874Gbv+p yY7KLe797SHk8trgnJsBjfPprsEpO1Ue2pe6kU42b0YxPOGxBtRQQGm+gi1vVaei09S44G K4bl/gxx/14cRscueC/OXwlYUKMSO5VQr+EN8nKYKsG6GI6RJkEi06KY3HNw/BBSVenK+y YM1trpjvguh8dwXcptgCYy67IUBBAQrWDDeYM2NlKCMpBaFSLDIXNwoBuesQuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699282036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esoDDZ3AWVOUGIvxNbCOMueNlzENKxM0MnZkYu7Hs9M=; b=cLV5jBeODDrsgkT7bs9ZXKQy3CggSAwurgVvHdG66MawEP/G9zgn310jfduD+gdoBdBEqX 5BFgD56sZ0TqJb8m/lKizS7UCYGsdDj9xkUlB+icIenYLfpZfo5rY0e2wDkOXpcb4NJ0G1 LCRgVnyFqz2ZQHbqZb2Rs6+sKk+zxkvlAFrTwdl/+R0rhdzmaDT5o9QaVEDOrH56SJAr/U k+8vZ4l+5ZgFwx2XtJsYMNVxNPei7CjVRIsmJaMNPnWgyXwLz6b2fb0aXdrf2FqtuX/OlA kE72r9heI04j4tq9FO/zF2+QCbKmVxsOmnKuxRCjq6J0xyCt4pq2jLl3I6tY1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699282036; a=rsa-sha256; cv=none; b=amgbLYSfjxQumfPu8b7PYHqXZrtzoh/KytKIIR+dTmfMKp7ijhwmDVX4Yfnhu1VF+F/PPM uR3siqNMYFfALGbjv4gG93QhzXNkDJx9i/q7uv1zZ2Debtyzg80F6oGAgZAinD1t7iubON kw+b+e8noyPngSS94HWQRH8n3yvp8tm7J6nU/Ikmcr82xf3hVdcYgn+1CUte2RUJSs7JwW uBgEIMxUOlO8cEummQPWQnkm4743Ua9QJk3mQhMcRyPVJ0x3nb0jJu88Ab2BPlGDaKryrP 7kFXdkUbFO9LfNNCl5uttZBfS5OS7hbszlrFrz/sBuRECm4QyW+9SFltPqhJ4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPDhg736sz19gl; Mon, 6 Nov 2023 14:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6ElF6s058139; Mon, 6 Nov 2023 14:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6ElFke058136; Mon, 6 Nov 2023 14:47:15 GMT (envelope-from git) Date: Mon, 6 Nov 2023 14:47:15 GMT Message-Id: <202311061447.3A6ElFke058136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: 94eca4b5f38b - main - loader.efi.8: Fix style warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94eca4b5f38baa03446216f585089852d98c283a Auto-Submitted: auto-generated The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=94eca4b5f38baa03446216f585089852d98c283a commit 94eca4b5f38baa03446216f585089852d98c283a Author: Benedict Reuschling AuthorDate: 2023-11-06 14:45:20 +0000 Commit: Benedict Reuschling CommitDate: 2023-11-06 14:45:20 +0000 loader.efi.8: Fix style warnings This is a follow-up commit to bce728719e7f57272d99b6d039f10b4c636fa024 to address mandoc(1) warnings. --- stand/man/loader.efi.8 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 16165c68556b..827c4ced7f2e 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -209,7 +209,9 @@ serial console otherwise. .Nm loads some extra variables early in startup from .Pa /efi/freebsd/loader.env -from the EFI partition. Only simple variables can be set here. It can be useful to specify the root filesystem: +from the EFI partition. +Only simple variables can be set here. +It can be useful to specify the root filesystem: .Bd -literal -offset indent rootdev=disk0s1a .Ed From nobody Mon Nov 6 15:13:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPFHJ4H17z4yxxR; Mon, 6 Nov 2023 15:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPFHJ3nRsz3Snc; Mon, 6 Nov 2023 15:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699283628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOBwfdzAImlMBMSSlhBxQraoWr++HuX58ycr52dvPgs=; b=Ap/dbk4L3r4xWCPAWhOYohUvL524KxgfW/Iiin/v7Sq9I6zakITLioejc1KbtyhdRSb2oE yEVpAU/6S/R/7MTgFdW/PJzqgmCMGoXBtw/Q8TsniPhSIiDkX+/UziheMBToWZ2AjSoykl mj45x/jChj5RpThx9PYJeXGnDv+kFQ62iWegTzlghbA1SA50PYBOCAGKtZcYUKPCaxlhxH DspwT2gCJGDO1wHvUJ4OCxcHpznMnZ9APKC7V2VsSsSsB5YVkz3vgbgDC2NJuDjBp0Pha8 6eSMpaywDcpOkFylaWWCO8v92FrV2K2kiYSwBVXYGk0cf6rv28LaBvghBt6tIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699283628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOBwfdzAImlMBMSSlhBxQraoWr++HuX58ycr52dvPgs=; b=U6S35sO+1Q5b8o79jCjn6zmYq0Ea7lrsZj6a3DqPEWFYlKyurLNVQAKYUzo/I7NEKU61Xp 8tvndyfmyw1Uy04WHA0aEnU1HvtR2YKgxnilFLXiR3gD7eOh9lLXtc2tp2rh7vkaN433E0 F0TO7PmggTWZC8KJKhUtmiJDzqkubO+GG3/A9K0nlk/dNTRHiaNsoJyMyVg4Z7wmMQxb6n aioL9aGByXzorZuFRzh2VkmfJ4YCEnyXbqDrBKoKf+ICdub5yVdbx06P8FEGorPXTDZW7J Kh68mtmGpQoN19+oO3xv/0369sQ+hVYYTilVk6/ljrupdBFOLbsqHMYGnn5Rzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699283628; a=rsa-sha256; cv=none; b=KddoGfD96lVkHup2/G+3qynFn0OXXdUyrb1jgowe7g3tHvcXCRzUa+/+O+1lH2mWX5UQ4C 9ZMQR/WY0eZLtIu865zYwq6okgpUK7cyN2y/ag3Cto864d89Uas4svyhlu92UXVUaRvz3V 1lMuX+26sFq2a/rhui2nk0DsktKnh2gq2SgQ70jeJrveKg4FuZgfpv+Ql+YC6GoE/0evr/ r2zmOM8Hak2OX5TBUc45Mu05v4pe6gSSjGI1Go9CdPMujZokh5eyiFvjE4c+QZRKCZSV6N MrQCi1+C/fQoYwah5OX1V+X8tSEJl2EKUifPfmSEdlqcgM+PzrOq2eEEHuDDCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPFHJ2rPpz1Bnd; Mon, 6 Nov 2023 15:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6FDmf3007731; Mon, 6 Nov 2023 15:13:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6FDmAZ007728; Mon, 6 Nov 2023 15:13:48 GMT (envelope-from git) Date: Mon, 6 Nov 2023 15:13:48 GMT Message-Id: <202311061513.3A6FDmAZ007728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: c21038f55230 - stable/14 - arm64: Use the Linux sigframe to restore registers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c21038f55230693b46cef0d900ff4fa90c05fcf6 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c21038f55230693b46cef0d900ff4fa90c05fcf6 commit c21038f55230693b46cef0d900ff4fa90c05fcf6 Author: Andrew Turner AuthorDate: 2023-10-25 09:50:11 +0000 Commit: Dmitry Chagin CommitDate: 2023-11-06 15:12:23 +0000 arm64: Use the Linux sigframe to restore registers When returning from a Linux signal use the Linux sigframe to find the register values to restore. Remove the FreeBSD ucontext from the stack as it's now unneeded. PR: 270250 Reviewed by: dchagin, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42360 (cherry picked from commit 070a4ff82a34652d533f9315ae9ad0aa8f1fdeb2) --- sys/arm64/linux/linux_sigframe.h | 1 - sys/arm64/linux/linux_sysvec.c | 96 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/sys/arm64/linux/linux_sigframe.h b/sys/arm64/linux/linux_sigframe.h index e903fea295dc..2a004f4db74d 100644 --- a/sys/arm64/linux/linux_sigframe.h +++ b/sys/arm64/linux/linux_sigframe.h @@ -76,7 +76,6 @@ struct l_sigframe { /* frame_record */ uint64_t fp; uint64_t lr; - ucontext_t uc; }; #define LINUX_MINSIGSTKSZ roundup(sizeof(struct l_sigframe), 16) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index a850d5e34bc0..4b5544841313 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -187,28 +187,109 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp, bzero(&pcb->pcb_dbg_regs, sizeof(pcb->pcb_dbg_regs)); } +static bool +linux_parse_sigreturn_ctx(struct thread *td, struct l_sigcontext *sc) +{ + struct l_fpsimd_context *fpsimd; + struct _l_aarch64_ctx *ctx; + int offset; + + offset = 0; + while (1) { + /* The offset must be 16 byte aligned */ + if ((offset & 15) != 0) + return (false); + + /* Check for buffer overflow of the ctx */ + if ((offset + sizeof(*ctx)) > + sizeof(sc->__reserved)) + return (false); + + ctx = (struct _l_aarch64_ctx *)&sc->__reserved[offset]; + + /* Check for buffer overflow of the data */ + if ((offset + ctx->size) > sizeof(sc->__reserved)) + return (false); + + switch(ctx->magic) { + case 0: + if (ctx->size != 0) + return (false); + return (true); + case L_ESR_MAGIC: + /* Ignore */ + break; +#ifdef VFP + case L_FPSIMD_MAGIC: + fpsimd = (struct l_fpsimd_context *)ctx; + + /* + * Discard any vfp state for the current thread, we + * are about to override it. + */ + critical_enter(); + vfp_discard(td); + critical_exit(); + + td->td_pcb->pcb_fpustate.vfp_fpcr = fpsimd->fpcr; + td->td_pcb->pcb_fpustate.vfp_fpsr = fpsimd->fpsr; + memcpy(td->td_pcb->pcb_fpustate.vfp_regs, + fpsimd->vregs, sizeof(fpsimd->vregs)); + + break; +#endif + default: + return (false); + } + + offset += ctx->size; + } + +} + int linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args) { + struct l_rt_sigframe *sf; struct l_sigframe *frame; - ucontext_t uc; struct trapframe *tf; + sigset_t bmask; int error; + sf = malloc(sizeof(*sf), M_LINUX, M_WAITOK | M_ZERO); + tf = td->td_frame; frame = (struct l_sigframe *)tf->tf_sp; + error = copyin((void *)&frame->sf, sf, sizeof(*sf)); + if (error != 0) { + free(sf, M_LINUX); + return (error); + } - if (copyin((void *)&frame->uc, &uc, sizeof(uc))) - return (EFAULT); + memcpy(tf->tf_x, sf->sf_uc.uc_sc.regs, sizeof(tf->tf_x)); + tf->tf_lr = sf->sf_uc.uc_sc.regs[30]; + tf->tf_sp = sf->sf_uc.uc_sc.sp; + tf->tf_elr = sf->sf_uc.uc_sc.pc; - error = set_mcontext(td, &uc.uc_mcontext); - if (error != 0) - return (error); + if ((sf->sf_uc.uc_sc.pstate & PSR_M_MASK) != PSR_M_EL0t || + (sf->sf_uc.uc_sc.pstate & PSR_AARCH32) != 0 || + (sf->sf_uc.uc_sc.pstate & PSR_DAIF) != + (td->td_frame->tf_spsr & PSR_DAIF)) + goto einval; + tf->tf_spsr = sf->sf_uc.uc_sc.pstate; + + if (!linux_parse_sigreturn_ctx(td, &sf->sf_uc.uc_sc)) + goto einval; /* Restore signal mask. */ - kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0); + linux_to_bsd_sigset(&sf->sf_uc.uc_sigmask, &bmask); + kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0); + free(sf, M_LINUX); return (EJUSTRETURN); +einval: + free(sf, M_LINUX); + return (EINVAL); } static void @@ -310,7 +391,6 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) } memcpy(&frame->sf.sf_uc.uc_stack, &uc_stack, sizeof(uc_stack)); - memcpy(&frame->uc, &uc, sizeof(uc)); /* Copy the sigframe out to the user's stack. */ if (copyout(frame, fp, sizeof(*fp)) != 0) { From nobody Mon Nov 6 15:18:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPFN84Y41z4yyYC for ; Mon, 6 Nov 2023 15:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPFN845PKz3T3f; Mon, 6 Nov 2023 15:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699283880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6o0DKLsjJcBvtZZJpCk4s0GLYHno5az22O8U6WEvyi0=; b=imS9HT2wrq1aGuHoC8BY9Q2d0Ia/kK+QaHQKfKbTXQI/NYGE5rlsp8a6VuPZQ/HMjVIInj lVHLsIQqTdU+lC9QivrXxOn/hw1R27ZotOQMf0+mKZwphbJrObiB2kxt52CfKDTsvGty1C evZkltvjHH6blCVT1DrUbJ6R7Pb508UNf7mrc5LwjVNUPZXmLwKsq4Huwig/FGuzy7K88b O4uVRhD+vwTppkTaSr0ZPeZKCI/PHO1aONqq8zhBlNroF+QHnExdTvrC0nfm0xv6rA3w4f r72MBSlF5M+II9UHHaC8Hlw85igL78rnCR6rBVzs0+QCvM+O45inczdG3ps32Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699283880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6o0DKLsjJcBvtZZJpCk4s0GLYHno5az22O8U6WEvyi0=; b=mynzP7WIPCQwGRMVnwqIbHU2ygnOa4qU0CNNE0Ulz2XnpJ4STg2PnjzuCGJELLx5eZQcxH H38jN/0ZhI8OD8nh44WZV7UYSDqo2qjQFsmiFtu/DEyrAr23QNjDmYX1hqs+iZSqtDr9qJ YOJrO6jJGrXkntHNUpKeuNx8oZMg+ptB6AEldqwBT9EUxRhMlewQC/sIq38lYgQgidUjjH 2/mFVUOx146b/xD/8TtXvY4yX163gkZ5pcBcIKFDu1vueZ5BbA1P03Pn3flFtxii8R6KWH x0hzA6uXpv2cFD7e/paInT1pDxQ7Qf+0mXRLqic0tOXNH3Blg6ULT49m3hDLXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699283880; a=rsa-sha256; cv=none; b=yft0NFVK6JGHoXMEEKKQtF84BrYXFwKe6i9pnwIteJQdVNJA2CceiQ0FrR5u0aGz113awp vfxHLKPTIhrqOT42My6VhpGa18ebWLxE1ztCS9AMgiFQ3Q2NIzfR42REBvzfGXr24zhjsw IFdFAsdxsA5Jnf6j4/3AF6Zl5cqZcgtKPx1/2Y5eGRIZuL4lc7Y8Dk5gxJOVptzNvpKnHP z6v0qwHsP9qyci+Xvz28Z5L/r9uUKSVHAyJPXfElEHK3JKJvgvFmlN6Lhn3+cC1+03xgKb uLkuU/NhQ6lJ67cdQkWrpxvt3eRqU61jnrDldnnG830pqcSpn9kgZyY4x6b6AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPFN8333fz1Bnk; Mon, 6 Nov 2023 15:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6FI0Nf008528; Mon, 6 Nov 2023 15:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6FI01v008525; Mon, 6 Nov 2023 15:18:00 GMT (envelope-from git) Date: Mon, 6 Nov 2023 15:18:00 GMT Message-Id: <202311061518.3A6FI01v008525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Mark Johnston Subject: git: 5748eafe7944 - internal/admin - Release christos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5748eafe79444fec3d6f86232775595fff7572b3 Auto-Submitted: auto-generated The branch internal/admin has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5748eafe79444fec3d6f86232775595fff7572b3 commit 5748eafe79444fec3d6f86232775595fff7572b3 Author: Mark Johnston AuthorDate: 2023-11-06 15:07:12 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 15:07:22 +0000 Release christos Approved by: core (implicit) --- mentors | 1 - 1 file changed, 1 deletion(-) diff --git a/mentors b/mentors index d9f57239184a..3d56a29ab2b9 100644 --- a/mentors +++ b/mentors @@ -14,7 +14,6 @@ afedorov vmaffione Co-mentor: jhb anish jhb brd allanjude Co-mentor: bapt bryanv grehan -christos markj def oshogbo dsl bz gordon delphij Co-mentor: emaste From nobody Mon Nov 6 15:36:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPFnw1LJlz502Ms; Mon, 6 Nov 2023 15:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPFnw0w1Nz3bQP; Mon, 6 Nov 2023 15:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699285012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qE9+cz0fi4GmN+L9Asb838sV057V2G0z1RoL4hgjIiA=; b=uqEy7abtQQARChLrW+5BY/b9GvfuM9xqjIZMN6Cc9qxQV8l+Xelfio+L3YIRXBYp+RmjVs tdxWw2/yAOlcLs+dKg917wyuNJovTl3lGFQcupEbUvyx2lPAcI+qXGDNi6VqW/gKUXBp28 FGNkl1zCMjEeOnDCIQAjAtOpIKd6Qw5I7f0sc3HffWsq8fKIpFl4F7V2UAgw/Myaj5nJf5 BoWrk+qot6z47Nn7k4aMcxjJlRyzrYh8RJIfuZn6whxWiOL4/ZSgG7lUHNnlJpOS2ecQam FfZ30PCf4/zfIcQ7DaNce92PDKeuy1GHyd7UdxySwceBbdVZ9BSyOLrplN5WRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699285012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qE9+cz0fi4GmN+L9Asb838sV057V2G0z1RoL4hgjIiA=; b=u8ZFhcMqx8ltHkyXiVeE5Q5ct/DMbkshw9VcDgdisxYz7mxDXBEhXoEJ5ka2aece2dYlRI SAGLjGcT58+Mnhem/Kh9eL/geePZp8AaWJPquWdrLSMNwnQehYEgtM+2vNMFI4IlzRvGVU JiBPN9u5yD5hokkPA87KpvMDH0z9lAAHQjNrE/L4W6B4s2BOVkyEmS8+vBDodakOgyMh9A vg709OEu5xi0neJ7NJ4LjEU34oxKglkxirtTQWlnHnJWQgITelydFL0szFzTaRFINZQwD3 J5oLiA35p7G6OmViXpRHlj/tcZLwi4hjk9WeP+I5AVP18wvKHqTrkzTNjPyGag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699285012; a=rsa-sha256; cv=none; b=sJsgARSDav9myq6+LrkInfxWmffGTuov4CikFs6zqy44zeOsYtqz5UwgxKNFWP+YB0KqTg I5txuLt9EviP84IHXVsxnJ8y+ZJcrpwBGbA8eH2s+X7b8vDu1GHwqMYmthQCDamp7PlXMq zrANtIaU1sbZvpBDvTx8dD7Rc8WDb0Igc1E+TCa84Au8OPCR3yQ6XHKe+690P/tGIa3p0h oKW5RQsf2K3Gw9eqQtM8+5e+rNzsWGWqaNpWtOjPyLynVcU8qouv+hYnaa1XJZ12SU+AoG T7DI11vJjMMnqUjSYqPCjFJyaYFCPZL9jR221WZ/4HjipNneL/8PITzUxq7Y9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPFnv75h8z1C3h; Mon, 6 Nov 2023 15:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6Fap8c041649; Mon, 6 Nov 2023 15:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6Fapav041646; Mon, 6 Nov 2023 15:36:51 GMT (envelope-from git) Date: Mon, 6 Nov 2023 15:36:51 GMT Message-Id: <202311061536.3A6Fapav041646@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: 963f38b2db52 - main - RELNOTES: bump version to 15.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 963f38b2db526d83c981223560a381b3418de31c Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=963f38b2db526d83c981223560a381b3418de31c commit 963f38b2db526d83c981223560a381b3418de31c Author: Christos Margiolis AuthorDate: 2023-11-06 15:36:33 +0000 Commit: Christos Margiolis CommitDate: 2023-11-06 15:36:33 +0000 RELNOTES: bump version to 15.0 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42478 --- RELNOTES | 233 +-------------------------------------------------------------- 1 file changed, 1 insertion(+), 232 deletions(-) diff --git a/RELNOTES b/RELNOTES index 77d423a5c50c..611b43686887 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,4 @@ -Release notes for FreeBSD 14.0. +Release notes for FreeBSD 15.0. This file describes new user-visible features, changes and updates relevant to users of binary FreeBSD releases. Each entry should describe the change in no @@ -52,234 +52,3 @@ ff01d71e48d4: released by extending some level of 32-bit support for one or more platforms in 15.0 or later. Users should use the stable/14 branch to migrate off of 32-bit platforms. - -3cb2f5f369ec: - The lua-flavored loader(8) will now interpret .lua files that appear in - loader_conf_files as lua, and execute them in a sandbox. Existing - loader environment variables are available as globals in the sandbox, - and any global variable set, if not a table value, will be reflected in - the loader environment upon successful execution of the configuration - file. Environment variables with names that aren't valid lua names may - be accessed as indices of _ENV; e.g., _ENV['net.fibs']. - -bdc81eeda05d: - nda is now the default nvme device on all platforms. While nda creates - nvd links by default so fstab, etc continues to work, configuration - should be updated to the new nda devices. - - To restore the old behavior, add hw.nvme.use_nvd=1 to loader.conf or - `options NVME_USE_NVD=1` to the kernel config. To disable the nvd - compatibility aliases, add kern.cam.nda.nvd_compat=0 to loader.conf. - -bbb2d2ce4220: - Change pw (hence bsdinstall) not to move /home to /usr/home. - Previously, when creating the path to home directories, pw - would move any path in the root directory under /usr, creating - a symlink in root. In particular, the default /home would become - /usr/home. Now /home is at the top level by default. /usr/home - can be used explicitly. - -3416e102c4e9: - Remove TI code from armv7 GENERIC kernel. - This code doesn't cope with newer DTS and hasn't in a long time so - support for TI armv7 platform (like BeagleBone and Pandaboard) is now - removed from GENERIC. - -d198b8774d2c: - Add a new "fwget" utility. - The goal of this utility is to inspect the system for peripherals - that needs firmware and install the appropriate packages for them. - For now only pci subsystem is supported and only firmwares for Intel - and AMD GPUs are known. - -896516e54a8c: - Add a new "syskrb5" mount option for Kerberized NFSv4.1/4.2 mounts. - Without this patch, a Kerberized NFSv4.1/4.2 mount must provide - a Kerberos credential for the client at mount time. - This patch uses a feature of NFSv4.1/4.2 called SP4_NONE, which - allows the state maintenance operations to be performed by any - authentication mechanism, so that these operations may be done via - AUTH_SYS instead of RPCSEC_GSS (KerberosV). As such, no Kerberos - credential is required at mount time. - See mount_nfs(8). - -330aa8acdec7,ff2f1f691cdb: - Adds support for the SP4_MACH_CRED case for the - NFSv4.1/4.2 ExchangeID operation since the Linux - NFSv4.1/4.2 client is now using this for Kerberized mounts. - This change should only affect Kerberized NFSv4.1/4.2 mounts. - The Linux Kerberized NFSv4.1/4.2 mounts currently work without - support for this because Linux will fall back to SP4_NONE, - but there is no guarantee this fallback will work forever. - -7344856e3a6d and many others: - Add support so that nfsd(8), nfsuserd(8), mountd(8), gssd(8) - and rpc.tlsservd(8) can be run in an appropriately configured - vnet prison. The vnet prison must be on its own file system, - have the "allow.nfsd" jail parameter set on it and enforce_statfs - cannot be set to "0". Use of UDP and pNFS server configurations - are not permitted. (ie. The nfsd command line options "-u", "-p" - and "-m" are not supported.) - See jail(8), nfsd(8) and mountd(8). - -2fb4f839f3fc,d89513ed2050,3413ee88c39d,f97a19ecb985,021562c5020d,431d2a81d421: - sendmail has been updated to the latest upstream version (8.17.1). - -4a30d7bb373c,d670a8f7c596,af01b4722577,4e240e55d818: - The growfs(7) script can now add a swap partition at the end of - the expansion area, and does so by default if there is no existing - swap. See growfs(7). - -86edb11e7491: - llvm-objdump is now always installed as objdump. - -616f32ea6da7: - mta_start_script along with othermta rc.d script has been retired. - -a67b925ff3e5: - The default mail transport agent is now dma(8) replacing sendmail. - -22893e584032: - L3 filtering on if_bridge will do surprising things which aren't - fail-safe, so net.link.bridge.pfil_member and - net.link.bridge.pfil_bridge now default to zero. - -f0bc4ed144fc: - A new DTrace provider, kinst, is introduced and documented in - dtrace_kinst(4). The provider allows kernel instructions to be traced, - similar to the FBT (function boundary tracing) provider except that all - instructions may be probed instead of logical entry and return - instructions. The provider is currently amd64-only. - -0aa2700123e2: - OPIE has been removed from the base system. If you still wish - to use it, install the security/opie port. Otherwise, make - sure to remove or comment out any mention of pam_opie and - pam_opieaccess from your PAM policies (etcupdate will normally - take care of this for the stock policies). - -0eea46fb1f83: - Removed telnetd. - -981ef32230b2,33721eb991d8: - These commits make the use of NFSv4.1/4.2 mounts with the "intr" - mount option fairly usable, although not 100% correct, so long as - the "nolockd" mount option is used as well. See the mount_nfs(8) - manual page for more information. - -b875d4f5ddcb,0685c73cfe88: - The NFSv4.1/4.2 client and server will now generate console messages - if sessions are broken, suggesting that users check to ensure - that the /etc/hostid strings are unique for all NFSv4.1/4.2 clients. - -240afd8c1fcc: - makefs(8) has ZFS support; it can create a ZFS pool, backed by a - single disk vdev, containing one or more datasets populated from - the staging directory. - -78ee8d1c4cda,f4f56ff43dbd: - The in-tree qat(4) driver has been replaced with Intel's QAT driver. - The new version provides additional interfaces to the chipset's - cryptographic and compression offload functionality. - - This will have no visible change for most users; however, the new - driver does not support Atom C2000 chipsets. To preserve support for - those chipsets, the old driver has been renamed to qat_c2xxx and kept - in the tree. Users of qat(4) on C2000 hardware will thus need to - ensure that qat_c2xxx(4) is loaded instead of qat(4). - -da5b7e90e740,5a8fceb3bd9f,7b0a665d72c0,13ec1e3155c7,318d0db5fe8a,1ae2c59bcf21: - Boottrace is a new kernel-userspace interface for capturing trace - events during system boot and shutdown. Event annotations are - present in: - - - The boot and shutdown paths in the kernel - - Some key system utilities (init(8), shutdown(8), reboot(8)) - - rc(8) scripts (via boottrace(8)) - - In contrast to other existing boot-time tracing facilities like TSLOG, - Boottrace focuses on the ease of use and is aimed primarily at system - administrators. - - It is available in the default GENERIC kernel and can be enabled by - toggling a single sysctl(8) variable. - - See boottrace(4) for more details. - -05a1d0f5d7ac: - Kernel TLS offload now supports receive-side offload of TLS 1.3. - -19dc64451179: - if_stf now supports 6rd (RFC5969). - -c1d255d3ffdb, 3968b47cd974, bd452dcbede6: - Add WiFi 6 support to wpa. - -ba48d52ca6c8,4ac3d08a9693,2533eca1c2b9: - The default bell tone is now 800Hz. It may be set with kbdcontrol - again. There's devd integration for people wishing to use their sound - cards for the beep. - -92b3e07229ba: - net.inet.tcp.nolocaltimewait enabled by default. It prevents - creation of timewait entries for TCP connections that were - terminated locally. - -d410b585b6f0: - sh(1) is now the default shell for the root user. - -396851c20aeb: - libncursesw has been split into libtinfow and libncursesw, linker - scripts should make it transparent for consumers. pkg-config files - are also now installed to ease ports detecting the ncurses setup from - base. - -a422084abbda: - LLVM's MemorySanitizer can now be used in amd64 kernels. See the - kmsan(9) manual page for more information. - -38da497a4dfc: - LLVM's AddressSanitizer can now be used in amd64 kernels. See the - kasan(9) manual page for more information. - -f39dd6a97844,23f24377b1a9,628bd30ab5a4: - One True Awk has been updated to the latest from upstream - (20210727). All the FreeBSD patches, but one, have now been - either up streamed or discarded. Notable changes include: - o Locale is no longer used for ranges - o Various bugs fixed - o Better compatibility with gawk and mawk - - The one FreeBSD change, likely to be removed in FreeBSD 14, is that - we still allow hex numbers, prefixed with 0x, to be parsed and - interpreted as hex numbers while all other awks (including one - true awk now) interpret them as 0 in line with awk's historic - behavior. - - A second change, less likely to be noticed, is the historic wart - if -Ft meaning to use hard tab characters as the field separator - is deprecated and will likely be removed in FreeBSD 14. - -ee29e6f31111: - Commit ee29e6f31111 added a new sysctl called vfs.nfsd.srvmaxio - that can be used to increase the maximum I/O size for the NFS - server to any power of 2 up to 1Mbyte while the nfsd(8) is not running. - The FreeBSD NFS client can now be set to use a 1Mbyte I/O size - via the vfs.maxbcachebuf tunable and the Linux NFS client - can also do 1Mbyte I/O. - kern.ipc.maxsockbuf will need to be increased. A console - message will suggest a setting for it. - -d575e81fbcfa: - gconcat(8) has added support for appending devices to the device - not present at creation time. - -76681661be28: - Remove support for asymmetric cryptographic operations from - the kernel open cryptographic framework (OCF). - -a145cf3f73c7: - The NFSv4 client now uses the highest minor version of NFSv4 - supported by the NFSv4 server by default instead of minor version 0, - for NFSv4 mounts. - The "minorversion" mount option may be used to override this default. From nobody Mon Nov 6 15:36:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPFnx3P4nz502Mv; Mon, 6 Nov 2023 15:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPFnx1tflz3bQf; Mon, 6 Nov 2023 15:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699285013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wf9b/XvovzRWVncLimL1XtpyuDV/FmSNXn+ibFTUlIw=; b=ENGK7k388OiSDj/wmmDIDPOtNvlqYcZy9pA60AuaLJbYd5vTgZ3QjZJ6Ub9HZ+MeVJRZcT fyg+1dH0Fn9KYZywak87vreR1npW0N42IFK0qVqFsdNWnCoY60QldQ2lwfKrLvgSRVN8Vo 94YSi5Qcni9uRucmb0km3G8ol23FL/504Cj7g4YaO+HLoASekudmpRYu3yTRmndssNeN00 p6AaUzxsGqH2YmDKKceTfU/S6PJzrQIcTzxvUj/L+OFHGzl31Gyo/K32ilgSdKlk+bWN0l E//gxcQXgBhcNhlvWgJC0qQ9Uk0mMVm/yGiF5T95G7cyNQtoiMXMQFkYGdSLpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699285013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wf9b/XvovzRWVncLimL1XtpyuDV/FmSNXn+ibFTUlIw=; b=nKXbFVAWW5Zq7PhCFlkeWRGngDSzOMu1el9FhvCoJti3SS+iQYVqowi9InDhGRib5nv9OV ijjjJ1lVX2smSMXaW22Kfv/frpiK6b9YzSLDDzE08u8lBA8VXAwxMagMu+M6KrxRTpxqHw KOuhL1/lhYO0bqT7si3bCe6PnoLWBqjUv/+A/g8GelGsGDVMeb9Xwn3KduEeZFApWhsCJy nvO8KVxhVJBo7bgLyWYL3yH9FGmW9td+bhcrKqRXWlsxtrNfIYa83ZsvOUyRuBEehku7Eo XhQ3KsgKSvD6AqgqQ+AZMt18CF+AuiNwcx8DxAxfQNIQOKJ64zOTOqa9wq13KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699285013; a=rsa-sha256; cv=none; b=cxys6P+/JdppttDjNfcEqEWaN0njoors77L2C5tnlRCqJ3XAh30i8hiRo/+JDZ2NbMyrL/ /9sRqoQEwWIs+l0TUfqijj1Fr523ZZwMbRii3DgkdSlCWkwm2Rm/IpZOgc04WSJdcs8xTl E4OWmGrjWwjzevtBhlDJbdsTYUKhh8FaOm91aDKoTzqDWpsD050CYEfNlTZxaL/SMUEdX1 TzedwA9ONB1WR5KuAbtWraK3OKlIKGNztFTVnnuRjgQEPkmsOkZJaJesb3AHzUkgMd3c2r ceA/7vT5yqxfGowEmu/0c2OtU/qUUt+5PecUfUNsoSmEPNHshVacqq8/9rNN9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPFnx0xrkz1CHv; Mon, 6 Nov 2023 15:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6FargS041685; Mon, 6 Nov 2023 15:36:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6Far9a041682; Mon, 6 Nov 2023 15:36:53 GMT (envelope-from git) Date: Mon, 6 Nov 2023 15:36:53 GMT Message-Id: <202311061536.3A6Far9a041682@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: b351fa9d08b4 - main - RELNOTES: mention bb830e346bd5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b351fa9d08b402eee0ddfee5af0b2bc3c3ad7e87 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b351fa9d08b402eee0ddfee5af0b2bc3c3ad7e87 commit b351fa9d08b402eee0ddfee5af0b2bc3c3ad7e87 Author: Christos Margiolis AuthorDate: 2023-11-06 15:36:39 +0000 Commit: Christos Margiolis CommitDate: 2023-11-06 15:36:39 +0000 RELNOTES: mention bb830e346bd5 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42479 --- RELNOTES | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/RELNOTES b/RELNOTES index 611b43686887..c5c20fe37975 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,14 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +bb830e346bd5: + Set the IUTF8 flag by default in tty(4). + + 128f63cedc14 and 9e589b093857 added proper UTF-8 backspacing handling + in the tty(4) driver, which is enabled by setting the new IUTF8 flag + through stty(1). Since the default locale is UTF-8, enable IUTF8 by + default. + ff01d71e48d4: dialog(1) has been replaced by bsddialog(1) From nobody Mon Nov 6 15:39:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPFrw1SGSz502k6; Mon, 6 Nov 2023 15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPFrw0y8pz3cSs; Mon, 6 Nov 2023 15: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=1699285168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5P32vbg+CST9m73rhJRc45WClhbjPNGzSLzMphTZso=; b=kGKbMARSk94C2KeY4k8QTNYSpXEd/0bg7p/X9yLXsH9DULRhhzEuKmx2zEmFEd1UOV5SaE 6XGMN91qb0xvTUxCT7bY2/5fFIAG+V6gIDDZ00m2WH3XCujVm0RfoQVJseMOEaOZN64mOS 2FtFEr2MxAiYVaGsI7lcMhR6RitG4Wt3Nm1Wp0WUtOTpb5rf/qfTmxXD7dRCp85A9Go1mj w4HWNO3AjOfguHcMjFhUZK7jW2ZIFP0tcEc5ZCUG7rQMpJ+r60da9gEEJnLkjGHDltiEA1 1RejBoB34NQb82R/kDo6Ws3nMeDUjZNe6LbGVw2wOoGteq66Z6/INQ+TcceJ+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699285168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5P32vbg+CST9m73rhJRc45WClhbjPNGzSLzMphTZso=; b=JgMc1ZvQbkB5TU1KeqMdpnsuYWrrll6bvybQuid50iVPVMZFrHrd9rzS7mVBR7waHa0Icw hkKrFfRmxuSxmz9/I4EPyrmxukGAydaOeKzIbS4AtAHu5lbyLj709+nQWwky+fMLNwb9L2 N2f55T1YAjEWRpVvxB+eLBI/528lRePSJwu9kUWEQIr45lAqcIKoQSqLDuqK6Rk54tc0hg zwRNU0+v2tB1Ihu0PpubwiVoT5VNCa68Zn8LP+LbY4pNNizhEdKkRQ0Qz53yzenHOTVp/G 2OXuHOhTEHUa6dFFOc7UJF5f+8PvvlGJ1A/gRTh+eMVU6GnsYF/Gj1XJr06ZEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699285168; a=rsa-sha256; cv=none; b=es0d3LmoeG9P5ezR6BeDWIYg4pqidq9kxIlgyJtt3/2j7Y8amWP3q1EYc3pc+mweEx1zXp NXVH8xprfOiiPdoxJy4Bz5Rng4gnf41487G4gEaeXH1Qpw3DxIK5V/ZjkqJT0fBvFi02TL +POKH0/pCex9exdpDz76Pqtnwh3PWFV986EzCJneVPcfrnjRfyZjSnqFGJtpw0AHG7y6oI 4RNYyBF8mz4dZVjtCRJg5DPnimz4G8oT7xH6nN8Q4tq27h6//BEG0okc4dOx0g4cV6eLjt QzdW+SWhQbRDV5qsUr3JfNjmHS9jcSzM03u8E9GjhgAKnBi/yrtSmCOrTM/k6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPFrw00hhz1CL8; Mon, 6 Nov 2023 15:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6FdREh042144; Mon, 6 Nov 2023 15:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6FdR1r042141; Mon, 6 Nov 2023 15:39:27 GMT (envelope-from git) Date: Mon, 6 Nov 2023 15:39:27 GMT Message-Id: <202311061539.3A6FdR1r042141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 733a66841d70 - main - Fix up the vm_guest_sysctl_names size 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 733a66841d70c6934f073d227db10678d6ef5226 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=733a66841d70c6934f073d227db10678d6ef5226 commit 733a66841d70c6934f073d227db10678d6ef5226 Author: Mateusz Guzik AuthorDate: 2023-11-06 15:38:06 +0000 Commit: Mateusz Guzik CommitDate: 2023-11-06 15:39:17 +0000 Fix up the vm_guest_sysctl_names size assert. As VM_LAST was included in the array, the size check had to always pass. While here modernize the assert itself. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/subr_param.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index b7dbf606f492..933bc8d645be 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -158,9 +158,9 @@ static const char *const vm_guest_sysctl_names[] = { [VM_GUEST_BHYVE] = "bhyve", [VM_GUEST_VBOX] = "vbox", [VM_GUEST_PARALLELS] = "parallels", - [VM_LAST] = NULL }; -CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST); +_Static_assert(nitems(vm_guest_sysctl_names) == VM_LAST, + "new vm guest type not added to vm_guest_sysctl_names"); /* * Boot time overrides that are not scaled against main memory From nobody Mon Nov 6 16:11:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPGZJ2Vc8z507h8; Mon, 6 Nov 2023 16:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPGZJ22kpz3gGl; Mon, 6 Nov 2023 16:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699287112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/BYY+Z3k1RyBZthksHNFQn+BAGASg0d3E7dddj7bdE=; b=IOV9SF1NclVfKVugImTT675zeh5bs+YhiOXz9K5amfeYuLQgNYgBDr/nCVUsoAxE84Y0sa AjXgXgT7lCf4WWv0zkJyro1Mf2rQb+hMoLr+dNGYpy4g17AZCwxtlorOplwzuMWyVFK8rA N9ezshg6XFCzFT2krQo2M1u6maYcL/09Lu8H/tWsUPuYO0bw8y53F5C5pH/+JZ5xtDr0kG RElK6silWwrJ9m7J2u7se+2nAel4pxB8IPy978EmXih0+U2+WeNdMNRYmvy1mMBhUZRbTa sPyr2uqvXcqEdBY4svFDMKaa+GhgQS1rq3DQil7ay9Nt/KR+8qNwjR1Cz2vrGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699287112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/BYY+Z3k1RyBZthksHNFQn+BAGASg0d3E7dddj7bdE=; b=Pq47xiEXBJIw89G1vZy2JF9G0UzfHSjbeuR2DSnybeoHDyK6wB338QhPlr2VfSYQcF5JHx +6Jy/Xv7vx8Is7TV6RnKgvd8fgpQqZfU5Z5hjVnHfFLHs8W0x/SOJME8M6/OIItCekyitD X/qnEyeZ0Yy+uaBcsS1qRUkbuMWaaO1bHojykyfElHkBVmoEDIV10mI7HOHx/fQqVVuvKY oMwC97kzLmEKgW3sBeRr4jJHX7QL4il/Z1TD/ly6VWKvPmtZ3NfOai4cpdSH27sXLKGCb3 x3gMAy4uPpnOPRcDIW6/gHdRokuWkGRuV7xk1C7Kg4qzJLxiYxGvZzhVtAm/4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699287112; a=rsa-sha256; cv=none; b=rwWT/AvIeGk+hmFXzVPUWKKbvyuLdTBfGINYsGVqTtdZEhwwVsu78H51BS/zkITNBB2M4t kUAp2A/brQtL68IN68jdrVKQCYaIPThh4NvI60/BSuarctr9U2KV3ir4pWCo/D+6IEprbA uzuLZGgek3MBPSZRhTkveMONwEKhbmbldYYqNIZlFfWr8D9kvBoMwGzoWBRUDnz6gXckB3 giPhIm/yXZuBvvxr+UQsP//BiEEX7bxmTNgEHEaAYQRydqWv3EkV6ETSBqR383O0WCT1BM 98zIrZgmoWFH3PeVgl9ldBl0A1xj5rsFygj5dU1KZhboLdrTSzQdHX2ya+AAKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPGZJ166Mz1Cnk; Mon, 6 Nov 2023 16:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GBqFE005139; Mon, 6 Nov 2023 16:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GBqwP005136; Mon, 6 Nov 2023 16:11:52 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:11:52 GMT Message-Id: <202311061611.3A6GBqwP005136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 8d6c0743e36e - main - nvme: Introduce longer timeouts for admin 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d6c0743e36e3cff9279c40468711a82db98df23 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=8d6c0743e36e3cff9279c40468711a82db98df23 commit 8d6c0743e36e3cff9279c40468711a82db98df23 Author: Alexander Motin AuthorDate: 2023-11-06 16:05:48 +0000 Commit: Alexander Motin CommitDate: 2023-11-06 16:05:48 +0000 nvme: Introduce longer timeouts for admin queue KIOXIA CD8 SSDs routinely take ~25 seconds to delete non-empty namespace. In some cases like hot-plug it takes longer, triggering timeout and controller resets after just 30 seconds. Linux for many years has separate 60 seconds timeout for admin queue. This patch does the same. And it is good to be consistent. Sponsored by: iXsystems, Inc. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42454 --- sys/dev/nvme/nvme_ctrlr.c | 6 ++++++ sys/dev/nvme/nvme_private.h | 2 ++ sys/dev/nvme/nvme_qpair.c | 2 ++ sys/dev/nvme/nvme_sysctl.c | 15 ++++++++++----- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 90cd0b64a980..b72359a061da 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1405,6 +1405,12 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev) to = NVME_CAP_LO_TO(cap_lo) + 1; ctrlr->ready_timeout_in_ms = to * 500; + timeout_period = NVME_ADMIN_TIMEOUT_PERIOD; + TUNABLE_INT_FETCH("hw.nvme.admin_timeout_period", &timeout_period); + timeout_period = min(timeout_period, NVME_MAX_TIMEOUT_PERIOD); + timeout_period = max(timeout_period, NVME_MIN_TIMEOUT_PERIOD); + ctrlr->admin_timeout_period = timeout_period; + timeout_period = NVME_DEFAULT_TIMEOUT_PERIOD; TUNABLE_INT_FETCH("hw.nvme.timeout_period", &timeout_period); timeout_period = min(timeout_period, NVME_MAX_TIMEOUT_PERIOD); diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index f6ad51795adb..1b6ea03c909a 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -86,6 +86,7 @@ MALLOC_DECLARE(M_NVME); #define NVME_MAX_CONSUMERS (2) #define NVME_MAX_ASYNC_EVENTS (8) +#define NVME_ADMIN_TIMEOUT_PERIOD (60) /* in seconds */ #define NVME_DEFAULT_TIMEOUT_PERIOD (30) /* in seconds */ #define NVME_MIN_TIMEOUT_PERIOD (5) #define NVME_MAX_TIMEOUT_PERIOD (120) @@ -279,6 +280,7 @@ struct nvme_controller { uint32_t int_coal_threshold; /** timeout period in seconds */ + uint32_t admin_timeout_period; uint32_t timeout_period; /** doorbell stride */ diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 569d54ab6aef..7345b1b59be5 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1181,6 +1181,8 @@ nvme_qpair_submit_tracker(struct nvme_qpair *qpair, struct nvme_tracker *tr) if (req->timeout) { if (req->cb_fn == nvme_completion_poll_cb) timeout = 1; + else if (qpair->id == 0) + timeout = ctrlr->admin_timeout_period; else timeout = ctrlr->timeout_period; tr->deadline = getsbinuptime() + timeout * SBT_1S; diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index ac0d507e2337..d6452a2e5492 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -132,8 +132,8 @@ nvme_sysctl_int_coal_threshold(SYSCTL_HANDLER_ARGS) static int nvme_sysctl_timeout_period(SYSCTL_HANDLER_ARGS) { - struct nvme_controller *ctrlr = arg1; - uint32_t newval = ctrlr->timeout_period; + uint32_t *ptr = arg1; + uint32_t newval = *ptr; int error = sysctl_handle_int(oidp, &newval, 0, req); if (error || (req->newptr == NULL)) @@ -143,7 +143,7 @@ nvme_sysctl_timeout_period(SYSCTL_HANDLER_ARGS) newval < NVME_MIN_TIMEOUT_PERIOD) { return (EINVAL); } else { - ctrlr->timeout_period = newval; + *ptr = newval; } return (0); @@ -352,10 +352,15 @@ nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr) nvme_sysctl_int_coal_threshold, "IU", "Interrupt coalescing threshold"); + SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, + "admin_timeout_period", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, + &ctrlr->admin_timeout_period, 0, nvme_sysctl_timeout_period, "IU", + "Timeout period for Admin queue (in seconds)"); + SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, "timeout_period", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, - ctrlr, 0, nvme_sysctl_timeout_period, "IU", - "Timeout period (in seconds)"); + &ctrlr->timeout_period, 0, nvme_sysctl_timeout_period, "IU", + "Timeout period for I/O queues (in seconds)"); SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, "num_cmds", CTLTYPE_S64 | CTLFLAG_RD | CTLFLAG_MPSAFE, From nobody Mon Nov 6 16:12:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPGbb0SZ5z507wt; Mon, 6 Nov 2023 16:12:59 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPGbZ6l9vz3gZf; Mon, 6 Nov 2023 16:12:58 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699287178; h=from:from:reply-to:subject: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=YjMD8JHcqU+8V1ZAIIn4Ho3j+D2inNlcyD/YtR39MCE=; b=lG7BhJWv4TM3VAVk7phVnRSGowBU05FhnCU7w3T/U7QHzlXMdSEOiRo13i+dC56mYN9F8/ ilBGbEpzQWq1/I1Jn5F4SuYCOrVNUJJhTw8o3w75Ecv0MP9Kf9riV+hhJ7wc9aHT4QLAtm k7q21wDY4XaAmc0VBW60aeJVlHh4ByJkwWv/5TJn08Z3HcCtopBK1g4R3aHZ0kejqt70yz kt7KlFM82GU6FAxz1FhE12zg3MjFnnYo6CAJqx0AIfNrylgpYdMTGpn5/DkfJANhcYNMIp QWWc1X5odzs+JkakPEhyLDh7p9GatVnxo1JAm8qzB1Y+uYEjXwN1Kw5JgCPgNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699287178; h=from:from:reply-to:subject: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=YjMD8JHcqU+8V1ZAIIn4Ho3j+D2inNlcyD/YtR39MCE=; b=FrxJ1ObDj1XDrcr5QFt0cD4JgberG6wmrtMT+Vmog1fa3Bhtccy+1/frlSmD5eE3otObWc c+FeP1z9d48Ubi8J/8v8tJTuvUbcnhaMGkJV1OG9DLimb7fcHk5ytuDzeXYaOd8V7IiCvr rpwTx+CVEo+ZpEk3SkDHiKOue6mK0Schm78XcQ35Z9WtC8vpjEIUS/Lo+xpB0KiHfDAO5a 0t4F2KpnoSs+G/ScSvqv0sdElo0tcHrLJzbnuUTGmf1liMkSHdnkd0WxtfHuf0ZYDuTmYR 2VHTAnAH2PRYYtcV4S6kLpwMJ4HjZrdb7TZin+4LEBRtkAZv1lAdy3wMMzkjXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699287178; a=rsa-sha256; cv=none; b=AbmxQ57dsmIPDq39xL5OlaoEkvtmKoRGFBF1mJrM3xJ83KJYS5LZy3qXEp9JaUKShzjkat Rg3nPIgfSV8TP6Ad8avQx4rVSRc0tilEsGhXE9BVPfzDLNhgU49d0Am0Fl5XnqmG4RSJah Rol4cUYArYcORqIM7bW/7sP+qj0Zo3XLx7Uz1Lp+9lB5Lr6JDXekRGG4jl/j3Vceo+7uVO YOgGWSBopKIuXTTyjzMEjWh1j5M2qUBTA2rWTEcFyUXDG/s+hnu2PszJiy75jxTxf1Wn4c BE29Aed+uTVpJQALKdUsTvHEPdfB6zXf/7Z72q98zHQtqkS3SSALMaB2Ao/gDw== Received: from [IPV6:2a01:e11:2002:4280::13:1] (unknown [IPv6:2a01:e11:2002:4280::13:1]) (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: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SPGbZ1mWRz1HjZ; Mon, 6 Nov 2023 16:12:58 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: <4b80a35a-e739-4804-9bbb-b40d16137f5a@FreeBSD.org> Date: Mon, 6 Nov 2023 17:12:53 +0100 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 94eca4b5f38b - main - loader.efi.8: Fix style warnings To: Benedict Reuschling , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202311061447.3A6ElFke058136@gitrepo.freebsd.org> Content-Language: en-US, it From: Guido Falsi In-Reply-To: <202311061447.3A6ElFke058136@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 06/11/23 15:47, Benedict Reuschling wrote: > The branch main has been updated by bcr: > > URL: https://cgit.FreeBSD.org/src/commit/?id=94eca4b5f38baa03446216f585089852d98c283a > > commit 94eca4b5f38baa03446216f585089852d98c283a > Author: Benedict Reuschling > AuthorDate: 2023-11-06 14:45:20 +0000 > Commit: Benedict Reuschling > CommitDate: 2023-11-06 14:45:20 +0000 > > loader.efi.8: Fix style warnings > > This is a follow-up commit to bce728719e7f57272d99b6d039f10b4c636fa024 > to address mandoc(1) warnings. Thanks! Sorry for inconveniencing you! -- Guido Falsi From nobody Mon Nov 6 16:20:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPGmX3t4sz5090R for ; Mon, 6 Nov 2023 16:20:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPGmX22t4z4DSH for ; Mon, 6 Nov 2023 16:20:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9a6190af24aso706299666b.0 for ; Mon, 06 Nov 2023 08:20:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1699287643; x=1699892443; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=hHcq4KdlwpGdUjK7CcT59avh8R+sXfH5XSEkL5tpwh4=; b=DlIXqsaypNop+L8YG4996shXtDreCctEKeSjDeZm2ozH9qPMQH/T/p0olSWkWRFakU yJGqoVIrWTRwGxDRn9+/wOK5N8zwKp62goMsjJWjT6yrl9DkJcRfIWQBekLCkrqJisUv vdQ8wq2tJ5vSk0+YlgnYUJSn6Sco9lgJN1QPHP+3wgzokAc+cfA484ZvqJqX56nlh0cp YJ3QlDd8yBeac4c/+gaqqDdhSk4T6j0gi3C7rZa/gQ0pWIJTjALl/rnr5PJeAP6uy3os Vgjj3MOHKF5L1WI5889yVbYBVsUZlgSlVuSOD7RnIhiLoMeqsR5ZtdbyQX70OF6znkjj Q59w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699287643; x=1699892443; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hHcq4KdlwpGdUjK7CcT59avh8R+sXfH5XSEkL5tpwh4=; b=wsmQw/CkaUlEOJFHw2yHFPVxdm41u1Q/Qjfi7dW/QJGjqnHM9ZqJAlvsTP8I9zgkke YrkOjHdrLA8ZONwjhMW8Gn+PNvlq5BpIoOhfh/kqTQpiBLNqsRSlWDs2HwlJPLmgF4sq aurle4QqpH9v5HBjM09BgYRP1NozGjK3xwLyq6RGGlMkQmOLMiTDWLix/yoYZncbkO/S Ss502IdqthTQi9O3iSQqQpgGtdbX40ih9GWBOhrWRIupmZTUHMlhBFlzfOJgV3mMTVaS gIyHJZd9qeTy5WtRYamgRLZdrO3B9GfXnFZ8qmj4imjYJozwfCeRHQP12Vd5p36atnZU nCFw== X-Gm-Message-State: AOJu0YwNyJP8ZZr/cYdrN5msGAY+JpcYaCCN2mBHqNrM+120+00ddlfy oXpeWjhVX9fDx+EEqmkWivu+xeWsVHSoz93xJ53GoQ== X-Google-Smtp-Source: AGHT+IG1xVrl+z9ppDAPDSx2i78vEErZoZncMPniUfmXfNJqICZ9NfuSp60p2/GPuZjLTZN56F69VwUaxd8+otAHfrE= X-Received: by 2002:a17:907:960f:b0:9c6:19ea:cdd6 with SMTP id gb15-20020a170907960f00b009c619eacdd6mr15315108ejc.50.1699287642929; Mon, 06 Nov 2023 08:20:42 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202311061447.3A6ElFke058136@gitrepo.freebsd.org> <4b80a35a-e739-4804-9bbb-b40d16137f5a@FreeBSD.org> In-Reply-To: <4b80a35a-e739-4804-9bbb-b40d16137f5a@FreeBSD.org> From: Warner Losh Date: Mon, 6 Nov 2023 09:20:32 -0700 Message-ID: Subject: Re: git: 94eca4b5f38b - main - loader.efi.8: Fix style warnings To: Guido Falsi Cc: Benedict Reuschling , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000054114506097e3cdc" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SPGmX22t4z4DSH --00000000000054114506097e3cdc Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Nov 6, 2023 at 9:13=E2=80=AFAM Guido Falsi w= rote: > On 06/11/23 15:47, Benedict Reuschling wrote: > > The branch main has been updated by bcr: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D94eca4b5f38baa03446216f58508985= 2d98c283a > > > > commit 94eca4b5f38baa03446216f585089852d98c283a > > Author: Benedict Reuschling > > AuthorDate: 2023-11-06 14:45:20 +0000 > > Commit: Benedict Reuschling > > CommitDate: 2023-11-06 14:45:20 +0000 > > > > loader.efi.8: Fix style warnings > > > > This is a follow-up commit to > bce728719e7f57272d99b6d039f10b4c636fa024 > > to address mandoc(1) warnings. > > Thanks! Sorry for inconveniencing you! > Thanks benedict.. I'd planned on fixing the technical content as well... Like what's a simple variable and how is it different than any other kind of variable... And it needs to be in a specific directory in the ESP (a term we try to use throughout the man page), etc. Wish I'd had had the chance to review it. Warner --00000000000054114506097e3cdc Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Nov 6, 2023 at 9:13=E2=80=AFA= M Guido Falsi <madpilot@freebsd.= org> wrote:
On 06/11/23 15:47, Benedict Reuschling wrote:
> The branch main has been updated by bcr:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D94eca4b5f38baa03446216f585089852d98c283a<= /a>
>
> commit 94eca4b5f38baa03446216f585089852d98c283a
> Author:=C2=A0 =C2=A0 =C2=A0Benedict Reuschling <bcr@FreeBSD.org>=
> AuthorDate: 2023-11-06 14:45:20 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Benedict Reuschling <bcr@FreeBSD.org>=
> CommitDate: 2023-11-06 14:45:20 +0000
>
>=C2=A0 =C2=A0 =C2=A0 loader.efi.8: Fix style warnings
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 This is a follow-up commit to bce728719e7f57272d99= b6d039f10b4c636fa024
>=C2=A0 =C2=A0 =C2=A0 to address mandoc(1) warnings.

Thanks! Sorry for inconveniencing you!


--00000000000054114506097e3cdc-- From nobody Mon Nov 6 16:45:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKT3fDdz50F60; Mon, 6 Nov 2023 16:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKT37yHz4GQd; Mon, 6 Nov 2023 16:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqM7GSTuuV5e6f4c4GCaHX3UaDcDxVy4mNKJmWwsY+g=; b=ViatHiFr7MffzAsgh5aLRE+TS+Ao1zsdNgQxp5jmJgU6u9a5hF6ygo46YjkUjKlU77x+8P eLVxTfjswNvJMP4LHvnAiaT2rLZ6A42M+y2qytwRkbXtRX8EY2ks44V1Azll4TQthlKHGo XDYg0k9iniKP2482C9YLDXAiMvEHXr24pN4ER0R4uHjDtWAsM17ly2nd4Pfxmc1FKjBgqx tWn/VAdp+hH6EBbHY3K//uvukMRZ/Y8nAK68M+XpEN2riaoEpO5fS/GsKBVVNMPj08UgcB aElKua23BcKNe3aq2px3himiZYE6X7GSv1xVE9MYukGa8jNTvMX3hRiKS7ryow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqM7GSTuuV5e6f4c4GCaHX3UaDcDxVy4mNKJmWwsY+g=; b=kwIzjLmBhd8UKIOkGLk+aiBv8ToNZYV+Wc4IOAFGwKfEbICIx6Z5mntxtFhXixI9rda3Ya Y5s2fn8IbqUbK3JVU3NPev4dw/UFGU/S2e5VsO34hQfy0+vJmF4YNj4dpFbAFsesFmmpib emt55NHXuxFAFuYQhn+aPakX37fbWhZSw9R8aKp/ZdxadZlA+apDLpQnIoMH6jrzGAy6k9 l5OOMZUKZ98wTf2Cnml9wYfKfI99oFWyAtrOVFudWyfwRRAAN1dBaC2pRaBfOXRLa1H5b9 Bn69s/1ldAKWcIx9g7+azKxkxBjrCvZ2rhXqdApgHS/i3AM2Wgs1C6FWZP1Ldw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289149; a=rsa-sha256; cv=none; b=nokZTUCwOWrXn8Ube+83dlBsCxBLRwTlfr4ccfrDqGeaGxX03Rpu/m8gPFNcJSfSzPlLkD Y6/NCwvkejvmgrcIYqLDZMdjHZN9ak4JydYok8/ZMGqJUyXihrEskBuIQRgZUZ9iI4d5sA D3cNFTdUn5VcmR/lPoZRdBUGluIhwf7Sv8e8l3Lg4nTZnLeD7epNsihBISVJd/XdnUlDrb yNeMitd89gc230ffVN6U32jGdOFUFkgcdMh1GshmcXAAFf2Aept07jzL0RmfVPTNqaBG5a NncZV7ICRBtKWOWMLn98b86U6S5Qlluyms25RYCWVtCydG5s5vX2DeNh1EAo6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKT2BlFzqV; Mon, 6 Nov 2023 16:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6Gjnd7058234; Mon, 6 Nov 2023 16:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6Gjn8T058231; Mon, 6 Nov 2023 16:45:49 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:49 GMT Message-Id: <202311061645.3A6Gjn8T058231@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: bf7f8a4e60ce - stable/14 - ping: Avoid reporting NaNs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bf7f8a4e60ce450bf31e6ae110e6e37c85ee5eb0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bf7f8a4e60ce450bf31e6ae110e6e37c85ee5eb0 commit bf7f8a4e60ce450bf31e6ae110e6e37c85ee5eb0 Author: Jose Luis Duran AuthorDate: 2023-10-06 17:55:06 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:43 +0000 ping: Avoid reporting NaNs Avoid calculating the square root of negative zero, which can easily happen on certain architectures when calculating the population standard deviation with a sample size of one, e.g., 0.01 - (0.1 * 0.1) = -0.000000. Avoid returning a NaN by capping the minimum possible variance value to zero (positive). In the future, maybe skip reporting statistics at all for a single sample. Reported by: Jenkins Reviewed by: asomers MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/863 Differential Revision: https://reviews.freebsd.org/D42114 (cherry picked from commit 4d348e83b738347f6aaf2b110459a01c5402d04e) --- sbin/ping/ping.c | 4 ++-- sbin/ping/ping6.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 072d4607f745..f67d85f30a5d 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1522,10 +1522,10 @@ finish(void) if (nreceived && timing) { double n = nreceived + nrepeats; double avg = tsum / n; - double vari = tsumsq / n - avg * avg; + double stddev = sqrt(fmax(0, tsumsq / n - avg * avg)); (void)printf( "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n", - tmin, avg, tmax, sqrt(vari)); + tmin, avg, tmax, stddev); } if (nreceived) diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index bd1658f9500a..d14da9c67a52 100644 --- a/sbin/ping/ping6.c +++ b/sbin/ping/ping6.c @@ -2349,10 +2349,10 @@ summary(void) /* Only display average to microseconds */ double num = nreceived + nrepeats; double avg = tsum / num; - double dev = sqrt(tsumsq / num - avg * avg); + double stddev = sqrt(fmax(0, tsumsq / num - avg * avg)); (void)printf( "round-trip min/avg/max/std-dev = %.3f/%.3f/%.3f/%.3f ms\n", - tmin, avg, tmax, dev); + tmin, avg, tmax, stddev); (void)fflush(stdout); } (void)fflush(stdout); From nobody Mon Nov 6 16:45:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKW2nJsz50DqM; Mon, 6 Nov 2023 16:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKV4JFJz4GqF; Mon, 6 Nov 2023 16:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WcUPUKeXmR+qcTjA1FZcJKefty9biovp69tz49DFcQI=; b=GLSK3ejeuMYYoBIzk5HiDiQaOmeRgKOQ7fEF8BV3Lkpw4Zr5OsxJDFDpVDgOdI3gDS13V+ F5Xnn52bBdsO9CY02IBBJuWRDyUIRmPFOVT3WHIzZBZoch010lp2Jo1mYvzalgGa5XCCGe nf4DpZHPVjOAstR8zzeUSVDJJ68qKfwaHsblTBfoi9JMxUG6BWZfljfz4Ense1ocbad4wz 2UBwXBYKPi/mzKJT/wjO4TadJ3xvGTASr0p1Quv4LZkXpIeTG9VxZrc0FF5sY54W7YKB8R 99Qa7SYLwc225QAVP/2fCxEKPyrkMqywP99uIvKfHGdvf3nSA3qLQmPU9nSSmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WcUPUKeXmR+qcTjA1FZcJKefty9biovp69tz49DFcQI=; b=ypYJblOEvfnLgTgYhE8GD56neB4TOaYwmXIWD+kc1XI+HK/xPN+xy6Qc24KAtR2I+f6/5L iRxc2C2zzovVOUJVVOFYAO1maVSXAoo46SCcLdTM4SQCS92ya8LR+quRSCC8Sy/3fKz00b d5SkH4NcdxxWXBEQVuzqwQVyNen4XexMwiNUr9lKRAOzcMRWZuGYjzah0P56Zc1HDaSWx5 5iMTW+TgqJt2mJpNtY26OJBEGSCywXkWvgc+aD+fN1VPjfBjuMWSVS/9HLmbV7Fz4NAd1i g4UCDLzV9BJCVOSldiWmDtVBAsI5yzZ4VY715Ek4koGde46NQRCjLevY3WTNOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289150; a=rsa-sha256; cv=none; b=DGlAR6jZcPNiIsj30lLuxG/3y44C8xBsUaLpsSfdkDzEQTzfnytq62cV63Y6V64oGBd2kr 8wt0GSeFGp+pfF+O4btmpzDWPF0q2jNFwnAv8NqzS/Tmb4tLyf8CVuOAaf1+PjZUmIb/1/ YjZKZ99BMAZzsTjee2cEgsTVCAwqr3l+qggNfFPlIK6AXp6Q78KD+oy0zyixAQhUGCqoIz TVdxar4+d36OYpPnhjeKe6x9/2Tr8VodxewI9xLCB3hfnsVR5P1GlC4Jh/4OwOMr+BH460 DcoIT+UV9Yyp0Rg1Hw5fnDnPtSP9RH5lTlPtDXBmftDTPODG+SFM8+Dq8MG0Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKV3BxJz14s; Mon, 6 Nov 2023 16:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GjoBc058286; Mon, 6 Nov 2023 16:45:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjoN3058284; Mon, 6 Nov 2023 16:45:50 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:50 GMT Message-Id: <202311061645.3A6GjoN3058284@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: b9e2bb1d6e41 - stable/14 - ping tests: Test IHL/quoted data/inner packet paths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b9e2bb1d6e414137aa3a980dddc6559fe52393e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e2bb1d6e414137aa3a980dddc6559fe52393e9 commit b9e2bb1d6e414137aa3a980dddc6559fe52393e9 Author: Jose Luis Duran AuthorDate: 2023-02-11 14:17:46 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:43 +0000 ping tests: Test IHL/quoted data/inner packet paths Commit 46d7b45a267b3d78c5054b210ff7b6c55bfca42b introduced these code paths. Test and document them. - Add inner packet too short test - Add inner IHL too short test - Add quoted data too short test - Add IHL too short test - Add max inner packet IHL without payload test Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/863 Differential Revision: https://reviews.freebsd.org/D38528 (cherry picked from commit 20012a3a1a045bfe02bb64063cf0aba4d82471cb) --- sbin/ping/tests/test_ping.py | 112 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index b501b8a606bf..93d45a1e3d7b 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -1030,6 +1030,118 @@ round-trip min/avg/max/stddev = /// ms }, id="_0_0_opts_NOP", ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 3, + "icmp_code": 1, + "ihl": 0x4, + }, + { + "returncode": 2, + "stdout": """\ +PING 192.0.2.2 (192.0.2.2): 56 data bytes + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 0 packets received, 100.0% packet loss +""", + "stderr": "", # "IHL too short" message not shown + "redacted": False, + }, + id="_IHL_too_short", + ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 3, + "icmp_code": 1, + "special": "no-payload", + }, + { + "returncode": 2, + "stdout": """\ +PATTERN: 0x01 +PING 192.0.2.2 (192.0.2.2): 56 data bytes + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 0 packets received, 100.0% packet loss +""", + "stderr": """\ +ping: quoted data too short (28 bytes) from 192.0.2.2 +""", + "redacted": False, + }, + id="_quoted_data_too_short", + ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 3, + "icmp_code": 1, + "oip_ihl": 0x4, + }, + { + "returncode": 2, + "stdout": """\ +PING 192.0.2.2 (192.0.2.2): 56 data bytes + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 0 packets received, 100.0% packet loss +""", + "stderr": "", # "inner IHL too short" message not shown + "redacted": False, + }, + id="_inner_IHL_too_short", + ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 3, + "icmp_code": 1, + "oip_ihl": 0xF, + }, + { + "returncode": 2, + "stdout": """\ +PING 192.0.2.2 (192.0.2.2): 56 data bytes + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 0 packets received, 100.0% packet loss +""", + "stderr": """\ +ping: inner packet too short (84 bytes) from 192.0.2.2 +""", + "redacted": False, + }, + id="_inner_packet_too_short", + ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 3, + "icmp_code": 1, + "oip_ihl": 0xF, + "special": "no-payload", + }, + { + "returncode": 2, + "stdout": """\ +PATTERN: 0x01 +PING 192.0.2.2 (192.0.2.2): 56 data bytes + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 0 packets received, 100.0% packet loss +""", + "stderr": "", + "redacted": False, + }, + id="_max_inner_packet_ihl_without_payload", + ), pytest.param( { "src": "192.0.2.1", From nobody Mon Nov 6 16:45:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKW6kW7z50F41; Mon, 6 Nov 2023 16:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKW55zKz4Glp; Mon, 6 Nov 2023 16:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BE2fUnWw8v/FROjPz3YJNOLYkAUrlN97dCSx7zfykbc=; b=M0vAJWcUrDi40vzRs6QF1LGQY9BaIGA33GFpO1x9VYNqf4nxk0JJJWNY8Q/tvR9YgrExPl lU0vl7NzQwz49Krwr4sx7R9RG/6u/jY/FVQk1nVDVK0e2d2LFBFXOzja5T0Je2itriL/L5 ruZPoUAgaPq8DCXUq5OlXeEMAjkp2NRC4bxblTOTrnn3byD2zmJY77BnKW6bmtFeKJxZL0 E1ecetIQbchLHjLOhuhnifJVIsTDdxrm61MBVgXmt6fbpRfYoe1lyDfzA/SimN8yKZI3oc 9IMaWPCKyc06DH4wHHEZLQ47rvTI8T0LucUhQuttD+UpT4mAu/rOu6q0Tz1x2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BE2fUnWw8v/FROjPz3YJNOLYkAUrlN97dCSx7zfykbc=; b=W1zeGoEW1nLIfRtxU9VgSK5MCHN/W41EYHRymcjGPmQnCd+aOKS5EBdI48B7bSZfmcLjSO uRFvMCwB31Mj2TxMRdYZco8coMuSkOQ3L2Wg2uARtFM7t6eHySYXjChmhy8M1sSJCcwZTt U4nyJkMDIlWu1HSG6L/Fm8gIiTupeI+XcupSLlUNPL3xzpStVE47h8ivEvzYydEQTLsXtm 1HR7GkJfTGuOMGuTgGNMtO3cFadTP6KtQPmoP2urLSYdIrbz6vQDKK4zcVXM3kzmnkV53S wS0dM/jSpBVsaRsRgH742s4vlHYuwUVcykDvOIiq6YdDPDMAq4vgjAej81dLfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289151; a=rsa-sha256; cv=none; b=wUSondDxeDABLu8N4KZcb8l8VztrYY3vFhWvptO0ReBTsyk9LNncmKjHFGHLucvoQ+v+UH cyhj/kaRPQWRVQ0Q9bNhoBBD+ltJBto207Cxs8pUHNcyujPQkPb7Q1ciSzpKzJ2KspHaov gp8aev51KWQhemfFxcTK3EeaXMZsAUG5RMt/r/gA2Zj8ZwoycFRgTMGTwW8CIqNQAkCVXP aghQUIX/WsRIIC/oas2dQh+OsbCwRHp2walS1XADpIYBjJw4Gix2eS/acGP1GuT0UFLVGO I+vNcK1FwOXuhoiFsVSQW0ynZyaDspeK6xW1BMPa3EBB+1HKUJu5hofgMe9iNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKW4CqJzVp; Mon, 6 Nov 2023 16:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GjpNb058334; Mon, 6 Nov 2023 16:45:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjpWP058331; Mon, 6 Nov 2023 16:45:51 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:51 GMT Message-Id: <202311061645.3A6GjpWP058331@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: b0da2a3fa145 - stable/14 - ping: Remove an extra new line character List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b0da2a3fa1458b5cf404edc868b3014bd8825ed7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b0da2a3fa1458b5cf404edc868b3014bd8825ed7 commit b0da2a3fa1458b5cf404edc868b3014bd8825ed7 Author: Jose Luis Duran AuthorDate: 2023-02-09 18:16:39 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:43 +0000 ping: Remove an extra new line character This matches the behavior when an RR truncated route is printed. Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/863 Differential Revision: https://reviews.freebsd.org/D39485 (cherry picked from commit d2c9a140547acf1bfe3a233ef15cf971be93e14d) --- sbin/ping/ping.c | 2 +- sbin/ping/tests/test_ping.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index f67d85f30a5d..848ffbbb7c76 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1406,7 +1406,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) (void)putchar('\n'); } } else - (void)printf("\t(truncated route)\n"); + (void)printf("\t(truncated route)"); break; case IPOPT_RR: j = cp[IPOPT_OLEN]; /* get length */ diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 93d45a1e3d7b..8d3bd115e2a6 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -859,7 +859,6 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes 64 bytes from: icmp_seq=0 ttl= time= ms LSRR: (truncated route) - --- 192.0.2.2 ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss round-trip min/avg/max/stddev = /// ms @@ -916,7 +915,6 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes 64 bytes from: icmp_seq=0 ttl= time= ms SSRR: (truncated route) - --- 192.0.2.2 ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss round-trip min/avg/max/stddev = /// ms From nobody Mon Nov 6 16:45:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKX6mk1z50Dyp; Mon, 6 Nov 2023 16:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKX5yd0z4Gx1; Mon, 6 Nov 2023 16:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64OhOr5mmviY7mWaRkSgTHu+8bte8wyvhg4f4qXU/is=; b=nmJno4oNr4VklQ09mqvjteLr6zIZCTRmIeF9jMFx4a/UDSuNCbXWBFPX2TE/6nzIpWHhE3 3JZderX2vMq7Wi24sXpePjNCEtqoOjldx6VH8vT9j1seuZQGZwe7zW0iTFmN5JlA1zJq+U 0sRkheFk9eI+wGRPHhHAO1W6zlvrqYNtsYl+ccMvfdvvk/ZRaTPOqoyUe0atotYyhpXG5f IHpeWqxJMS6pouWoLTYwXwi2XydAND773Re2K7JD79CiPIJHwMVwtd5IQdF/tL4vmTkdUa WLL9a9NegnNOGNwDw726t0fh4hFWIN7kPkk1chwK1Ep4L/akPihZohicS7W9ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64OhOr5mmviY7mWaRkSgTHu+8bte8wyvhg4f4qXU/is=; b=DHzP3psunp8JZGByEye/GP44A/zLtp7DiCwOFsmuqZPOHJQ7+cSmQQSRKx78rWeAINNDcz P1+wMj23c+1KA1A9xfxD1oMYzeBpiAQD4uyE4hBZ6HDFpKnTm1dJ1UcHyA59CUmqQhxAaG Jk9ecaQb6A0TrEpHY/EmVGRQRnKSHvfgLEKOSHKWOIz3AmUb0iwUc42rEWD21T7LqzCkeE JUs8zYlbVwZAzEM5WGvZEpUq9Xv4Tn03VTWwXRQXf/+RGMglu0ymIHcQyFM3Kg3OuWMnuF Pm0YGub6luM+3kjOoE0AjihehCsyRczpkyfMjlCOMJNGDBn2UbrpyYMX6JjOKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289152; a=rsa-sha256; cv=none; b=Me5k177ctdRu4x8g1EFLlPYiK1IezLhG8WUyJdcmsnPl1qPYr6MtsRSwzdkhvSfVAEn0aX By9JFs/DAbhm/pD7/OlDeXGWeDSv4eTV60cnC6mYh5MIJwSv/fDuHfUYZJUGPtpXBkhSgp cbE605MxWcjVVt2ervxGYH1qKwK+W7xAzLi9wvEW4wE1l0MYLFlxmaHzBzi039J7BJstCd 1UPacPC90VuPIcyeceeqpomtT02gA4aweSuDpftTmpZwRimdbMJK7s4FHyxIcHqA1UYvXw UkMRzPZ0MpF0gLyIKQd7NpnLLP786A/2kMXnxH559kpNZPRLAy+0SeQu0RiDKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKX4x9FzqW; Mon, 6 Nov 2023 16:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6Gjqis058376; Mon, 6 Nov 2023 16:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjqT2058373; Mon, 6 Nov 2023 16:45:52 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:52 GMT Message-Id: <202311061645.3A6GjqT2058373@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: 5a5ae1d16e9d - stable/14 - ping: Specify the sigaction(2) name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5a5ae1d16e9d2cc95293802f054be926acc5cea2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5a5ae1d16e9d2cc95293802f054be926acc5cea2 commit 5a5ae1d16e9d2cc95293802f054be926acc5cea2 Author: Jose Luis Duran AuthorDate: 2023-02-10 14:01:22 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:43 +0000 ping: Specify the sigaction(2) name After a2a008880568eaeb87d8404b39627b83df851f34, specify the signal name. Obtained from: Darwin MFC after: 1 week Reviewed by: asomers Pull Request: https://github.com/freebsd/freebsd-src/pull/863 Differential Revision: https://reviews.freebsd.org/D38484 (cherry picked from commit 72d3e6677f477defa5b3741f42b0cca39bafeee9) --- sbin/ping/ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 848ffbbb7c76..ad16ff5a5ee9 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -890,7 +890,7 @@ ping(int argc, char *const *argv) si_sa.sa_handler = status; if (sigaction(SIGINFO, &si_sa, 0) == -1) { - err(EX_OSERR, "sigaction"); + err(EX_OSERR, "sigaction SIGINFO"); } if (alarmtimeout > 0) { From nobody Mon Nov 6 16:45:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKZ0XQyz50F8R; Mon, 6 Nov 2023 16:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKY6tWPz4Gxn; Mon, 6 Nov 2023 16:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1u4UGTL132vfsGsAiuj6C0gFsyeNChGvGxvRlceI6Kg=; b=AMveO/HAXFJUp3iwbj32fYg6diubQKTKE4a5Pn85zbq+OHwU9VM4xy6F6I2R0sJlE0wFuS Lm66S4+ByC3sOgvNjAhPXBAYilLhhfVESf2RfC0jGSHv8zE9kHUfea2EmvJN8ZWewaTk/F 8otGfq8uw2txvsPWWPAYNcIuJzqo5XtLDmUTREu+aOOplKXuXxV79SaMTpmFoRNzLiDIeD 6iqKoJnJazw7jSS5bqytY5/sdFV+ZACdDpEpZ7zH8H5N7gt6rlH1c9mjoPTZtIT+OuIzYD 7K2YE1Vm/rVc2wuFGNeKWBWc/AQxyZ5W0vFFinWh+rMmr5obnYQeLDKCiWK0OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1u4UGTL132vfsGsAiuj6C0gFsyeNChGvGxvRlceI6Kg=; b=FEGItur0wvrS2Cy6VF3CrxZNqZKk/raSa+A9GtCNzSMrSADm1ekJJnnNWV3/WHuGUrm58c UrvmhcE4kvPlofMhreQmIvChh6n59L620IocKdKiMnhpEcZSk7490Ue9FcZzx2s3EfIk1A FNw3kPDbW8EZVTZurTcgJP1CqJmmqHEMTYp5aHls9G2jFFi3nmf/q2tNJhBD7ydTyqZkiu NNhdLOYlITkZOelf7/cTXL13CffdFuXiPMcIGKCD1Bh22bH9MdphRgOr5BCeehVD+/3oey rvPx+ekGlGIpHG4P8nD8qjHSquSiWT8DCcszFOHE35YKEJ+pJOXTk6DYpGIcwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289153; a=rsa-sha256; cv=none; b=Lt2YlAN/yFqC0uq5RTA3OZBJWny5GiLKIztqt+GBPTHsOscFfFee7bdMIwNStePj+PQPum xkuP32i8AT5bBnTi0sldwrmLNs9DaA4LhpFElHW5PnXLgK4pofGrl67x7fBn4Q/t/M9UnN XsFveFZmo0oKA4rXA56RHj+UIrXhACm89ZvvlSpZ1rv24DTaQSdf1QibrrOVUrsWmREmKx Dt/yJ/M576lZbfTGuswIeuPou+c/V3I+gZSLEtIn7WLe8Nx87QpDMpqfUlPWPOsKIn2r2r RC189he//MdndTdrERLSRil1EitUWR2i2BzrgmgIrx/g6hBCK6oi50KHt2pWgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKY5wsLzc8; Mon, 6 Nov 2023 16:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6Gjr9a058425; Mon, 6 Nov 2023 16:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjrOO058422; Mon, 6 Nov 2023 16:45:53 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:53 GMT Message-Id: <202311061645.3A6GjrOO058422@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: e2c9158f1a99 - stable/14 - ping: Unify ping/ping6 statistics section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e2c9158f1a993bcd410c7887b0e40ed82410dc43 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e2c9158f1a993bcd410c7887b0e40ed82410dc43 commit e2c9158f1a993bcd410c7887b0e40ed82410dc43 Author: Jose Luis Duran AuthorDate: 2022-11-21 01:18:43 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:43 +0000 ping: Unify ping/ping6 statistics section This is a first step towards a unification/simplification of ping/ping6 (internally). The end goal is to produce a standardized user-facing output. Before (ping6): PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 16 bytes from ::1, icmp_seq=0 hlim=64 time=0.168 ms 16 bytes from ::1, icmp_seq=1 hlim=64 time=0.068 ms --- 2001:db8::2 ping6 statistics --- round-trip min/avg/max/std-dev = 0.068/0.118/0.168/0.050 ms After (ping6): PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 16 bytes from ::1, icmp_seq=0 hlim=64 time=0.168 ms 16 bytes from ::1, icmp_seq=1 hlim=64 time=0.068 ms --- 2001:db8::2 ping statistics --- round-trip min/avg/max/stddev = 0.068/0.118/0.168/0.050 ms This has the nice side-effect of adding units to SIGINFO's statistics, as printing numbers without units may not be of much help. Also mentions the fact that these times are round-trip. Before (ping/ping6 SIGINFO): 2/2 packets received (100.0%) 0.068 min / 0.118 avg / 0.168 max After (ping/ping6 SIGINFO): --- ping statistics --- 2 packets transmitted, 2 packets received, 0.0% packet loss round-trip min/avg/max/stddev = 0.068/0.118/0.168/0.050 ms In the case of a SIGINFO, the output will be printed to stderr, for both ping and ping6. Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/863 Differential Revision: https://reviews.freebsd.org/D39126 (cherry picked from commit 03d4d1c778091a08277d070185a9c60c7a6d57e0) --- sbin/ping/main.c | 83 +++++++++++++++++ sbin/ping/main.h | 25 ++++++ sbin/ping/ping.c | 169 +++++++---------------------------- sbin/ping/ping6.c | 123 +++---------------------- sbin/ping/tests/ping_6_c1_s8_t1.out | 6 +- sbin/ping/tests/ping_c1_s8_t1_S1.out | 6 +- sbin/ping/tests/test_ping.py | 72 +++++++-------- 7 files changed, 193 insertions(+), 291 deletions(-) diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 6321178e1228..5b710b09e985 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -35,6 +35,8 @@ #include #include +#include +#include #include #include #include @@ -59,6 +61,28 @@ #error At least one of INET and INET6 is required #endif +/* various options */ +u_int options; + +char *hostname; + +/* counters */ +long nreceived; /* # of packets we got back */ +long nrepeats; /* number of duplicates */ +long ntransmitted; /* sequence # for outbound packets = #sent */ +long nrcvtimeout = 0; /* # of packets we got back after waittime */ + +/* nonzero if we've been told to finish up */ +volatile sig_atomic_t seenint; +volatile sig_atomic_t seeninfo; + +/* timing */ +int timing; /* flag to do timing */ +double tmin = 999999999.0; /* minimum round trip time */ +double tmax = 0.0; /* maximum round trip time */ +double tsum = 0.0; /* sum of all times, for doing average */ +double tsumsq = 0.0; /* sum of all times squared, for std. dev. */ + int main(int argc, char *argv[]) { @@ -170,6 +194,65 @@ main(int argc, char *argv[]) errx(1, "Unknown host"); } +/* + * onsignal -- + * Set the global bit that causes the main loop to quit. + */ +void +onsignal(int sig) +{ + switch (sig) { + case SIGALRM: + case SIGINT: + /* + * When doing reverse DNS lookups, the seenint flag might not + * be noticed for a while. Just exit if we get a second SIGINT. + */ + if (!(options & F_HOSTNAME) && seenint != 0) + _exit(nreceived ? 0 : 2); + seenint++; + break; + case SIGINFO: + seeninfo++; + break; + } +} + +/* + * pr_summary -- + * Print out summary statistics to the given output stream. + */ +void +pr_summary(FILE * restrict stream) +{ + fprintf(stream, "\n--- %s ping statistics ---\n", hostname); + fprintf(stream, "%ld packets transmitted, ", ntransmitted); + fprintf(stream, "%ld packets received, ", nreceived); + if (nrepeats) + fprintf(stream, "+%ld duplicates, ", nrepeats); + if (ntransmitted) { + if (nreceived > ntransmitted) + fprintf(stream, "-- somebody's duplicating packets!"); + else + fprintf(stream, "%.1f%% packet loss", + ((((double)ntransmitted - nreceived) * 100.0) / + ntransmitted)); + } + if (nrcvtimeout) + fprintf(stream, ", %ld packets out of wait time", nrcvtimeout); + fputc('\n', stream); + if (nreceived && timing) { + /* Only display average to microseconds */ + double num = nreceived + nrepeats; + double avg = tsum / num; + double stddev = sqrt(fmax(0, tsumsq / num - avg * avg)); + fprintf(stream, + "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n", + tmin, avg, tmax, stddev); + } + fflush(stream); +} + void usage(void) { diff --git a/sbin/ping/main.h b/sbin/ping/main.h index 7084585e6bb0..9a883b61a350 100644 --- a/sbin/ping/main.h +++ b/sbin/ping/main.h @@ -49,6 +49,31 @@ #endif #define PING6OPTS ".::6Aab:C:c:Dde:fHI:i:k:l:m:nNoOp:qS:s:t:uvyYW:z:" PING6ADDOPTS +/* various options */ +extern u_int options; +#define F_HOSTNAME 0x0004 + +extern char *hostname; + +/* counters */ +extern long nreceived; /* # of packets we got back */ +extern long nrepeats; /* number of duplicates */ +extern long ntransmitted; /* sequence # for outbound packets = #sent */ +extern long nrcvtimeout; /* # of packets we got back after waittime */ + +/* nonzero if we've been told to finish up */ +extern volatile sig_atomic_t seenint; +extern volatile sig_atomic_t seeninfo; + +/* timing */ +extern int timing; /* flag to do timing */ +extern double tmin; /* minimum round trip time */ +extern double tmax; /* maximum round trip time */ +extern double tsum; /* sum of all times, for doing average */ +extern double tsumsq; /* sum of all times squared, for std. dev. */ + +void onsignal(int); +void pr_summary(FILE * __restrict); void usage(void) __dead2; #endif diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index ad16ff5a5ee9..bbb103a7361f 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -87,7 +87,6 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #include #include #include -#include #include #include #include @@ -127,10 +126,8 @@ struct tv32 { }; /* various options */ -static int options; #define F_FLOOD 0x0001 #define F_INTERVAL 0x0002 -#define F_NUMERIC 0x0004 #define F_PINGFILLED 0x0008 #define F_QUIET 0x0010 #define F_RROUTE 0x0020 @@ -178,7 +175,6 @@ static char BSPACE = '\b'; /* characters written for flood */ static const char *DOT = "."; static size_t DOTlen = 1; static size_t DOTidx = 0; -static char *hostname; static char *shostname; static int ident; /* process id to identify our packets */ static int uid; /* cached uid for micro-optimization */ @@ -190,9 +186,6 @@ static int send_len; /* counters */ static long nmissedmax; /* max value of ntransmitted - nreceived - 1 */ static long npackets; /* max packets to transmit */ -static long nreceived; /* # of packets we got back */ -static long nrepeats; /* number of duplicates */ -static long ntransmitted; /* sequence # for outbound packets = #sent */ static long snpackets; /* max packets to transmit in one sweep */ static long sntransmitted; /* # of packets we sent in this sweep */ static int sweepmax; /* max value of payload in sweep */ @@ -200,33 +193,17 @@ static int sweepmin = 0; /* start value of payload in sweep */ static int sweepincr = 1; /* payload increment in sweep */ static int interval = 1000; /* interval between packets, ms */ static int waittime = MAXWAIT; /* timeout for each packet */ -static long nrcvtimeout = 0; /* # of packets we got back after waittime */ - -/* timing */ -static int timing; /* flag to do timing */ -static double tmin = 999999999.0; /* minimum round trip time */ -static double tmax = 0.0; /* maximum round trip time */ -static double tsum = 0.0; /* sum of all times, for doing average */ -static double tsumsq = 0.0; /* sum of all times squared, for std. dev. */ - -/* nonzero if we've been told to finish up */ -static volatile sig_atomic_t finish_up; -static volatile sig_atomic_t siginfo_p; static cap_channel_t *capdns; static void fill(char *, char *); static cap_channel_t *capdns_setup(void); -static void check_status(void); -static void finish(void) __dead2; static void pinger(void); static char *pr_addr(struct in_addr); static char *pr_ntime(n_time); static void pr_icmph(struct icmp *, struct ip *, const u_char *const); static void pr_iph(struct ip *, const u_char *); static void pr_pack(char *, ssize_t, struct sockaddr_in *, struct timespec *); -static void status(int); -static void stopit(int); int ping(int argc, char *const *argv) @@ -264,8 +241,6 @@ ping(int argc, char *const *argv) #endif cap_rights_t rights; - options |= F_NUMERIC; - /* * Do the stuff that we need root priv's for *first*, and * then drop our setuid bit. Save error reporting for @@ -379,7 +354,7 @@ ping(int argc, char *const *argv) options |= F_SWEEP; break; case 'H': - options &= ~F_NUMERIC; + options |= F_HOSTNAME; break; case 'h': /* Packet size increment for ping sweep */ ltmp = strtonum(optarg, 1, INT_MAX, &errstr); @@ -452,7 +427,7 @@ ping(int argc, char *const *argv) options |= F_TTL; break; case 'n': - options |= F_NUMERIC; + options &= ~F_HOSTNAME; break; case 'o': options |= F_ONCE; @@ -882,22 +857,17 @@ ping(int argc, char *const *argv) sigemptyset(&si_sa.sa_mask); si_sa.sa_flags = 0; - - si_sa.sa_handler = stopit; - if (sigaction(SIGINT, &si_sa, 0) == -1) { + si_sa.sa_handler = onsignal; + if (sigaction(SIGINT, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGINT"); - } - - si_sa.sa_handler = status; - if (sigaction(SIGINFO, &si_sa, 0) == -1) { + seenint = 0; + if (sigaction(SIGINFO, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGINFO"); - } - - if (alarmtimeout > 0) { - si_sa.sa_handler = stopit; + seeninfo = 0; + if (alarmtimeout > 0) { if (sigaction(SIGALRM, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGALRM"); - } + } bzero(&msg, sizeof(msg)); msg.msg_name = (caddr_t)&from; @@ -929,13 +899,18 @@ ping(int argc, char *const *argv) } almost_done = 0; - while (!finish_up) { + while (seenint == 0) { struct timespec now, timeout; fd_set rfds; int n; ssize_t cc; - check_status(); + /* signal handling */ + if (seeninfo) { + pr_summary(stderr); + seeninfo = 0; + continue; + } if ((unsigned)srecv >= FD_SETSIZE) errx(EX_OSERR, "descriptor too large"); FD_ZERO(&rfds); @@ -945,9 +920,10 @@ ping(int argc, char *const *argv) timespecsub(&timeout, &now, &timeout); if (timeout.tv_sec < 0) timespecclear(&timeout); + n = pselect(srecv + 1, &rfds, NULL, NULL, &timeout, NULL); if (n < 0) - continue; /* Must be EINTR. */ + continue; /* EINTR */ if (n == 1) { struct timespec *tv = NULL; #ifdef SO_TIMESTAMP @@ -982,7 +958,7 @@ ping(int argc, char *const *argv) (npackets && nreceived >= npackets)) break; } - if (n == 0 || options & F_FLOOD) { + if (n == 0 || (options & F_FLOOD)) { if (sweepmax && sntransmitted == snpackets) { if (datalen + sweepincr > sweepmax) break; @@ -998,14 +974,21 @@ ping(int argc, char *const *argv) if (almost_done) break; almost_done = 1; + /* + * If we're not transmitting any more packets, + * change the timer to wait two round-trip times + * if we've received any packets or (waittime) + * milliseconds if we haven't. + */ intvl.tv_nsec = 0; if (nreceived) { intvl.tv_sec = 2 * tmax / 1000; - if (!intvl.tv_sec) + if (intvl.tv_sec == 0) intvl.tv_sec = 1; } else { intvl.tv_sec = waittime / 1000; - intvl.tv_nsec = waittime % 1000 * 1000000; + intvl.tv_nsec = + waittime % 1000 * 1000000; } } (void)clock_gettime(CLOCK_MONOTONIC, &last); @@ -1016,28 +999,9 @@ ping(int argc, char *const *argv) } } } - finish(); - /* NOTREACHED */ - exit(0); /* Make the compiler happy */ -} - -/* - * stopit -- - * Set the global bit that causes the main loop to quit. - * Do NOT call finish() from here, since finish() does far too much - * to be called from a signal handler. - */ -void -stopit(int sig __unused) -{ + pr_summary(stdout); - /* - * When doing reverse DNS lookups, the finish_up flag might not - * be noticed for a while. Just exit if we get a second SIGINT. - */ - if (!(options & F_NUMERIC) && finish_up) - _exit(nreceived ? 0 : 2); - finish_up = 1; + exit(nreceived ? 0 : 2); } /* @@ -1463,77 +1427,6 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) } } -/* - * status -- - * Print out statistics when SIGINFO is received. - */ - -static void -status(int sig __unused) -{ - - siginfo_p = 1; -} - -static void -check_status(void) -{ - - if (siginfo_p) { - siginfo_p = 0; - (void)fprintf(stderr, "\r%ld/%ld packets received (%.1f%%)", - nreceived, ntransmitted, - ntransmitted ? nreceived * 100.0 / ntransmitted : 0.0); - if (nreceived && timing) - (void)fprintf(stderr, " %.3f min / %.3f avg / %.3f max", - tmin, tsum / (nreceived + nrepeats), tmax); - (void)fprintf(stderr, "\n"); - } -} - -/* - * finish -- - * Print out statistics, and give up. - */ -static void -finish(void) -{ - - (void)signal(SIGINT, SIG_IGN); - (void)signal(SIGALRM, SIG_IGN); - (void)putchar('\n'); - (void)fflush(stdout); - (void)printf("--- %s ping statistics ---\n", hostname); - (void)printf("%ld packets transmitted, ", ntransmitted); - (void)printf("%ld packets received, ", nreceived); - if (nrepeats) - (void)printf("+%ld duplicates, ", nrepeats); - if (ntransmitted) { - if (nreceived > ntransmitted) - (void)printf("-- somebody's printing up packets!"); - else - (void)printf("%.1f%% packet loss", - ((ntransmitted - nreceived) * 100.0) / - ntransmitted); - } - if (nrcvtimeout) - (void)printf(", %ld packets out of wait time", nrcvtimeout); - (void)putchar('\n'); - if (nreceived && timing) { - double n = nreceived + nrepeats; - double avg = tsum / n; - double stddev = sqrt(fmax(0, tsumsq / n - avg * avg)); - (void)printf( - "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n", - tmin, avg, tmax, stddev); - } - - if (nreceived) - exit(0); - else - exit(2); -} - /* * pr_icmph -- * Print a descriptive string about an ICMP header. @@ -1705,7 +1598,7 @@ pr_addr(struct in_addr ina) struct hostent *hp; static char buf[16 + 3 + MAXHOSTNAMELEN]; - if (options & F_NUMERIC) + if (!(options & F_HOSTNAME)) return inet_ntoa(ina); hp = cap_gethostbyaddr(capdns, (char *)&ina, sizeof(ina), AF_INET); diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index d14da9c67a52..a71ef8a84aee 100644 --- a/sbin/ping/ping6.c +++ b/sbin/ping/ping6.c @@ -124,7 +124,6 @@ static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #include #include #include -#include #include #include #include @@ -188,7 +187,6 @@ struct tv32 { #define F_FQDN 0x1000 #define F_INTERFACE 0x2000 #define F_SRCADDR 0x4000 -#define F_HOSTNAME 0x10000 #define F_FQDNOLD 0x20000 #define F_NIGROUP 0x40000 #define F_SUPTYPES 0x80000 @@ -200,7 +198,6 @@ struct tv32 { #define F_NOUSERDATA (F_NODEADDR | F_FQDN | F_FQDNOLD | F_SUPTYPES) #define F_WAITTIME 0x2000000 #define F_DOT 0x4000000 -static u_int options; #define IN6LEN sizeof(struct in6_addr) #define SA6LEN sizeof(struct sockaddr_in6) @@ -229,7 +226,6 @@ static char BBELL = '\a'; /* characters written for AUDIBLE */ static const char *DOT = "."; static size_t DOTlen = 1; static size_t DOTidx = 0; -static char *hostname; static int ident; /* process id to identify our packets */ static u_int8_t nonce[8]; /* nonce field for node information */ static int hoplimit = -1; /* hoplimit */ @@ -241,20 +237,9 @@ static cap_channel_t *capdns; /* counters */ static long nmissedmax; /* max value of ntransmitted - nreceived - 1 */ static long npackets; /* max packets to transmit */ -static long nreceived; /* # of packets we got back */ -static long nrepeats; /* number of duplicates */ -static long ntransmitted; /* sequence # for outbound packets = #sent */ static long ntransmitfailures; /* number of transmit failures */ static int interval = 1000; /* interval between packets in ms */ static int waittime = MAXWAIT; /* timeout for each packet */ -static long nrcvtimeout = 0; /* # of packets we got back after waittime */ - -/* timing */ -static int timing; /* flag to do timing */ -static double tmin = 999999999.0; /* minimum round trip time */ -static double tmax = 0.0; /* maximum round trip time */ -static double tsum = 0.0; /* sum of all times, for doing average */ -static double tsumsq = 0.0; /* sum of all times squared, for std. dev. */ /* for node addresses */ static u_short naflags; @@ -264,18 +249,11 @@ static struct msghdr smsghdr; static struct iovec smsgiov; static char *scmsg = 0; -static volatile sig_atomic_t seenint; -#ifdef SIGINFO -static volatile sig_atomic_t seeninfo; -#endif - static cap_channel_t *capdns_setup(void); static void fill(char *, char *); static int get_hoplim(struct msghdr *); static int get_pathmtu(struct msghdr *); static struct in6_pktinfo *get_rcvpktinfo(struct msghdr *); -static void onsignal(int); -static void onint(int); static size_t pingerlen(void); static int pinger(void); static const char *pr_addr(struct sockaddr *, int); @@ -293,7 +271,6 @@ static void pr_ip6opt(void *, size_t); static void pr_rthdr(void *, size_t); static int pr_bitrange(u_int32_t, int, int); static void pr_retip(struct ip6_hdr *, u_char *); -static void summary(void); #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC static int setpolicy(int, char *); @@ -1142,7 +1119,7 @@ ping6(int argc, char *argv[]) if (caph_rights_limit(ssend, &rights_ssend) < 0) err(1, "caph_rights_limit ssend setsockopt"); - printf("PING6(%lu=40+8+%lu bytes) ", (unsigned long)(40 + pingerlen()), + printf("PING(%lu=40+8+%lu bytes) ", (unsigned long)(40 + pingerlen()), (unsigned long)(pingerlen() - 8)); printf("%s --> ", pr_addr((struct sockaddr *)&src, sizeof(src))); printf("%s\n", pr_addr((struct sockaddr *)&dst, sizeof(dst))); @@ -1163,11 +1140,9 @@ ping6(int argc, char *argv[]) if (sigaction(SIGINT, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGINT"); seenint = 0; -#ifdef SIGINFO if (sigaction(SIGINFO, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGINFO"); seeninfo = 0; -#endif if (alarmtimeout > 0) { if (sigaction(SIGALRM, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGALRM"); @@ -1186,15 +1161,11 @@ ping6(int argc, char *argv[]) int n; /* signal handling */ - if (seenint) - onint(SIGINT); -#ifdef SIGINFO if (seeninfo) { - summary(); + pr_summary(stderr); seeninfo = 0; continue; } -#endif FD_ZERO(&rfds); FD_SET(srecv, &rfds); clock_gettime(CLOCK_MONOTONIC, &now); @@ -1258,12 +1229,12 @@ ping6(int argc, char *argv[]) if (almost_done) break; almost_done = 1; - /* - * If we're not transmitting any more packets, - * change the timer to wait two round-trip times - * if we've received any packets or (waittime) - * milliseconds if we haven't. - */ + /* + * If we're not transmitting any more packets, + * change the timer to wait two round-trip times + * if we've received any packets or (waittime) + * milliseconds if we haven't. + */ intvl.tv_nsec = 0; if (nreceived) { intvl.tv_sec = 2 * tmax / 1000; @@ -1272,7 +1243,7 @@ ping6(int argc, char *argv[]) } else { intvl.tv_sec = waittime / 1000; intvl.tv_nsec = - waittime % 1000 * 1000000; + waittime % 1000 * 1000000; } } clock_gettime(CLOCK_MONOTONIC, &last); @@ -1288,7 +1259,7 @@ ping6(int argc, char *argv[]) si_sa.sa_handler = SIG_IGN; sigaction(SIGINT, &si_sa, 0); sigaction(SIGALRM, &si_sa, 0); - summary(); + pr_summary(stdout); if(packet != NULL) free(packet); @@ -1301,23 +1272,6 @@ ping6(int argc, char *argv[]) exit(EX_OSERR); } -static void -onsignal(int sig) -{ - - switch (sig) { - case SIGINT: - case SIGALRM: - seenint++; - break; -#ifdef SIGINFO - case SIGINFO: - seeninfo++; - break; -#endif - } -} - /* * pinger -- * Compose and transmit an ICMP ECHO REQUEST packet. The IP packet @@ -1469,7 +1423,7 @@ pinger(void) ntransmitfailures++; warn("sendmsg"); } - (void)printf("ping6: wrote %s %d chars, ret=%d\n", + (void)printf("ping: wrote %s %d chars, ret=%d\n", hostname, cc, i); } if (!(options & F_QUIET) && options & F_DOT) @@ -2305,59 +2259,6 @@ get_pathmtu(struct msghdr *mhdr) return(0); } -/* - * onint -- - * SIGINT handler. - */ -/* ARGSUSED */ -static void -onint(int notused __unused) -{ - /* - * When doing reverse DNS lookups, the seenint flag might not - * be noticed for a while. Just exit if we get a second SIGINT. - */ - if ((options & F_HOSTNAME) && seenint != 0) - _exit(nreceived ? 0 : 2); -} - -/* - * summary -- - * Print out statistics. - */ -static void -summary(void) -{ - - (void)printf("\n--- %s ping6 statistics ---\n", hostname); - (void)printf("%ld packets transmitted, ", ntransmitted); - (void)printf("%ld packets received, ", nreceived); - if (nrepeats) - (void)printf("+%ld duplicates, ", nrepeats); - if (ntransmitted) { - if (nreceived > ntransmitted) - (void)printf("-- somebody's duplicating packets!"); - else - (void)printf("%.1f%% packet loss", - ((((double)ntransmitted - nreceived) * 100.0) / - ntransmitted)); - } - if (nrcvtimeout) - printf(", %ld packets out of wait time", nrcvtimeout); - (void)putchar('\n'); - if (nreceived && timing) { - /* Only display average to microseconds */ - double num = nreceived + nrepeats; - double avg = tsum / num; - double stddev = sqrt(fmax(0, tsumsq / num - avg * avg)); - (void)printf( - "round-trip min/avg/max/std-dev = %.3f/%.3f/%.3f/%.3f ms\n", - tmin, avg, tmax, stddev); - (void)fflush(stdout); - } - (void)fflush(stdout); -} - /*subject type*/ static const char *niqcode[] = { "IPv6 address", @@ -2640,7 +2541,7 @@ pr_addr(struct sockaddr *addr, int addrlen) static char buf[NI_MAXHOST]; int flag = 0; - if ((options & F_HOSTNAME) == 0) + if (!(options & F_HOSTNAME)) flag |= NI_NUMERICHOST; if (cap_getnameinfo(capdns, addr, addrlen, buf, sizeof(buf), NULL, 0, diff --git a/sbin/ping/tests/ping_6_c1_s8_t1.out b/sbin/ping/tests/ping_6_c1_s8_t1.out index 81c56e6cf586..0d207e74bc3e 100644 --- a/sbin/ping/tests/ping_6_c1_s8_t1.out +++ b/sbin/ping/tests/ping_6_c1_s8_t1.out @@ -1,6 +1,6 @@ -PING6(56=40+8+8 bytes) ::1 --> ::1 +PING(56=40+8+8 bytes) ::1 --> ::1 16 bytes from ::1, icmp_seq=0 hlim= time= ms ---- localhost ping6 statistics --- +--- localhost ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms diff --git a/sbin/ping/tests/ping_c1_s8_t1_S1.out b/sbin/ping/tests/ping_c1_s8_t1_S1.out index 81c56e6cf586..0d207e74bc3e 100644 --- a/sbin/ping/tests/ping_c1_s8_t1_S1.out +++ b/sbin/ping/tests/ping_c1_s8_t1_S1.out @@ -1,6 +1,6 @@ -PING6(56=40+8+8 bytes) ::1 --> ::1 +PING(56=40+8+8 bytes) ::1 --> ::1 16 bytes from ::1, icmp_seq=0 hlim= time= ms ---- localhost ping6 statistics --- +--- localhost ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 8d3bd115e2a6..52be1c7f91ae 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -311,12 +311,12 @@ round-trip min/avg/max/stddev = /// ms "args": "ping -6 -c1 -s8 -t1 localhost", "returncode": 0, "stdout": """\ -PING6(56=40+8+8 bytes) ::1 --> ::1 +PING(56=40+8+8 bytes) ::1 --> ::1 16 bytes from ::1, icmp_seq=0 hlim= time= ms ---- localhost ping6 statistics --- +--- localhost ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms """, "stderr": "", }, @@ -357,12 +357,12 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes "args": "ping -A -c1 2001:db8::1", "returncode": 0, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms ---- 2001:db8::1 ping6 statistics --- +--- 2001:db8::1 ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms """, "stderr": "", }, @@ -373,9 +373,9 @@ round-trip min/avg/max/std-dev = /// ms "args": "ping -A -c1 2001:db8::2", "returncode": 2, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 ---- 2001:db8::2 ping6 statistics --- +--- 2001:db8::2 ping statistics --- 1 packets transmitted, 0 packets received, 100.0% packet loss """, "stderr": "", @@ -419,14 +419,14 @@ round-trip min/avg/max/stddev = /// ms "args": "ping -A -c3 2001:db8::1", "returncode": 0, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms 16 bytes from 2001:db8::1, icmp_seq=1 hlim= time= ms 16 bytes from 2001:db8::1, icmp_seq=2 hlim= time= ms ---- 2001:db8::1 ping6 statistics --- +--- 2001:db8::1 ping statistics --- 3 packets transmitted, 3 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms """, "stderr": "", }, @@ -437,9 +437,9 @@ round-trip min/avg/max/std-dev = /// ms "args": "ping -A -c3 2001:db8::2", "returncode": 2, "stdout": """\ -\x07\x07PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 +\x07\x07PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 ---- 2001:db8::2 ping6 statistics --- +--- 2001:db8::2 ping statistics --- 3 packets transmitted, 0 packets received, 100.0% packet loss """, "stderr": "", @@ -481,12 +481,12 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes "args": "ping -c1 2001:db8::1", "returncode": 0, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms ---- 2001:db8::1 ping6 statistics --- +--- 2001:db8::1 ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms """, "stderr": "", }, @@ -497,9 +497,9 @@ round-trip min/avg/max/std-dev = /// ms "args": "ping -c1 2001:db8::2", "returncode": 2, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 ---- 2001:db8::2 ping6 statistics --- +--- 2001:db8::2 ping statistics --- 1 packets transmitted, 0 packets received, 100.0% packet loss """, "stderr": "", @@ -527,12 +527,12 @@ round-trip min/avg/max/stddev = /// ms "args": "ping -c1 -S::1 -s8 -t1 localhost", "returncode": 0, "stdout": """\ -PING6(56=40+8+8 bytes) ::1 --> ::1 +PING(56=40+8+8 bytes) ::1 --> ::1 16 bytes from ::1, icmp_seq=0 hlim= time= ms ---- localhost ping6 statistics --- +--- localhost ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms """, "stderr": "", }, @@ -575,14 +575,14 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes "args": "ping -c3 2001:db8::1", "returncode": 0, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms 16 bytes from 2001:db8::1, icmp_seq=1 hlim= time= ms 16 bytes from 2001:db8::1, icmp_seq=2 hlim= time= ms ---- 2001:db8::1 ping6 statistics --- +--- 2001:db8::1 ping statistics --- 3 packets transmitted, 3 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms """, "stderr": "", }, @@ -593,9 +593,9 @@ round-trip min/avg/max/std-dev = /// ms "args": "ping -c3 2001:db8::2", "returncode": 2, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 ---- 2001:db8::2 ping6 statistics --- +--- 2001:db8::2 ping statistics --- 3 packets transmitted, 0 packets received, 100.0% packet loss """, "stderr": "", @@ -636,11 +636,11 @@ PING 192.0.2.2 (192.0.2.2): 56 data bytes "args": "ping -q -c1 2001:db8::1", "returncode": 0, "stdout": """\ -PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1 ---- 2001:db8::1 ping6 statistics --- +--- 2001:db8::1 ping statistics --- 1 packets transmitted, 1 packets received, 0.0% packet loss -round-trip min/avg/max/std-dev = /// ms +round-trip min/avg/max/stddev = /// ms """, "stderr": "", }, @@ -651,9 +651,9 @@ round-trip min/avg/max/std-dev = /// ms "args": "ping -q -c1 2001:db8::2", "returncode": 2, *** 36 LINES SKIPPED *** From nobody Mon Nov 6 16:45:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKb1MRfz50FBf; Mon, 6 Nov 2023 16:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKb0p0Dz4GyZ; Mon, 6 Nov 2023 16:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQFp91ljFAWg1kWp+d79Zxc/DwCLIBP6T4G74g2tELU=; b=jpl3botur9dBdmzyaIUb8R21IMMAJy0sH47L8TZKm7jqLZNc3qoUI7muqs5SD/+pWYZZkN BAG/9D0JmN/3yVxbpLX8u7H4cIa63xhGuCCjhwrVU7aI9d3zSdHXlspZ02wcfmvQZZTYLn SDHsYkGKlT7gOLl6ykoibwc3NxWI9P+qsiPryxUnZ0RKMxIpAzTYX1EI/b0R4iBf5oz7vF a8dV2ukBdNDkbv7t+JV95Mtbsg+AqOX+12nYbjJu7Uy6HAifiJtdVvBrSVW3Vk3Pw9rRhE BgSgPnaZj/VWVlGEGFNU+zloFCBgmNVWBoueJ9b2HNxlrBcFR7E/TtF2XI9qgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQFp91ljFAWg1kWp+d79Zxc/DwCLIBP6T4G74g2tELU=; b=xoOBQyzAi9+iijDbdKExgeN6eDE/g5lkxeYhiG/JpFAq5yXsKzEfv3vzKL7iB6OvVSIRju bYfaV2jqWM+Q8aAvPQvXkSTYD0iZGXu2uXSVzGdMNjR4Sw6NgLZE8wjpWDD65z/waxiMvk Scj/4OSjchRU9iqJrQ9Zrgzaao5+T4wsu6q2FOoQS0oz39pNbPybEb8wcMk+2YUBOQGzzT OerPRu5HO5PfqsrMAdCO1jdSm7D0Si8VzvNXA9zcyeeHH8eBOksX44Gsc6iBewgCMJdZBn 7KgGFCgO+wEdJyi2UhbhH2Bnz1Vs6HGTVUnwTQduTtkuEe6+/HlYkPTzoCFNOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289155; a=rsa-sha256; cv=none; b=xHUWo59Jgn3z5f9OLMJ7IY19mH1IilaKScuZPmOZUXNSj0WISeRBX3F6mIk4KA1/+pdezV 4ujr6jSkAR9MjKs0+4hrrEaIUYzuGUJfDShlXJTM1HQPXaU+7j3JdlLy1ccxH5wrq3i6M3 uiPOaAFUmoMhqO+xkuuV26Rw0FjyyGkWIn1bZubIovifnzppZKmM1zK77r8jdQkTl8neh6 P6l0NS6NsJvaAzO4AYsZptpMsAMwODCTzCeaYCpmVNiHqIEKvr2XFPgjwzyRp12RCfqlj9 5pRpL746jMAATSQ5PFL3PvJVUWV/vl0v3lb//b6PCtdTohP/1YSCmZHWn47vkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKZ6z1nzsk; Mon, 6 Nov 2023 16:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GjsUX058482; Mon, 6 Nov 2023 16:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjsHB058479; Mon, 6 Nov 2023 16:45:54 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:54 GMT Message-Id: <202311061645.3A6GjsHB058479@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: 0c74823f5c13 - stable/14 - ping: Fix the spacing between the time stamp and cp/dp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0c74823f5c135a039832f62dd50b79625f26f0fe Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0c74823f5c135a039832f62dd50b79625f26f0fe commit 0c74823f5c135a039832f62dd50b79625f26f0fe Author: Jose Luis Duran AuthorDate: 2023-04-10 16:58:42 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:44 +0000 ping: Fix the spacing between the time stamp and cp/dp When an echo reply packet is received, the data is compared with the sent data. When a wrong byte is detected the command displays a report with the differences. The first row (the first 8-bytes of data after the ICMP header) should include the time stamp (if data is at least 8-bytes), this value is not taken into consideration for the comparison. The remaining rows represent the data (padded pattern) received/sent, with each byte being compared for differences. Print the space before (not after), to add an extra space after cp:/dp: for better readability when the first time stamp octet is not zero-padded, and to remove trailing spaces in the output. Before: cp:99 0 0 c 1 5 c 0␣ ab cd ab cd ab cd ab cd ab cd ab cd ab cd ab cd␣ ... After: cp: 99 0 0 c 1 5 c 0 ab cd ab cd ab cd ab cd ab cd ab cd ab cd ab cd ... Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/863 Differential Revision: https://reviews.freebsd.org/D39492 (cherry picked from commit 8db2c5802abe14543504e17ab5ed6325088a63f3) --- sbin/ping/ping.c | 4 ++-- sbin/ping/tests/test_ping.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index bbb103a7361f..fcc27d34ee54 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1261,14 +1261,14 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) for (i = 0; i < datalen; ++i, ++cp) { if ((i % 16) == 8) (void)printf("\n\t"); - (void)printf("%2x ", *cp); + (void)printf(" %2x", *cp); } (void)printf("\ndp:"); cp = &outpack[ICMP_MINLEN]; for (i = 0; i < datalen; ++i, ++cp) { if ((i % 16) == 8) (void)printf("\n\t"); - (void)printf("%2x ", *cp); + (void)printf(" %2x", *cp); } break; } diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 52be1c7f91ae..00ddbbd63723 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -275,6 +275,8 @@ def redact(output): ("hlim=[0-9]*", "hlim="), ("ttl=[0-9]*", "ttl="), ("time=[0-9.-]*", "time="), + ("cp: .*", "cp: xx xx xx xx xx xx xx xx"), + ("dp: .*", "dp: xx xx xx xx xx xx xx xx"), ("\(-[0-9\.]+[0-9]+ ms\)", "(- ms)"), ("[0-9\.]+/[0-9.]+", "/"), ] @@ -1401,6 +1403,39 @@ ping: time of day goes back (- ms), clamping time to 0 }, id="_0_0_special_warp", ), + pytest.param( + { + "src": "192.0.2.1", + "dst": "192.0.2.2", + "icmp_type": 0, + "icmp_code": 0, + "special": "wrong", + }, + { + "returncode": 0, + "stdout": """\ +PATTERN: 0x01 +PING 192.0.2.2 (192.0.2.2): 56 data bytes +64 bytes from: icmp_seq=0 ttl= time= ms +wrong data byte #55 should be 0x1 but was 0x0 +cp: xx xx xx xx xx xx xx xx + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 +dp: xx xx xx xx xx xx xx xx + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + +--- 192.0.2.2 ping statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss +round-trip min/avg/max/stddev = /// ms +""", + "stderr": "", + "redacted": True, + }, + id="_0_0_special_wrong", + ), ] @pytest.mark.parametrize("pinger_kargs, expected", pinger_testdata) From nobody Mon Nov 6 16:45:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKc3Pk4z50FBq; Mon, 6 Nov 2023 16:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKc1kFsz4GvZ; Mon, 6 Nov 2023 16:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fbmUCZOMWCEYUjveOC2Ggt7AQ2KP4mPlXK3G0W0r+ak=; b=XDbSJ5cPz0+RFJ0enr3lgRlTV+JqikL9Q9CQUuPCMA6YSjKuovV500SCp0KGcbi/8lnE3n K2DK1gAdMpcHKPi5FCko+0pXnUL0eoAlj9VjzPPCKqZgIuS33pxJzO5m0bV9D3nsXXHUJ3 I3ymnNHTVufynqoQyf3pTPp2lWSkYtpRkMVJZebj0tOkn7twbcVLEyAtvNJXna3FvZRP/T /ujF44F7FQgMrOnt59kDdOS+kZr5xsytsie+PWOVa6I1W+fpxZWRzCg9kc4Z4BbDn3lu2g Ku6yne7+b+bkFZnMEeTZep/sG/kCJsjw0Fx2ZzcPlgrXHnDK9Lb6H4WiiSZkgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fbmUCZOMWCEYUjveOC2Ggt7AQ2KP4mPlXK3G0W0r+ak=; b=yI9Qzyp7lCOatA005sLGHFwwG/T+spyw190OUAicgnIlyicr4iTLpxdhXnX8dxx5wuA4jo /2QB1GtIcmTPBFQ2aCgCrqGxYHoUIxRjvyZJXODzpreCPhLTGhr/g5zo7ErTDPWeCtgxiZ 6eI/ILXIJZ/d48ymMdl6csa4XtXFRt7j/BbSIKqXv2iEGEZiLbbeZ5VDqX032U6ozdkM+2 bp0XODWF8KKY2NdQQmYKkbA/Wfi5W3X6l08iLlaTbh5XqyjjXrYFQS8mDPLjI6tYx9QDN/ k5UebEghGihV7Romsj94dnoHys+uef7ooxZ82v0Q1U2Q1vyQoaxXBNlhYbEiSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289156; a=rsa-sha256; cv=none; b=UHaAT13NE1Favup7dVoEcift9IrV9sEPG1dZE2+0RE9EgJhQbBNW7Aa8+esWRfGZabiXsA E5hd769v80xkY/yB/dfOazCcyMZIGr6WTP7An5/XfwvAcUX9EFM37Iz4rU1tzWtAkSaWUr NFNwdhDl9I1Q3UT4QRvN9JM4tRI/h48vSgMNxR7yGc2KXAzJzNtrqRX52wWwklGVN2hINp 7WRo0DDPaRlLOpR6BR0lQHiS6DiraCVDaB3n/SdOopkm1WQ9STO2SjbLNrOeS8BvlJsUfd TIRSivYh1ju+28CHwPlKHgBqNJAhaeqHvBFmjLqpi8WK4yAdsTdGPTy02A7mNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKc0r1Xz14t; Mon, 6 Nov 2023 16:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GjuSQ058519; Mon, 6 Nov 2023 16:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjuED058516; Mon, 6 Nov 2023 16:45:56 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:56 GMT Message-Id: <202311061645.3A6GjuED058516@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: a753d3632eaf - stable/14 - ping: pr_iph() improvements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a753d3632eaf8369a6fc8eff0c904b935f56dad9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a753d3632eaf8369a6fc8eff0c904b935f56dad9 commit a753d3632eaf8369a6fc8eff0c904b935f56dad9 Author: Jose Luis Duran AuthorDate: 2023-04-13 15:30:44 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:44 +0000 ping: pr_iph() improvements Very early on, the Src/Dst IP addresses were printed in hex notation (%08x), which will always be 8-characters wide. It was later changed to use a dot-decimal notation. Depending on the IP address length, the Src and Dst headers may require a different padding. Use the source and destination IP lengths as padding for the headers. Also, print an Opts (options) header, if there are options present. It has been abbreviated to Opts to match the length of the previous Data header, removed in ef9e6dc7eebe9830511602904d3ef5218d964080. Print the header info such that no trailing spaces are produced. As some git workflows may automatically trim them, and make the tests fail (see 25b86f8559c2e7076daff56933217e95cd4398d4). Before Vr HL TOS Len ID Flg off TTL Pro cks Src Dst 4 f 00 007c 0001 0 0000 40 01 d868 192.0.2.1 192.0.2.2␣ After Vr HL TOS Len ID Flg off TTL Pro cks Src Dst 4 f 00 007c 0001 0 0000 40 01 d868 192.0.2.1 192.0.2.2 And with options: Before Vr HL TOS Len ID Flg off TTL Pro cks Src Dst 4 f 00 007c 0001 0 0000 40 01 d868 192.0.2.1 192.0.2.2 01... After Vr HL TOS Len ID Flg off TTL Pro cks Src Dst Opts 4 f 00 007c 0001 0 0000 40 01 d868 192.0.2.1 192.0.2.2 01... Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/863 Differential Revision: https://reviews.freebsd.org/D39561 (cherry picked from commit b86e4812cce88920cb592bd3b8571572373dbb9c) --- sbin/ping/ping.c | 25 +++++++++++++++++-------- sbin/ping/tests/test_ping.py | 12 ++++++------ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index fcc27d34ee54..3b8663772e87 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1561,13 +1561,21 @@ pr_icmph(struct icmp *icp, struct ip *oip, const u_char *const oicmp_raw) static void pr_iph(struct ip *ip, const u_char *cp) { - struct in_addr ina; + struct in_addr dst_ina, src_ina; int hlen; hlen = ip->ip_hl << 2; cp = cp + sizeof(struct ip); /* point to options */ - (void)printf("Vr HL TOS Len ID Flg off TTL Pro cks Src Dst\n"); + memcpy(&src_ina, &ip->ip_src.s_addr, sizeof(src_ina)); + memcpy(&dst_ina, &ip->ip_dst.s_addr, sizeof(dst_ina)); + + (void)printf("Vr HL TOS Len ID Flg off TTL Pro cks %*s %*s", + (int)strlen(inet_ntoa(src_ina)), "Src", + (int)strlen(inet_ntoa(dst_ina)), "Dst"); + if (hlen > (int)sizeof(struct ip)) + (void)printf(" Opts"); + (void)putchar('\n'); (void)printf(" %1x %1x %02x %04x %04x", ip->ip_v, ip->ip_hl, ip->ip_tos, ntohs(ip->ip_len), ntohs(ip->ip_id)); @@ -1576,13 +1584,14 @@ pr_iph(struct ip *ip, const u_char *cp) ntohs(ip->ip_off) & 0x1fff); (void)printf(" %02x %02x %04x", ip->ip_ttl, ip->ip_p, ntohs(ip->ip_sum)); - memcpy(&ina, &ip->ip_src.s_addr, sizeof ina); - (void)printf(" %s ", inet_ntoa(ina)); - memcpy(&ina, &ip->ip_dst.s_addr, sizeof ina); - (void)printf(" %s ", inet_ntoa(ina)); + (void)printf(" %s", inet_ntoa(src_ina)); + (void)printf(" %s", inet_ntoa(dst_ina)); /* dump any option bytes */ - while (hlen-- > (int)sizeof(struct ip)) { - (void)printf("%02x", *cp++); + if (hlen > (int)sizeof(struct ip)) { + (void)printf(" "); + while (hlen-- > (int)sizeof(struct ip)) { + (void)printf("%02x", *cp++); + } } (void)putchar('\n'); } diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 00ddbbd63723..2a052b50ce07 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -1244,8 +1244,8 @@ round-trip min/avg/max/stddev = /// ms "stdout": """\ PING 192.0.2.2 (192.0.2.2): 56 data bytes 132 bytes from 192.0.2.2: Destination Host Unreachable -Vr HL TOS Len ID Flg off TTL Pro cks Src Dst - 4 f 00 007c 0001 0 0000 40 01 d868 192.0.2.1 192.0.2.2 01010101010101010101010101010101010101010101010101010101010101010101010101010101 +Vr HL TOS Len ID Flg off TTL Pro cks Src Dst Opts + 4 f 00 007c 0001 0 0000 40 01 d868 192.0.2.1 192.0.2.2 01010101010101010101010101010101010101010101010101010101010101010101010101010101 --- 192.0.2.2 ping statistics --- @@ -1269,8 +1269,8 @@ Vr HL TOS Len ID Flg off TTL Pro cks Src Dst "stdout": """\ PING 192.0.2.2 (192.0.2.2): 56 data bytes 92 bytes from 192.0.2.2: Destination Host Unreachable -Vr HL TOS Len ID Flg off TTL Pro cks Src Dst - 4 5 00 0054 0001 2 0000 40 01 b6a4 192.0.2.1 192.0.2.2 +Vr HL TOS Len ID Flg off TTL Pro cks Src Dst + 4 5 00 0054 0001 2 0000 40 01 b6a4 192.0.2.1 192.0.2.2 --- 192.0.2.2 ping statistics --- @@ -1342,8 +1342,8 @@ ping: quoted data too short (28 bytes) from 192.0.2.2 "stdout": """\ PING 192.0.2.2 (192.0.2.2): 56 data bytes 92 bytes from 192.0.2.2: Destination Host Unreachable -Vr HL TOS Len ID Flg off TTL Pro cks Src Dst - 4 5 00 0054 0001 0 0000 40 01 f6a4 192.0.2.1 192.0.2.2 +Vr HL TOS Len ID Flg off TTL Pro cks Src Dst + 4 5 00 0054 0001 0 0000 40 01 f6a4 192.0.2.1 192.0.2.2 --- 192.0.2.2 ping statistics --- From nobody Mon Nov 6 16:45:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHKd4qv9z50F1q; Mon, 6 Nov 2023 16:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHKd2lZcz4H8V; Mon, 6 Nov 2023 16:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tr/f74ObLhtWOshVZT+Bk3wIeSsHtZBvGzNIgAN4acI=; b=k7KIsD0Q0ScRCPtDr/iAvlJ0gDQmXcPLo2I2TYWQDbY2KJp+k4nW1udxxlWvtlP/UgMx5W bcUqDf8/qhSx/ygfqVLglnxlNp15kRJRIyjFnT3IOeKiPuuFAepqwPJRYSOdxQ559egabm rhfRhk7Xe82ksHBpqTaz8oXjr4c82djPJuifSgwsZhPJGHV9L/ahlsJ8hHWNNRElD5sKV2 VXI6eOpzQ9TKqD41BtJnV7EEHcAMM0FVVd5C8r3v3Z39Jbm0Loosjux3JeBp0VyULTCTHa QkfrLPYVAzYvHg399xfERxm3GaBfyuKUASHJXDIPc/BBbtbzcE7LubltpxczdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tr/f74ObLhtWOshVZT+Bk3wIeSsHtZBvGzNIgAN4acI=; b=ueF/CeR2lNVrIxj9jEb0oMVpUoG2DzW54ooTJS/Yv4y9zFNr7z4XyC5WmXfr2IW7yVgsbO v/hqGtrxFNb60iZt6c+efYXrsBOPJEhra2gVLfHDsBtm/8SurJ8aTysE3Qs+bjLTPD+9GF MKkXiO8AKcs+lS2pRQSVbyFXNJPgM9z4DPhFVXh0WMpDm301dVTq1Mk2ZyTYtFs52lbxyu YMbwHLGu1chI1ScXbsjfK3/hRUBxaGZMArjwE2iCjV5538EG0KzbJa2egctbU8H5EqbmVg 2OclF7cLX3X2jbZx5jxxOFWkKjVVB0yFT1vfroEVqvrGvQh9QnsQWuLu/9ut2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289157; a=rsa-sha256; cv=none; b=FF9PpZYn+k5rBsUQuhGaFGe29Gzv4X2a8w9N//LRGKrxeAyXfoBozNAgbRiyFp/s3UyJmm AWCl5b6wZeHPknMXaE5kWHFo8eZ3Ty1wgm6zTAxiZ4NmRd2s0LSj4DzeSikuGiVZdjADUZ emd6MXMqUm7odk8qCM3oJQewEdps6dxj0xm83cY2JgreOjUT/3QBg/ozBCA2+FJvGhePYN E+7utGlHAIum6fXKEEPtmGT7niru/YhY7CE0/bxlrkdK5UvYq2B2G/EK0BJaR7PJ3WlDKu hcDjNAorY4dnStQChokI8ssexOOOTutESuEjBUpde9PD1pChulPj5Z79FJP8ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHKd1s3Gz14v; Mon, 6 Nov 2023 16:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GjvJR058567; Mon, 6 Nov 2023 16:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GjvQT058564; Mon, 6 Nov 2023 16:45:57 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:45:57 GMT Message-Id: <202311061645.3A6GjvQT058564@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: ae6e3ea5e1fc - stable/14 - ping: Require root user for pytests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ae6e3ea5e1fcd122f269705a90bd8709fdc6b505 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae6e3ea5e1fcd122f269705a90bd8709fdc6b505 commit ae6e3ea5e1fcd122f269705a90bd8709fdc6b505 Author: Jose Luis Duran AuthorDate: 2023-10-11 13:57:11 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 16:45:44 +0000 ping: Require root user for pytests atf_python may use vnet jails for creating an isolated test environment. Mark these tests that require root user privileges. Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/863 (cherry picked from commit 4efaf43c6fa76e0daa1ed5ea535d863f15415bf4) --- sbin/ping/tests/test_ping.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 2a052b50ce07..3c66e6c54c4d 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -723,6 +723,7 @@ PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 ] @pytest.mark.parametrize("expected", testdata) + @pytest.mark.require_user("root") def test_ping(self, expected): """Test ping""" ping = subprocess.run( @@ -751,6 +752,7 @@ PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 ] @pytest.mark.parametrize("expected", ping46_testdata) + @pytest.mark.require_user("root") def test_ping_46(self, expected): """Test ping -4/ping -6""" for version in [4, 6]: From nobody Mon Nov 6 16:55:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPHXM184nz50Gfn; Mon, 6 Nov 2023 16:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPHXM0KX6z4LQ2; Mon, 6 Nov 2023 16:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SC9lyA25Ln7iU3JNQN8QsqavAsZm4U3brTgzS/A8fZg=; b=NcdGajBmzIrj0zfzJVOvVHejOF5vSI43mi/UHvNntGs4GDe9EFj7nQ85ms4t3UjxynM64g nsJxTyDg1A7CgO050UOk/wiVTVpreDRBElEsBohPiIQjKv9lV6nTU/GIdtU4FHLWG4L9PG HlQpmNYaYoC9LV/I0YBlHfhbExR255n4qYrknS+Rqi8pN3oGJZH9JA0Hefg0tF8PlgO3E1 M57s55eq+U1CVPtohPRdAVw3QHoXH4KjgFgrG/l4ytfc3nIvhw6slNXk6V+JynKkazFY9g OPMhRE+Bwvn/gWGZkl/7tvhcBK+P4KuqyaDUmc3uw1heaO8QyLKQshv7P72OYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699289715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SC9lyA25Ln7iU3JNQN8QsqavAsZm4U3brTgzS/A8fZg=; b=DjLvCAtUmoAch5DOe7ONFqG2wsXXYFuy5igniJo/X+E1HxFOLplKvbBPUA+kLWDwj5D0qM mxUw90KTDTVu3czwZ1fi4HJL6HX+SFXEujrHtG5QPCpD2ufJzorE0B0T5zhdZW1JuszQRd kjKU/dzu7gRX/2k0Sw8e0f2OhZJU5wNgDKz9IeZQixgW8EJ7OdGv4yF5d1Vf9+N8B5kmT5 EJHT7XAFQ1pYs5d+KDq08yV5uFP44/TFpMawuovPa6w29rCgXZfbtx12n9EsTSlKVWZkjf Nuc1Q2Ru5WXEbiGdNbOFuFGGqjm4BEb7s8LGDVWzafIhamHu63CzyLLg7XXSJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699289715; a=rsa-sha256; cv=none; b=iz2qR4T//wU1eInIHmBxvOozIHmXC2ZawpTw4oe6U4n34c8XOqJ1iY7dEJ4P0TK3iG913E X2p3ILOevJSvaRow4EBOP6H9fimN/R30w5Q3vNNyABHwGn4z7AMGcvyys+mNPcOL0FERJP 3NBPoLo+BWpgyv7cj6V3qdeJ6XNcDiBKgV4FxCJSGRkHq2kJrhbUfOGOE4rNweqXrImmLK YESRgdVf0XQzHClNHZBQBj6cTl88i9Ph070TVP+KoYz3SB8dxphOinFZNwTu3EX5uQTqlA gawazbe0IU3VRlKOjyYn3pF1SYhlafLeaZMVQ9u0/fU7acvedNVZcN20Y+nwnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPHXL6PfRzYl; Mon, 6 Nov 2023 16:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6GtE2H074871; Mon, 6 Nov 2023 16:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6GtElF074868; Mon, 6 Nov 2023 16:55:14 GMT (envelope-from git) Date: Mon, 6 Nov 2023 16:55:14 GMT Message-Id: <202311061655.3A6GtElF074868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c1e21468213e - main - pmap_kextract(9): some additions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1e21468213e3ae35c5302f94472f1d996d530cd Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c1e21468213e3ae35c5302f94472f1d996d530cd commit c1e21468213e3ae35c5302f94472f1d996d530cd Author: Mitchell Horne AuthorDate: 2023-11-06 16:54:18 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 16:54:45 +0000 pmap_kextract(9): some additions Mainly, provide a little more detail on the caller's responsibilities. Suggested by: kib, jhb Reviewed by: kib, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42458 --- share/man/man9/pmap_kextract.9 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/share/man/man9/pmap_kextract.9 b/share/man/man9/pmap_kextract.9 index 40008a1bc96c..a93bbc70b351 100644 --- a/share/man/man9/pmap_kextract.9 +++ b/share/man/man9/pmap_kextract.9 @@ -31,9 +31,21 @@ The function retrieves the underlying physical memory address corresponding to the given kernel virtual address .Fa va . -The value of +The caller is responsible for ensuring that .Fa va -must belong to a valid mapping in the kernel address space. +belongs to a valid mapping in the kernel address space. +The returned physical address is only meaningful as long as the mapping remains +stable, so the caller must also have some knowledge or guarantee of the +mapping's lifetime. +For example, it is invalid to call +.Fn pmap_kextract +with the address of a malloc'd object while there is a possibility for that +object to be freed concurrently. +.Pp +Unlike +.Xr pmap_extract 9 , +.Fn pmap_kextract +is safe to be called from any context; it has no internal locking or sleep. .Pp .Fn vtophys is an alias for @@ -42,7 +54,7 @@ and behaves identically. .Sh RETURN VALUES The .Fn pmap_kextract -function returns the address of physical memory mapped at the kernel +function returns the physical address of memory mapped at the kernel virtual address .Fa va . .Pp From nobody Mon Nov 6 18:56:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLDF2jNQz4yg6l; Mon, 6 Nov 2023 18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLDF2HN2z4ctH; Mon, 6 Nov 2023 18: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=1699296989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vyXAmW4zFbpXyW06Kxcv22j4I7zwyF+k/QwfPg+67U=; b=g2ymLcYc6nqvN2DiHkg3GLMt4XPr7zzPD8aDnf5FmVzjf00BL6QVxNwiwXFO3WNb4AqSsn cfZ67bDR4xg/dnpluy5U93dzX86k5Hn4b3PIXbfAEpQex6em6ucy0uVfHl0yLeVP4X9xs8 1emaa4epRhnj/ZBjLtKOjSweIM07/LjDTFWrZym83HgJPunkwLbSZtgW7c7rM8B5H6nR5o 6ouPsoQ35bm6bNVe4By2YwKJ9bpLJN9yn8dBprcd/H4jwnnVYU21oxlHOwQjzYF12U7uo1 Q5gksPTn2kKNIh5AoGd4/cJvT6GBRHmNk8CQajUVEmj4NtLnzsG+k431wPJzaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699296989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vyXAmW4zFbpXyW06Kxcv22j4I7zwyF+k/QwfPg+67U=; b=e2Ik/Wwk3ObUHll5L1/mamuKgH/bKqj9b0lDZ1ivPDfjfOEslD0C8POtfqwUsMeDZhFyQN p78zb6HQpnrus5Z/BjQXUkGArj84UpAjChc3+LAlkHQ4ysr9QYoDnCHv/GPNcNcL3D+EVL +E1m26FRVFB/nuSMMUT19DTzRlMt0P3Lb4a+V6lLP8+8tSFLDHPsz9mZTIVU5LenkF8tYt yExTXJtv0FrOnbCks4r9fsi1LZvppYdnxMQw1bI8Jov3N9cwEmQtyNl/IOiS0pBSOf0siy 0SwNaJP13MWYlXoXi1vNhLj7PJN0IG4eNdW5dBJ5LtF/xHhVCUYZhtuL+fmOkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699296989; a=rsa-sha256; cv=none; b=f/zAkEzYc72zKMlaU/PKDZbXQj21gZBnbXBIo3IujZFEVMp/UJtqtEf5TzsBGD86Xou24s FfYDxcYADEnJ3U29u8w8+yMwcs482ZBbmY/QV9FrNSbcMUaXvO1eX9AWOtkorH5v91r/G2 G8EPdELYSfK+ffLZ+vmyBPbRe7C/1iEZ+BrsvEbo8Ih3P9EkV+93y2dpf6CIq1p/PkdDHN 0pYYU5gPKtkOR7Wc9/FYgiCFXh7fVaK1MTFHA4RYGd5mENj/QtTY/rDv1VqABQCFIxXmxM z3DoqMLg3ZhpPU7neXeCGRygjPClLAIHCcQsyyY6YrROJMx+o83FMnX2vM5A4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLDF1DKtz4Gm; Mon, 6 Nov 2023 18:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6IuTFv076021; Mon, 6 Nov 2023 18:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6IuTp6076018; Mon, 6 Nov 2023 18:56:29 GMT (envelope-from git) Date: Mon, 6 Nov 2023 18:56:29 GMT Message-Id: <202311061856.3A6IuTp6076018@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: fd9a4a67d053 - main - cam: Minor opt_cam.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: fd9a4a67d053a51349ba6eba5ea61a7cd2cf20af Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd9a4a67d053a51349ba6eba5ea61a7cd2cf20af commit fd9a4a67d053a51349ba6eba5ea61a7cd2cf20af Author: Warner Losh AuthorDate: 2023-11-06 17:47:15 +0000 Commit: Warner Losh CommitDate: 2023-11-06 17:47:15 +0000 cam: Minor opt_cam.h cleanup sys/cam/cam.h includes opt_cam.h, so none of the clients need to do this. cam.h does all the right dancing to conditionally include opt_cam.h only when it makes sense. It generally only matters when cam_debug.h is included (it must be included before that). Many of the stray opt_cam.h includes were after cam_debug.h which would be a problem were it not included in cam/cam.h. The other users of CAM options that aren't debug all already include cam/cam.h. Also trim unneeded sys/cdefs.h files from the files touched. Sponsored by: Netflix --- sys/cam/ata/ata_xpt.c | 2 -- sys/cam/cam_compat.c | 2 -- sys/cam/cam_iosched.c | 3 --- sys/cam/cam_xpt.c | 2 -- sys/cam/mmc/mmc_xpt.c | 2 -- sys/cam/nvme/nvme_xpt.c | 2 -- sys/cam/scsi/scsi_xpt.c | 2 -- sys/dev/nvme/nvme_ctrlr.c | 2 -- sys/dev/sdio/sdiob.c | 3 --- 9 files changed, 20 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index feece601a6a9..1b759f55ee8a 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -59,7 +58,6 @@ #include #include #include /* for xpt_print below */ -#include "opt_cam.h" struct ata_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/cam/cam_compat.c b/sys/cam/cam_compat.c index c377763fc7c5..d95a11e80c2e 100644 --- a/sys/cam/cam_compat.c +++ b/sys/cam/cam_compat.c @@ -50,8 +50,6 @@ #include -#include "opt_cam.h" - static int cam_compat_handle_0x17(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td, d_ioctl_t *cbfnp); static int cam_compat_handle_0x18(struct cdev *dev, u_long cmd, caddr_t addr, diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 739fe34ef184..b83ab9699425 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -27,12 +27,9 @@ * SUCH DAMAGE. */ -#include "opt_cam.h" #include "opt_ddb.h" -#include #include - #include #include #include diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index a1dec7a8a674..dc423991fd58 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -71,8 +71,6 @@ #include /* for xpt_print below */ -#include "opt_cam.h" - /* Wild guess based on not wanting to grow the stack too much */ #define XPT_PRINT_MAXLEN 512 #ifdef PRINTF_BUFR_SIZE diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index 41b3f5146530..c8b57c2d8d86 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -61,7 +60,6 @@ #include /* for xpt_print below */ #include /* for PRIu64 */ -#include "opt_cam.h" FEATURE(mmccam, "CAM-based MMC/SD/SDIO stack"); diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index 54dc81cfef7e..8b9fbcd21291 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -27,7 +27,6 @@ * derived from ata_xpt.c: Copyright (c) 2009 Alexander Motin */ -#include #include #include #include @@ -59,7 +58,6 @@ #include #include #include /* for xpt_print below */ -#include "opt_cam.h" struct nvme_quirk_entry { u_int quirks; diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 9e936330fb27..42f290765c53 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -61,7 +60,6 @@ #include #include #include /* for xpt_print below */ -#include "opt_cam.h" struct scsi_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index b72359a061da..5d72f707d3b1 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include -#include "opt_cam.h" #include "opt_nvme.h" #include diff --git a/sys/dev/sdio/sdiob.c b/sys/dev/sdio/sdiob.c index e60e8759599f..60389c419e35 100644 --- a/sys/dev/sdio/sdiob.c +++ b/sys/dev/sdio/sdiob.c @@ -62,9 +62,6 @@ * messages from MMCCAM to newbus and back. */ -#include -#include "opt_cam.h" - #include #include #include From nobody Mon Nov 6 19:07:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLSz1d8cz4yjDx; Mon, 6 Nov 2023 19:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLSz16zNz4f9b; Mon, 6 Nov 2023 19:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sEH9EHHyNyyhBjn+5YE+izumZvHDH67qcRy17z8+kE8=; b=Z0nIXA4QSevQapqTTuCKMpgeGD55V+q9utC7v+bVHd6lJR7+PifR2pabX4rgBTSVpgOtG3 Y6UQHUmwP85lKpS2ONsosPt1S+aU31lqaQsXWfeGXZGP6gCF0UWEqH0qXmZ3Pxbuleg2bv rXXqmhrE3YBiVZ2Do1c/U9cJt6J+Ag1FVrR55J9vLPoH7VbQva7kQVtf5EjR5qpQSHdpMF xrHbVyjgXdng9OjK8wwED+VokI8e4rvHMrZK9uVOASIg0U12a7sFwYXNZPb+NrFFc+S+v5 XU/a7KLYGDdkaps4dq3ijGyCfLSEFzUYbnxhtfu7f1H/Z2EK66KosEXGVdKVng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sEH9EHHyNyyhBjn+5YE+izumZvHDH67qcRy17z8+kE8=; b=CH1gjPK1P4nWQydVBkY7ugbkSuHEomYET2wFMJsahUOAeEmRJD0PhZ410hzpEtSLlcfeMh USwwp2vi5eYJYFca8FFoGXoAm/Xa70pEDJPLwjqi5euVUdWenCjkaRydJd//kkyMCtlOua dxfUASfnp7WYSwtdhDMKRkafmkEb8buoDr/kNY/Z5FBMURnnO1Xa3amDpWAeaPHDIstWwW DVx05E85DSz7K2081ZleQxH9/rvLKhwOV4POIOeiv73xNKj7NumtYg1ItEEmOvBPq9nxs1 8b1rLE58o6jqTFpI72ny3c7wgwFC2vCUIBu7kNxPtJLJB6ZSIJxQfUi9lD6LEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297651; a=rsa-sha256; cv=none; b=XD6KstA9RPbnBMhYmxumr8U+VQksSQQXO6FUmeRCm5yN0kNARF4a4QErpoaf/2SLdth77p JY2fd94RZZoI2BKkWapGnM7j9WEHCydTXiIU9COUyov1H7VNAx/x8O1z9uYWMr3Q7+eeVR j5W3bVfdfLyC7M4WhTzcSdtnS2ueooOYYKwSLd0L13EMJ/O7xCtwozdyVv+VXiDoVPYKy7 RkAZtXuW5NktO5WcqSacwlVjnpWAxRyVEK684Jfiv41FW7FhEzkKSpyzzk+UI0orl3WaXE +AEqPx1zjLl9bCgjMm16k2/Cw1ZO9I4FAe2ctzF/57JdxqPOnQ1EA/CiKSv4Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLSz0BYdz4RJ; Mon, 6 Nov 2023 19:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6J7U5t094213; Mon, 6 Nov 2023 19:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6J7U5g094210; Mon, 6 Nov 2023 19:07:30 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:07:30 GMT Message-Id: <202311061907.3A6J7U5g094210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: be5a2c70b1c8 - main - rtadvd: Remove return statement at the end of void functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be5a2c70b1c8c243a9c22e16d60335b56c9983ee Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=be5a2c70b1c8c243a9c22e16d60335b56c9983ee commit be5a2c70b1c8c243a9c22e16d60335b56c9983ee Author: Elyes Haouas AuthorDate: 2023-11-03 17:44:50 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 19:07:10 +0000 rtadvd: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas --- usr.sbin/rtadvd/config.c | 1 - usr.sbin/rtadvd/if.c | 2 -- usr.sbin/rtadvd/rrenum.c | 3 --- usr.sbin/rtadvd/rtadvd.c | 10 ---------- usr.sbin/rtadvd/timer.c | 4 ---- 5 files changed, 20 deletions(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index a264858edaf7..bd990c58b36a 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1548,5 +1548,4 @@ make_packet(struct rainfo *rai) syslog(LOG_DEBUG, "<%s>: nd_opt_dnssl_len = %d", __func__, ndopt_dnssl->nd_opt_dnssl_len); } - return; } diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index ead273bbcdd2..6212639ba028 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -143,8 +143,6 @@ lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt) __func__, sdl->sdl_type); exit(1); } - - return; } int diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c index 0d0d7d5bf708..d148d5d20885 100644 --- a/usr.sbin/rtadvd/rrenum.c +++ b/usr.sbin/rtadvd/rrenum.c @@ -431,7 +431,6 @@ rr_command_input(int len, struct icmp6_router_renum *rr, failed: syslog(LOG_ERR, "<%s> received RR was invalid", __func__); - return; } void @@ -499,6 +498,4 @@ rr_input(int len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi, break; } - - return; } diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 181b1211d7af..aa9038b65e63 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -704,8 +704,6 @@ rtmsg_input(struct sockinfo *s) set_short_delay(ifi); } } - - return; } void @@ -897,8 +895,6 @@ rtadvd_input(struct sockinfo *s) syslog(LOG_ERR, "invalid icmp type(%d)", icp->icmp6_type); return; } - - return; } static void @@ -990,7 +986,6 @@ rs_input(int len, struct nd_router_solicit *rs, done: free_ndopts(&ndopts); - return; } static void @@ -1220,7 +1215,6 @@ ra_input(int len, struct nd_router_advert *nra, done: free_ndopts(&ndopts); - return; } static uint32_t @@ -1612,8 +1606,6 @@ sock_open(struct sockinfo *s) sndmhdr.msg_iovlen = 1; sndmhdr.msg_control = (caddr_t)sndcmsgbuf; sndmhdr.msg_controllen = sndcmsgbuflen; - - return; } /* open a routing socket to watch the routing table */ @@ -1915,6 +1907,4 @@ ra_timer_update(void *arg, struct timespec *tm) "<%s> RA timer on %s is set to %ld:%ld", __func__, ifi->ifi_ifname, (long int)tm->tv_sec, (long int)tm->tv_nsec / 1000); - - return; } diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c index 0e0cdd277071..a73bf6f94d29 100644 --- a/usr.sbin/rtadvd/timer.c +++ b/usr.sbin/rtadvd/timer.c @@ -99,8 +99,6 @@ rtadvd_update_timeout_handler(void) break; } } - - return; } struct rtadvd_timer * @@ -195,6 +193,4 @@ rtadvd_set_timer(struct timespec *tm, struct rtadvd_timer *rat) /* update the next expiration time */ if (TS_CMP(&rat->rat_tm, &tm_max, <)) tm_max = rat->rat_tm; - - return; } From nobody Mon Nov 6 19:07:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLT02yqvz4yjF3; Mon, 6 Nov 2023 19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLT028Jkz4fMw; Mon, 6 Nov 2023 19: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=1699297652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjUqCWhzetgu5XT4ydUMmXUVnoz3/3tE0oWACqzfGW0=; b=hFGmLPTamwZVMLvK4y+V345XRho45BuPT2HqO3Hcl10ahaGGZP46fKEY5kBdLZ35JJw3at zrrQn1h2c/M/snKU7Z8bYLTKpCauwKPxKeZY1+zMo3YJhkeh4FuHEqU0HtMmSvmjbiQSoO S/FPiG23wn4JZHdilbX0ovTCbiNCGNS4kf8bMwz8sh+IOCRgJKGd6Mg9B85VtMLhg1A03A zb8IrX+9Z4t/z6UhRGHxIFQFygZsTRdcm5wYEC+vLQWdxwa4hKB1Ed6yjBH7EDorDpZIQo GoqN0KnJ4NkcyMXgVlDWuQhBtOGjfHom9yk6w0nlfCF9815FHnkscNVW8d2tUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjUqCWhzetgu5XT4ydUMmXUVnoz3/3tE0oWACqzfGW0=; b=YF8GsLvlE4aXAD/FArJBPhxK3MaDo9mtpA8Oggvqdg0TdviRtO7VdAOG4XIEsozDbhg6JS wp2+G3lBtl0ZrE5QC88Vd/ulswuOvX8WpYnTHgHioWwVuEP5JnKUalGui2KNvkJt8jW7VA o/VEoA56EfRVgI6wfqnU0RmeNF0VOI3oCWU8iyrNyoXzhJdC7TsDFC0MiRY6eAOmSoqVLE X5YS4mUwGf7LeEHvyCglNUtwj/7uxHF1ri/mHoJdOC1BCNPFLsJbLybKOMhJvguWav1ymg YGmvyXc0ZN4QIiwrphmBO9SL9eqvXefS+2QnDCw9XNeRKuDJmfCwqyvjinQuJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297652; a=rsa-sha256; cv=none; b=QYtg9S1pgUSRWt6xWmDCN/W9WVINxJMaDTKhPqjAaiXNKA+kXV7N8OmC+TH6oSrRf9wLuM EwmulKIIQIsar1iIGZczoG9tpqj5luwiC6lNpMfuCU61V3gRu5sAxwG3bhRSBqVndFs1cN LLbhd/Rngo571dlPXyYUQb87oOj+n2GUfHiy8URoFH2jzdRyY9CLvjmagGfgjB6vo4fxNC TcOhyKLKC13pKCIrcb/QkhbmlikW7CAZQfdCCzTcinFQE3m87xafjPVO2WBodECxaXjuUy B73deehJUNvgEQm05cs9QTzK9dxy6CqmKz+kbFT7PGAJw0iR56lfnF5thaOkRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLT00zl2z4XC; Mon, 6 Nov 2023 19:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6J7WZO094270; Mon, 6 Nov 2023 19:07:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6J7WtK094267; Mon, 6 Nov 2023 19:07:32 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:07:32 GMT Message-Id: <202311061907.3A6J7WtK094267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: e9e666f7de0f - main - keyserv: Remove return statement at the end of void functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9e666f7de0fe9a18d2299a61c2f4d6ce9187bd1 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e9e666f7de0fe9a18d2299a61c2f4d6ce9187bd1 commit e9e666f7de0fe9a18d2299a61c2f4d6ce9187bd1 Author: Elyes Haouas AuthorDate: 2023-11-03 17:45:55 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 19:07:10 +0000 keyserv: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas --- usr.sbin/keyserv/crypt_server.c | 2 -- usr.sbin/keyserv/keyserv.c | 1 - 2 files changed, 3 deletions(-) diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c index 04290326cf3b..99ce8b8bf1af 100644 --- a/usr.sbin/keyserv/crypt_server.c +++ b/usr.sbin/keyserv/crypt_server.c @@ -196,8 +196,6 @@ void load_des(int warn, char *libpath) printf ("Using %s shared object.\n", dlpath); } } - - return; } desresp * diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c index bc219e886020..cd27c66965b1 100644 --- a/usr.sbin/keyserv/keyserv.c +++ b/usr.sbin/keyserv/keyserv.c @@ -704,7 +704,6 @@ keyprogram(struct svc_req *rqstp, SVCXPRT *transp) "unable to free arguments\n"); exit(1); } - return; } static int From nobody Mon Nov 6 19:07:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLT14Kp0z4yjFF; Mon, 6 Nov 2023 19:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLT13T0Vz4fHJ; Mon, 6 Nov 2023 19:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UbJ6TVro53MDsz3O+Ge9RfmzlFx9rMWTeDjPFDWrbTo=; b=Dzu33N+Bjs0QJEN7PfuPdfNQbg5+dee9++Ca7aKYBIoX1r8IAX+GELOJVGBAmNOCtVKpvZ w0ugeh+P+aUZUOrXB6JoJEEhqCD7b2+r6zFylAlWAv9yvihzDUNfJWU+svwimq0XF2yxwU YqlPLPBVltzAJhgYVHKV+9igPluqZ4F9Tw1ocJRfzA05XQgOJsKSHEH9jMQDViT9DrxNWY lwEXQKg1Y1wWZ1labiDGctVv9IkIIJqt9zjmoR6Ef+c6CT6D8fSjlEiY8oZTGSE215+MiT MSbR0Ix02IJFS86NR5Ig3CKC9clPFTHt0P6c+HiWt4LQZeFp4Mlz3C2tTvf20g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UbJ6TVro53MDsz3O+Ge9RfmzlFx9rMWTeDjPFDWrbTo=; b=KLeeTv3NN0UWHZCYXUXGBqP4dU+VZnGkLrCF8kyDmQGffEympL71BNivsQ+Ojl1WMDCaV1 B4mI6oqm9N/9hlin4wrsA0gA+zY+F9T/vO5n+UPOvjdZfcOBpveVMa1sgYraOWBBRuaebo A0y2X5jRd8Z87SfxANETS2kFrGADNUU5ZMV1yIUv8Lj2NT12YqshCV4+YNYQVJve9jYdHN ncFW1Uf1SpVFmO20HMDd+7deNp7NVWtRVZrng4D7Wid0rnOu/OaiF/oAaSh3ez/vn7324/ dFLOVEXGdLLrOShUkZUyapx+l+RZmxiGynOsRmNblA++5i8AeJmTRiyS9OSqIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297653; a=rsa-sha256; cv=none; b=nUlXLIQ0MRPNei7qYj0PxZx2UqLKv6Oeic3/K8xofE57vLq6ZuuxJlVExh5UIgKYEQmUGp sGEpiwxk9QMPG+7FXDArJJuKPgSZ+PTR8NxrAeHponSyvOId3oHqEocIaT2JVBJx3/m5Ga cOB0/xy4WEL9JNIGc7/z29UH5BbOv/D/hiC/t/um+eyR1423nD+l+jvrT1ilq+R820nH/Y ff7+RtCG6E5TVUiov+b7+3ccmjt0edbl+U3EbZmzJnWpT3+31bVoTXaBJoazIf9SmIINoN p/mVjJwcaLBcNKhD8o7cJnC7XqCZkI8UveaAe72716TEtFZqW4UzbfdXBsbJfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLT1254Qz45n; Mon, 6 Nov 2023 19:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6J7Xca094327; Mon, 6 Nov 2023 19:07:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6J7XH6094324; Mon, 6 Nov 2023 19:07:33 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:07:33 GMT Message-Id: <202311061907.3A6J7XH6094324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: b5ebd8bb4e90 - main - ypserv: Remove return statement at the end of void functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5ebd8bb4e90b810c834aabb78c87054ab84db8e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ebd8bb4e90b810c834aabb78c87054ab84db8e commit b5ebd8bb4e90b810c834aabb78c87054ab84db8e Author: Elyes Haouas AuthorDate: 2023-11-03 17:46:16 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 19:07:10 +0000 ypserv: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas --- usr.sbin/ypserv/yp_dblookup.c | 6 ------ usr.sbin/ypserv/yp_dnslookup.c | 6 ------ usr.sbin/ypserv/yp_main.c | 1 - usr.sbin/ypserv/yp_server.c | 2 -- 4 files changed, 15 deletions(-) diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c index ee3a4c2e9d98..c0aefb048cb9 100644 --- a/usr.sbin/ypserv/yp_dblookup.c +++ b/usr.sbin/ypserv/yp_dblookup.c @@ -91,7 +91,6 @@ void yp_init_dbs(void) { TAILQ_INIT(&qhead); - return; } /* @@ -153,8 +152,6 @@ yp_free_qent(struct circleq_entry *q) */ free(q); q = NULL; - - return; } /* @@ -171,8 +168,6 @@ yp_flush(void) TAILQ_REMOVE(&qhead, qptr, links); yp_free_qent(qptr); numdbs--; - - return; } /* @@ -190,7 +185,6 @@ yp_flush_all(void) } numdbs = 0; - return; } static char *inter_string = "YP_INTERDOMAIN"; diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c index b1dc712c35ff..699c4d7e8018 100644 --- a/usr.sbin/ypserv/yp_dnslookup.c +++ b/usr.sbin/ypserv/yp_dnslookup.c @@ -306,8 +306,6 @@ yp_send_dns_reply(struct circleq_dnsentry *q, char *buf) if (q->prot_type == SOCK_DGRAM) svcudp_set_xid(q->xprt, xid); q->xprt->xp_raddr = client_addr; - - return; } /* @@ -334,8 +332,6 @@ yp_prune_dnsq(void) if (pending < 0) pending = 0; - - return; } /* @@ -403,8 +399,6 @@ yp_run_dnsq(void) /* Decrement TTLs on other entries while we're here. */ yp_prune_dnsq(); - - return; } /* diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c index dac006d4bc28..d326603a9229 100644 --- a/usr.sbin/ypserv/yp_main.c +++ b/usr.sbin/ypserv/yp_main.c @@ -209,7 +209,6 @@ reaper(int sig) exit(0); } errno = saved_errno; - return; } static void diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c index 8bfff7355a16..62e45e35cbe1 100644 --- a/usr.sbin/ypserv/yp_server.c +++ b/usr.sbin/ypserv/yp_server.c @@ -305,7 +305,6 @@ ypxfr_callback(ypxfrstat rval, struct sockaddr_in *addr, unsigned int transid, } clnt_destroy(clnt); - return; } #define YPXFR_RETURN(CODE) \ @@ -673,7 +672,6 @@ static void yp_maplist_free(struct ypmaplist *yp_maplist) free(yp_maplist); yp_maplist = next; } - return; } static struct ypmaplist * From nobody Mon Nov 6 19:07:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLT24fnLz4yj1w; Mon, 6 Nov 2023 19:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLT23tRXz4fHy; Mon, 6 Nov 2023 19:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=732lyK+e61Nuo79jB4/J3+Lq50oXTQQvKPApi/GiWQY=; b=LmkXto4tXVZziMpQwChKUg9bx2ULQFGh4bPNvNGUaXGqa4QsFO4gDl4AtSKYeWCxb/4t2W lXgQAeiSsi5OrqBCIoN63cjK4j6mfVmXQYd0S6hmQezZbqY9V92hWU7uYQNAfvauvQVzmv D2bc2M0fA2Od5w6XdcVxCdyletYndjKtQ4UgApnkprMxc5xQFRbuMzqpAs2gb0ekPx2cZn 3Vma3SBBFp2vF7ffAbjDKLmZ1rmk62R8NVQsKDBRrvegczmu9RBizu8UVR536xBigu1TdR ie34y0WkN+lRR2ZYh2akdfalxIPAVgAMkd+HZa7CC09vX6JzUkrrp8O+koWw3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=732lyK+e61Nuo79jB4/J3+Lq50oXTQQvKPApi/GiWQY=; b=xESJ05d9aHYJnGFVwNsAPCFLOweqTeQ2SE9ao92IhLT1UgogJ9otsAvt9nRAvpWR8htRpp gXgDvYI3CNGLsqEtEeozTupI9/tNQIXHzLoq64QaAOfN88YP/AJ79VNrjwYoFL93Bssmqp ysn4yOc4zc/NvKR6NZwPp6x9Z8xxNOc12k3Xb5KiTf/S6Gt20Zbg5lXE86g5gcn4HdbrVN RgoxUJ7plHwmzZX245plG8FaNtKidgLRWmpJhoypZ91TOdSCX25oypoILEpT/4Pe8/eQAi aOgB6j1O2YQFiAM6CMqSxGYMEMwVES2zWxw3IH65qk9dIuhxW4U+Gnlw7izQ5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297654; a=rsa-sha256; cv=none; b=YcUBpEJ8J8o1fsU1biDj6DlLuopBrbfT/lbHCJKIiJJWSEqcJH9A3dSw9JPqCdyichVNFs 9+npre2defwU98x267/TLpbz/N9obc4KH0beojnF9RghEv6Jk39SexNnYbgZ3AORIrgcKe Dhwz4p7/IbT+oQOGG++lWMHJVvbTleswJ983ret/00+A9IcjgaQBlEIskNJ58uj7JLSqdI MfEkGxQD2nU6pUiaw7TdA+jwfPgqUTzYh0WtgmHL+uyeglnz1/ATbDI5xvn6NXFhtWS14K kaWMEJofpYng1AM4wnyMjw8/WEuFgKc77QbH1WqoNg6R1feJX7XKW/qAZoQ/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 4SPLT22yVQz45p; Mon, 6 Nov 2023 19:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6J7Y8C094386; Mon, 6 Nov 2023 19:07:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6J7YTc094382; Mon, 6 Nov 2023 19:07:34 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:07:34 GMT Message-Id: <202311061907.3A6J7YTc094382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 6e90567dde1d - main - rpc.ypxfrd: Remove return statement at the end of void functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e90567dde1d8692e9e631f8b0939029e9c63cb5 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6e90567dde1d8692e9e631f8b0939029e9c63cb5 commit 6e90567dde1d8692e9e631f8b0939029e9c63cb5 Author: Elyes Haouas AuthorDate: 2023-11-03 17:46:38 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 19:07:10 +0000 rpc.ypxfrd: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas --- usr.sbin/rpc.ypxfrd/ypxfrd_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c index be24b8d7dff1..5498535930f1 100644 --- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c +++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c @@ -182,7 +182,6 @@ static void reaper(int sig) } errno = saved_errno; - return; } void From nobody Mon Nov 6 19:07:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLT40PW9z4yj6X; Mon, 6 Nov 2023 19:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLT356rVz4fTR; Mon, 6 Nov 2023 19:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsQhcUyl7U7N2dTrhQBnatye1U9I00elUlGtXe+QesY=; b=DPUmgMwPuLoVRMjzwvwOSSNm1cRUpyONnrvBwT09V25EK5nA42LKZxSBsw6D6ZAs0qpxzk 05zFMieJffl+JMi0Ujpm9iFAMAxeBa4IiaVo4XVzpWtZSTMYxxSvzu9jFi+i23jpOU6F8m wYFl4L9o64y0DXfGbDngpjGM24WaeEucc/bpBazZapZOizVwyT4F5Wny6d7reWT0wH7FO2 NIr3squ50gMCfGu75kTlQ7uovmnV749bl72L/wnBl3oDcsqUg5Rg22EleM8nCVhPbLDJeB QHYUEKrftLLRpZfZKyWMUCp8zGNgjV3CRVTkdhciKXl/bPp1Qc2ngWpokFWoZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsQhcUyl7U7N2dTrhQBnatye1U9I00elUlGtXe+QesY=; b=bM4l3soKFUkA3hE3wkqq2boUHoRqfgU02JOfOS6ahh2l9qLix8hknAUVycLvlvjLi3ICy1 tlZmcAera4OZaczwaY7+O97PGKmRN5js5+BTa/sMmbrxtyZ+suroml5GylaRz+/mnaLFK4 aJjlbLKXScfVr7llA5UHCnH9ihDHUodrwSPbXaqt26siEp5//BxgH5pQN7+9wUDKXadi0z ULdIYExvBjn9zOIzXbihmK/fujkMWd8Ps8bdcAgb4Pt7imxhF4tyKHeEmnU7dzgHJP0Nel br8X4jQHWi8GNr3Aq8xg2/C2hgsH9SHoH/nElhvlfKzlvZvynu0sGI+3L1yFLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297655; a=rsa-sha256; cv=none; b=v1tSPMwCT9/40wFHCfhmpCDXDRmxBpuEk5Fl/7/DLqZSoR73EgC0JyR25NSJaXxn3/1t9k pEL2YycFDw+GoOAUqs5BT2W0L5gDD2Q92Y2SGIpqCwD2rAyyTt8LfUu3k6uX9VUTI4jcMf RAYzt1wQRGRMIa7EHYGqtAjDLsIuT3gZIW8Icxq/jPQ2JRH8Uo/usArX+TtXnCNFvS1w15 yDuXFJHK23ASOP1sZDLF2zJXTzL3Hbu1XBZ51Y6mCcipBbf6aBdNcyAVPUnQM2sTLfuNUX gXRhBTdY0umU4n79WDklybn0CG4OVl8GF2T5d5XtRbJxep2k9HfcjJoAJCZsPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLT34Dx1z4RK; Mon, 6 Nov 2023 19:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6J7Zi6094448; Mon, 6 Nov 2023 19:07:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6J7Zix094445; Mon, 6 Nov 2023 19:07:35 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:07:35 GMT Message-Id: <202311061907.3A6J7Zix094445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 29ca15158677 - main - rpcbind: Remove return statement at the end of void functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29ca15158677e5b142542d9db18bf7429b40b020 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=29ca15158677e5b142542d9db18bf7429b40b020 commit 29ca15158677e5b142542d9db18bf7429b40b020 Author: Elyes Haouas AuthorDate: 2023-11-03 17:47:01 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 19:07:10 +0000 rpcbind: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas --- usr.sbin/rpcbind/rpcb_stat.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usr.sbin/rpcbind/rpcb_stat.c b/usr.sbin/rpcbind/rpcb_stat.c index 296fb8206c21..86bb21d91e9f 100644 --- a/usr.sbin/rpcbind/rpcb_stat.c +++ b/usr.sbin/rpcbind/rpcb_stat.c @@ -79,7 +79,6 @@ rpcbs_procinfo(rpcvers_t rtype, rpcproc_t proc) default: return; } inf[rtype].info[proc]++; - return; } void @@ -88,7 +87,6 @@ rpcbs_set(rpcvers_t rtype, bool_t success) if ((rtype >= RPCBVERS_STAT) || (success == FALSE)) return; inf[rtype].setinfo++; - return; } void @@ -97,7 +95,6 @@ rpcbs_unset(rpcvers_t rtype, bool_t success) if ((rtype >= RPCBVERS_STAT) || (success == FALSE)) return; inf[rtype].unsetinfo++; - return; } void @@ -194,7 +191,6 @@ rpcbs_rmtcall(rpcvers_t rtype, rpcproc_t rpcbproc, rpcprog_t prog, rl->indirect = 1; rl->next = inf[rtype].rmtinfo; inf[rtype].rmtinfo = rl; - return; } void * From nobody Mon Nov 6 19:07:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLT500TQz4yj4J; Mon, 6 Nov 2023 19:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLT46CRmz4fG6; Mon, 6 Nov 2023 19:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkfMoS4oexIYPwTVXA+tOtzY8hh6NtkH8T2e8ZnPZPU=; b=MOSZ1f3Rc/NhgUl3KfcqEU29AyJVbBsuyxZ8jiuOro6reUKJu/puPjzQB0PLtwW/DzGGQw LfhCY1M1BaKRpo7TkQdojIlMgxl1NL2DgZGPXOuae2HgK2e2EU97DkmYXRrU4c1AoQTmwz qrvp55t0jMSAW/S2T70HS1Gf7vKHXc2bAwGhrue2tRPNbGChH/w2joOuHewJGO94LYkIo4 +GSKqjqhrk2yG/GoLrjTW2uDqvl2PeVS4QIW/veR0d+dpjVEtqlsGIjM7DTi/7zZyDyVD8 egEKAjrGG8qB2fP8leijlrU4AgkDSV7jpFUOQ8j7uy5c7pGQ6sCfBLTGEiNziA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkfMoS4oexIYPwTVXA+tOtzY8hh6NtkH8T2e8ZnPZPU=; b=HQbWCapHFfyvtcJuCqD0o+0M/8sTxvlWtHeU0QZF16uLvQx1aGSMZy5Gj7pH9wrdBff6Wp w3RFnUc4cJkRykBg4ZR8XlWoQP+JXRiOfFRh+YAYVCE1Ki4vfhIxdToIPzPzyUzG4F3Y3D V5JdH++1ND8cBwwoeLCP7VoF+H9CKOQjebLz6J46o07h7UAsmagZNpdw7FP+Monq8U6JLE p70TMjUX+/WsJihpNGh9t3EcqYoWFLGOcioFFAndVON5qk1ct4Scm7pMf4/MGNUB/JJ5E4 Q6isTCyvHNvThiOU41BX3osykR2It+LlrhQxSIfkT2ScP/1rc4RcNudjFnWIwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297656; a=rsa-sha256; cv=none; b=fsEV2xTCWFo+l60pk5NkePjFzXGqrOOGOyW4ivXew4H9fdOvXlYy2oenVi4y6SHP3gNsu9 xMmy7lZQcFE/+Ie+voVtRbLGhdIs4DWaIVRS5RrlK9Sc6BJfGlqsHIfw6IXrs6v5BfqgwG XCOgiji5yR5zrnXzdmGH0Id89RSwnD/GfC85943oNvbx8pIIEDXFNPDesJQmqZMmsVpVKr aTKPi+dnOY9kby8uUdNvysGb/M8mqkjqPeB9q3QrkhJ7l5mt0WGCyiGbTHlXvtnFz3LRwi p7/W68OzhyFYU/2s4x5eGls35oO/IZukhc28/a2ZOr9Vn/MBBnDAiTgO/WufVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLT45JFCz4Yd; Mon, 6 Nov 2023 19:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6J7a6Z094508; Mon, 6 Nov 2023 19:07:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6J7a8F094505; Mon, 6 Nov 2023 19:07:36 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:07:36 GMT Message-Id: <202311061907.3A6J7a8F094505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: e5f905c72a33 - main - yppush: Remove return statement at the end of void functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5f905c72a33007aac3b2061d6404b1d962cd5ba Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e5f905c72a33007aac3b2061d6404b1d962cd5ba commit e5f905c72a33007aac3b2061d6404b1d962cd5ba Author: Elyes Haouas AuthorDate: 2023-11-03 17:47:17 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 19:07:10 +0000 yppush: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas --- usr.sbin/yppush/yppush_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c index 15163bc6ba80..2b167846d1b6 100644 --- a/usr.sbin/yppush/yppush_main.c +++ b/usr.sbin/yppush/yppush_main.c @@ -215,7 +215,6 @@ static void handler(int sig) { yppush_exit (1); - return; } /* From nobody Mon Nov 6 19:11:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLYN2DXvz4yjxy; Mon, 6 Nov 2023 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLYN1n3qz3D1F; Mon, 6 Nov 2023 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2tVwCWnv+/RAJACA83Z3M8OIAw0Q2u5QLDFRJQ/1z7M=; b=E+SCQKKcXzT52S7N/gn1w3GxRJ5OIenbcD8402N/Z9Fl0YQBsqJTPGGWuTOnXkvJ9PpAzK q0zxg4rUhqJiPhGhKoIghEohihWXTCoFYA7uF30tv53SAdYO+q7JsLisqdtHivb2nzfgLc Ra7Qkl1nFNB5ecNtEMZe2zJl/+8oPsA57NP6ZD8+U+GEsi3e1z7DAdOUl5nO/O5h8GFZmD C+777vIDkUjh4L3JFPb+0rh++t7f9AWCVW4gE/JCJ0RpLKlR+IIX363wwH8xn8UlP7vTCX Yqk/6gkVPBm4vadvp188JGUE516CC7QWxmlRX3H6cS+NGzwQszkk5nQiUrQjiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2tVwCWnv+/RAJACA83Z3M8OIAw0Q2u5QLDFRJQ/1z7M=; b=PGKQGwoMqgXdDQqkfUWrxyba7Gr+zJUvFSnldNqTN+xiKaPCFOupVUTGUTyAESw3QjfjLe pkhxLj5E/g7CshlSqHGaDwRu9Wc/lioq54aZA4ND9iFkdle7Y6n0JMWjv503LNj4f2xPXH PHay65P0h0RlajCxTCNbCEdC7CAR1HLNDnFmc5F9chtZWDOcAvZ+e9JHHoHraw6a1MNIjY KLT8+1ZrMkxn9FZES0wWTprSGWuGHTR1E88SyGkAJp8zhQboEEJC8Uwfw3bRe9VCDy67CQ oHn504g/k2PHzDhUJ+OuICUHm5/ZIQ9Al8r53zLDeBxr6Y7nc+rITbbYMTCd3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297880; a=rsa-sha256; cv=none; b=boxUirzbWIin50ZZyYq1ojO+Rl69rpaHF0my/+V3DCXnaksdmHbRrh248eGKlLXnUKUmlf 1vzPCv54oIQbMX3brBBJU9asJok+edP2Nqy+CRkp3er/z+uMTzc09/L1a9vC5fyjpM9TVZ 0q9EMDd3zyJuGCPgEkAJmYmo0f5VQj97i67naE98vgZTJpmS5vEwjwh/e8tId/E0u+dLQb Egj3G+Ur4aD95nNRJYpoVRHZPSn3a1pXmoYb9SeSX8mjRefQla+YZ1JzrXJiRyz1PjLM0B Y7U2Ef+RTAVDXoVzxCjSN5scOOs5C/RpaBfLAZPRBDcYFZnN1k2LX0wY/B4hwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLYN0sLXz48h; Mon, 6 Nov 2023 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6JBKfl008195; Mon, 6 Nov 2023 19:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6JBKqJ008192; Mon, 6 Nov 2023 19:11:20 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:11:20 GMT Message-Id: <202311061911.3A6JBKqJ008192@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: 500196c5c705 - main - cam: Add nvme error devctl publishing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 500196c5c705f48e847ad8d568c7167fbef738b0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=500196c5c705f48e847ad8d568c7167fbef738b0 commit 500196c5c705f48e847ad8d568c7167fbef738b0 Author: Warner Losh AuthorDate: 2023-11-06 19:09:31 +0000 Commit: Warner Losh CommitDate: 2023-11-06 19:10:42 +0000 cam: Add nvme error devctl publishing Start reporting nvme errors from devices, like we report ata and scsi errors. Sponsored by: Netflix Reviewed by: mav, jhb Differential Revision: https://reviews.freebsd.org/D41086 --- sys/cam/cam_periph.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index ebdda9ef449f..101abda5db25 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -2172,19 +2172,49 @@ cam_periph_devctl_notify(union ccb *ccb) sbuf_printf(&sb, "\" "); type = "error"; break; + case CAM_NVME_STATUS_ERROR: + { + struct ccb_nvmeio *n = &ccb->nvmeio; + + sbuf_printf(&sb, "sc=\"%02x\" sct=\"%02x\" cdw0=\"%08x\" ", + NVME_STATUS_GET_SC(n->cpl.status), + NVME_STATUS_GET_SCT(n->cpl.status), n->cpl.cdw0); + type = "error"; + break; + } default: type = "error"; break; } - if (ccb->ccb_h.func_code == XPT_SCSI_IO) { + + switch (ccb->ccb_h.func_code) { + case XPT_SCSI_IO: sbuf_printf(&sb, "CDB=\""); scsi_cdb_sbuf(scsiio_cdb_ptr(&ccb->csio), &sb); sbuf_printf(&sb, "\" "); - } else if (ccb->ccb_h.func_code == XPT_ATA_IO) { + break; + case XPT_ATA_IO: sbuf_printf(&sb, "ACB=\""); ata_cmd_sbuf(&ccb->ataio.cmd, &sb); sbuf_printf(&sb, "\" "); + break; + case XPT_NVME_IO: + case XPT_NVME_ADMIN: + { + struct ccb_nvmeio *n = &ccb->nvmeio; + struct nvme_command *cmd = &n->cmd; + + // XXX Likely should be nvme_cmd_sbuf + sbuf_printf(&sb, "opc=\"%02x\" fuse=\"%02x\" cid=\"%04x\" " + "nsid=\"%08x\" cdw10=\"%08x\" cdw11=\"%08x\" cdw12=\"%08x\" " + "cdw13=\"%08x\" cdw14=\"%08x\" cdw15=\"%08x\" ", + cmd->opc, cmd->fuse, cmd->cid, cmd->nsid, cmd->cdw10, + cmd->cdw11, cmd->cdw12, cmd->cdw13, cmd->cdw14, cmd->cdw15); + break; + } + default: + break; } if (sbuf_finish(&sb) == 0) From nobody Mon Nov 6 19:19:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLkm1dzjz4ylX0; Mon, 6 Nov 2023 19:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLkm1Bhnz3Dtk; Mon, 6 Nov 2023 19:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699298368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9OZ8or32h6Ir0iMSxrZe4kRSKgbOSZv2WX5DRDP2JuY=; b=GX7uh/SiWJX1p61elendNH72pz0qT4jhteme2PH2CItsimkKeb/zwtw1Cz13GSOiEINNS4 hj5YWVNOf8+N87DArCtSo75/XnfC0oA7wf9oXhE4zktESVo+FevaRtZAme087++CHvnTNE 9qogPe9cgc+cjzMgBmDh+3SL31FJPuSaIjEJQ/5Ry1TQFMRBzqr8tOOTdTpC2iem+UFcpZ 6EI65pdMOKAdUZZyB8dluJOCYnImMGjZB2YNLuFv+ktR5HviTEAdc7HhJgpe40DAzHHXWV Mu8gZrP09dGvRsCStfTjJ93PaW9nWDtybLGdsZ9jnZyRgrAsSoUNe9fpsU8zbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699298368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9OZ8or32h6Ir0iMSxrZe4kRSKgbOSZv2WX5DRDP2JuY=; b=J7i2x3Z3lKKG4yItCCZx7EmeXarWTD4w7afKvBm/i7WXeql9wgV8M8GZFvCfGUziRPfJ57 kDVdyYKVijo9XPxwvQ8zCI18s9G8U4XUOJIEF+xQNMbrTTcQOYA4pRGwnFuXlRyostio9b 0Xpmmh8v7kiRMDlpBfo0aMI1OZ7etlO66aAbdDs7YWRSPgdPMnncM3ZAkfFsRBncRFtl7c 2nl5NWuK4/tHHkylBtI9PRUixWRuks4hg+/4LYfoaw2mCeSxr1xjvIYdHp+cNKp1MutFao vHnfqpFSmQWk+53tqKdp5zRI0/weySKPvgGndPtf/Rt3ORWNEx/i41nrDSbqNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699298368; a=rsa-sha256; cv=none; b=mu1GzxghilfmqLhfKfGNSYE5ZT8ymA44DbL6xulsaM185tdR7F+pukQVRo0tw7kuXYbVIP 2IsEKETJFuv9X8bhfyCd3a6Bl4grIsNZyvmFXvvu3glfC2hKCSt7P2oKMWym4uSN4crQfu KuDxK3qy9Co4tuUzFRIadeKhbG3vX6/cyKy3Ud4LCVPqiVKOXuMp/kKFnQYu1BWiPcxgCb Xjb5DDhDdb+MvkLelSi9RM9CCTtoiii4cc2UL1AElLZVeLsoXmpuZVFtczzxaRoFo02baR FYEQFX1qfwc9hPj7S0knzX9V0sFhWss+PcAQlDjKpN4xJ2FaQiAjJ8ytAlrWnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLkm080sz4kf; Mon, 6 Nov 2023 19:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6JJRTD011518; Mon, 6 Nov 2023 19:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6JJR43011515; Mon, 6 Nov 2023 19:19:27 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:19:27 GMT Message-Id: <202311061919.3A6JJR43011515@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: 765757c6301f - stable/14 - cap_net: correct capability name from addr2name to name2addr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 765757c6301fa41c0b59108347c600fbc9020c39 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=765757c6301fa41c0b59108347c600fbc9020c39 commit 765757c6301fa41c0b59108347c600fbc9020c39 Author: Mariusz Zaborski AuthorDate: 2023-10-23 21:03:51 +0000 Commit: Ed Maste CommitDate: 2023-11-06 19:19:04 +0000 cap_net: correct capability name from addr2name to name2addr Previously, while checking name2addr capabilities, we mistakenly used the addr2name set. This error could cause a process to inadvertently reset its limitations. Reported by: Shawn Webb (cherry picked from commit afd74c400075d94e01dd3430844bb290834660ef) --- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/tests/net_test.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index bbb2a666440f..a8f039f81843 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1232,7 +1232,7 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits, oldfunclimits = NULL; if (oldlimits != NULL) { oldfunclimits = dnvlist_get_nvlist(oldlimits, - LIMIT_NV_ADDR2NAME, NULL); + LIMIT_NV_NAME2ADDR, NULL); } cookie = NULL; diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index 5522f92516eb..dcb897de467b 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -783,6 +783,18 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); ATF_REQUIRE(cap_net_limit(limit) != 0); + /* Try to extend the limit. */ + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_0, NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + cap_close(capnet); } From nobody Mon Nov 6 19:20:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLlb2qwfz4ylbX; Mon, 6 Nov 2023 19:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLlb2HK4z3F6f; Mon, 6 Nov 2023 19:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699298411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iApXQzCZ28/5Ch/MgYkctyWMcM7ikzP03Lm7adwLZKA=; b=mFFOmkOiYKbxhC48SzUuJOtvJERzUXuIaFmETfxJEHEr+IF0TfnE/+a7/SgmvRgkUkGHab d5ICV5lzEOok8n9rBRNmG+WaZBppca/kshWNrhPmAYPop8vkoYT35AYRzE2/nAF3i3mbro yu3VLjQegrXljMKdJUsbOzYWLV4NTFwwhhz2bOPtUM+gBcvkkoiRKm5I1d8x0S6SxKHToR 3klaoewVk1SToEcqfOam4B2GmcaHpqp323S4Tzhv/mK5hLzLap6Pqmt54us/6Qg0jkBBBU Cn/0RdOEuwtgOuS20CSgo2F+0ch9Rg3aL76DutBYAMaxFipWDRjbjL3LzBw/lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699298411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iApXQzCZ28/5Ch/MgYkctyWMcM7ikzP03Lm7adwLZKA=; b=Jz9YOBC1XS6OfEMhKo5y9p2ff6FXJ7uVRUwiZ8RueYHrPKTYpPdQwiaAMhfAaGLJwwA6Hg BrLQAoL3ilAXUGFqA/mTRiWaf2kC/HrYLsDaGllTtUyPEWA+FojHCz2+8fElAqgAPqRt+X C7bI1ZgxOCsqHrVwR9iN0jJsYF5Z9XqJwAZwO8+FLIE8GifIV9edXxx00fj3cHWO6MFD8S DAKarwddW59HWSf9FAhdJJLjAbEw4AA4te+jFEGi+/OPJizmr1HCS9pwLhkvt4nzX9M6Fo ZPaUVMpTIM70pCL5c2V9JpXzYqUvDPE9Qk6WORPepp4NftAcBYKBwfMKMoE04g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699298411; a=rsa-sha256; cv=none; b=bP4n+JeE1Y6fmhoxJND4gqnaKCINYIHAvcjCeK+MQgcNx+A8dlDUBOu1BJJyoHbmJ1l2Tq 6MOm33ZmrSLBtdy6zMX0LN/ZwVsGAP04Qh6tER/rTqoqvQA7506HRlprWphq8doyUqUX6/ dQOl2NmKX6OkZ1roWb7noQdCPTqEF6NB0dUUBdmhHtAormm7C0O/2gf+EfemR2pB/yU3lu WbrACGX5jF+lLg2ZL9u+zWJLRNYIzbrYZdgtQc5rIYlSBHEkaXNX80brgcYMTAxX/A6WnF Ihu3GAgwd9jrmBskxWmPRQ9wA5fYthfYYcSnp2kCokmzCW6PtElCZ9hYG4O7rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLlb1NtQz4lX; Mon, 6 Nov 2023 19:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6JKBIw016263; Mon, 6 Nov 2023 19:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6JKBTR016255; Mon, 6 Nov 2023 19:20:11 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:20:11 GMT Message-Id: <202311061920.3A6JKBTR016255@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: 114c6d9bef76 - stable/13 - cap_net: correct capability name from addr2name to name2addr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 114c6d9bef765a47ebcb8e65d1c935cbcbe51002 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=114c6d9bef765a47ebcb8e65d1c935cbcbe51002 commit 114c6d9bef765a47ebcb8e65d1c935cbcbe51002 Author: Mariusz Zaborski AuthorDate: 2023-10-23 21:03:51 +0000 Commit: Ed Maste CommitDate: 2023-11-06 19:19:54 +0000 cap_net: correct capability name from addr2name to name2addr Previously, while checking name2addr capabilities, we mistakenly used the addr2name set. This error could cause a process to inadvertently reset its limitations. Reported by: Shawn Webb (cherry picked from commit afd74c400075d94e01dd3430844bb290834660ef) (cherry picked from commit 765757c6301fa41c0b59108347c600fbc9020c39) --- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/tests/net_test.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index 06fbc780bbce..c29bc36bf64c 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1232,7 +1232,7 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits, oldfunclimits = NULL; if (oldlimits != NULL) { oldfunclimits = dnvlist_get_nvlist(oldlimits, - LIMIT_NV_ADDR2NAME, NULL); + LIMIT_NV_NAME2ADDR, NULL); } cookie = NULL; diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index 989a98f3ae22..86d771fc97d7 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -742,6 +742,18 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); ATF_REQUIRE(cap_net_limit(limit) != 0); + /* Try to extend the limit. */ + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_0, NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + cap_close(capnet); } From nobody Mon Nov 6 19:21:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLnS0qnDz4ylcx; Mon, 6 Nov 2023 19:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLnS0dBvz3FST; Mon, 6 Nov 2023 19:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699298508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slmk/FvQn3t26nl7r+ygtMMVM2qgaRfNWe9UdW7OyEw=; b=NR0mlC2ZsvF36FvfmYAjnLOkBsu2pp3Mmh/xznw7IcMMshHtoMBDdeOb/rEc+74kIfNHU7 vhjHACNhQtlba42l18u/mabZrqsKORawwF7cPIWUzPIX/pyeYDISBx/3yBF1l3V/jnfntz D8trp0nXM7OTUQ11b6LLFSIdFG5jNxOxpejEOG++STEd4y8Um5QKRbHCh1mhoUi8fFhL+9 RGBPFGvuCB6gMz91W2qQ9fCFjdfD2puvt3aZhrY7oL9cnOi2k4DXj+U1VzPYDuOPawVYS2 2mpQfZJZiQBWGxsywh93qec2/9MtuW6z1qXsX918ZX/802wO0KCKBTlz766PiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699298508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slmk/FvQn3t26nl7r+ygtMMVM2qgaRfNWe9UdW7OyEw=; b=Kv8n+9gWcylzcSLsjYixIjkffRhJKRSY67lUH4vXWQimUViudIIBYK4OEFMtGcBOjqbdGx P2Q2sN0BS54su4uELN7dVEuLiA3eTBnNNh3NMk3YyzdamGBH6P39vfJq2bpP0cVINOOY4c eyzoo3unKjL76YBbUS0u+OKZD0EG9KwbwQj5CNhoD/llRszKcUe4rejpxzmg857fqd8Xn7 SdAcY9GVvh2EFMqgiKHhrTaSAZzzrvm90XQ3+uR3PjHCwQ+2hEtmJNGgXkBq9CFouucS1S Lwbw14wvOOknfSHhT1rhS9/GxWiCZC9SaFhrcNh7DvCbG36he3fxFyc+6PJeQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699298508; a=rsa-sha256; cv=none; b=P5NQ9hTXqYLOC8uLVUkiiGHJAGUG4nSJEvD5DjiTpSsFx2XwSOHJYSLBuPtRaHekS8d3dj Dd/KoYMcggXi6gA31oz0KYEAVAYRShbOyQ25emsIuK62Of9vv+THIXAwto5HhvqYbxtmyd Hx2x2jeLhRgPZuiAB6UJ3lg36fV2EDiEAYyyNEBMbm71PhWtLEuZOf5VA3ufS0HrmXlGqG ax1BBE6b2/1Zm98ZOUMmDEXpvuf/HRS33AnQM4WbfaruuHdro7Ea/tmhHl9Gza77TbrOGL oBXXfYMXsIQYJXV8w2zJa+AnDPIB6aEL7ybQdyjt2IZ5B6yjMdG83C71CX9frg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLnR6WkQz46l; Mon, 6 Nov 2023 19:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6JLl1P025711; Mon, 6 Nov 2023 19:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6JLl6C025706; Mon, 6 Nov 2023 19:21:47 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:21:47 GMT Message-Id: <202311061921.3A6JLl6C025706@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: 2ffd30f7ee15 - main - cam: Remove left-over sys/cdefs.h in sys/cam List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2ffd30f7ee15c87ee092cbac6a4438bcb3af923c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2ffd30f7ee15c87ee092cbac6a4438bcb3af923c commit 2ffd30f7ee15c87ee092cbac6a4438bcb3af923c Author: Warner Losh AuthorDate: 2023-11-06 19:20:23 +0000 Commit: Warner Losh CommitDate: 2023-11-06 19:20:23 +0000 cam: Remove left-over sys/cdefs.h in sys/cam These weren't removed when $FreeBSD$ was removed. They aren't needed and now are a style(9) nonconformity. Sponsored by: Netflix --- sys/cam/ata/ata_all.c | 1 - sys/cam/ata/ata_da.c | 1 - sys/cam/ata/ata_pmp.c | 1 - sys/cam/cam.c | 1 - sys/cam/cam.h | 1 - sys/cam/cam_ccb.h | 1 - sys/cam/cam_compat.c | 1 - sys/cam/cam_periph.c | 1 - sys/cam/cam_queue.c | 1 - sys/cam/cam_sim.c | 1 - sys/cam/cam_xpt.c | 1 - sys/cam/ctl/ctl.c | 1 - sys/cam/ctl/ctl_backend.c | 1 - sys/cam/ctl/ctl_backend_block.c | 1 - sys/cam/ctl/ctl_backend_ramdisk.c | 1 - sys/cam/ctl/ctl_cmd_table.c | 1 - sys/cam/ctl/ctl_error.c | 1 - sys/cam/ctl/ctl_frontend.c | 1 - sys/cam/ctl/ctl_frontend_cam_sim.c | 1 - sys/cam/ctl/ctl_frontend_ioctl.c | 1 - sys/cam/ctl/ctl_frontend_iscsi.c | 1 - sys/cam/ctl/ctl_ha.c | 1 - sys/cam/ctl/ctl_tpc.c | 1 - sys/cam/ctl/ctl_tpc_local.c | 1 - sys/cam/ctl/ctl_util.c | 1 - sys/cam/ctl/scsi_ctl.c | 1 - sys/cam/mmc/mmc_da.c | 1 - sys/cam/mmc/mmc_sim.c | 1 - sys/cam/nvme/nvme_all.c | 1 - sys/cam/nvme/nvme_da.c | 1 - sys/cam/scsi/scsi_all.c | 1 - sys/cam/scsi/scsi_all.h | 1 - sys/cam/scsi/scsi_cd.c | 1 - sys/cam/scsi/scsi_ch.c | 1 - sys/cam/scsi/scsi_ch.h | 1 - sys/cam/scsi/scsi_da.c | 1 - sys/cam/scsi/scsi_da.h | 1 - sys/cam/scsi/scsi_enc.c | 1 - sys/cam/scsi/scsi_enc_safte.c | 1 - sys/cam/scsi/scsi_enc_ses.c | 1 - sys/cam/scsi/scsi_pass.c | 1 - sys/cam/scsi/scsi_pt.c | 1 - sys/cam/scsi/scsi_sa.c | 1 - sys/cam/scsi/scsi_sa.h | 1 - sys/cam/scsi/scsi_sg.c | 1 - sys/cam/scsi/scsi_targ_bh.c | 1 - sys/cam/scsi/scsi_target.c | 1 - sys/cam/scsi/smp_all.c | 1 - 48 files changed, 48 deletions(-) diff --git a/sys/cam/ata/ata_all.c b/sys/cam/ata/ata_all.c index 7cc3d607f01d..aff7cafcdbad 100644 --- a/sys/cam/ata/ata_all.c +++ b/sys/cam/ata/ata_all.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #ifdef _KERNEL diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index d1ef28300666..db2dc3a23b34 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "opt_ada.h" #include diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c index d3f5c9cc0fed..51f60645a969 100644 --- a/sys/cam/ata/ata_pmp.c +++ b/sys/cam/ata/ata_pmp.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #ifdef _KERNEL diff --git a/sys/cam/cam.c b/sys/cam/cam.c index ef2bb4f5840d..09bef8ee3a83 100644 --- a/sys/cam/cam.c +++ b/sys/cam/cam.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #ifdef _KERNEL #include diff --git a/sys/cam/cam.h b/sys/cam/cam.h index 445540d07e3d..692f515aa1aa 100644 --- a/sys/cam/cam.h +++ b/sys/cam/cam.h @@ -35,7 +35,6 @@ #include "opt_cam.h" #endif -#include #ifndef _KERNEL #include #endif diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 47fb3d09664d..9d52213e3952 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -32,7 +32,6 @@ #define _CAM_CAM_CCB_H 1 #include -#include #include #include #ifndef _KERNEL diff --git a/sys/cam/cam_compat.c b/sys/cam/cam_compat.c index d95a11e80c2e..1b53eaa4a2c8 100644 --- a/sys/cam/cam_compat.c +++ b/sys/cam/cam_compat.c @@ -29,7 +29,6 @@ * */ -#include #include #include #include diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 101abda5db25..165929347a68 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c index aa78539acbb6..5f9aa35642de 100644 --- a/sys/cam/cam_queue.c +++ b/sys/cam/cam_queue.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c index 8fc3d0ee3c1a..2bb60420ad84 100644 --- a/sys/cam/cam_sim.c +++ b/sys/cam/cam_sim.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index dc423991fd58..83fef42453fa 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -31,7 +31,6 @@ #include "opt_printf.h" -#include #include #include #include diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index a315c5ef7df3..7ad7912ef323 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -44,7 +44,6 @@ * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_backend.c b/sys/cam/ctl/ctl_backend.c index a57c5f127f08..a2249b5d8f44 100644 --- a/sys/cam/ctl/ctl_backend.c +++ b/sys/cam/ctl/ctl_backend.c @@ -37,7 +37,6 @@ * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c index dd6511295dc4..4b8ea04cca27 100644 --- a/sys/cam/ctl/ctl_backend_block.c +++ b/sys/cam/ctl/ctl_backend_block.c @@ -45,7 +45,6 @@ * * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c index dced32d8aed1..ecb0caae89b1 100644 --- a/sys/cam/ctl/ctl_backend_ramdisk.c +++ b/sys/cam/ctl/ctl_backend_ramdisk.c @@ -42,7 +42,6 @@ * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c index 353236b1c1b6..8b81ea7e56b3 100644 --- a/sys/cam/ctl/ctl_cmd_table.c +++ b/sys/cam/ctl/ctl_cmd_table.c @@ -38,7 +38,6 @@ * Author: Ken Merry , Kim Le */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c index 89bf3fab7096..a17095c91ac5 100644 --- a/sys/cam/ctl/ctl_error.c +++ b/sys/cam/ctl/ctl_error.c @@ -39,7 +39,6 @@ * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c index ed5e2b3ac8c9..ac41a882db6b 100644 --- a/sys/cam/ctl/ctl_frontend.c +++ b/sys/cam/ctl/ctl_frontend.c @@ -38,7 +38,6 @@ * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_frontend_cam_sim.c b/sys/cam/ctl/ctl_frontend_cam_sim.c index 5b964c2a4781..544912d602d9 100644 --- a/sys/cam/ctl/ctl_frontend_cam_sim.c +++ b/sys/cam/ctl/ctl_frontend_cam_sim.c @@ -38,7 +38,6 @@ * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c index 428fb9983b9f..7fc8deac82b3 100644 --- a/sys/cam/ctl/ctl_frontend_ioctl.c +++ b/sys/cam/ctl/ctl_frontend_ioctl.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index 5c7cdaf0770e..019026d78d67 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -32,7 +32,6 @@ * CTL frontend for the iSCSI protocol. */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c index 32c83025bb1b..181f42640cce 100644 --- a/sys/cam/ctl/ctl_ha.c +++ b/sys/cam/ctl/ctl_ha.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_tpc.c b/sys/cam/ctl/ctl_tpc.c index 063f674f00ff..824a0debb25e 100644 --- a/sys/cam/ctl/ctl_tpc.c +++ b/sys/cam/ctl/ctl_tpc.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_tpc_local.c b/sys/cam/ctl/ctl_tpc_local.c index 3d087d9cab4c..5b353046eda7 100644 --- a/sys/cam/ctl/ctl_tpc_local.c +++ b/sys/cam/ctl/ctl_tpc_local.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/ctl/ctl_util.c b/sys/cam/ctl/ctl_util.c index dc7a9177deeb..3b0e40311213 100644 --- a/sys/cam/ctl/ctl_util.c +++ b/sys/cam/ctl/ctl_util.c @@ -37,7 +37,6 @@ * Author: Ken Merry */ -#include #ifdef _KERNEL #include #include diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c index 590631fc4326..93cb4d71b6a5 100644 --- a/sys/cam/ctl/scsi_ctl.c +++ b/sys/cam/ctl/scsi_ctl.c @@ -38,7 +38,6 @@ * Author: Ken Merry */ -#include #include #include #include diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 0809de6e0764..597ba0efb47e 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -32,7 +32,6 @@ * Bernd Walter , and other authors. */ -#include //#include "opt_sdda.h" #include diff --git a/sys/cam/mmc/mmc_sim.c b/sys/cam/mmc/mmc_sim.c index 3033e327d0d5..104916a41782 100644 --- a/sys/cam/mmc/mmc_sim.c +++ b/sys/cam/mmc/mmc_sim.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c index 1a740f71948e..7f0878c0f288 100644 --- a/sys/cam/nvme/nvme_all.c +++ b/sys/cam/nvme/nvme_all.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #ifdef _KERNEL diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index e8e75a121679..89984e3aaf36 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -28,7 +28,6 @@ * Copyright (c) 2009 Alexander Motin */ -#include #include #ifdef _KERNEL diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 0e42403d74a6..7cc323595566 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index 4842732c8169..7456998a4f88 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -22,7 +22,6 @@ #ifndef _SCSI_SCSI_ALL_H #define _SCSI_SCSI_ALL_H 1 -#include #ifdef _KERNEL #include #include diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 9891110e6b3d..b892708ffb99 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -47,7 +47,6 @@ * from: cd.c,v 1.83 1997/05/04 15:24:22 joerg Exp $ */ -#include #include "opt_cd.h" #include diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c index 30e4c8e73efd..89a817c1b488 100644 --- a/sys/cam/scsi/scsi_ch.c +++ b/sys/cam/scsi/scsi_ch.c @@ -65,7 +65,6 @@ * $NetBSD: ch.c,v 1.34 1998/08/31 22:28:06 cgd Exp $ */ -#include #include #include #include diff --git a/sys/cam/scsi/scsi_ch.h b/sys/cam/scsi/scsi_ch.h index ad9f01f76585..a8f980166600 100644 --- a/sys/cam/scsi/scsi_ch.h +++ b/sys/cam/scsi/scsi_ch.h @@ -64,7 +64,6 @@ #ifndef _SCSI_SCSI_CH_H #define _SCSI_SCSI_CH_H 1 -#include /* * SCSI command format diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 7a063fce128b..e795cecb5d11 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #ifdef _KERNEL diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h index ead0b4312f5e..6ce025d15497 100644 --- a/sys/cam/scsi/scsi_da.h +++ b/sys/cam/scsi/scsi_da.h @@ -50,7 +50,6 @@ #ifndef _SCSI_SCSI_DA_H #define _SCSI_SCSI_DA_H 1 -#include struct scsi_rezero_unit { diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index f93fd6e31861..4415e940cd96 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sys/cam/scsi/scsi_enc_safte.c b/sys/cam/scsi/scsi_enc_safte.c index 3d42c9fae207..78c5324fb6eb 100644 --- a/sys/cam/scsi/scsi_enc_safte.c +++ b/sys/cam/scsi/scsi_enc_safte.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 767f4f0b7fa6..e122e0d0e0d9 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -33,7 +33,6 @@ * Structures and routines specific && private to SES only */ -#include #include #include diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index cf27c304d919..5c05ca84bcab 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c index 18d11eb6e058..57d9df3f9dc1 100644 --- a/sys/cam/scsi/scsi_pt.c +++ b/sys/cam/scsi/scsi_pt.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index 78b22ba7eba1..aa4dc8e84c10 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #ifdef _KERNEL diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h index ace208fe97a7..3d8edcac7aa7 100644 --- a/sys/cam/scsi/scsi_sa.h +++ b/sys/cam/scsi/scsi_sa.h @@ -33,7 +33,6 @@ #ifndef _SCSI_SCSI_SA_H #define _SCSI_SCSI_SA_H 1 -#include struct scsi_read_block_limits { diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c index b17a156503a2..27a0b298fd31 100644 --- a/sys/cam/scsi/scsi_sg.c +++ b/sys/cam/scsi/scsi_sg.c @@ -31,7 +31,6 @@ * SG passthrough interface for SCSI. */ -#include #include #include #include diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c index 9773c99d04e3..234dd777d88d 100644 --- a/sys/cam/scsi/scsi_targ_bh.c +++ b/sys/cam/scsi/scsi_targ_bh.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c index 45a5eb8415b9..5fe123427447 100644 --- a/sys/cam/scsi/scsi_target.c +++ b/sys/cam/scsi/scsi_target.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/cam/scsi/smp_all.c b/sys/cam/scsi/smp_all.c index 7f387af25395..7e06f3297aaf 100644 --- a/sys/cam/scsi/smp_all.c +++ b/sys/cam/scsi/smp_all.c @@ -36,7 +36,6 @@ * Serial Management Protocol helper functions. */ -#include #include #include #ifdef _KERNEL From nobody Mon Nov 6 20:09:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPMrR5j0Vz4yxP4; Mon, 6 Nov 2023 20:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPMrR4yBNz3NdP; Mon, 6 Nov 2023 20:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQbbZio6KgkdIrFQ4nF+9fp5UknRDR7n9ayq8a2GzwU=; b=cq6DYEQOnCeU4U5zkvZ7ztyvBYJoBzUaEeJWHb2Z4xBl23Zh4bGOGhucXvdeLv8IP38soI lBQCEPILn3C4qNIQoLLlBkO6s/i5Uun0UME20bt+TMW8hBn6Rv5cYKlXXldVL7DKXlG8IQ /cuPsIn8l0PnPXCkO7xRGx4x2PopZW+uct85R/FYyc6uWzHmYniyL7m1D4eg/JVQXzKhF2 19k1bSM/FZZwkcE142Xqttn/pOE7WgD3k0mwb4CkIlk4kJ+WMeMTTouF+roMn34xXhXz43 4FgeHHJQO2bgjK9ytRckp+KwUd+K0It6ng74ujXjrqW0IiGw1F8y0ktbERJFrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQbbZio6KgkdIrFQ4nF+9fp5UknRDR7n9ayq8a2GzwU=; b=iVxW1+IpdldNtr/Bw/MnvH/DJm1CiAmTm3Z7RhLBcW+acSLFCSyzrcl/9s7MSY1G4Cm66Q QwxWNTAx7xk3Kbll++4wgkK82UYnd/MVO5Kr+xYJU5r84bJ2nYUHPgaM+c6WiaVF5iwfsk vWC2KkxOyL8WVUwTARgBOyjtl36Bdx539gAxhNXcMi0dZ8PHg+foED/jz8O9UmjwaVT3Yj tFkw/RoJR4D2kgNNG11Wnm+rNkR4XfEyetjEi2gRrRAfb4+FOqR7NxJI3DOeve//zX/kpm Tq/XIuNPsBnbtBfqktJasvVRQyfDAr5OLk9kJE5xHMJOpwfryvWMWtU+Bn6D7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699301367; a=rsa-sha256; cv=none; b=ilHVyIkRkVVYsa2PaO2FR4II2qbqssK8wFvK92mGqT4YKAu3la2GWACSNxRXCCNUI+RX02 PI43PbmvAs2CDahBZ44lBiylwtNCi/nsPZBAksCxmJzK9q/DZY4EMu2iCL30xGgAmSoVOQ oBqkxJ2yju+m9y52QLKLFrPKeTJH+IrfjGoQta/kajveTmy5fPafV3dPKIDWx5l8fm0cyu gS3ViSd4mjyoVNfSDCHDdRkvYWBuuJ6dcC+H0l+KS1N0Aie+hObuhbTCFjYvCIOgoKSaUm Ob5EYotiNLf4dNkcBeFVrLDzpxBQ4L88AxCj7YjymxrcUrJVykCibl45tIVaBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPMrR3rbsz6HW; Mon, 6 Nov 2023 20:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6K9R7m094662; Mon, 6 Nov 2023 20:09:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6K9Rq4094659; Mon, 6 Nov 2023 20:09:27 GMT (envelope-from git) Date: Mon, 6 Nov 2023 20:09:27 GMT Message-Id: <202311062009.3A6K9Rq4094659@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: 725962a9f4c0 - main - e6000sw: Fix locking in miibus_{read,write}reg implementations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 725962a9f4c050b21488edd58d317e87c76d6f66 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=725962a9f4c050b21488edd58d317e87c76d6f66 commit 725962a9f4c050b21488edd58d317e87c76d6f66 Author: Mark Johnston AuthorDate: 2023-11-06 19:57:56 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 19:57:56 +0000 e6000sw: Fix locking in miibus_{read,write}reg implementations Commit 469290648005e13b819a19353032ca53dda4378f made e6000sw's implementation of miibus_(read|write)reg assume that the softc lock is held. I presume that is to avoid lock recursion in e6000sw_attach() -> e6000sw_attach_miibus() -> mii_attach() -> MIIBUS_READREG(). However, the lock assertion in e6000sw_readphy_locked() can fail if a different driver uses the interface to probe registers. Work around the problem by providing implementations which lock the softc if it is not already locked. PR: 274795 Fixes: 469290648005 ("e6000sw: add readphy and writephy wrappers") Reviewed by: kp, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42466 --- sys/dev/etherswitch/e6000sw/e6000sw.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index 768d1b927e3e..95f1a2e96db6 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -66,6 +66,7 @@ MALLOC_DEFINE(M_E6000SW, "e6000sw", "e6000sw switch"); #define E6000SW_UNLOCK(_sc) sx_unlock(&(_sc)->sx) #define E6000SW_LOCK_ASSERT(_sc, _what) sx_assert(&(_sc)->sx, (_what)) #define E6000SW_TRYLOCK(_sc) sx_tryxlock(&(_sc)->sx) +#define E6000SW_LOCKED(_sc) sx_xlocked(&(_sc)->sx) #define E6000SW_WAITREADY(_sc, _reg, _bit) \ e6000sw_waitready((_sc), REG_GLOBAL, (_reg), (_bit)) #define E6000SW_WAITREADY2(_sc, _reg, _bit) \ @@ -169,8 +170,8 @@ static device_method_t e6000sw_methods[] = { DEVMETHOD(bus_add_child, device_add_child_ordered), /* mii interface */ - DEVMETHOD(miibus_readreg, e6000sw_readphy_locked), - DEVMETHOD(miibus_writereg, e6000sw_writephy_locked), + DEVMETHOD(miibus_readreg, e6000sw_readphy), + DEVMETHOD(miibus_writereg, e6000sw_writephy), /* etherswitch interface */ DEVMETHOD(etherswitch_getinfo, e6000sw_getinfo), @@ -744,17 +745,20 @@ e6000sw_write_xmdio(device_t dev, int phy, int devaddr, int devreg, int val) return (0); } -static int e6000sw_readphy(device_t dev, int phy, int reg) +static int +e6000sw_readphy(device_t dev, int phy, int reg) { e6000sw_softc_t *sc; - int ret; + int locked, ret; sc = device_get_softc(dev); - E6000SW_LOCK_ASSERT(sc, SA_UNLOCKED); - E6000SW_LOCK(sc); + locked = E6000SW_LOCKED(sc); + if (!locked) + E6000SW_LOCK(sc); ret = e6000sw_readphy_locked(dev, phy, reg); - E6000SW_UNLOCK(sc); + if (!locked) + E6000SW_UNLOCK(sc); return (ret); } @@ -795,17 +799,20 @@ e6000sw_readphy_locked(device_t dev, int phy, int reg) return (val & PHY_DATA_MASK); } -static int e6000sw_writephy(device_t dev, int phy, int reg, int data) +static int +e6000sw_writephy(device_t dev, int phy, int reg, int data) { e6000sw_softc_t *sc; - int ret; + int locked, ret; sc = device_get_softc(dev); - E6000SW_LOCK_ASSERT(sc, SA_UNLOCKED); - E6000SW_LOCK(sc); + locked = E6000SW_LOCKED(sc); + if (!locked) + E6000SW_LOCK(sc); ret = e6000sw_writephy_locked(dev, phy, reg, data); - E6000SW_UNLOCK(sc); + if (!locked) + E6000SW_UNLOCK(sc); return (ret); } From nobody Mon Nov 6 20:09:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPMrS5llQz4yxJ7; Mon, 6 Nov 2023 20:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPMrS5B0kz3NjK; Mon, 6 Nov 2023 20:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KnK3pLQ4VsSOiP7IEAl9x1jX+YXexeUFCrbmA6VWRzM=; b=YfRQ6yN+aYJIhjAhBb5jEFEjlWc4doJEbKg4d4CtqVNkyRrg/Wdq86e74EZoSfcFHPQYtj jH+tf0zLTO0GtTuAo22z5FM1AU9B5WX3G2oBf/v+QJnE5x+RzRQSAAL6ffiT6TOkCxF30b 6c2VQOWP2KaTGa6bXIJHv8WU3WmtVXFOcunlBB+C0PMSMMdC5x0QrOmgkf/dmgjciy12fl XuFWOF/HraV5JRNiLjVWz9rLSSKNpemHok7KWt7K4bozww6/ByGlNTy1uBkHJUIOPSIx3b 9v9FRi07nRB20hRZm4d+CAFcgcTiPdUq4Lqai0lpiMEjsmyUu330+QVqgihsGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KnK3pLQ4VsSOiP7IEAl9x1jX+YXexeUFCrbmA6VWRzM=; b=R0+Awku14o2gzQ2YuoIlBbVPe/lZ286e9vqolg9Lg85SpY0jZHJKGnoexBnRHPl4snV6f4 1ejrZEbqo/aIEf3Mvg2fN4QpkLmrUpGa9Ci08ocLrsyF+lZhNQdUKRZqEKQkQulF8xXgVD FWx+PuPlkx4b8CvD0u7UH4umgBNAaptTb09vTsUthIdXgdKOCfSaSuiD6Os8MzppXW/0SL FJ7NtPTOAY+/euLrtw/7nFi22DkD8mT10qINHG5IYiR5YijxKaiIBkZUV0WfgnObYsQx3q qPAQXPdf2dFMzheP3hfE4TT57NDr/9PPuq33y042bdKJoGX8+7sBvwHSXnR7Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699301368; a=rsa-sha256; cv=none; b=pfeFbx3Z2C9Ti/SudVFOUyE/e2lcER9SiyQbQqqlNzJr+mGuZxQMj1UIwQkJef9U2Us4Az BbinfMxvE+lE8pDvJ7NFqUk6XUWUdkjlL6BC6ebeFZQAP2RmGmBOUVyj1Zb4zvt5UQdPbN 9UQAfqqoCAJlepQZPV6dq/dkO9a2bEQmLnA5IEYo+IZd3jxqg86pViIkYEBp6c1dlepKFE IFRHDerDLOZ8BHllquHAFMgvXMoEVM5qMolcIcpNw3jfDSZP7Pj3RIoidaQe+sI+gJRsPh 1GSphOGwyCsmafsXYgti8ZEgR0bOcf22DGAYqZQ0wBWz7FhUuASHAd5KTeXP0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPMrS47rtz5v1; Mon, 6 Nov 2023 20:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6K9SQG094719; Mon, 6 Nov 2023 20:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6K9SHY094716; Mon, 6 Nov 2023 20:09:28 GMT (envelope-from git) Date: Mon, 6 Nov 2023 20:09:28 GMT Message-Id: <202311062009.3A6K9SHY094716@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: 3e356fb885f6 - main - crashinfo: Get local variable values in the gdb backtrace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3e356fb885f6a742c496cefd71d8d33564de542a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e356fb885f6a742c496cefd71d8d33564de542a commit 3e356fb885f6a742c496cefd71d8d33564de542a Author: Mark Johnston AuthorDate: 2023-11-06 19:59:10 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 19:59:10 +0000 crashinfo: Get local variable values in the gdb backtrace This should make crash reports a bit more useful without having to ask for additional information. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42465 --- usr.sbin/crashinfo/crashinfo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh index 0482d41804f2..9a3d26020654 100755 --- a/usr.sbin/crashinfo/crashinfo.sh +++ b/usr.sbin/crashinfo/crashinfo.sh @@ -219,7 +219,7 @@ echo # kgdb via stdin and have to use a temporary file instead. file=`mktemp /tmp/crashinfo.XXXXXX` if [ $? -eq 0 ]; then - echo "bt" >> $file + echo "bt -full" >> $file echo "quit" >> $file ${GDB%gdb}kgdb $KERNEL $VMCORE < $file rm -f $file From nobody Mon Nov 6 20:13:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPMxB4vrCz4yy1c; Mon, 6 Nov 2023 20:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPMxB4N1Kz3Pfs; Mon, 6 Nov 2023 20:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b9jIWGDc+tu8mWD9ZtdI2JAGbRbZObKGQGSixMAHWpg=; b=osHRwoO/OFwU0YUc/lD/ZbJ0MXUixUFZbThuSaryfrkEeic0Kvpg150NTcyB2YLn73l53G jsY/vszKWQ+NlLPnkeikFJOvpyYflFxXOMoKOd3fn9os1n52Fa0fdvja3FswoAhYwH9km2 d3ympzAJq6D7mo9MDulE0alvuaG6K0awJZOU2DfiJjJmF6c3fZ7NeONwDiNhspXREgaKgc RtKzE5i9dgSdASQxgNrtPPjqLmf38WMfLoBqJRnj/vJTq61AhzkPLsDbuL4FFnl+yInCBd jiF5I5vl/xH0gjhxNkYIXRFlgKn2RkKDmrq4RbC3H2dKLDSITvkrbMEflrFeaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b9jIWGDc+tu8mWD9ZtdI2JAGbRbZObKGQGSixMAHWpg=; b=bN1oCdnRsYjQxMqxkQX3tIAD2RAZjJL04p3tBV2mhNJaD3cYF8PEb27fVZ6Cho4jTdNUS9 DSOZsnYhhhl0nFWF5o3REw8muBQLfnIYzCCSiW40NqBLo8J6L5lYeLeGMC10lli6+z761i 2P5gGsKhovN0UF3/rtanzxpS+WzIlo80LkruNNRH5ECTk/HI47Z9kb0nnUPfWBK56ufWhf zVA9ju+/ztJOH2h4Lk+OGYAl5ey/+WwJlJ2gUwWWkHwFCEvbjiFuh1McvlT+FhUmov7ROd z5WXvPc20bZStOa4ixu3hDk9DXqOLkhSgMqgwCICRH0DzzIYR/BheGXg2w8/Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699301614; a=rsa-sha256; cv=none; b=Wx7mKbDiccoxKpUpNlOcceioTgoCP3nK17JDQ2j4tq5Ynk0q+YzOxTkOXeTRV/SU7J1eKU Yyg5mf3+A3X5WTJ+v+1ZpqboXqi/sG9D67PuhAutEyvzWEIvG2szgL/Hm+z3K8zZCRX1AB 5+yUSzipAn97MsX8VhpjYJa69cI1p5p8d3FlHmEGYebPbkQRDNMy+CHFANLgJwEzLiC367 EtnvgJBno3wzDSbntCJ9p8PySHAOBi0qHrzUN7sZi1AXo07dWvqmhsYWrM5Au/uVVVjFqG NYnleT0YxanrjS6+twAYRtdKc3eDuTReoCrKR8VcKjJKqUQnyTkEYn16swH3MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPMxB38Y6z6GV; Mon, 6 Nov 2023 20:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6KDYvt010429; Mon, 6 Nov 2023 20:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6KDYpt010426; Mon, 6 Nov 2023 20:13:34 GMT (envelope-from git) Date: Mon, 6 Nov 2023 20:13:34 GMT Message-Id: <202311062013.3A6KDYpt010426@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: 09cca16bfc26 - stable/14 - pfsync: Avoid transmitting uninitialized bytes in pfsync_sendout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 09cca16bfc26f669a5aea2a47e9891e34c3bebeb Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=09cca16bfc26f669a5aea2a47e9891e34c3bebeb commit 09cca16bfc26f669a5aea2a47e9891e34c3bebeb Author: Mark Johnston AuthorDate: 2023-11-04 14:28:24 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 20:11:35 +0000 pfsync: Avoid transmitting uninitialized bytes in pfsync_sendout() When IPv6 support was added to pfsync, PFSYNC_MINPKT increased such that we always allocate enough space for either IPv4 or IPv6 headers. IPv6 headers are 20 bytes larger than IPv4 headers. When pfsync_sendout() does its thing, it ends up allocating enough space for either; thus when transmitting an IPv4 packet, the last 20 bytes of the buffer are left uninitialized. Fix the problem by stashing the length in a local variable and adjusting it depending on the address family in use. While here, just zero the entire buffer in one go rather than being careful to initialize each subheader. This seems simpler and less error prone. Reported by: KMSAN Reviewed by: kp Fixes: 6fc7fc2dbb2b ("pfsync: transport over IPv6") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42461 (cherry picked from commit bd80263606d73c0391d3fa8a156fcca89a821810) --- sys/netpfil/pf/if_pfsync.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index e29c00fcb879..75c361b394e0 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1777,6 +1777,7 @@ pfsync_sendout(int schedswi, int c) struct pf_kstate *st, *st_next; struct pfsync_upd_req_item *ur; struct pfsync_bucket *b = &sc->sc_buckets[c]; + size_t len; int aflen, offset, count = 0; enum pfsync_q_id q; @@ -1797,7 +1798,9 @@ pfsync_sendout(int schedswi, int c) return; } m->m_data += max_linkhdr; - m->m_len = m->m_pkthdr.len = b->b_len; + bzero(m->m_data, b->b_len); + + len = b->b_len; /* build the ip header */ switch (sc->sc_sync_peer.ss_family) { @@ -1810,7 +1813,8 @@ pfsync_sendout(int schedswi, int c) bcopy(&sc->sc_template.ipv4, ip, sizeof(*ip)); aflen = offset = sizeof(*ip); - ip->ip_len = htons(m->m_pkthdr.len); + len -= sizeof(union inet_template) - sizeof(struct ip); + ip->ip_len = htons(len); ip_fillid(ip); break; } @@ -1824,7 +1828,8 @@ pfsync_sendout(int schedswi, int c) bcopy(&sc->sc_template.ipv6, ip6, sizeof(*ip6)); aflen = offset = sizeof(*ip6); - ip6->ip6_plen = htons(m->m_pkthdr.len); + len -= sizeof(union inet_template) - sizeof(struct ip6_hdr); + ip6->ip6_plen = htons(len); break; } #endif @@ -1832,14 +1837,14 @@ pfsync_sendout(int schedswi, int c) m_freem(m); return; } + m->m_len = m->m_pkthdr.len = len; /* build the pfsync header */ ph = (struct pfsync_header *)(m->m_data + offset); - bzero(ph, sizeof(*ph)); offset += sizeof(*ph); ph->version = PFSYNC_VERSION; - ph->len = htons(b->b_len - aflen); + ph->len = htons(len - aflen); bcopy(V_pf_status.pf_chksum, ph->pfcksum, PF_MD5_DIGEST_LENGTH); /* walk the queues */ @@ -1867,7 +1872,6 @@ pfsync_sendout(int schedswi, int c) } TAILQ_INIT(&b->b_qs[q]); - bzero(subh, sizeof(*subh)); subh->action = pfsync_qs[q].action; subh->count = htons(count); V_pfsyncstats.pfsyncs_oacts[pfsync_qs[q].action] += count; @@ -1888,7 +1892,6 @@ pfsync_sendout(int schedswi, int c) count++; } - bzero(subh, sizeof(*subh)); subh->action = PFSYNC_ACT_UPD_REQ; subh->count = htons(count); V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_UPD_REQ] += count; @@ -1905,7 +1908,6 @@ pfsync_sendout(int schedswi, int c) subh = (struct pfsync_subheader *)(m->m_data + offset); offset += sizeof(*subh); - bzero(subh, sizeof(*subh)); subh->action = PFSYNC_ACT_EOF; subh->count = htons(1); V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_EOF]++; @@ -1913,10 +1915,10 @@ pfsync_sendout(int schedswi, int c) /* we're done, let's put it on the wire */ if (ifp->if_bpf) { m->m_data += aflen; - m->m_len = m->m_pkthdr.len = b->b_len - aflen; + m->m_len = m->m_pkthdr.len = len - aflen; BPF_MTAP(ifp, m); m->m_data -= aflen; - m->m_len = m->m_pkthdr.len = b->b_len; + m->m_len = m->m_pkthdr.len = len; } if (sc->sc_sync_if == NULL) { From nobody Mon Nov 6 21:01:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPP000hpDz507dS; Mon, 6 Nov 2023 21:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPP000Cbwz3WnZ; Mon, 6 Nov 2023 21:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699304464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4sX6RKXMF6uwLKnxOtjPfXJtdlAWcO0I0T+VbW0Ju8=; b=QlqCoFVoQrdPrZ/SUFJ2UibtyfQUxA+cg9BNEC3cRbu7x2j51vYjjb0ISbNDz0r3JaAeVm QsHZsiQErJ3apsvIYN3U9BBzarVkWriCtiKyagbiET0Ea1vcDr52+6V7KpBtHNJoEGbLP5 xEKzVObMEtaGQkgTJTWcUZs2cZ4TNXEN7XO7fN/2JuMy1agiKSeTm0rJ0JZGB6K0nwfJBw t2nJj41ekMnLQU5xbyR65HpvA0ukyTE4H9kUkTPOPkzfM5DPkV2PNHubyfA9hGU6AcGzYk bayC2hbPTegy82gccN6iSMeN+UxQOtPhdNPZLxomO6kR6PyiTQkxeDx6fd5CYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699304464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U4sX6RKXMF6uwLKnxOtjPfXJtdlAWcO0I0T+VbW0Ju8=; b=wYh9OYfuMfjcRfKUuQa6wPuwILrsXgJ/7cB3U20fFnydZRwtLp/WvZTZrlaBcaA3U3ELLP htcDm2XSzw9xM1K98+AwOQD9M0bRKNJVEDyM4yruq1C7Ch5DI0fcXglq15RGud+tUwwx3n w2GNVhxmXC96vGDeTpsOr6sqKKiq+pEM/PR3E8T+fnKXNJT3IvYR4p3Az5I5vCF8jCIZ1u /2S7hIi/1YZHvJUbljS68772Booc4UVN6iDtgCvDWV8Ss2b4cbk75J2oe+Vy/x85+bxnVV Wb+Dngi7cMJoouaQWyv/J3g6jSdUPfDEADV9iy4VN8BKUTL6iyDQ1in4ofeAwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699304464; a=rsa-sha256; cv=none; b=M3HiIopDSkve2RPDPpa3+8CofxrTzl6UkQL1v2q71wK4jR4WADoijn0iAzrErA1bqJppQv I7FMdo09Oyrxyko1nuacP8JckBFmv9WFBI4hqgMik8b4mJW0U0dB51QsrAsf7MT5G+jg1n xFMyDAyN4pO3+aHuEOMpuSBHO9wvB6rBf1Nt/7EJ5Z8yL3RM4TH8ip6pkyoOCKouMdIixk c2sGyug6qJJp5BMyIGD4XHv5NaPS3MRU8qgogMsmlSGQHOsRU7gObUZfSyyv89SvMCfROi Ye1rwcsHWH2aQW/qZXEKz6iDZiAO8uM6/fbd+jVQsXPjW5o+XWaCTmyPm3zY0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPNzz6P0xz7Lf; Mon, 6 Nov 2023 21:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6L13pP090432; Mon, 6 Nov 2023 21:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6L13Ef090429; Mon, 6 Nov 2023 21:01:03 GMT (envelope-from git) Date: Mon, 6 Nov 2023 21:01:03 GMT Message-Id: <202311062101.3A6L13Ef090429@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: 86e87c3bd1b3 - main - Skip sys.netinet6.frag6.frag6_19.frag6_19 in CI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 86e87c3bd1b377242aafe7e2222ae17ca0be96d9 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=86e87c3bd1b377242aafe7e2222ae17ca0be96d9 commit 86e87c3bd1b377242aafe7e2222ae17ca0be96d9 Author: Li-Wen Hsu AuthorDate: 2023-11-06 20:59:24 +0000 Commit: Li-Wen Hsu CommitDate: 2023-11-06 20:59:24 +0000 Skip sys.netinet6.frag6.frag6_19.frag6_19 in CI This test case is unreliable in CI environment. PR: 274941 Sponsored by: The FreeBSD Foundation --- tests/sys/netinet6/frag6/frag6_19.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netinet6/frag6/frag6_19.sh b/tests/sys/netinet6/frag6/frag6_19.sh index 34095ed74f7a..187876c4c2bc 100755 --- a/tests/sys/netinet6/frag6/frag6_19.sh +++ b/tests/sys/netinet6/frag6/frag6_19.sh @@ -207,6 +207,9 @@ frag6_19_head() { } frag6_19_body() { + if [ "$(atf_config_get ci false)" = "true" ]; then + atf_skip "https://bugs.freebsd.org/274941" + fi frag6_body 19 frag6_19_check_stats } From nobody Mon Nov 6 21:20:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPPQw0D09z50BWh; Mon, 6 Nov 2023 21:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPPQv6tTYz3ZgG; Mon, 6 Nov 2023 21:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699305656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4oBDWLnmlpX3mqq3pL7xv9OxnFMnwg2KVQ9a66bsFo=; b=VLwyrM4jbUE8FEwE9JrL2icD2Tf4JAgz7MFaQPv2zi20U/qk4goWgc98xinPBZiDInEdqp HTwml9/2fI9cdDWrygpPkPlmydlez+elLLivjudGVYR/FiYoTQ7+Yk39ehujOx4StDqHK2 J022Gs3Y7H3gF5kuGLZDl2+cXaD6qI4ecnBsHn88bxQ0ChmJgskSvfrBsZT5yzm5DD+am5 qStTck1T7cHdv3epR2kZJrcpWJOqA21WcT9jChyhF8qeJvmJf3JYpJE07JID6lEN1zTWlI wfLV/UEYYGOZeXJaVZMy3mTtfzYT2zvtxpXPN391L/x7k6Y4mBDJKMAZiF7YdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699305656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4oBDWLnmlpX3mqq3pL7xv9OxnFMnwg2KVQ9a66bsFo=; b=Q+n2jhZKD7lvPEyQtLvBCyk8ifqp8a4Cepd/M7RIznmICYl1VUe0gie5KMuEl6ZuL5o1UR FJ3DK7GxZBv92g0b2ixMM0NJPRM36YKqpO1iF8fvR0x2/vzCUByMvmfeShuN5xH0fYHS3H WWvnxig5MJ8bfmHHgSF78mVUFeM7jjIyPd/BGEN4NYEtA2yK8NfeWbbCCoDx+nSWMP0BtK MJ9AYgz/gWJsGNAkEx+fxiuhux9DVThtS03faV0gwSBJN9rXC2ZNJXaYkRodK8w/+Sdja+ siraQNrHeFexE98Eeo+J138MPJeAux84NoLTy5vLDVI0lF5W8NE6Z0RhV+Jreg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699305656; a=rsa-sha256; cv=none; b=QbQajg7zZFYY+8xwe6V+gQYw2jlq/3l3FTPCGvBm2Z0vt5CgcbbNJxula8Ntz8VWxW5r4q RGm6B2/ekcvYAp+1F83sCQbGCFIZt3A7ARCNRgZAN/R33wa/cXMNLLL3uk/7Fkl3NkoPTi xoe2qVp2fZs2sCySaOSSHYqH4HIC+cz3cT61UPj3ETO+Ycpr35F0m8ZG2G7KSDCyBLm14K VpdIC629Xbt7D+AemTp0NbCDdZUpOx9Z0urigd1n6eYiQZj/yb01Ome7xe4fqp5jXIaP6D WGaK1+SIQGlD/VH9DBdBIuwvnShN5YfckEcM0l9har7BKbnhppQ3WVn1Fo+tmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPPQv5v8Xz7dR; Mon, 6 Nov 2023 21:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6LKtKI020806; Mon, 6 Nov 2023 21:20:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6LKtX6020803; Mon, 6 Nov 2023 21:20:55 GMT (envelope-from git) Date: Mon, 6 Nov 2023 21:20:55 GMT Message-Id: <202311062120.3A6LKtX6020803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Guido Falsi Subject: git: e6eb94a8ff9d - main - nanobsd: fix typo in utility function call name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6eb94a8ff9d646db9dc81fca7996f785fa828ea Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=e6eb94a8ff9d646db9dc81fca7996f785fa828ea commit e6eb94a8ff9d646db9dc81fca7996f785fa828ea Author: Guido Falsi AuthorDate: 2023-11-06 21:18:35 +0000 Commit: Guido Falsi CommitDate: 2023-11-06 21:18:35 +0000 nanobsd: fix typo in utility function call name Approved by: imp Differential Revision: https://reviews.freebsd.org/D42475 --- tools/tools/nanobsd/defaults.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index d9de03fe72da..1fa7a74fd27b 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -425,7 +425,7 @@ install_kernel ( ) ( ) native_xtools ( ) ( - print 2 "Installing the optimized native build tools for cross env" + pprint 2 "Installing the optimized native build tools for cross env" pprint 3 "log: ${NANO_LOG}/_.native_xtools" ( From nobody Mon Nov 6 21:33:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPPjs48Z1z50FLV; Mon, 6 Nov 2023 21:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPPjs3f9kz3cM0; Mon, 6 Nov 2023 21:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699306433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYgebCJ7mjmlyVN43OKjhziDtvoiIs3Cqe4lCu1PmpU=; b=I4bvr2/JKrM7gjXnNOi6xNPPWl3D0PzMtKAMQwSmqDwvJZcU9f4Vsob80WOZQ679efnHwN 2WZ8P8fIKedm8GY1qHR4VlhKsXUF3VbD2ZIZQmsQcoM7EIEE5qYk6N7gS039fJMXe2hogD UAS9YTNQfFICJoGyDjrItP20ZswXkSNRc0ogMq6HHdoAbFWss0275bdO5z+R3lnqITwBVU 9Soz6fff2DRMD/pkb+ufnCMmpgYmmb9dSsfMi+CoqQMHsURpWF0u39aqOFodx+IifgT3az 615CfuWUa1kEDmIL3ZwcpZV7iRCaGRRb3vet7jt8ysRyfeBxmJEpsFtpdZFrNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699306433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYgebCJ7mjmlyVN43OKjhziDtvoiIs3Cqe4lCu1PmpU=; b=B7df1Sqiu/apbbM4WZneV1EY3M9NTA3HyBff9wCmUHEzLrmFZBOtdsV2MR5dZ2JDwy3pUp 6Pzl07UvYHsqc5fAX99w1x/ZavyzVfu0VZ1wfZqsAQxqXG1CPUI5RaxGy/OOrcQ1/cTpTR JdLIY48Uw1i/oCw/UK8iSSdaZNuelsn1ltZFbqitPODaBY9A0iNobAHKLK0QG0+b2Rsk3n 7Fx9gf8W1h7bjC6KyUGhUF3Ujyl8W8VYP36DIFWYIeB/vKtBYRzZM8dHODWRCNvOYyuhK9 Sd9qdohjsycw8SaHQgG9SH03SOv0oM1zXsQUGMbqN7duhgnX6ffTydMOsagKOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699306433; a=rsa-sha256; cv=none; b=tvLzTP5ud9Jc45ObCRjyPPF5LeDEsAGpi41afa6dUwF8LA+igWtxuZHlpWes/Cn9IzLsDn PWowaD4toJ2oHHtWdXO8MTTw4Xw7wJGjYFMr4PFPORWQEX87qIY68AlPGe7azhs70j3zgS nrEww42K26EZtilRMbvJyl4lHjLJeXmnRxTyaB3tSKcSQN97ksJzPWnLI0FjXAU46JB/OB ZRfz1+HbnJGFXMckXoTZCR8Q6tpEUuAJuZlu+/FkAEiubFTx+6noXFqrXcKgfdqfPWvmxZ kQSu3ZUG0VlVkxZ0fpXGD2Pkt50+B+IpGLHvF0YAsV5JAS2356dqwE6clJSdMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPPjs2jXRz8Xn; Mon, 6 Nov 2023 21:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6LXrlw044670; Mon, 6 Nov 2023 21:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6LXrxm044667; Mon, 6 Nov 2023 21:33:53 GMT (envelope-from git) Date: Mon, 6 Nov 2023 21:33:53 GMT Message-Id: <202311062133.3A6LXrxm044667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a6173e94635b - main - pf: expose more syncookie state information to 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6173e94635b03aa7aab90a67785c8c3e7c6247b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a6173e94635b03aa7aab90a67785c8c3e7c6247b commit a6173e94635b03aa7aab90a67785c8c3e7c6247b Author: Kristof Provost AuthorDate: 2023-11-06 21:20:32 +0000 Commit: Kristof Provost CommitDate: 2023-11-06 21:22:24 +0000 pf: expose more syncookie state information to userspace Allow userspace to retrieve low and high water marks, as well as the current number of half open states. MFC after: 1 week Sponsored by: Modirum MDPay --- lib/libpfctl/libpfctl.c | 1 + lib/libpfctl/libpfctl.h | 1 + sbin/pfctl/pfctl_parser.c | 5 +++++ sys/netpfil/pf/pf_ioctl.c | 1 + sys/netpfil/pf/pf_syncookies.c | 2 ++ 5 files changed, 10 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 12b7c1df7ee8..41ac2892a5a6 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1694,6 +1694,7 @@ pfctl_get_syncookies(int dev, struct pfctl_syncookies *s) s->highwater = nvlist_get_number(nvl, "highwater") * 100 / state_limit; s->lowwater = nvlist_get_number(nvl, "lowwater") * 100 / state_limit; + s->halfopen_states = nvlist_get_number(nvl, "halfopen_states"); nvlist_destroy(nvl); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 31b4b444ba64..7f3b1b600db7 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -382,6 +382,7 @@ struct pfctl_syncookies { enum pfctl_syncookies_mode mode; uint8_t highwater; /* Percent */ uint8_t lowwater; /* Percent */ + uint32_t halfopen_states; }; int pfctl_startstop(int start); diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 0268d1b07c79..cb307cd6ede5 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -628,6 +628,11 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts) PFCTL_SYNCOOKIES_MODE_NAMES[cookies->mode]); printf(" %-25s %s\n", "active", s->syncookies_active ? "active" : "inactive"); + if (opts & PF_OPT_VERBOSE2) { + printf(" %-25s %d %%\n", "highwater", cookies->highwater); + printf(" %-25s %d %%\n", "lowwater", cookies->lowwater); + printf(" %-25s %d\n", "halfopen states", cookies->halfopen_states); + } printf("Reassemble %24s %s\n", s->reass & PF_REASS_ENABLED ? "yes" : "no", s->reass & PF_REASS_NODF ? "no-df" : "" diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 65d4b45afd79..1598939c2375 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5691,6 +5691,7 @@ pf_getstatus(struct pfioc_nv *nv) nvlist_add_number(nvl, "reass", V_pf_status.reass); nvlist_add_bool(nvl, "syncookies_active", V_pf_status.syncookies_active); + nvlist_add_number(nvl, "halfopen_states", V_pf_status.states_halfopen); /* counters */ error = pf_add_status_counters(nvl, "counters", V_pf_status.counters, diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index b5e59178e7e8..c5ee64c6aed0 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -162,6 +162,8 @@ pf_get_syncookies(struct pfioc_nv *nv) V_pf_status.syncookies_mode == PF_SYNCOOKIES_ADAPTIVE); nvlist_add_number(nvl, "highwater", V_pf_syncookie_status.hiwat); nvlist_add_number(nvl, "lowwater", V_pf_syncookie_status.lowat); + nvlist_add_number(nvl, "halfopen_states", + atomic_load_32(&V_pf_status.states_halfopen)); nvlpacked = nvlist_pack(nvl, &nv->len); if (nvlpacked == NULL) From nobody Mon Nov 6 22:26:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPQtZ70Vtz50Qpr; Mon, 6 Nov 2023 22:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPQtZ4yBrz4GPk; Mon, 6 Nov 2023 22:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699309590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFlAh0QqAS0pGF5WU0arVXuZgrVWw9pxRhNjB8Zg4S4=; b=DYZmSP7lVXxd+k6GLQnq+bs91PDOrG6+/zxWURYFW0xm+j6FlaKqxwRAEB6dPrX0U4IMdz X6+uvYDp1KrXsY9Sof6snWePhKyRqvx5JJRS9Ctf66gVoLVWyGOJijcnOwlrmskCgH1N9D 14LDu2goNNpwq2y+bEBB1mW+y8go/fqDAXVOcmp0YU4RMSI+QbNVUQ8iquYqHGoLAXB6y0 o8LssL6Q2ivvXogsIiknSd6UfYQ3SX0AW4NDs1+9Cye01nfV0Eyxvl2B8jFUKAqaTtJ8jM kuh6WRkGDLy+vsdHo7ciTZaxmdvdNdXYUkGJO2CRXAaMri1ZikNZbFJZRUPZ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699309590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFlAh0QqAS0pGF5WU0arVXuZgrVWw9pxRhNjB8Zg4S4=; b=h15p7KgIbZtrR5PcKkgL1kK/L3wyCQyfxoI0XDrSdVPMIJZTJ66od/QAFpxQ/gxzESzyMs ek4AZOo0X+doktWtAOXmMhfH+9kI1JzfBiQtjHs99Lyg6UdirUk8y/0IPMR5ASX6tgiwq4 CFTcFDvT5H989GzJwzUa30DvokpHSMJlwwLmEsL2Dda+gQYGKh1ygDq9nz6QZqaqPjeVai Z/rsMvp4jqDCm9hHR7G1s47nnzo8c+VIwYJzfNOGIxCAnL5qlcIFw866n8AtodcZUsHBRn 0iTsWNrAi19cXKh2r9xhGo+3p8Wl8BqF/MVRZCSFZIRyLSbvxnKrZgqUqanBkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699309590; a=rsa-sha256; cv=none; b=r5mLXfyxLryr2j8lK/VC7zJdPG8SeoC2fvgfHs8qxCihABPquldFLR/yDBh6wrMaY/5P1p NdGT3o2INJ+XIGNPi1Co6KfMoximcvvM70zVcqGsOPPZkUHIITmMyQbu7awCfUrmZ2ofxL 5b/hRmEEMVrfW8CQFKxuwoaBTK1kOIWdR+5vMbn6hQKfUOxNVw2LwJ+/d/UZxq9e/s+/Jh jOEEoLBkujw9Z6Nr48pERRjIdMomexNtJ07krJjqs++GUuhCFcSPAMWTlmU8k++nDvJq60 zfF07hkV6T9sfsjFvV5MutnMm9HgfoE4DkdVx6eAd1HsxvCeyvxP58Ugaw90Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPQtZ42Tnz9Wc; Mon, 6 Nov 2023 22:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6MQU56028450; Mon, 6 Nov 2023 22:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6MQU0o028447; Mon, 6 Nov 2023 22:26:30 GMT (envelope-from git) Date: Mon, 6 Nov 2023 22:26:30 GMT Message-Id: <202311062226.3A6MQU0o028447@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: 501bdf300119 - main - nfscl: newnfs_copycred() cannot be called when a mutex 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 501bdf3001190686bf55d9d333cb533858c2cf2f Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=501bdf3001190686bf55d9d333cb533858c2cf2f commit 501bdf3001190686bf55d9d333cb533858c2cf2f Author: Rick Macklem AuthorDate: 2023-11-06 22:25:30 +0000 Commit: Rick Macklem CommitDate: 2023-11-06 22:25:30 +0000 nfscl: newnfs_copycred() cannot be called when a mutex is held Since newnfs_copycred() calls crsetgroups() which in turn calls crextend() which might do a malloc(M_WAITOK), newnfs_copycred() cannot be called with a mutex held. Fortunately, the malloc() call is rarely done, since XU_GROUPS is 16 and the NFS client uses a maximum of 17 (only 17 groups will cause the malloc() to be called). Further, it is only a problem if the malloc() tries to sleep(). As such, this bug does not seem to have caused problems in practice. This patch fixes the one place in the NFS client where newnfs_copycred() is called while a mutex is held by moving the call to after where the mutex is released. Found by inspection while working on an experimental patch. MFC after: 2 weeks --- sys/fs/nfsclient/nfs_clstate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 579210941802..ebc11efea637 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -526,6 +526,7 @@ nfscl_getstateid(vnode_t vp, u_int8_t *nfhp, int fhlen, u_int32_t mode, struct nfscldeleg *dp; struct nfsnode *np; struct nfsmount *nmp; + struct nfscred ncr; u_int8_t own[NFSV4CL_LOCKNAMELEN], lockown[NFSV4CL_LOCKNAMELEN]; int error; bool done; @@ -683,7 +684,7 @@ nfscl_getstateid(vnode_t vp, u_int8_t *nfhp, int fhlen, u_int32_t mode, * A read ahead or write behind is indicated by p == NULL. */ if (p == NULL) - newnfs_copycred(&op->nfso_cred, cred); + memcpy(&ncr, &op->nfso_cred, sizeof(ncr)); } /* @@ -697,6 +698,8 @@ nfscl_getstateid(vnode_t vp, u_int8_t *nfhp, int fhlen, u_int32_t mode, stateidp->other[1] = op->nfso_stateid.other[1]; stateidp->other[2] = op->nfso_stateid.other[2]; NFSUNLOCKCLSTATE(); + if (p == NULL) + newnfs_copycred(&ncr, cred); return (0); } From nobody Mon Nov 6 23:32:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPSMG0httz50fWL; Mon, 6 Nov 2023 23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPSMG0DDnz4PCF; Mon, 6 Nov 2023 23: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=1699313578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RO4LAufepDuKdLS9Kvv7HT3Exb2gy+USFrbAG2Mghi8=; b=S0+47Axnolopp4VQMWyObigKQnbhska/xoeSwJKYDRGANWekKVyFNF6QJIMqS1AItlr2Xh GGNimPx7+5e3sWR6vFd+qNAOHxPrRQnH+VqgDKe9Fyqqe/w8zZ0xFBsUTQ/UWhjmeSybo3 okf+NM+OASG9coz8H71s7rjLD4mmygZU4THqtJCM8cXfGbuGMj35gCqPxzE2+fIyexrsvH OScpdGg8O6sUfgqD5buxl21B2ak4Ra9CaTIXstKV2wW0QNTTDHEDFms3lazydRYaJwFU4u 6X/rr+H6Uw7RGLV7/bqQF8N4963Cg/Yle+jPtB+O1XbBd9Ithshfh8iGBUYwIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699313578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RO4LAufepDuKdLS9Kvv7HT3Exb2gy+USFrbAG2Mghi8=; b=P5Y4HnVbuPAXKG/anCgDhuT/SkuRBIgyK7HSoLFG9iRUkVs70uKqqu6hUhec+0Uc05tbAX x7ozHeNUGlz18Lg3F3fr1O9v6B68aizpLz366BSjuDQMNZLyGIEo+hM9GY0k3DCS/4XgVy cgXHZphmMtUdExcTjxuO0PKPOguXhIWaLB+yq87hblrDhrzflPRVPkbf9PZg+1jZVjyCEf p+Zx5iSftAXmRaxa4Ek+0pE0i+1mBXHIUpnZoJE7soVFcQvpKJsC0Omzm2P2f24wqC8o2f RrDp2YzG90kQN0v7+P8dPgih98uX6H1PT07eFYZLCR0TxWHEJcYzqDb7HmTLqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699313578; a=rsa-sha256; cv=none; b=g6hLVsjDm0H4ZQJEI+aehJ1pGLjDzYR9LuRAAZVb8RqRt/p+vA6MqWP44HMOMVp8nqt81N gat50xvWjZsMdKCH9/y5/sNicarG97pun8QEeei/WCRE/LkQaQSUXB6MKFQv5DRn8VUPVy nMFx1dcSGWQmMZpYhKCR8HTrv70Vr2mrK4/i9uI6K1xURyRrQJIneNwvVzBLYCg7uoEt1H PKT4mOmVfS/i6022+9R8vBAd9/pDkMZPClebaYrUjNarDsfx1t2Horv7Z0R+BgVfzb0Prj EukQRD88kqRNaxte5xy9ms7jLAXT5zJ57RfnJAN1dUUG5wMkce+Z3lZo1UL0Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPSMF6PjRzCRn; Mon, 6 Nov 2023 23:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6NWvO9044330; Mon, 6 Nov 2023 23:32:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6NWvCX044327; Mon, 6 Nov 2023 23:32:57 GMT (envelope-from git) Date: Mon, 6 Nov 2023 23:32:57 GMT Message-Id: <202311062332.3A6NWvCX044327@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: 0d4c814512b4 - releng/14.0 - pfsync: Avoid transmitting uninitialized bytes in pfsync_sendout() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0d4c814512b4e8a3fe65ad0c9fca0c18def3621e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0d4c814512b4e8a3fe65ad0c9fca0c18def3621e commit 0d4c814512b4e8a3fe65ad0c9fca0c18def3621e Author: Mark Johnston AuthorDate: 2023-11-04 14:28:24 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 23:32:38 +0000 pfsync: Avoid transmitting uninitialized bytes in pfsync_sendout() When IPv6 support was added to pfsync, PFSYNC_MINPKT increased such that we always allocate enough space for either IPv4 or IPv6 headers. IPv6 headers are 20 bytes larger than IPv4 headers. When pfsync_sendout() does its thing, it ends up allocating enough space for either; thus when transmitting an IPv4 packet, the last 20 bytes of the buffer are left uninitialized. Fix the problem by stashing the length in a local variable and adjusting it depending on the address family in use. While here, just zero the entire buffer in one go rather than being careful to initialize each subheader. This seems simpler and less error prone. Approved by: re (gjb) Approved by: so Reported by: KMSAN Reviewed by: kp Fixes: 6fc7fc2dbb2b ("pfsync: transport over IPv6") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42461 (cherry picked from commit bd80263606d73c0391d3fa8a156fcca89a821810) (cherry picked from commit 09cca16bfc26f669a5aea2a47e9891e34c3bebeb) --- sys/netpfil/pf/if_pfsync.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index e29c00fcb879..75c361b394e0 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1777,6 +1777,7 @@ pfsync_sendout(int schedswi, int c) struct pf_kstate *st, *st_next; struct pfsync_upd_req_item *ur; struct pfsync_bucket *b = &sc->sc_buckets[c]; + size_t len; int aflen, offset, count = 0; enum pfsync_q_id q; @@ -1797,7 +1798,9 @@ pfsync_sendout(int schedswi, int c) return; } m->m_data += max_linkhdr; - m->m_len = m->m_pkthdr.len = b->b_len; + bzero(m->m_data, b->b_len); + + len = b->b_len; /* build the ip header */ switch (sc->sc_sync_peer.ss_family) { @@ -1810,7 +1813,8 @@ pfsync_sendout(int schedswi, int c) bcopy(&sc->sc_template.ipv4, ip, sizeof(*ip)); aflen = offset = sizeof(*ip); - ip->ip_len = htons(m->m_pkthdr.len); + len -= sizeof(union inet_template) - sizeof(struct ip); + ip->ip_len = htons(len); ip_fillid(ip); break; } @@ -1824,7 +1828,8 @@ pfsync_sendout(int schedswi, int c) bcopy(&sc->sc_template.ipv6, ip6, sizeof(*ip6)); aflen = offset = sizeof(*ip6); - ip6->ip6_plen = htons(m->m_pkthdr.len); + len -= sizeof(union inet_template) - sizeof(struct ip6_hdr); + ip6->ip6_plen = htons(len); break; } #endif @@ -1832,14 +1837,14 @@ pfsync_sendout(int schedswi, int c) m_freem(m); return; } + m->m_len = m->m_pkthdr.len = len; /* build the pfsync header */ ph = (struct pfsync_header *)(m->m_data + offset); - bzero(ph, sizeof(*ph)); offset += sizeof(*ph); ph->version = PFSYNC_VERSION; - ph->len = htons(b->b_len - aflen); + ph->len = htons(len - aflen); bcopy(V_pf_status.pf_chksum, ph->pfcksum, PF_MD5_DIGEST_LENGTH); /* walk the queues */ @@ -1867,7 +1872,6 @@ pfsync_sendout(int schedswi, int c) } TAILQ_INIT(&b->b_qs[q]); - bzero(subh, sizeof(*subh)); subh->action = pfsync_qs[q].action; subh->count = htons(count); V_pfsyncstats.pfsyncs_oacts[pfsync_qs[q].action] += count; @@ -1888,7 +1892,6 @@ pfsync_sendout(int schedswi, int c) count++; } - bzero(subh, sizeof(*subh)); subh->action = PFSYNC_ACT_UPD_REQ; subh->count = htons(count); V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_UPD_REQ] += count; @@ -1905,7 +1908,6 @@ pfsync_sendout(int schedswi, int c) subh = (struct pfsync_subheader *)(m->m_data + offset); offset += sizeof(*subh); - bzero(subh, sizeof(*subh)); subh->action = PFSYNC_ACT_EOF; subh->count = htons(1); V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_EOF]++; @@ -1913,10 +1915,10 @@ pfsync_sendout(int schedswi, int c) /* we're done, let's put it on the wire */ if (ifp->if_bpf) { m->m_data += aflen; - m->m_len = m->m_pkthdr.len = b->b_len - aflen; + m->m_len = m->m_pkthdr.len = len - aflen; BPF_MTAP(ifp, m); m->m_data -= aflen; - m->m_len = m->m_pkthdr.len = b->b_len; + m->m_len = m->m_pkthdr.len = len; } if (sc->sc_sync_if == NULL) { From nobody Tue Nov 7 00:23:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPTTy3hhdz50q82; Tue, 7 Nov 2023 00:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPTTy3Dkcz4cwF; Tue, 7 Nov 2023 00:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ew2nJJy0OeftcfI8TUZh0rEKe69VinhCv+BsuWolGfc=; b=O2STUbZbKNdIE0hyotfPNQH5BK9tRbuT1BrlnmVuqFE9b/7kU0kigSo52OnY65tMwUmnGi ApWnltETwfY4hZkvZlgmGePKnWOuvW7kUmUWx0W8j8EGtW21645powo7s3Yh5QNcVoc1tB X3FRq8XKwA4n1q/J37rpgRoVwqck0jcWCW3imbSZDFU+SKUSpqC+m1IW7MlRkObezvXcO9 48qsBcZnGczxl6TJbhR/6CwTfA3yW243EoGXQg5BC1c4OcTSKBKhn2RjlEjfoJ+hWRH21D nOcB2unQPDANdx9PXtfE7CkpPEAG+HgYEIEn1Ckr09ogyZwaJGW8RLzZit3xFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ew2nJJy0OeftcfI8TUZh0rEKe69VinhCv+BsuWolGfc=; b=upwLi9mjKvhOEXZrrWezcmKmpthUhyNp9V0MTf+o4u7nP9njZtQGMyeXS899yYZeWRv7O5 RjEmOeEu03XWdhGlUJbwCzN4a+YbmW488+PxXE9dO7I5adoJPyEMdZHB3oU4ddiRhKXbIv S+cJ8VD6q8V+9X7SOehXpsMLxU6WfRXUZtIocBWlS9PZtSvRggKPEZHQKV+7kNlIGhOFlf iHmq0q7tu1ruXc6NSYMzebINeXnXhN5wQ4FXbtIvOrFUEQhOIFFLNUPhNuBKL6huxJpkaB 5TzhCWvMRBYGc5T5gCqKNGW7C1Z5VItue8TneL33NE1MS5ppROGEiTO/+3JikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699316630; a=rsa-sha256; cv=none; b=lu0eULppOc74c2nzUrOMQap/IhIn1+2EHjdBAp2GXpcrHhWFDR6OAtsMjp37xArVZhqI2T ZreDZyR0bsKbw0vFASE96SE/0EW6yCKYcxW6QPjxLsO2YrQOff16fFZVZYiN4uDqn4377u V7w+okqvukhaBlkgezRf5fzHh+WCPlrzFTjRoOt8c4kIVPpV1Dcl95Ep+eRnl1jUm0F3RV fD76DQ9NiAK366ituu44T74uGcKkAUb454/9eyB8ZPeAKAsb5ITA6TLburOSocVjFHHycX hXr18qjMYnJKlUEWA1Z7ewfUqP02IFvt7dB8p3RRqsgBudHWivjK9+vGUfHmiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPTTy2KctzTgW; Tue, 7 Nov 2023 00:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A70No8B032988; Tue, 7 Nov 2023 00:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A70NoLo032985; Tue, 7 Nov 2023 00:23:50 GMT (envelope-from git) Date: Tue, 7 Nov 2023 00:23:50 GMT Message-Id: <202311070023.3A70NoLo032985@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: 8da1c3715139 - stable/14 - reboot: Avoid unlocking Giant if the scheduler 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8da1c3715139ecfbda9159c766507e0f80212e92 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8da1c3715139ecfbda9159c766507e0f80212e92 commit 8da1c3715139ecfbda9159c766507e0f80212e92 Author: Mark Johnston AuthorDate: 2023-11-04 14:48:58 +0000 Commit: Mark Johnston CommitDate: 2023-11-07 00:23:38 +0000 reboot: Avoid unlocking Giant if the scheduler is stopped When the scheduler is stopped, mtx_unlock() turns into a no-op, so the loop while (mtx_owned(&Giant)) mtx_unlock(&Giant); runs forever if the calling thread has Giant locked. Reviewed by: mhorne MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42460 (cherry picked from commit deacab756026f86515781944a9e0271e8db9f86b) --- sys/kern/kern_shutdown.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index e0eff6dbec01..19920d30357f 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -471,7 +471,7 @@ kern_reboot(int howto) * deadlock than to lock against code that won't ever * continue. */ - while (mtx_owned(&Giant)) + while (!SCHEDULER_STOPPED() && mtx_owned(&Giant)) mtx_unlock(&Giant); #if defined(SMP) From nobody Tue Nov 7 04:48:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPbMS19Jmz50Xst; Tue, 7 Nov 2023 04:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPbMR6Scsz4HKC; Tue, 7 Nov 2023 04:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699332515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=REKMIY4VnCr8+byL9hcIPRRYs7/zl4kh0RQxC0n1Q1Q=; b=qfhN1Os/hECm2tBaGymyOdm5S3M2VZpvTYo8BHQKzxMI8ZmadOe5tVlo0uXwx2NyzAvX9i 96q0U947bIMprx9+u9klqj0PaYIQtwd2M7NbZQMVLYRwrxK7Ai0mR0voKm2EF+fXEjWoTh lxxyNtLTLfW4veDGqfRor8M/rv2UAzM6l/TYbqMbiiGvy+4NFKSz0jFICXAkngmJMp2tOA AI6pb7TmscyhKPXDGBnJAGxT+SeFYO2EgTBcqK5VLfrcKdDDN/Y74e9Pp9SKJnTi5cjmS8 hu/wNCWhLm7p3m+uMcTGdmndGzkMesHKe2YLq6AMXk5RfMb3xOCxxIt8gpmq1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699332515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=REKMIY4VnCr8+byL9hcIPRRYs7/zl4kh0RQxC0n1Q1Q=; b=Yym0RdYT1uRnhZgLkSO8tYY47OYZzUx6sp1HtcNQodRzKrWuu4tesv6PbW0IzZ+QeA41sS +DcGeGxFxwvWNckHNxurXD6FBZSNajVjRbuLP1iu3bAJ9IGP7N39pTAF8CdNyKGSemtQPE 18TuLn6/46jMuMFQJLVunGfKWggEJxNtIKgWolSudJxQZRrcZkICxO7duQTrceIKAjxSMP ZmS2Zcwt6QoSxxmkztFZOjNkcDGjRqREnoHCrfTF3LDHJ9QTUv6jhLGpEngfr3onxJ8NNl zXYOUwSKiRFPWFZWr0AS1LZ1I1xQ3Jv12D02dqetIil/NpX8KCYsbMRATZQqNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699332515; a=rsa-sha256; cv=none; b=deEoDnx+7VW1VhFNwFKhmblCAVYG3efuq2ovLoof5jBQBhpotNgKIBOZBI3GkxsQJeUfl7 +0/Db7qvfsCCUXoG9GIsP09UBWN9Pb1wOY+G6PPed2Tu2j3dht2egMv3cby6/5ts0rOk39 +YLNMvlkBU3vbkDjlEqt9RM4b5KuAHu0rY87+aRDDZDDRJbmw38SWeBXt/66VfmDVDrDoh BSi5jMLCIXK/3zcfMKfM2F2nfMVEz2v6zEGCM3BmF6NllMVTo1r5r0AOinNQXJT3QIhU4m LuQRj3KKBVkhCyW5VsXG6YTA1W2EadSDpY5JJ26IGI1xttmgVd8Q1T9dfVWjIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPbMR5YT2zbpS; Tue, 7 Nov 2023 04:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A74mZ7J069243; Tue, 7 Nov 2023 04:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A74mZSm069240; Tue, 7 Nov 2023 04:48:35 GMT (envelope-from git) Date: Tue, 7 Nov 2023 04:48:35 GMT Message-Id: <202311070448.3A74mZSm069240@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: ecf710f0e04e - main - kern linker: Do not retry loading modules on EEXIST List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ecf710f0e04e3314a492747124166ccb7cf4019e Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ecf710f0e04e3314a492747124166ccb7cf4019e commit ecf710f0e04e3314a492747124166ccb7cf4019e Author: Zhenlei Huang AuthorDate: 2023-11-07 04:45:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-07 04:45:25 +0000 kern linker: Do not retry loading modules on EEXIST LINKER_LOAD_FILE() calls linker_load_dependencies() which will return EEXIST in case the module to be loaded has already been compiled into the kernel. Since the format of the module is now recognized then there is no need to retry loading with a different linker, otherwise the userland will get misleading error number ENOEXEC. PR: 274936 Reviewed by: dfr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42474 --- sys/kern/kern_linker.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 2367bf35da76..c6eb0273c39d 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -461,8 +461,11 @@ linker_load_file(const char *filename, linker_file_t *result) * If we got something other than ENOENT, then it exists but * we cannot load it for some other reason. */ - if (error != ENOENT) + if (error != ENOENT) { foundfile = 1; + if (error == EEXIST) + break; + } if (lf) { error = linker_file_register_modules(lf); if (error == EEXIST) { From nobody Tue Nov 7 10:43:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPlDy4jc7z50nLW; Tue, 7 Nov 2023 10:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPlDy4HF9z3Vrv; Tue, 7 Nov 2023 10:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699353810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xoi09Hf9ABrdR3T2FEaX3EVlTcD4uDNw/9sT8bH42+U=; b=Bsw+HDQtzAhWeoGPb0zdPiejUQ7DtToCreJWPFV41OqkKlQjke/OE/abbjc+MplvkQwoOF k2+jkfE5sSHyxcsuuoNVVi8zEOTxZOdiUBgIJpbfIxF1Iq+uuco6ZrUe6j9XebdP2ETc/O xovYbueatnEsG45ocCx/13+I7glb+hxWgdFNkSSuCzMW2vDepCEzvXdxJ6beJF2uR3+hex B6nAWxNSg+oECeT+tuzzAHFXgAXZowICK7MlenCEwcxsy4T3BG88xQV2roe3tfVREQ4BWp a8hb8GBb1rChmK3vLxxW2rmUkw5okHtFjXpokAGx9p+VImF9s0LnHtKDRnpW4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699353810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xoi09Hf9ABrdR3T2FEaX3EVlTcD4uDNw/9sT8bH42+U=; b=L/ZHrTrDJx3SKgC9b+m9ku9REWN9vIcdrB5XId5rPqOBzKmoQAAp1mkQwiOBvEPjzA11Nz W2ezOH1nkJAwdirwoZg4U25WGBOHPtx3+D+rKeTEOrB5NuAAgxcEcNOOAWds3DcoMYuW2L EbNOANy7tUYoMlbiosBTA92BAT4ICQ1yzWFPhbSJsZ6NKwFlOpV7UmE/La/KGg9at/Znfr vHKxeeC+Qekp1XmVBPp0ppowfJTO3O+H9w9SL0eGSF/mMs/fOZZutVSnQOP+TcB2jLh4Uw sCCu7RzF4DZEz8bWYr6Q5l9w8tiueDESmdi1lX98V50l5nLx5DUPydVFu06rHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699353810; a=rsa-sha256; cv=none; b=N/rLYc4geAJw4lBx2WRcNnWYRjEO+HLFaWo2CJmEOQIh/2ViP0U/nkSt6mQTER+8nhKKkg s2G6ImWg7Eay7F2clwIQt6kCKNCFTbDJIEjcldPgjSNtdenp7DkV2Ce/lC0s8dbzR7AS0G myZcSdSiK2oiBdcC/fiho/kzSaDiIakQbPg4V/fWH+Up54lyTgoRLUIOOVQjCJI4ZYJzWe wBmxva+bQywn9IUSKWlTafI0XX1pkNeJz6oEb+I1aQQIV89Tp6eY2MU0tC542VUqXGIDJm 1f9wsK/qe3ASXv8lBSERIrw8RXsW1EF5pMk3EUWx7d/vQK04ZidacYlDYRnpFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPlDy3M5vzmjB; Tue, 7 Nov 2023 10:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7AhU0s066964; Tue, 7 Nov 2023 10:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7AhUBP066961; Tue, 7 Nov 2023 10:43:30 GMT (envelope-from git) Date: Tue, 7 Nov 2023 10:43:30 GMT Message-Id: <202311071043.3A7AhUBP066961@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: 51224d6d2e1d - stable/14 - setkey(8): make the policy specification more readable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 51224d6d2e1dfca2a7c20b8b10423e4a6d0ad819 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=51224d6d2e1dfca2a7c20b8b10423e4a6d0ad819 commit 51224d6d2e1dfca2a7c20b8b10423e4a6d0ad819 Author: Konstantin Belousov AuthorDate: 2023-10-31 04:07:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-07 10:42:58 +0000 setkey(8): make the policy specification more readable (cherry picked from commit 224fc33f603884e7eb9ed219afdd4c57ddec3cb9) --- sbin/setkey/setkey.8 | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 7dab0f622efd..8eece16030e5 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 27, 2023 +.Dd October 31, 2023 .Dt SETKEY 8 .Os .\" @@ -472,27 +472,43 @@ is expressed in one of the following three formats: .Xc .El .Pp -The direction of a policy must be specified as -one of: +.Bl -tag -compact -width "policy level" +.It Ar direction +The +.Ar direction +of a policy must be specified as one of: .Li out or .Li in . +.It Ar policy level The direction is followed by one of the following policy levels: .Li discard , .Li none , or .Li ipsec . +.Bl -compact -bullet +.It The .Li discard -policylevel means that packets matching the supplied indices will -be discarded while +policy level means that packets matching the supplied indices will +be discarded. +.It +The .Li none -means that IPsec operations will not take place on the packet and +policy level means that IPsec operations will not take place on +the packet. +.It +The .Li ipsec -means that IPsec operation will take place onto the packet. +policy level means that IPsec operation will take place onto +the packet. +.El +.It Ar protocol/mode/src-dst/level The .Ar protocol/mode/src-dst/level statement gives the rule for how to process the packet. +.Bl -compact -bullet +.It The .Ar protocol is specified as @@ -500,12 +516,15 @@ is specified as .Li esp or .Li ipcomp . +.It The .Ar mode is either .Li transport or .Li tunnel . +.El +.Pp If .Ar mode is @@ -517,6 +536,7 @@ and with a dash, .Sq - , between the addresses. +.Pp If .Ar mode is @@ -526,6 +546,7 @@ both and .Ar dst can be omitted. +.Pp The .Ar level is one of the following: @@ -534,25 +555,32 @@ or .Li unique . If the SA is not available in every level, the kernel will request the SA from the key exchange daemon. +.Pp +.Bl -compact -bullet +.It A value of .Li default tells the kernel to use the system wide default protocol e.g.,\& the one from the .Li esp_trans_deflev sysctl variable, when the kernel processes the packet. +.It A value of .Li use means that the kernel will use an SA if it is available, otherwise the kernel will pass the packet as it would normally. +.It A value of .Li require means that an SA is required whenever the kernel sends a packet matched that matches the policy. +.It The .Li unique level is the same as .Li require but, in addition, it allows the policy to bind with the unique out-bound SA. +.Pp For example, if you specify the policy level .Li unique , .Xr racoon 8 Pq Pa ports/security/ipsec-tools @@ -570,6 +598,8 @@ must be between 1 and 32767, which corresponds to .Ar extensions Fl u of manual SA configuration. +.El +.El .Pp When you want to use an SA bundle, you can define multiple rules. For From nobody Tue Nov 7 10:44:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPlFY5SB9z50n2d; Tue, 7 Nov 2023 10:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPlFY4lrWz3VrB; Tue, 7 Nov 2023 10:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699353841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56zyX6D0me/5ao+GTdfvhxhWgyF0SEl9tliXIlS5sRY=; b=YZBUeBHbXodiw3b/yQZQbdgO05JBnN/q91FJOtSaYUrFmhbYSn+dyPI4uYRX0MIIgz2QBl AwIhZ5utZY7cFURVgZyhRXWknPtAjA0OZlZ7hJf8PPS/LNgaJmi34Yy2l4FKPFhsFfXrgi yoFPLD7ypJKogv+rYchN8Ur8F70w0bq2IsazvjrJthS/YnsTC8tignUMDYm4TZFlqtLL49 xkBdNbAwNzAp3xySgAYIf0c9wLWmjgNVbyojTj1iFJI3nx30owrwMONgrQkngSXBrKb2Ki eFi811GD7VSb5rismNFQQxiC+sxaH3YOINUYLYb6Vdo/LmXLDGeVWE/5tQ0hzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699353841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56zyX6D0me/5ao+GTdfvhxhWgyF0SEl9tliXIlS5sRY=; b=kS+irAln37UbuSzPszuhRSNyjdE3SZH6auv5GpYvcSRG7bZmfBnWg2xrW30e5cBBBoUhkO xlq985/uFiKGJ+5IES8R96ayWUjUuLXZOREecGi6yUMPOrmQxNS+HyJ4DOEWTemHE/F6be F6uGrn67D4tTbQP7wOi04qyN8YW3pqytX43fjf8vgVpR6VKC+YbcXPEtH10tK6EaQzMGuh 0r42fxiyaMhHMKeIzjBX6j1scznK/HKeiwxpJsiq4mqtK2pKRaDJI2rFYpcwy9TvvqF7/W JDyKxrVqJnRrd9tk0UzvThiiGKzUnAGBn0i1bwwwRASxj9t5sBTPRMdAzMyNsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699353841; a=rsa-sha256; cv=none; b=UvWgsFbmSdGuXSQ8mMJXRcWKZ+KzPqJKen/Xgf+tMhQYWidEXYggneYTHpFTkL+afpvQKv Yr7v2TEtSeEPe7hLibxTsrR9SC/wYtF6vQhzZY868JiNOX9aYLCcHll6K0P3IqeC6CdJx7 MN3NU+R4i2c3HbUkJgtmi4JNIC1mkF1+jsV5pHy8B9/vn4VHmDKQsroila+dUNthcEi0Dy HTgCCRLbYwIRXnH6wyr11PfJh8GHpgnCHBnBlak23Oo1M8FlnwbWjTTFOfNTYRVfo1Xuxs WPXRzuz9SSGskNp+l7rpY4YyL9XoT7/AEehfJr4b+hpH1hHYXYklYn91w34jMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPlFY3q6CznDR; Tue, 7 Nov 2023 10:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7Ai1Sv067178; Tue, 7 Nov 2023 10:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7Ai1Y2067175; Tue, 7 Nov 2023 10:44:01 GMT (envelope-from git) Date: Tue, 7 Nov 2023 10:44:01 GMT Message-Id: <202311071044.3A7Ai1Y2067175@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: 342bf5645f8d - stable/13 - setkey(8): make the policy specification more readable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 342bf5645f8df8c631a93a3b35a8708310ecce6a Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=342bf5645f8df8c631a93a3b35a8708310ecce6a commit 342bf5645f8df8c631a93a3b35a8708310ecce6a Author: Konstantin Belousov AuthorDate: 2023-10-31 04:07:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-07 10:43:37 +0000 setkey(8): make the policy specification more readable (cherry picked from commit 224fc33f603884e7eb9ed219afdd4c57ddec3cb9) --- sbin/setkey/setkey.8 | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 8a0a999a7567..c99b21e53dcd 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 27, 2023 +.Dd October 31, 2023 .Dt SETKEY 8 .Os .\" @@ -472,27 +472,43 @@ is expressed in one of the following three formats: .Xc .El .Pp -The direction of a policy must be specified as -one of: +.Bl -tag -compact -width "policy level" +.It Ar direction +The +.Ar direction +of a policy must be specified as one of: .Li out or .Li in . +.It Ar policy level The direction is followed by one of the following policy levels: .Li discard , .Li none , or .Li ipsec . +.Bl -compact -bullet +.It The .Li discard -policylevel means that packets matching the supplied indices will -be discarded while +policy level means that packets matching the supplied indices will +be discarded. +.It +The .Li none -means that IPsec operations will not take place on the packet and +policy level means that IPsec operations will not take place on +the packet. +.It +The .Li ipsec -means that IPsec operation will take place onto the packet. +policy level means that IPsec operation will take place onto +the packet. +.El +.It Ar protocol/mode/src-dst/level The .Ar protocol/mode/src-dst/level statement gives the rule for how to process the packet. +.Bl -compact -bullet +.It The .Ar protocol is specified as @@ -500,12 +516,15 @@ is specified as .Li esp or .Li ipcomp . +.It The .Ar mode is either .Li transport or .Li tunnel . +.El +.Pp If .Ar mode is @@ -517,6 +536,7 @@ and with a dash, .Sq - , between the addresses. +.Pp If .Ar mode is @@ -526,6 +546,7 @@ both and .Ar dst can be omitted. +.Pp The .Ar level is one of the following: @@ -534,25 +555,32 @@ or .Li unique . If the SA is not available in every level, the kernel will request the SA from the key exchange daemon. +.Pp +.Bl -compact -bullet +.It A value of .Li default tells the kernel to use the system wide default protocol e.g.,\& the one from the .Li esp_trans_deflev sysctl variable, when the kernel processes the packet. +.It A value of .Li use means that the kernel will use an SA if it is available, otherwise the kernel will pass the packet as it would normally. +.It A value of .Li require means that an SA is required whenever the kernel sends a packet matched that matches the policy. +.It The .Li unique level is the same as .Li require but, in addition, it allows the policy to bind with the unique out-bound SA. +.Pp For example, if you specify the policy level .Li unique , .Xr racoon 8 @@ -570,6 +598,8 @@ must be between 1 and 32767, which corresponds to .Ar extensions Fl u of manual SA configuration. +.El +.El .Pp When you want to use an SA bundle, you can define multiple rules. For From nobody Tue Nov 7 11:23:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPm6b2wRfz4ygn5; Tue, 7 Nov 2023 11:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPm6b2Pl6z3cTQ; Tue, 7 Nov 2023 11:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699356183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=It/rShlp98Z7/iPDBfFjq02FQuZmPPl+F3zBuj0j43s=; b=E2XokKQAIdhuDg4bHyihR+JLtMMGPAkie4VY8n6YrwIkcto2O7qzgoFc/x+zYrLS2FZWFi CMDpGbNx47sIJnrBHicIeHc9FjhZ9I1R1ya/JqBax5cB8zXcxBm4319ORfMysLhnNjVwjg wixd7C7x2zasqTHZ7e+t9ZnWoWUB1ANDXKvbX09mbjEwKYAo8Hu/0/LGIEhZPGnXktOFcH wiH8G4/J8Gq/lCTAJY6cGAeoY4se6NM52xEYaI8v/vQGjmo6XE6L7lPvQZfuRUaeZ+JnCf ySzJvmjQn32THmUrwvXX5LSDbcwVGsmaXiuVVRA6ZiPYdg1++F2xcaRTKdoHYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699356183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=It/rShlp98Z7/iPDBfFjq02FQuZmPPl+F3zBuj0j43s=; b=lssrIP8CrVhxJO/YP9pGBMg+rr/qA+C4rksI2LWVVGtNICEnXnZOsYljHQeQZ6tomHgh/m mNW9SEY2PKaTn/wUvZelIJT0MBKBv/Z5UNwaIAl2rfOSLh8njtZ3CJHf9RgzNUILnRLkzO wSNfQwQjsO3wrtJjkKwO+Y1r2rm+FDjlDIEV6WHK5lbinxmmjHWXJdZMA3Bu3/69L2uk1E TjyFVc3zJx0QvHv71MUsZYYieVwDMFYmbLiQ42cBtVXVwXndCodbRVTZQuJu9zzRwm4oBv nkxn9uQuH56dxPYJfmQboaK1f64xHyPHniohzYuxA2lFz3gkj7ciphgWtJrW9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699356183; a=rsa-sha256; cv=none; b=ZWhScQgqpA5hzFWwbFV34POQbUXS/nH6UCWds7LhXgT3ui48Y0+eDZXlkarOtT/aGWk2RP dr0vMH4CelvbOjrz82j2O/JnSTNrKHvmqc8YgxqPB+iSvrUxfLU5xX45r8mAUN1eqaDyuo REDg0lYVY9Vh0qsLJU/YlM8z24ObstQQwHqsRBQQGs0TzTFkxUShoVl11mZnKizkMq7xSe dHQuMaXXL/0g18UqTlnBsltegsicuHTdE8xt+/H7Tl+wo8C3XH52YlWWp0BCmgt+ErLYle 2UMmz5z9y10OfWHred82O4IBG6Qrd518CvKfts+vEkNBQk+QL1fwWCoE4Olh2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPm6b1SlzzpK6; Tue, 7 Nov 2023 11:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7BN3qe034090; Tue, 7 Nov 2023 11:23:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7BN3DI034087; Tue, 7 Nov 2023 11:23:03 GMT (envelope-from git) Date: Tue, 7 Nov 2023 11:23:03 GMT Message-Id: <202311071123.3A7BN3DI034087@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: 05fe82455f26 - main - linuxkpi: races between linux_queue_delayed_work_on() and linux_cancel_delayed_work_sync() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 05fe82455f263ad107a860ce20dd89e1a5c1619c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=05fe82455f263ad107a860ce20dd89e1a5c1619c commit 05fe82455f263ad107a860ce20dd89e1a5c1619c Author: Konstantin Belousov AuthorDate: 2023-11-04 07:45:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-07 10:58:04 +0000 linuxkpi: races between linux_queue_delayed_work_on() and linux_cancel_delayed_work_sync() 1. Suppose that linux_queue_delayed_work_on() is called with non-zero delay and found the work.state WORK_ST_IDLE. It resets the state to WORK_ST_TIMER and locks timer.mtx. Now, if linux_cancel_delayed_work_sync() was also called meantime, read state as WORK_ST_TIMER and already taken the mutex, it is executing callout_stop() on non-armed callout. Then linux_queue_delayed_work_on() continues and schedules callout. But the return value from cancel() is false, making it possible to the requeue from callback to slip in. 2. If linux_cancel_delayed_work_sync() returned true, we need to cancel again. The requeue from callback could have revived the work. The end result is that we schedule callout that might be freed, since cancel_delayed_work_sync() claims that everything was stopped. This contradicts the way the KPI is used in Linux, where consumers expect that cancel_delayed_work_sync() is reliable on its own. Reviewed by: markj Discussed with: bz Sponsored by: NVidia networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42468 --- sys/compat/linuxkpi/common/src/linux_work.c | 36 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_work.c b/sys/compat/linuxkpi/common/src/linux_work.c index 990ba5d20fd5..888ac97dbff6 100644 --- a/sys/compat/linuxkpi/common/src/linux_work.c +++ b/sys/compat/linuxkpi/common/src/linux_work.c @@ -221,16 +221,19 @@ linux_queue_delayed_work_on(int cpu, struct workqueue_struct *wq, [WORK_ST_EXEC] = WORK_ST_TIMER, /* start timeout */ [WORK_ST_CANCEL] = WORK_ST_TIMER, /* start timeout */ }; + bool res; if (atomic_read(&wq->draining) != 0) return (!work_pending(&dwork->work)); + mtx_lock(&dwork->timer.mtx); switch (linux_update_state(&dwork->work.state, states)) { case WORK_ST_EXEC: case WORK_ST_CANCEL: if (delay == 0 && linux_work_exec_unblock(&dwork->work) != 0) { dwork->timer.expires = jiffies; - return (true); + res = true; + goto out; } /* FALLTHROUGH */ case WORK_ST_IDLE: @@ -240,20 +243,21 @@ linux_queue_delayed_work_on(int cpu, struct workqueue_struct *wq, if (delay == 0) { linux_delayed_work_enqueue(dwork); } else if (unlikely(cpu != WORK_CPU_UNBOUND)) { - mtx_lock(&dwork->timer.mtx); callout_reset_on(&dwork->timer.callout, delay, &linux_delayed_work_timer_fn, dwork, cpu); - mtx_unlock(&dwork->timer.mtx); } else { - mtx_lock(&dwork->timer.mtx); callout_reset(&dwork->timer.callout, delay, &linux_delayed_work_timer_fn, dwork); - mtx_unlock(&dwork->timer.mtx); } - return (true); + res = true; + break; default: - return (false); /* already on a queue */ + res = false; + break; } +out: + mtx_unlock(&dwork->timer.mtx); + return (res); } void @@ -467,8 +471,8 @@ linux_cancel_delayed_work(struct delayed_work *dwork) * fashion. It returns non-zero if the work was successfully * cancelled. Else the work was already cancelled. */ -bool -linux_cancel_delayed_work_sync(struct delayed_work *dwork) +static bool +linux_cancel_delayed_work_sync_int(struct delayed_work *dwork) { static const uint8_t states[WORK_ST_MAX] __aligned(8) = { [WORK_ST_IDLE] = WORK_ST_IDLE, /* NOP */ @@ -478,7 +482,6 @@ linux_cancel_delayed_work_sync(struct delayed_work *dwork) [WORK_ST_CANCEL] = WORK_ST_IDLE, /* cancel and drain */ }; struct taskqueue *tq; - bool retval = false; int ret, state; bool cancelled; @@ -490,7 +493,7 @@ linux_cancel_delayed_work_sync(struct delayed_work *dwork) switch (state) { case WORK_ST_IDLE: mtx_unlock(&dwork->timer.mtx); - return (retval); + return (false); case WORK_ST_TIMER: case WORK_ST_CANCEL: cancelled = (callout_stop(&dwork->timer.callout) == 1); @@ -512,6 +515,17 @@ linux_cancel_delayed_work_sync(struct delayed_work *dwork) } } +bool +linux_cancel_delayed_work_sync(struct delayed_work *dwork) +{ + bool res; + + res = false; + while (linux_cancel_delayed_work_sync_int(dwork)) + res = true; + return (res); +} + /* * This function waits until the given work structure is completed. * It returns non-zero if the work was successfully From nobody Tue Nov 7 11:23:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPm6c46wWz4ygn8; Tue, 7 Nov 2023 11:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPm6c39ZMz3cHq; Tue, 7 Nov 2023 11:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699356184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwiDgPXB7t4ut++Jtb0NQRoBbFyQDZHivsTyRXdGhpw=; b=q6awJ4qvdM1D0GX/2eWfLZx9fwYZYaoohfob+RQnRAm+WN6PVDTGrN5FV3ETlsUPoFAozD hFxT+TIKyepW5rSK7mX/0YmRe35G4Dqlv+wucSAEMtkgOLFKQbUYI13EW3q0+0q6IzODAh BItYhx6VcmaX6vEoTkignczAOOoSOUOT94VRAlzgmQIrg10VtRv+8IlYjyxCyQ8C6XDXLd T5bXhy8+E5sozM3v0DULC/xNJHEflUEDSh8SRi35ALU5MP5S6472QmDiVK5Vup/qpoGyDA wnEapiI8/Ow8qOnQoc8NzajwtUWmUP0DavXrFJ/gkKGYyld7VclPxGTjjYrCaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699356184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwiDgPXB7t4ut++Jtb0NQRoBbFyQDZHivsTyRXdGhpw=; b=qggnA6GUZ3zdOpzbN8JK2fV6hO/M2M+NAcm4AMTM2Bngi88vTYfZSBuFPPzrdy3UWHha/R J3/lnWlzHooD0SgRcuY7ZleowB3jOYzmKTfABaQJ5rdeFThNLCUHd2yq4eDCKW4hsNJ5TL y5T9uq8gg2n/vo6jcS5UccgyJcjYl9Gt9o3p/NKgpXcvxv31dyvjRl9ue3iEkZMWDdMIcm BhW3n+q6sBhmNGmDz3yxbXmix88LktAwxb4Q1B6qsc4RXdh1R2W0fxUcgFttlg0VP0j1oD 3w/CKuYqJ2dDdrRgDkZdfzZ8FHu/7xyU++GVakP37IqUxkY8sWV52Y76TPWC8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699356184; a=rsa-sha256; cv=none; b=OYdVnfA9zy/Z45tUCn5KzfV1dhLHkGx6avvppGAPzAp100EuWuzsPfs6tts5nyB0x7eIxq EZFOJgd6JjAZAH983B71QgAQ7UFtC6gTuHoF4+Aui7M7iv4EnOhtxzxveAuCGK9LHbPNep F3TmbQFULiTS1WDfsQfxsSS5xLrwygxqZhSa8HMU6WHo9dTSbP0EPZZTNBl9VS30TfZ6nX QPEgJzshbhXMG65erS4ES8QIZ9yQrjIjPqjbkWevjp9KYHFbccLHh+m7BILbT1XHdybZsZ 4/YbBPRFsc8MpfixposCIlPCVNJQS7JaKfmNkeEsFI4MLribOvSySyVxOXtraw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPm6c28Kwzp0f; Tue, 7 Nov 2023 11:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7BN4hO034140; Tue, 7 Nov 2023 11:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7BN4SE034137; Tue, 7 Nov 2023 11:23:04 GMT (envelope-from git) Date: Tue, 7 Nov 2023 11:23:04 GMT Message-Id: <202311071123.3A7BN4SE034137@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: 96cb1d70008e - main - linuxkpi linux_work: use 'true' instead of 'non-zero' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 96cb1d70008e6d42750e95135316cafd6899384f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=96cb1d70008e6d42750e95135316cafd6899384f commit 96cb1d70008e6d42750e95135316cafd6899384f Author: Konstantin Belousov AuthorDate: 2023-11-07 10:56:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-07 10:58:21 +0000 linuxkpi linux_work: use 'true' instead of 'non-zero' Submitted by: markj MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42468 --- sys/compat/linuxkpi/common/src/linux_work.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_work.c b/sys/compat/linuxkpi/common/src/linux_work.c index 888ac97dbff6..c62302ad2346 100644 --- a/sys/compat/linuxkpi/common/src/linux_work.c +++ b/sys/compat/linuxkpi/common/src/linux_work.c @@ -206,7 +206,7 @@ linux_flush_rcu_work(struct rcu_work *rwork) /* * This function queues the given work structure on the given - * workqueue after a given delay in ticks. It returns non-zero if the + * workqueue after a given delay in ticks. It returns true if the * work was successfully [re-]queued. Else the work is already pending * for completion. */ @@ -230,7 +230,7 @@ linux_queue_delayed_work_on(int cpu, struct workqueue_struct *wq, switch (linux_update_state(&dwork->work.state, states)) { case WORK_ST_EXEC: case WORK_ST_CANCEL: - if (delay == 0 && linux_work_exec_unblock(&dwork->work) != 0) { + if (delay == 0 && linux_work_exec_unblock(&dwork->work)) { dwork->timer.expires = jiffies; res = true; goto out; @@ -468,7 +468,7 @@ linux_cancel_delayed_work(struct delayed_work *dwork) /* * This function cancels the given work structure in a synchronous - * fashion. It returns non-zero if the work was successfully + * fashion. It returns true if the work was successfully * cancelled. Else the work was already cancelled. */ static bool From nobody Tue Nov 7 13:37:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPq5l33gvz506J1; Tue, 7 Nov 2023 13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPq5l2LZSz4RpK; Tue, 7 Nov 2023 13: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=1699364251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E3yPGDKXw2rPM3Jltxt8JaFa8z0DP5cmuycCdxnupzA=; b=qf9as/JNnwS++S26Ho6vXXJWsgZEOtG+Cq3W+W4i6SEjMnslLh4LB8/p1TGVrlM4YjgWAm jU82BMo+ooaU6hzOmg+nOS3aVU4NC7B77F90MEEykle3kO+8zFMybjnChD/atsglb9SjUs JLFseq91egySWebmu9BqbTlUbCJpeGU5ezep69dYrx4s86A0JzBGkvWlLdaTSIMj4lp6lk b+w5GKPzQPKgMy7C5nx4WUvTG1mXUiuWknN3oya7xomXIVVICFP6QwwYEiM12kMq8XHu9g RzQOhGdII/GaqvgTdcGh0/H9PJ/DYC5Lfx1K0qa2+9NIX1zk+GAbe/lxmTy1Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699364251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E3yPGDKXw2rPM3Jltxt8JaFa8z0DP5cmuycCdxnupzA=; b=pYmOdHLyFENc/fryJ5GuM7oEluHfV6vLtXKdFoOf0O0yrvg6dXLeXrVyAj+UU0gWwWlvvT S0ceF2orRCQJ2E6eLn4sYfBx0ABjpTQ9HVpuRlxWGHuw6zEVlpQfqT4lYrNE/lDRuoQYJX oPF+TCWGPadXN6D/w72hUR+51PGwkT4BBcfFi774vKNQi5s+Y88+U2RBysbtum/h8THaf0 mZ0mW0AMf3oPhrgv9YSAF1afcviksNIZMqdMHN5EUvdGlAyImwXuxuevR2WzmMpzCiz273 rcKVRNcaoqVWQCmH8PW/RaV//9fflWPAOXuT1FR/SRbKo2EubLLKrJ9y2w1Log== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699364251; a=rsa-sha256; cv=none; b=vzpScicZE7k7kQKAWOnC140SSY6QMpOVZI5n/rgg9c7eyeZX7OkxbMSNhP6G1DjVzvcvLb dg7/CeWPlSvppiRQebTh+0ne0jltfoH0fjFVyRYgTDXuT0BL/pxeajvxuZ7lV7ycvYawld roLSKlWMhe1hz7N9mHc5W5988k07J6VWasOR/P2E5Q4wWGGSg/01P72iooU+JvZ0zCtzpT GjSKtWSJn27temJ7R6+4oouFuzYHmenyw6BE/qNgbPpajlSPEIR4iX2ti/Vzyt3e7HrJvq pTEAdHnRKbLH0pZiqr9w6oltjbIK6SagWKVAB/Vxa7JYypRowjavoBFam1dTKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPq5l1P0Pzs3m; Tue, 7 Nov 2023 13:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7DbV5l051807; Tue, 7 Nov 2023 13:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7DbVlm051804; Tue, 7 Nov 2023 13:37:31 GMT (envelope-from git) Date: Tue, 7 Nov 2023 13:37:31 GMT Message-Id: <202311071337.3A7DbVlm051804@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: d09a3bf72c0b - main - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d09a3bf72c0b5f1779c52269671872368c99f02a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d09a3bf72c0b5f1779c52269671872368c99f02a commit d09a3bf72c0b5f1779c52269671872368c99f02a Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 13:21:12 +0000 fflush: correct buffer handling in __sflush This fixes CVE-2014-8611 correctly. The commit that purported to fix CVE-2014-8611 (805288c2f062) only hid it behind another bug. Two later commits, 86a16ada1ea6 and 44cf1e5eb470, attempted to address this new bug but mostly just confused the issue. This commit rolls back the three previous changes and fixes CVE-2014-8611 correctly. The key to understanding the bug (and the fix) is that `_w` has different meanings for different stream modes. If the stream is unbuffered, it is always zero. If the stream is fully buffered, it is the amount of space remaining in the buffer (equal to the buffer size when the buffer is empty and zero when the buffer is full). If the stream is line-buffered, it is a negative number reflecting the amount of data in the buffer (zero when the buffer is empty and negative buffer size when the buffer is full). At the heart of `fflush()`, we call the stream's write function in a loop, where `t` represents the return value from the last call and `n` the amount of data that remains to be written. When the write function fails, we need to move the unwritten data to the top of the buffer (unless nothing was written) and adjust `_p` (which points to the next free location in the buffer) and `_w` accordingly. These variables have already been set to the values they should have after a successful flush, so instead of adjusting them down to reflect what was written, we're adjusting them up to reflect what remains. The bug was that while `_p` was always adjusted, we only adjusted `_w` if the stream was fully buffered. The fix is to also adjust `_w` for line-buffered streams. Everything else is just noise. Fixes: 805288c2f062 Fixes: 86a16ada1ea6 Fixes: 44cf1e5eb470 Sponsored by: Klara, Inc. --- lib/libc/stdio/fflush.c | 21 +++++++-------------- lib/libc/stdio/fvwrite.c | 4 ++-- lib/libc/stdio/wbuf.c | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index c658fbec697d..af2164ab3be2 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -102,8 +102,8 @@ __weak_reference(__fflush, fflush_unlocked); int __sflush(FILE *fp) { - unsigned char *p, *old_p; - int n, f, t, old_w; + unsigned char *p; + int n, f, t; f = fp->_flags; if ((f & __SWR) == 0) @@ -118,26 +118,19 @@ __sflush(FILE *fp) * Set these immediately to avoid problems with longjmp and to allow * exchange buffering (via setvbuf) in user write function. */ - old_p = fp->_p; fp->_p = p; - old_w = fp->_w; fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); if (t <= 0) { - /* Reset _p and _w. */ - if (p > fp->_p) { + if (p > fp->_p) /* Some was written. */ memmove(fp->_p, p, n); - fp->_p += n; - if ((fp->_flags & (__SLBF | __SNBF)) == 0) - fp->_w -= n; - /* conditional to handle setvbuf */ - } else if (p == fp->_p && errno == EINTR) { - fp->_p = old_p; - fp->_w = old_w; - } + /* Reset _p and _w. */ + fp->_p += n; + if ((fp->_flags & __SNBF) == 0) + fp->_w -= n; fp->_flags |= __SERR; return (EOF); } diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 3bb2f3fb6d9c..301e0d6f5e58 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -138,7 +138,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) fp->_p += w; old_p = fp->_p; if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) + if (old_p == fp->_p) fp->_p -= w; goto err; } @@ -182,7 +182,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) fp->_p += w; old_p = fp->_p; if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) + if (old_p == fp->_p) fp->_p -= w; goto err; } diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index 27ec67d28d80..7153350c99f1 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -88,7 +88,7 @@ __swbuf(int c, FILE *fp) old_p = fp->_p; if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { if (__fflush(fp) != 0) { - if (fp->_p == old_p && errno == EINTR) { + if (fp->_p == old_p) { fp->_p--; fp->_w++; } From nobody Tue Nov 7 13:37:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPq5m3gLdz506bq; Tue, 7 Nov 2023 13:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPq5m348qz4S30; Tue, 7 Nov 2023 13: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=1699364252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3VRUfO/ldXvCRzRtpRjLQ3aAVdQPis12XHVxY3RFrHc=; b=PE/M9keJAtXCqMcZUl/hRR5w9ROFnDqlQGH62f+9VlLlV90gj4060vBXQuP7DfbqgLO1vA xeuo+noMH/xxaCNZVY/jp02BcUoW/VlhEj3+pDGkRj9FdaLLSSlX2eyhipYQaubfGkhGF6 ljjyl9JiMJQJB6O4e4Olzr9ceDswrobME3LquQOjO5pg6hfLCStmv7oQhotn4CdwniZDJo qdcwWhk+ncMXf9i1wecSVXfUcqJpep+b1gGQgJUcqWccOAF0mseUgIL/tJA9RTydCXXYGt md+wncpzSm2waA+7wmz0WamaI6OmmlGZplr0YSorWJhQXHxqmWZOg/eBqHfG6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699364252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3VRUfO/ldXvCRzRtpRjLQ3aAVdQPis12XHVxY3RFrHc=; b=RpHpMaCI3kTj2mUUTjAnOjcwqMhj/bNgx2EkNg+IFCOjj4iwyEBOMGyZwlWRMlnU70mH+X iFIsTXTJwyFhXuK656HIdAntk40ULsTi8PKfmqEXLlJGY5TmSBAXU6M32uDetYeJPjMbXB 5u4bYwJ2fmMYDMZInaOCpknnE8j85TvpXZVCUOqG1iRTgVGV1SI2yAj12MWJw1TG+SiKWL 5BriNEedXJVwZFbRWYoXRnZzReJyV2/c3gNjABsjYctRBYuTCCUNYjAQKX/2nTZ2taIDxI wtSUYaqRvjNRvPrH8+WxNbQEUE5/ckfR7M2oBrYJBiXrmb+qH7axRqBNJDTBtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699364252; a=rsa-sha256; cv=none; b=XwOlI80B7J548Oa+IFdqZOtGVMUAzKvF+/IzcBTBtGXkwtq9QJq36PDyK6LKENm1hAaQJ2 9lqwQjsczH2YfgYC3XPK0xkYse3ITzTNdTQUANvhpm59AGmYBExs4O0uHPxJiwQQcCc1oc MurY9C0/IAzoPgpT16EWivfdLAvcjxlTkTZOnjG1yMZ1fsHWq8DOtZ+6co53oUVDNf6Ueq 84+sXumoPmriLJ6ZIpZWMVIMxdeZNGqrBZMdzFBZrpoSHUrYXntWijNHUko2E1sj58MrTU xwzfr0o037oYoaxwThLjqX3xYLAIGRjnjh2qDsGSWD9P0TuPdYMorUB3xXfFYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPq5m28PLzsVZ; Tue, 7 Nov 2023 13:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7DbWsN051858; Tue, 7 Nov 2023 13:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7DbWMC051855; Tue, 7 Nov 2023 13:37:32 GMT (envelope-from git) Date: Tue, 7 Nov 2023 13:37:32 GMT Message-Id: <202311071337.3A7DbWMC051855@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: b8dbfb0a6c18 - main - fflush: Add test for buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b8dbfb0a6c181a9aeab0b793deb0813d06052df9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b8dbfb0a6c181a9aeab0b793deb0813d06052df9 commit b8dbfb0a6c181a9aeab0b793deb0813d06052df9 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 13:21:12 +0000 fflush: Add test for buffer handling in __sflush Sponsored by: Klara, Inc. --- lib/libc/tests/stdio/Makefile | 1 + lib/libc/tests/stdio/flushlbuf_test.c | 155 ++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile index 7716a60c0e6b..f0822601e34b 100644 --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -3,6 +3,7 @@ ATF_TESTS_C+= eintr_test ATF_TESTS_C+= fdopen_test +ATF_TESTS_C+= flushlbuf_test ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test ATF_TESTS_C+= freopen_test diff --git a/lib/libc/tests/stdio/flushlbuf_test.c b/lib/libc/tests/stdio/flushlbuf_test.c new file mode 100644 index 000000000000..11d9ea4ecc6c --- /dev/null +++ b/lib/libc/tests/stdio/flushlbuf_test.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2023 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include + +#define BUFSIZE 16 + +static const char seq[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; + +struct stream { + char buf[BUFSIZE]; + unsigned int len; + unsigned int pos; +}; + +static int writefn(void *cookie, const char *buf, int len) +{ + struct stream *s = cookie; + int written = 0; + + if (len <= 0) + return 0; + while (len > 0 && s->pos < s->len) { + s->buf[s->pos++] = *buf++; + written++; + len--; + } + if (written > 0) + return written; + errno = EAGAIN; + return -1; +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_partial); +ATF_TC_BODY(flushlbuf_partial, tc) +{ + static struct stream s; + static char buf[BUFSIZE + 1]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = BUFSIZE / 2; // write will fail after this amount + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will consume s.len characters before + * returning EAGAIN, causing fprintf() to fail without having + * written anything (which is why we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * We have consumed s.len characters from the buffer, so continue + * printing until it is full again and check that no overflow has + * occurred yet. + */ + while (i < BUFSIZE + s.len) + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(BUFSIZE + s.len, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); + + /* + * The straw that breaks the camel's back: libc fails to recognize + * that the buffer is full and continues to write beyond its end. + */ + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_full); +ATF_TC_BODY(flushlbuf_full, tc) +{ + static struct stream s; + static char buf[BUFSIZE]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = 0; // any attempt to write will fail + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will immediately return EAGAIN, causing + * fprintf() to fail without having written anything (which is why + * we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * Now make our stream writeable. + */ + s.len = sizeof(s.buf); + + /* + * Flush the stream again. The data we failed to write previously + * should still be in the buffer and will now be written to the + * stream. + */ + ATF_CHECK_EQ(0, fflush(f)); + ATF_CHECK_EQ(seq[0], s.buf[0]); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, flushlbuf_partial); + ATF_TP_ADD_TC(tp, flushlbuf_full); + + return (atf_no_error()); +} From nobody Tue Nov 7 13:39:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPq7S2sTpz506l9; Tue, 7 Nov 2023 13:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPq7S2Ll3z4Sjt; Tue, 7 Nov 2023 13:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699364340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8kgXhOFPXmV0rVK7yHJ2+SvmMDRyBmoKDnpZc2cJX8=; b=YUVzGK1dJND4T87/sjtrGndUtVJIyK2ZYgPJnUO7NnNgFd9o6DjK74oyorMIQX6dTUtzQu 7aL1JTnPE2DmzYpoflJv6deGAAbdq8LwdCi7T68/KwN0idf92Kl413dA0M7w9OZcdlS8VJ cOSCfOxKvGi1bbhOQ5PmjDJS/mtXa2oWn+Pgu1Q7HBV3jutmAMWJgy8TL9Trf/LUm+xwug Xl/hH3mS/r7mFuwoc7bsSurbmElu9TZvIgVpqGX+LaaGhqTVyBjrIwMRGrFlIu8UHInEA4 5kd7HDKH++f9qFqcXCSG33fx/ibA6IaOicW5tdOB0+UOtwTHu5Y46FLszy2KZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699364340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8kgXhOFPXmV0rVK7yHJ2+SvmMDRyBmoKDnpZc2cJX8=; b=YutfQt8//QJHeFmhYyxNakMlB1+MSY+MDvaXVxyAsnoDIyxifyWyEjc/hQHzubLTVQGBcl DASbqVPCl/a+rU3pIFXcYh7rGVhoqO//8O99sTi+AnSmYkwVgUS/Eib3zd8WgTizRnsrYG FaXP3da7OR3/pCFP+6ntSS90m8qEY72ic/SAqJheAqxOSL288vdQrPTH1v9fO2vTY8V8vS mLeW/AGX0hnOef/9K9N8PLAYkKLdzXn4wpNNjZxCg4Lg30vNEU3C1YM86ZtYalyXQshCXJ /g7wuERqiJOIaENQxhxKmkR4FVmGU2TbLCucLx+J2ajn5FrId5aRYFe1larkmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699364340; a=rsa-sha256; cv=none; b=sMWKUntAEIrQgF1zPeF0UWX+ji9GE/N9vS6mli0IMdGxAo8krf8lmzsqSzNVRvZSUCbj5l eetOwfoLIzC3R11jrAb21HftWtt4We42WdcUs/1kXXcbfNJfc8aidFfsrP9THyyKbpTeVZ HWL+d/lRcchjsMqh2wmW4oORGlllSitUFFWZeFA+RlboqnX/JqgK/svFBoXiXp67Gi9HwK 5aKuWqjDiR+jkrSOVAJM9CM1ty/ongpQMLAbDviHkDiOujLJl6F7v4pmvFmsVQe3Zbn92q bmuCPwcHRThwFHvq67Pw2PLHSrVsFLlcekxocSYJTpdWmXNG1rfoBpigr5F0yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPq7S1SBBzrnm; Tue, 7 Nov 2023 13:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7Dd0db052154; Tue, 7 Nov 2023 13:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7Dd0lg052151; Tue, 7 Nov 2023 13:39:00 GMT (envelope-from git) Date: Tue, 7 Nov 2023 13:39:00 GMT Message-Id: <202311071339.3A7Dd0lg052151@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: 92709431b14d - stable/14 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 92709431b14df6c0687446247ac57cfc189ee827 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=92709431b14df6c0687446247ac57cfc189ee827 commit 92709431b14df6c0687446247ac57cfc189ee827 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 13:38:24 +0000 fflush: correct buffer handling in __sflush This fixes CVE-2014-8611 correctly. The commit that purported to fix CVE-2014-8611 (805288c2f062) only hid it behind another bug. Two later commits, 86a16ada1ea6 and 44cf1e5eb470, attempted to address this new bug but mostly just confused the issue. This commit rolls back the three previous changes and fixes CVE-2014-8611 correctly. The key to understanding the bug (and the fix) is that `_w` has different meanings for different stream modes. If the stream is unbuffered, it is always zero. If the stream is fully buffered, it is the amount of space remaining in the buffer (equal to the buffer size when the buffer is empty and zero when the buffer is full). If the stream is line-buffered, it is a negative number reflecting the amount of data in the buffer (zero when the buffer is empty and negative buffer size when the buffer is full). At the heart of `fflush()`, we call the stream's write function in a loop, where `t` represents the return value from the last call and `n` the amount of data that remains to be written. When the write function fails, we need to move the unwritten data to the top of the buffer (unless nothing was written) and adjust `_p` (which points to the next free location in the buffer) and `_w` accordingly. These variables have already been set to the values they should have after a successful flush, so instead of adjusting them down to reflect what was written, we're adjusting them up to reflect what remains. The bug was that while `_p` was always adjusted, we only adjusted `_w` if the stream was fully buffered. The fix is to also adjust `_w` for line-buffered streams. Everything else is just noise. Fixes: 805288c2f062 Fixes: 86a16ada1ea6 Fixes: 44cf1e5eb470 Sponsored by: Klara, Inc. (cherry picked from commit d09a3bf72c0b5f1779c52269671872368c99f02a) Approved by: so --- lib/libc/stdio/fflush.c | 21 +++++++-------------- lib/libc/stdio/fvwrite.c | 4 ++-- lib/libc/stdio/wbuf.c | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index 7ad6adedf53f..61f23335106f 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -103,8 +103,8 @@ __weak_reference(__fflush, fflush_unlocked); int __sflush(FILE *fp) { - unsigned char *p, *old_p; - int n, f, t, old_w; + unsigned char *p; + int n, f, t; f = fp->_flags; if ((f & __SWR) == 0) @@ -119,26 +119,19 @@ __sflush(FILE *fp) * Set these immediately to avoid problems with longjmp and to allow * exchange buffering (via setvbuf) in user write function. */ - old_p = fp->_p; fp->_p = p; - old_w = fp->_w; fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); if (t <= 0) { - /* Reset _p and _w. */ - if (p > fp->_p) { + if (p > fp->_p) /* Some was written. */ memmove(fp->_p, p, n); - fp->_p += n; - if ((fp->_flags & (__SLBF | __SNBF)) == 0) - fp->_w -= n; - /* conditional to handle setvbuf */ - } else if (p == fp->_p && errno == EINTR) { - fp->_p = old_p; - fp->_w = old_w; - } + /* Reset _p and _w. */ + fp->_p += n; + if ((fp->_flags & __SNBF) == 0) + fp->_w -= n; fp->_flags |= __SERR; return (EOF); } diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 81e7ba89a644..26245acca1c9 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -139,7 +139,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) fp->_p += w; old_p = fp->_p; if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) + if (old_p == fp->_p) fp->_p -= w; goto err; } @@ -183,7 +183,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) fp->_p += w; old_p = fp->_p; if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) + if (old_p == fp->_p) fp->_p -= w; goto err; } diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index acbe379ad90e..808cfa588cfb 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -89,7 +89,7 @@ __swbuf(int c, FILE *fp) old_p = fp->_p; if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { if (__fflush(fp) != 0) { - if (fp->_p == old_p && errno == EINTR) { + if (fp->_p == old_p) { fp->_p--; fp->_w++; } From nobody Tue Nov 7 13:39:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPq7T4gmxz506g2; Tue, 7 Nov 2023 13:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPq7T3hTLz4SYn; Tue, 7 Nov 2023 13:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699364341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4yuHi9zA7JCnYczfMA6R5NFg4FjjaDNY3mrzHk4i8M=; b=W06Xz/Gk+B7YmkzhOY4f/GTF0bV1ZsOymF88v0bUdZ2K7Ine2RcKAmnkjsj45it5suoouW 33NXSRIAqpss2RADu6FJ0XbWVFYdQDuV3Xizyy7mYIZpbKcULY7Gu9q97SFCnymC6oIpRg qwGmaTAb+4BNyJQla4VG/WZRd85zhXQ8kH7Rfo7oZdDZWIoyQY6BkLyvoHgqS6m7AZCnqO DFAtS9eUyOFJk2cCFkHUWvCc8nwwx3/dyHMNmr9SRrvif6ly3/PWElhWzpYccKlbigDSmI 6Eu/LEs4tqz8bI8gHz+dSEaLu9RvczelWkNT2QBUMN9FxT4qurYz0RSwmZ6HnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699364341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4yuHi9zA7JCnYczfMA6R5NFg4FjjaDNY3mrzHk4i8M=; b=KrFDlDC1ZivnoJV4Xw1BAGpCRB2WKu2auyIQivr14Mu9unhu2GSVIJvgBZ1elHSUIfwaEc NniRByI0BV42OvsPzbq5tDlec6AwatOwkWbRrdEMf8p0X9884fgf1pdj7AtBxae3bSiQxU MfhOI/cleApFtKJPEMlH9lIDr9MYhqSDEkMnZxK3cn/3SlWkmoDQefE5TcrqyLvURXiPLz 0CI0zDS4mMeG3RW0KKrQtIW8XaokMyOIrBXtg5w4xn1kTfbjp+0WAiCI1rDwYr2ciMQKjv wLkKSQU5KhugUXqxwBqPt0EhsR6EBcTnBAOt1JZzIykNwACZ3OMoXJxtq7I+gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699364341; a=rsa-sha256; cv=none; b=D5t7pwtNF92rMR3p9/DbcRm7Xhywtfo+9qLBf7R2yV/SyXWK9cDzeuelGvsxQgQaOrPqAb a56MWbrVO4RzvTJsFZR/QN8V41GGsKsgnlEzznVf3okT+GqOOMhMA8YPYtTbwE0DH/RLnW Hf9FK0Mb94E3J3XkTOuFE7KpUo7u4G0uzdwRCL4PI9IEk2EzSNs+4DXdIdn/Ibm6aVbyCK drj5pkaPoPSTT9feCSrASvM/6edReKnhAscFWktqw5JJFCRTEYHsU0xtHufDCBYZcKDH3Q tc4UY2bIn6/8OC7dNT5Je3kY3ueIQUJOQLueiZM2VXsgEEGCyq5YTriurkMmdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPq7T2lrqzrbj; Tue, 7 Nov 2023 13:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7Dd179052211; Tue, 7 Nov 2023 13:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7Dd15c052208; Tue, 7 Nov 2023 13:39:01 GMT (envelope-from git) Date: Tue, 7 Nov 2023 13:39:01 GMT Message-Id: <202311071339.3A7Dd15c052208@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: ba490dfc95e0 - stable/14 - fflush: Add test for buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ba490dfc95e0941216420a2003757b3c4b5b2ec2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ba490dfc95e0941216420a2003757b3c4b5b2ec2 commit ba490dfc95e0941216420a2003757b3c4b5b2ec2 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 13:38:35 +0000 fflush: Add test for buffer handling in __sflush Sponsored by: Klara, Inc. (cherry picked from commit b8dbfb0a6c181a9aeab0b793deb0813d06052df9) Approved by: so --- lib/libc/tests/stdio/Makefile | 1 + lib/libc/tests/stdio/flushlbuf_test.c | 155 ++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile index 7716a60c0e6b..f0822601e34b 100644 --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -3,6 +3,7 @@ ATF_TESTS_C+= eintr_test ATF_TESTS_C+= fdopen_test +ATF_TESTS_C+= flushlbuf_test ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test ATF_TESTS_C+= freopen_test diff --git a/lib/libc/tests/stdio/flushlbuf_test.c b/lib/libc/tests/stdio/flushlbuf_test.c new file mode 100644 index 000000000000..11d9ea4ecc6c --- /dev/null +++ b/lib/libc/tests/stdio/flushlbuf_test.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2023 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include + +#define BUFSIZE 16 + +static const char seq[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; + +struct stream { + char buf[BUFSIZE]; + unsigned int len; + unsigned int pos; +}; + +static int writefn(void *cookie, const char *buf, int len) +{ + struct stream *s = cookie; + int written = 0; + + if (len <= 0) + return 0; + while (len > 0 && s->pos < s->len) { + s->buf[s->pos++] = *buf++; + written++; + len--; + } + if (written > 0) + return written; + errno = EAGAIN; + return -1; +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_partial); +ATF_TC_BODY(flushlbuf_partial, tc) +{ + static struct stream s; + static char buf[BUFSIZE + 1]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = BUFSIZE / 2; // write will fail after this amount + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will consume s.len characters before + * returning EAGAIN, causing fprintf() to fail without having + * written anything (which is why we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * We have consumed s.len characters from the buffer, so continue + * printing until it is full again and check that no overflow has + * occurred yet. + */ + while (i < BUFSIZE + s.len) + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(BUFSIZE + s.len, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); + + /* + * The straw that breaks the camel's back: libc fails to recognize + * that the buffer is full and continues to write beyond its end. + */ + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_full); +ATF_TC_BODY(flushlbuf_full, tc) +{ + static struct stream s; + static char buf[BUFSIZE]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = 0; // any attempt to write will fail + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will immediately return EAGAIN, causing + * fprintf() to fail without having written anything (which is why + * we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * Now make our stream writeable. + */ + s.len = sizeof(s.buf); + + /* + * Flush the stream again. The data we failed to write previously + * should still be in the buffer and will now be written to the + * stream. + */ + ATF_CHECK_EQ(0, fflush(f)); + ATF_CHECK_EQ(seq[0], s.buf[0]); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, flushlbuf_partial); + ATF_TP_ADD_TC(tp, flushlbuf_full); + + return (atf_no_error()); +} From nobody Tue Nov 7 14:10:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPqqT0mR7z50C16; Tue, 7 Nov 2023 14:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPqqT0F4bz4Xm3; Tue, 7 Nov 2023 14:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699366213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXUbZlQl6fCsL37VeiL12o0wqrEBkUQKyggDt3e8nHs=; b=J3UCF/tPBU4WmkKHpHGoSCo2UJetZUSiFIA4zGDmSRTI543aLMYvvFD2OcyZovB+nIPyrd EM2FabqaoEJjfoHgRwiUecZE1nM6k5k5+nwSu+z5w0tcVEoQrOcKxLYW457ukUEUhaVzND be8cKK7x2hw7IMbSGsw50mUoclZw7mo7qXJZATgy4dvZnF+GAMMWSx+/xGO6VMg9LXC/0e itCLG0KcJH3kRQbzc1vFjgg61jLA/FuBg04jYM0fmcYWDq9Lw1c51lHOPq5qo7jyP+1vwi zMCEfbtbpqJ35/BADg4H7ZIupXJUDL99xdwspuFRHc09cpa5C70wN7WVNxzWgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699366213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXUbZlQl6fCsL37VeiL12o0wqrEBkUQKyggDt3e8nHs=; b=dHM71C6uyYXlla9JH05FrMkYgZ8efAzqSqXWTF+wIomFnz9BZ/104IZOEUhgYdBOL5FU1L kmVOnAkJcTHfGHKH+zxwsYr9+o/KY3cPFmN/krOQZv+QMYBkqw6E3mURqL3eH5M35IReAx 7j9VHMRBBxnkusmjQygwYnwiZz0JemU8Y3tOkuOLOhda8NBjXV43p5sc57uxtorHVvk9Xl 7NiGqebF1073Z18cSCKBJwhmPmyNo9P5iVqmtlh3JCGxwGvpP/wa+vPE2wLscBdxUKA1V4 PAIVZD8d9uNqEL+/tY3RSTCiY2LG3IdAJgHInLvK5YUrLCmSOxpX8NN6rHrwbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699366213; a=rsa-sha256; cv=none; b=mb2VDTiYE6ZEpidKSpLeGMQXGX1HFzlgkfXsGiOdK2RARnsvSNQ7rWOexX1s69Eh4kypZ+ XnRwwgC76hLK+JgC/ZMgAuf9FQ02dIvr28q00xNT1cC8kKmBi37bKH+ab5BOfZYQ2TIGTk 2l/z8Ls/9yJ7zh2KNQe7jHjO4nduQEfV1TKaPnCywtwhqEI0RE0//WhGD1He0efQ48wThV VlwWLZWpepc7zF6bcqzJEkJ8uN61IbCJk/006K7NkYNfUNZpF7P02fdLwXa4jGtRWAAs09 a7Ohndahm53f6qrDC1rKuscxkcHPQvEV0pf93iQjIqcsDVvfGvdBk61mMRQ09A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPqqS6RLVzsvH; Tue, 7 Nov 2023 14:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7EACxe008795; Tue, 7 Nov 2023 14:10:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7EAC7f008783; Tue, 7 Nov 2023 14:10:12 GMT (envelope-from git) Date: Tue, 7 Nov 2023 14:10:12 GMT Message-Id: <202311071410.3A7EAC7f008783@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: 6cb5690b3495 - stable/13 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6cb5690b3495741e9ece6f42ba4a85732932aa83 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb5690b3495741e9ece6f42ba4a85732932aa83 commit 6cb5690b3495741e9ece6f42ba4a85732932aa83 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 13:39:48 +0000 fflush: correct buffer handling in __sflush This fixes CVE-2014-8611 correctly. The commit that purported to fix CVE-2014-8611 (805288c2f062) only hid it behind another bug. Two later commits, 86a16ada1ea6 and 44cf1e5eb470, attempted to address this new bug but mostly just confused the issue. This commit rolls back the three previous changes and fixes CVE-2014-8611 correctly. The key to understanding the bug (and the fix) is that `_w` has different meanings for different stream modes. If the stream is unbuffered, it is always zero. If the stream is fully buffered, it is the amount of space remaining in the buffer (equal to the buffer size when the buffer is empty and zero when the buffer is full). If the stream is line-buffered, it is a negative number reflecting the amount of data in the buffer (zero when the buffer is empty and negative buffer size when the buffer is full). At the heart of `fflush()`, we call the stream's write function in a loop, where `t` represents the return value from the last call and `n` the amount of data that remains to be written. When the write function fails, we need to move the unwritten data to the top of the buffer (unless nothing was written) and adjust `_p` (which points to the next free location in the buffer) and `_w` accordingly. These variables have already been set to the values they should have after a successful flush, so instead of adjusting them down to reflect what was written, we're adjusting them up to reflect what remains. The bug was that while `_p` was always adjusted, we only adjusted `_w` if the stream was fully buffered. The fix is to also adjust `_w` for line-buffered streams. Everything else is just noise. Fixes: 805288c2f062 Fixes: 86a16ada1ea6 Fixes: 44cf1e5eb470 Sponsored by: Klara, Inc. (cherry picked from commit d09a3bf72c0b5f1779c52269671872368c99f02a) (cherry picked from commit 92709431b14df6c0687446247ac57cfc189ee827) Approved by: so --- lib/libc/stdio/fflush.c | 21 +++++++-------------- lib/libc/stdio/fvwrite.c | 4 ++-- lib/libc/stdio/wbuf.c | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index 7ad6adedf53f..61f23335106f 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -103,8 +103,8 @@ __weak_reference(__fflush, fflush_unlocked); int __sflush(FILE *fp) { - unsigned char *p, *old_p; - int n, f, t, old_w; + unsigned char *p; + int n, f, t; f = fp->_flags; if ((f & __SWR) == 0) @@ -119,26 +119,19 @@ __sflush(FILE *fp) * Set these immediately to avoid problems with longjmp and to allow * exchange buffering (via setvbuf) in user write function. */ - old_p = fp->_p; fp->_p = p; - old_w = fp->_w; fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); if (t <= 0) { - /* Reset _p and _w. */ - if (p > fp->_p) { + if (p > fp->_p) /* Some was written. */ memmove(fp->_p, p, n); - fp->_p += n; - if ((fp->_flags & (__SLBF | __SNBF)) == 0) - fp->_w -= n; - /* conditional to handle setvbuf */ - } else if (p == fp->_p && errno == EINTR) { - fp->_p = old_p; - fp->_w = old_w; - } + /* Reset _p and _w. */ + fp->_p += n; + if ((fp->_flags & __SNBF) == 0) + fp->_w -= n; fp->_flags |= __SERR; return (EOF); } diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 81e7ba89a644..26245acca1c9 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -139,7 +139,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) fp->_p += w; old_p = fp->_p; if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) + if (old_p == fp->_p) fp->_p -= w; goto err; } @@ -183,7 +183,7 @@ __sfvwrite(FILE *fp, struct __suio *uio) fp->_p += w; old_p = fp->_p; if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) + if (old_p == fp->_p) fp->_p -= w; goto err; } diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index acbe379ad90e..808cfa588cfb 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -89,7 +89,7 @@ __swbuf(int c, FILE *fp) old_p = fp->_p; if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { if (__fflush(fp) != 0) { - if (fp->_p == old_p && errno == EINTR) { + if (fp->_p == old_p) { fp->_p--; fp->_w++; } From nobody Tue Nov 7 14:10:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPqqV20FNz50C89; Tue, 7 Nov 2023 14:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPqqV11GWz4Xs0; Tue, 7 Nov 2023 14:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699366214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyNiwCSxC79pYfmPa/0xbHJkqSUnn58zLszBgimI0t0=; b=kcovV2sCisS9asOD2uvrVxXrQ/MRYsK5+G5t0l4RxfngynEpSqWdZ9f4c6aSw3aZs12kTO 5ujD+eOhVrSPB98QkGtLH9HLexQHprfcj80pBFW39TOrz75rC0EF0uDZrkLi/zLZ3MnVn5 vN/12nGjp6/Sf24PbmdkdMiIsI2OsRzoAjQyONoTIrfBsOK9TnmSORX1TPjj2PCknyWl1W Dii1UUlFGWAptl/6Nm98byd0qZDhumH/16Ci5Zj1/YhP2cOanifpCCL611grcX5DQ6r3As D8tMSZGaVHUNXJSlFvv7Fza7uwb6j08wpek3UD6Wr9dybNA5iQlJ7y3FzM+WRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699366214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyNiwCSxC79pYfmPa/0xbHJkqSUnn58zLszBgimI0t0=; b=heQ1rEv6+1QgVO6//fX7eQ2/oIR4hBdyrbWScjl+tmOjfn5+2IXq2pkS3pIGolZ8ZHisti g7g6Y7HvCluTR6+T4Iv1MjNsCsseLxpVQKlSMDKErpAqtjx3QuWZGYTkhoUfgpMirxS+d2 FAkT/CvYBdvlSIRlUjWrbK9OKdlin/zfm2d+VnPY5UxLLFvGU+A03rskSx28Iy95+joGiy ry6+haCyb+NQz9kU9VrGvuDR56IcfuZKTqbCN7U94llTzPr+JwOq/ELevS+c7+P4ftDMFA 5PBmn4Gh1yLd+EL2SJVyyZqxN9Nm5X9wvP7ckhcCNxTe2N9k3oBBnbl23H3URA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699366214; a=rsa-sha256; cv=none; b=S8WcqsYLnxHeVRREJlm2nvfNuMMvue0Qd4WFa86vmzIncpjxTXxyzTWXP2E3zHpzXRSTfA pDcqMo1uwdyB36EithUZbUiH/iIDJ+u+wxZM/sRjJGJeuY6FiWl0PE3wirqIWfVp2g5eaO /Bqprjn/dwMzzo+tlVpdjxa7FQ9jMKNNQzhPbfWfYqF/BgJb3KPG/VU3E9a3crzp4E7a0M EknvCjbTFMh0U6IMJEPqY/u9DUDxnqW0v99sT9K8/ESe3S5xzAX9b2RwisPrwXyTexyAsx ctskRVohjU2UQyqll8xvYQbDs5BgAHTtMRxIRCZTWKlZsZJeicNHfKg7n0r+hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPqqT75W3zsvJ; Tue, 7 Nov 2023 14:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7EADlw009500; Tue, 7 Nov 2023 14:10:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7EAD7D009497; Tue, 7 Nov 2023 14:10:13 GMT (envelope-from git) Date: Tue, 7 Nov 2023 14:10:13 GMT Message-Id: <202311071410.3A7EAD7D009497@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: 66d84f1362f6 - stable/13 - fflush: Add test for buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 66d84f1362f63c23f6f451490e153e0703a7cda6 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=66d84f1362f63c23f6f451490e153e0703a7cda6 commit 66d84f1362f63c23f6f451490e153e0703a7cda6 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 13:39:55 +0000 fflush: Add test for buffer handling in __sflush Sponsored by: Klara, Inc. (cherry picked from commit b8dbfb0a6c181a9aeab0b793deb0813d06052df9) (cherry picked from commit ba490dfc95e0941216420a2003757b3c4b5b2ec2) Approved by: so --- lib/libc/tests/stdio/Makefile | 1 + lib/libc/tests/stdio/flushlbuf_test.c | 155 ++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile index 12ae44855da5..452bcc535d21 100644 --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -3,6 +3,7 @@ ATF_TESTS_C+= eintr_test ATF_TESTS_C+= fdopen_test +ATF_TESTS_C+= flushlbuf_test ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test ATF_TESTS_C+= freopen_test diff --git a/lib/libc/tests/stdio/flushlbuf_test.c b/lib/libc/tests/stdio/flushlbuf_test.c new file mode 100644 index 000000000000..11d9ea4ecc6c --- /dev/null +++ b/lib/libc/tests/stdio/flushlbuf_test.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2023 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include + +#define BUFSIZE 16 + +static const char seq[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; + +struct stream { + char buf[BUFSIZE]; + unsigned int len; + unsigned int pos; +}; + +static int writefn(void *cookie, const char *buf, int len) +{ + struct stream *s = cookie; + int written = 0; + + if (len <= 0) + return 0; + while (len > 0 && s->pos < s->len) { + s->buf[s->pos++] = *buf++; + written++; + len--; + } + if (written > 0) + return written; + errno = EAGAIN; + return -1; +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_partial); +ATF_TC_BODY(flushlbuf_partial, tc) +{ + static struct stream s; + static char buf[BUFSIZE + 1]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = BUFSIZE / 2; // write will fail after this amount + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will consume s.len characters before + * returning EAGAIN, causing fprintf() to fail without having + * written anything (which is why we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * We have consumed s.len characters from the buffer, so continue + * printing until it is full again and check that no overflow has + * occurred yet. + */ + while (i < BUFSIZE + s.len) + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(BUFSIZE + s.len, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); + + /* + * The straw that breaks the camel's back: libc fails to recognize + * that the buffer is full and continues to write beyond its end. + */ + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_full); +ATF_TC_BODY(flushlbuf_full, tc) +{ + static struct stream s; + static char buf[BUFSIZE]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = 0; // any attempt to write will fail + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will immediately return EAGAIN, causing + * fprintf() to fail without having written anything (which is why + * we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * Now make our stream writeable. + */ + s.len = sizeof(s.buf); + + /* + * Flush the stream again. The data we failed to write previously + * should still be in the buffer and will now be written to the + * stream. + */ + ATF_CHECK_EQ(0, fflush(f)); + ATF_CHECK_EQ(seq[0], s.buf[0]); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, flushlbuf_partial); + ATF_TP_ADD_TC(tp, flushlbuf_full); + + return (atf_no_error()); +} From nobody Tue Nov 7 14:29:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPrG33625z50G5c; Tue, 7 Nov 2023 14:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPrG32bkdz4Zw5; Tue, 7 Nov 2023 14:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699367387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F1pmxnMcDDryg0wOf74FHIxvrSVc/Mak5voVMT8v0gE=; b=vdWLx4AsqfIzOBWvGIB8ZEH/SHl7F+fqxjqvQwPaLNxCSOV9mb4/JctagPQ1y7TwvIJF8m HbvGRzdg/sG04HR0TPsmq7+7sls7+kHWBrAlLdfdbJkMroH1N06zH2N0vw7g0xLJAaXCoS FLdEAcvfAublFAK0knGobg6TTCQvGPx17phQqPotn8p1reElTH1hHKCNbLoTd8F4otxg/U qF7ok6XvmwfcQZDL9CDq0WLWy+MbZJZMGLEn4/q8DLlZy1fgamhlTQL31tbNMap3pN+lFM Nr1s9X0w3YudE4VP5ZkxXRBAaw/L7kcJEULkxTjcYCKYD4TpyObb2jsB8PcHrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699367387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F1pmxnMcDDryg0wOf74FHIxvrSVc/Mak5voVMT8v0gE=; b=D+4Mw9Viro+zQ6/q9fV9BhuSulgGyAH7kDKb8+C5bBegccwFFq0cNByKXAfqGVKriVQK2f nTtjQkvDTDBSEanAXkTFOEMffaiMK8HMXt0AGtcqguC1A/BumgQVSF1wu0UFlIgXPHrK4k eSsF+cs2vzFMzRGJhId35d5tqbKq3Yqvf46+DzUvXAApHH4+hg+5gqyI93esPUVDGWBhdD BeRfqHRHqc5f4+s8h06V1scwOF8s+KtOv2YKBIme2kuzxa6BC+cC68xSFRqzcskUqjWzuX 0AjH2zUPHw+rH/Mcf98LLDpt8BFAMWU5VMQmN8QZ7/LiBZx10Lc7nChcvpyPdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699367387; a=rsa-sha256; cv=none; b=e4O4ahGW5nDurMk1RXugAOG4wR82dukinubnVdRpP4WwGRXsAIV+C23mhpFTDtZYBKqT5I SUeZvKMdhWBSwkSADyCpbTjdIyXtG1VcpiWN1O5bKtqMyXCKVSw2qT1W4UsgK2o7TguEjp /fl4Difrxm382iLNDNZoTOmXfmzzCL9Sb4rjXt12bP/s7Wap6OiCAgHDLECNm8HgZMfBpj 4IGobXXbZ42tT2Id1Cz4QdvsLs8GYNglYMAlRtUBfHoKImNxpnNJKig6ND26sASPq+0dFU B+RNfPyxY6hMinOJO0VXeX+ohfKMqtAbbomyjZBFjGhx9JAtAEbIQxqppLCC7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPrG31YPBztNV; Tue, 7 Nov 2023 14:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7ETloN035860; Tue, 7 Nov 2023 14:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7ETlmk035857; Tue, 7 Nov 2023 14:29:47 GMT (envelope-from git) Date: Tue, 7 Nov 2023 14:29:47 GMT Message-Id: <202311071429.3A7ETlmk035857@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: 3a2ea31568c8 - stable/12 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 3a2ea31568c81f7b29710abd3d3e1ada2fbeb6c9 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3a2ea31568c81f7b29710abd3d3e1ada2fbeb6c9 commit 3a2ea31568c81f7b29710abd3d3e1ada2fbeb6c9 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 14:11:54 +0000 fflush: correct buffer handling in __sflush This fixes CVE-2014-8611 correctly. The commit that purported to fix CVE-2014-8611 (805288c2f062) only hid it behind another bug. Two later commits, 86a16ada1ea6 and 44cf1e5eb470, attempted to address this new bug but mostly just confused the issue. This commit rolls back the three previous changes and fixes CVE-2014-8611 correctly. The key to understanding the bug (and the fix) is that `_w` has different meanings for different stream modes. If the stream is unbuffered, it is always zero. If the stream is fully buffered, it is the amount of space remaining in the buffer (equal to the buffer size when the buffer is empty and zero when the buffer is full). If the stream is line-buffered, it is a negative number reflecting the amount of data in the buffer (zero when the buffer is empty and negative buffer size when the buffer is full). At the heart of `fflush()`, we call the stream's write function in a loop, where `t` represents the return value from the last call and `n` the amount of data that remains to be written. When the write function fails, we need to move the unwritten data to the top of the buffer (unless nothing was written) and adjust `_p` (which points to the next free location in the buffer) and `_w` accordingly. These variables have already been set to the values they should have after a successful flush, so instead of adjusting them down to reflect what was written, we're adjusting them up to reflect what remains. The bug was that while `_p` was always adjusted, we only adjusted `_w` if the stream was fully buffered. The fix is to also adjust `_w` for line-buffered streams. Everything else is just noise. Fixes: 805288c2f062 Fixes: 86a16ada1ea6 Fixes: 44cf1e5eb470 Sponsored by: Klara, Inc. (cherry picked from commit d09a3bf72c0b5f1779c52269671872368c99f02a) (cherry picked from commit 92709431b14df6c0687446247ac57cfc189ee827) (cherry picked from commit 6cb5690b3495741e9ece6f42ba4a85732932aa83) Approved by: so --- lib/libc/stdio/fflush.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index 05e587ecec66..75f145fae6a3 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -127,14 +127,13 @@ __sflush(FILE *fp) for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); if (t <= 0) { - /* Reset _p and _w. */ - if (p > fp->_p) { + if (p > fp->_p) /* Some was written. */ memmove(fp->_p, p, n); - fp->_p += n; - if ((fp->_flags & (__SLBF | __SNBF)) == 0) - fp->_w -= n; - } + /* Reset _p and _w. */ + fp->_p += n; + if ((fp->_flags & __SNBF) == 0) + fp->_w -= n; fp->_flags |= __SERR; return (EOF); } From nobody Tue Nov 7 14:30:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPrGm6pD8z50G1Y; Tue, 7 Nov 2023 14:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPrGm6HYtz4b7D; Tue, 7 Nov 2023 14:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699367424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5xPsRqAFEs77npUxoLx3/3wuVDu9twVyuq3Psu+XSJc=; b=f1kR89DmbU/0wxX+cD1Fi8XRuG42ndWibxMw+lJfLMq2/QI3is50xK6NiI7yPVEz2VIcPV bhCQBl1REP5+LRA64lJbfGH5WIaXcVJ3Ml7EmO585AfgbHcUMwWFYqFzQIpCR9fZDzDa/3 VPAGVLOFrB36gDNB7Lj41LZnyKa7c2LXdwTyvDi0scyvMLj8q61/kMT4BrOO8gpjPM8QKP //JBvaFg2cY89PpJFn7wcdGOdL4EyIE1ISKBP4rsksTx0s63lk/fRTPIFX+hGQf4afX1hF PK/K1rgZJASSlqbgEm0RrlyJ1m3XFvnsPB005xq/Hb+a14YSQpDkl34lzQ10hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699367424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5xPsRqAFEs77npUxoLx3/3wuVDu9twVyuq3Psu+XSJc=; b=RrJ4Np05dj0BsTDcwK9/BN6Uv+zQ/sH3silLe/tqf6ldIfFmVii2D+e7qq7qUnUYXwnStL 3mLkkZhN2LWt68C3L+XmhbGq3fwM69bU/wW7r946AomEEcYHGmL2xJrkop5HUwRP+qo2aF uy8scTyvJShy3ecO6yik8Qm6vxRryf3oYhG/rjAcByv7Vv9eM6zPxhx4cLw64tjaQRM+KG j7z160waOi247qVYvz5WxsuhE3Q9wYbt5LWNGyLLATh9x4t0GuQ2SsLNl6gEs5tGcCSTU5 DH7hcpoXSWTOLmll+hDl2F+8HnQ3predCpyR6tb/aQX08kNIc0KemFMirV9KwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699367424; a=rsa-sha256; cv=none; b=hVcgkav9PPAj0s+dYXdRtv72G7IG/VI4cPzo8LvjrbTcAiNbGMQIvHvyCFo+aOlqRHYuR+ bY1ouy5NFrllOYUfti5A8kC1MuFkTJNA8bStU8XY6tcA7U4534SlAP0JCDCUPksCd9UU2f F+Qp6BGBwm5OhTZXwhlAP532Ehe/jcpiytATJbVH5Z7kclIgZglEJ3g7fxGhZAYBgu44+S r+M1x4lDNSJArd60h61rG+Ue8zBQ6B/VG5MnLzq1bqyZrRlKuD2moDGDDF+L022SnFRb0S GtkyTSJ6+khSwnjv4M8hGl0fJkxiwgMDA65zqbU5H9OsZE32awGT8nY0QnF6kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPrGm5MJbztSP; Tue, 7 Nov 2023 14:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7EUODd044542; Tue, 7 Nov 2023 14:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7EUOvi044539; Tue, 7 Nov 2023 14:30:24 GMT (envelope-from git) Date: Tue, 7 Nov 2023 14:30:24 GMT Message-Id: <202311071430.3A7EUOvi044539@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: 6a0891c6ebb7 - stable/12 - fflush: Add test for buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 6a0891c6ebb78bd59a3fc440675e31b6982de896 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0891c6ebb78bd59a3fc440675e31b6982de896 commit 6a0891c6ebb78bd59a3fc440675e31b6982de896 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:13:45 +0000 Commit: Ed Maste CommitDate: 2023-11-07 14:30:07 +0000 fflush: Add test for buffer handling in __sflush Sponsored by: Klara, Inc. (cherry picked from commit b8dbfb0a6c181a9aeab0b793deb0813d06052df9) (cherry picked from commit ba490dfc95e0941216420a2003757b3c4b5b2ec2) (cherry picked from commit 66d84f1362f63c23f6f451490e153e0703a7cda6) Approved by: so --- lib/libc/tests/stdio/Makefile | 1 + lib/libc/tests/stdio/flushlbuf_test.c | 155 ++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile index 248a05bc45e7..5280fff8bfb4 100644 --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -3,6 +3,7 @@ .include ATF_TESTS_C+= fdopen_test +ATF_TESTS_C+= flushlbuf_test ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test ATF_TESTS_C+= freopen_test diff --git a/lib/libc/tests/stdio/flushlbuf_test.c b/lib/libc/tests/stdio/flushlbuf_test.c new file mode 100644 index 000000000000..11d9ea4ecc6c --- /dev/null +++ b/lib/libc/tests/stdio/flushlbuf_test.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2023 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include + +#define BUFSIZE 16 + +static const char seq[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; + +struct stream { + char buf[BUFSIZE]; + unsigned int len; + unsigned int pos; +}; + +static int writefn(void *cookie, const char *buf, int len) +{ + struct stream *s = cookie; + int written = 0; + + if (len <= 0) + return 0; + while (len > 0 && s->pos < s->len) { + s->buf[s->pos++] = *buf++; + written++; + len--; + } + if (written > 0) + return written; + errno = EAGAIN; + return -1; +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_partial); +ATF_TC_BODY(flushlbuf_partial, tc) +{ + static struct stream s; + static char buf[BUFSIZE + 1]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = BUFSIZE / 2; // write will fail after this amount + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will consume s.len characters before + * returning EAGAIN, causing fprintf() to fail without having + * written anything (which is why we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * We have consumed s.len characters from the buffer, so continue + * printing until it is full again and check that no overflow has + * occurred yet. + */ + while (i < BUFSIZE + s.len) + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(BUFSIZE + s.len, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); + + /* + * The straw that breaks the camel's back: libc fails to recognize + * that the buffer is full and continues to write beyond its end. + */ + fprintf(f, "%c", seq[i++]); + ATF_CHECK_EQ(0, buf[BUFSIZE]); +} + +ATF_TC_WITHOUT_HEAD(flushlbuf_full); +ATF_TC_BODY(flushlbuf_full, tc) +{ + static struct stream s; + static char buf[BUFSIZE]; + FILE *f; + unsigned int i = 0; + int ret = 0; + + /* + * Create the stream and its buffer, print just enough characters + * to the stream to fill the buffer without triggering a flush, + * then check the state. + */ + s.len = 0; // any attempt to write will fail + ATF_REQUIRE((f = fwopen(&s, writefn)) != NULL); + ATF_REQUIRE(setvbuf(f, buf, _IOLBF, BUFSIZE) == 0); + while (i < BUFSIZE) + if ((ret = fprintf(f, "%c", seq[i++])) < 0) + break; + ATF_CHECK_EQ(BUFSIZE, i); + ATF_CHECK_EQ(seq[i - 1], buf[BUFSIZE - 1]); + ATF_CHECK_EQ(1, ret); + ATF_CHECK_EQ(0, s.pos); + + /* + * At this point, the buffer is full but writefn() has not yet + * been called. The next fprintf() call will trigger a preemptive + * fflush(), and writefn() will immediately return EAGAIN, causing + * fprintf() to fail without having written anything (which is why + * we don't increment i here). + */ + ret = fprintf(f, "%c", seq[i]); + ATF_CHECK_ERRNO(EAGAIN, ret < 0); + ATF_CHECK_EQ(s.len, s.pos); + + /* + * Now make our stream writeable. + */ + s.len = sizeof(s.buf); + + /* + * Flush the stream again. The data we failed to write previously + * should still be in the buffer and will now be written to the + * stream. + */ + ATF_CHECK_EQ(0, fflush(f)); + ATF_CHECK_EQ(seq[0], s.buf[0]); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, flushlbuf_partial); + ATF_TP_ADD_TC(tp, flushlbuf_full); + + return (atf_no_error()); +} From nobody Tue Nov 7 15:01:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPrz12vD5z50NKh; Tue, 7 Nov 2023 15:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPrz12LGQz3DBT; Tue, 7 Nov 2023 15:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699369309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=waOrCwXg+rF8Lurh6zYm7AkSnsTEgZeY5lO3+9zOy3Y=; b=t9XebIXCqOW6W+gIlrXIWiLqHrNDjcxFJvHVmqA/qswv+nhM91uHbdMfjlz6EznaPFKrLD 6z2BTFZouVXNqauXJjIX1mK6UrN2draXvTVbyYYYJLcgaCWMA5ML3lacrFUsTJAXC3N2eK FOmV4zWJGAk2W4LMQMlnuQDXJ+Cj7HJixfXpC3NZcQjosXIVyNowtFHY8Ds3HN0xixSWaF eF5NPHAsu/se2ImpQh/ZCZM9571Z8GBG1kn3w4K298/q68LR56rqHwz5vB59TutkNpAjcW NNBpGt8W9om3BifJ17wOHpmDMKMGCnlqknAUoRhKY78TPAdJHI2My2IVZTxn/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699369309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=waOrCwXg+rF8Lurh6zYm7AkSnsTEgZeY5lO3+9zOy3Y=; b=mrQj30wB6rgG+3awmRpPN4YjFJf+0ziPZpkMsGp9Wd7ytTen33vlpLmevU1EYSuTYvIucc 9As534umem2C+JPOKM8ciByT9nBG/AFx+auTSbVEb8/oluJ1gbJtAiGfcBfWKBDBFv54lo ZazG+IiHeqSYjE2kSyJgq7S6+CIkUrVJyuKBaZbm0O7i/+eWcpMusW+tk/dyKiLSLnBDBC yWah9ae0fDT4x/iWcGUs+zyafJtxa4FXi8LtecQGrNnjEFUB6i5oNdCFai39CtdjnI4I2k iw3iodYwy5UoGvx0K6S5vGe4+U+VxnU3QaEM1VRmX/1HJhziuQ5Q5MFIoGRgZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699369309; a=rsa-sha256; cv=none; b=DwlWUWurapEE7Nd+WNItkxNClgDh/5AXA8oo9KMhtPi1KGhuefmJF9d5rkYNw9c/3yfYcG 9+SB+rDUTGm0Vf3Ffur9FdChSwgpBei+cv9fIy9VUz9rWn4Um8HYiHp2rDSjqFpGW3MkKB cqzfbKsjckmEhcAADbU+Ib9fIDzf24z6UQg2GHfg+rwZq0F1pUsHeCNhgGKWzFJagGqtHe JXMiNWODXxG6/6migfIW70q0B8eQ09mhrMoyMudR25lqKPHKa0mWcX1yPmIuiVZ/58ZVif /hEm4Uv8gIAjeqw86ZggOlaWgRhMhGh8nlSnkg2wJUTVUm4iP4J69MswGW0Dng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPrz11NjdzvBy; Tue, 7 Nov 2023 15:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7F1nMg001437; Tue, 7 Nov 2023 15:01:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7F1n3g001434; Tue, 7 Nov 2023 15:01:49 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:01:49 GMT Message-Id: <202311071501.3A7F1n3g001434@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: b247ff70e8f1 - main - stand: Rename LIBFDT to LIBSAFDT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b247ff70e8f1b4bf184b9fc85d2908ec4db2d1ab Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b247ff70e8f1b4bf184b9fc85d2908ec4db2d1ab commit b247ff70e8f1b4bf184b9fc85d2908ec4db2d1ab Author: Mark Johnston AuthorDate: 2023-11-07 14:57:32 +0000 Commit: Mark Johnston CommitDate: 2023-11-07 14:57:32 +0000 stand: Rename LIBFDT to LIBSAFDT Preemptively address a collision with LIBFDT (to be added in the future) from src.libnames.mk, which gets included via bsd.progs.mk. No functional change intended. Reviewed by: imp MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D42486 --- stand/efi/loader/Makefile | 4 ++-- stand/fdt.mk | 2 +- stand/kboot/Makefile | 4 ++-- stand/powerpc/ofw/Makefile | 4 ++-- stand/uboot/Makefile | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 3ce9ac169bd1..5a755c1d329f 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -122,7 +122,7 @@ ${LOADER}.efi: ${PROG} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a -DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT} -LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT} +LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} .include diff --git a/stand/fdt.mk b/stand/fdt.mk index 56c9ff95b5ad..1b3df587d0db 100644 --- a/stand/fdt.mk +++ b/stand/fdt.mk @@ -4,5 +4,5 @@ CFLAGS+= -I${FDTSRC} CFLAGS+= -I${BOOTOBJ}/fdt CFLAGS+= -I${SYSDIR}/contrib/libfdt CFLAGS+= -DLOADER_FDT_SUPPORT -LIBFDT= ${BOOTOBJ}/fdt/libfdt.a +LIBSAFDT= ${BOOTOBJ}/fdt/libfdt.a .endif diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index f5049a1c19c0..b9d68cddf97d 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -63,7 +63,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} CFLAGS+= -Wall -DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} +LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} .include diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile index 2beb315a4d41..3e4c92220fac 100644 --- a/stand/powerpc/ofw/Makefile +++ b/stand/powerpc/ofw/Makefile @@ -59,8 +59,8 @@ LDFLAGS+= -T ${.CURDIR}/ldscript.powerpc LIBOFW= ${BOOTOBJ}/libofw/libofw.a CFLAGS+= -I${BOOTSRC}/libofw -DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} +LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} MK_PIE= no diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index 1cc4abe86d9b..83ac5949cbb3 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -78,7 +78,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ubldr ubldr.bin ubldr.pie: ${OBJS} .endif -DPADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA} -LDADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA} +DPADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA} +LDADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA} .include From nobody Tue Nov 7 15:23:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPsS30W0Gz50SMB; Tue, 7 Nov 2023 15:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPsS233wnz3GMp; Tue, 7 Nov 2023 15:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699370610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DzPSN0ro2F4T7SICw+Qj8XBTvZxDho+Iqx6yizsPM4s=; b=H5+0Rr5H+II7yERsPZEiY1upClyINBOl6R8H9Ne/oy+RdbH35V07B/vGnT/h+C2AExtDuz CNy/+QVtu48UF6tFAjCtYlrRdQSOovZegSJmTwVpFLUg0lzbp6i2yRkYwf2at1p3osiKpn u4Z/WChP7s3Z6PBiGRoDP3QZ5HGk99kaV5RT70g2+vdZkA1IHw916Mq5qMgkdP+6DiOvOH r36VsmUwAWYDq19m5noLUIJH6tbq3cBrvjZinUEkiUFJcgCbPNPZ3kpmLGdWRLwnhArdpd Da0wOACgie5R1opvcA9WvSLaZOBd9fEXgZxPmAmlC2maioFQdyxE/yJk/C7NHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699370610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DzPSN0ro2F4T7SICw+Qj8XBTvZxDho+Iqx6yizsPM4s=; b=TaKa278drvKiuQlWmsCKkX7aWxu8qvdrmmGGnucf48JeGgKschsQdW7e9NSDK7clJMuUo1 z9KwjOL2NLtiUu9+C/SJhavmA6vuqUv+ACVd3j6lkHLy5GEkmFUHsWdgwpqWHeRzhAtlxR t0ZejbHyDnHtncBq2q5pjZ5utKHQ8SCnaCxa9hs4lAqOiWgfE7wrduMxzHjOVDQAu46g60 jLr1XtqVaPaHlp2ibOpEhKjw7JA9/6CZe9ygAdpqVfkReyIK2kzbqs9G6YfXZFQBFrccnP uwtFd9jaTGVDzOl5IxwiRqc5R5zd7Y8iAmQcnBao1RFSYRi0ntT90d8kDft5ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699370610; a=rsa-sha256; cv=none; b=JJCcToawNDlf/eObuMXCJ/VB43slE3LlHMFrk0OAbbWesTHyB5UCPEDYTPWZyGIQzbxgH4 zc7JLgGDxKzW0w5zBSJAYg573RmXIvIp0G0B7EXyyp43J6O6Vpp41BFlQk7Y/ztjNXdt2P 3mFoLuqZ/oFTJ+dd/LXUWUtnWEcKaLECye8oaWuH+caBYk2ia5Z4PaDqPlmHz3DrLkJtHS 82PRjJqVJ9q0+d+4461N5nKKt/xzDoOJupHjm4s8ZvZcs1++U7Ro9FKgEuvpLUgNy+4FTx 7WACQpHm1fSAfZxZxCnrlF29E759zCY5JEUlE4B9NP4UrZJcOiLA1i6Av+RtSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPsS227Kczvwc; Tue, 7 Nov 2023 15:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FNU0s035808; Tue, 7 Nov 2023 15:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FNUmx035805; Tue, 7 Nov 2023 15:23:30 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:23:30 GMT Message-Id: <202311071523.3A7FNUmx035805@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: 418f026bd5a5 - main - libc: remove unused errno.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 418f026bd5a5084c1c4e2e91ad38051f6caa928c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=418f026bd5a5084c1c4e2e91ad38051f6caa928c commit 418f026bd5a5084c1c4e2e91ad38051f6caa928c Author: Ed Maste AuthorDate: 2023-11-07 15:00:35 +0000 Commit: Ed Maste CommitDate: 2023-11-07 15:23:20 +0000 libc: remove unused errno.h include errno.h was added in 44cf1e5eb470, which has been reverted. Fixes: d09a3bf72c0b ("fflush: correct buffer handling in __sflush") Sponsored by: The FreeBSD Foundation --- lib/libc/stdio/fvwrite.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 301e0d6f5e58..63d17a8f8ffd 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -35,7 +35,6 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include #include #include #include From nobody Tue Nov 7 15:47:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszZ3rDWz50Wbn; Tue, 7 Nov 2023 15:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszZ3NJlz3JdZ; Tue, 7 Nov 2023 15:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Box5d9ntebhVfL1GLkymmb67EA4ISpCjOrUUdXxmIVA=; b=q0FvxyizEqKrUwfL85MCarDYeI/Mku3R3m/XaqmO7nON0KSLDNZ2wMv2Cq+CX/Qxkn3ADb Z5w7Qhr4v+OusgkW15+r5RSDDaWUbVo9d5sQLwC4tvSHAPqXhEGzj64cgzK2KGVL0RUsRP nGZCrJFVJk4TSTnC9ifvpbeBFHW7jPZ6t0LlFIleSvW54Pxx4EvphrPPNFpVxFRxH5MONn 8BBpuEuB1Ku4BzUNWBE91dk4H+DcJqg2usjA83wOimTcz1H3/l534oZommMvnFInAHm/JC RLw6EZoaNAP4CZZJvAIqfSfvKj4QUL3uypv2pYt9bS8yiPOaQKmjW6Tjey0RSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Box5d9ntebhVfL1GLkymmb67EA4ISpCjOrUUdXxmIVA=; b=NC1rnnYXppw7CS1daqpg24lUhBZ/MX1gHg32hMXmU/UE9jrjDNbLVQAKUsnPaNvDmpRu5I 8p2nAobGvW0ZZMTcrsJ6Ydao5pGs7z/toyNJUX7Mkb7+AsOKRDdN4P+WE4aFnk1Hw9KPwb HKXr0ly62lYuqVuB9+l/UtixhqA2XktNElT4Ws8dlRECg7PEC9p5Cxwt98Xlqx1VqIOr5d fUxspoUacLaxj/vDYLBNiE8UvRYjogOQ1h8rVwuErv69JlQGaNNg5OVdGY5Z7S7TDo3cna XiC73q74BHophxyBJ3oxHWGjHXnGnULS6CzWllqLy7FE1TJdDT1d0nN8neKZNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372042; a=rsa-sha256; cv=none; b=WneRCkpGzsfgYGzQRjj1qkFpGCBF79Tmjj952tVa0TJmaGbB6kfXxe4bQYd0MnohzMdkWr JcBAbkPiMJnlcXrz7raURZt+qUjW/upEw9BSm84u+12dseFY9vL127LbrVBhe0SLu+aIly gqYO17hA73NJuZkM1K36cLVjxzkNHKUa+gBjL2ypEjnvrUJ6rGvvwjgG/wBvnj0umY0Wdu hWc5Q2t20eBAnxQ6Kb4hGYx/KugskdKPXwaXwXVJbEeQkb/hz3Imvok45BOhxqI1I3ETq7 U2RzagWy8NYTbAilyP4wq+0fZZENp/lx5M05ZHp/5wUriVpj8CJN0EgNfqnzLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPszZ2PnczwC1; Tue, 7 Nov 2023 15:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlMil069635; Tue, 7 Nov 2023 15:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlMHF069632; Tue, 7 Nov 2023 15:47:22 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:22 GMT Message-Id: <202311071547.3A7FlMHF069632@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: 7afd7a768792 - stable/14 - pf: fix missing SCTP multihomed states List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7afd7a76879235c25f1013ba884318452d976bef Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7afd7a76879235c25f1013ba884318452d976bef commit 7afd7a76879235c25f1013ba884318452d976bef Author: Kristof Provost AuthorDate: 2023-10-17 16:10:39 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:46:52 +0000 pf: fix missing SCTP multihomed states The existing code to create extra states when SCTP endpoints supplied extra addresses missed a case. As a result we failed to generate all of the required states. Briefly, if host A has address 1 and 2 and host B has addres 3 and 4 we generated 1 - 3 and 2 - 3, as well as 1 - 4, but not 2 - 4. Store the list of endpoints supplied by each host and use those to generate all of the connection permutations. MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42361 (cherry picked from commit d6d38b02ee57920cc02a306a6d8d2aec9c4b759c) --- sys/netpfil/pf/pf.c | 253 ++++++++++++++++++++++++++++++++++++++++++++--- sys/netpfil/pf/pf_norm.c | 2 + 2 files changed, 240 insertions(+), 15 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 39d240f49dbd..96e8a165692f 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -179,6 +179,34 @@ VNET_DEFINE(size_t, pf_allrulecount); VNET_DEFINE(struct pf_krule *, pf_rulemarker); #endif +struct pf_sctp_endpoint; +RB_HEAD(pf_sctp_endpoints, pf_sctp_endpoint); +struct pf_sctp_source { + sa_family_t af; + struct pf_addr addr; + TAILQ_ENTRY(pf_sctp_source) entry; +}; +TAILQ_HEAD(pf_sctp_sources, pf_sctp_source); +struct pf_sctp_endpoint +{ + uint32_t v_tag; + struct pf_sctp_sources sources; + RB_ENTRY(pf_sctp_endpoint) entry; +}; +static int +pf_sctp_endpoint_compare(struct pf_sctp_endpoint *a, struct pf_sctp_endpoint *b) +{ + return (a->v_tag - b->v_tag); +} +RB_PROTOTYPE(pf_sctp_endpoints, pf_sctp_endpoint, entry, pf_sctp_endpoint_compare); +RB_GENERATE(pf_sctp_endpoints, pf_sctp_endpoint, entry, pf_sctp_endpoint_compare); +VNET_DEFINE_STATIC(struct pf_sctp_endpoints, pf_sctp_endpoints); +#define V_pf_sctp_endpoints VNET(pf_sctp_endpoints) +static struct mtx_padalign pf_sctp_endpoints_mtx; +MTX_SYSINIT(pf_sctp_endpoints_mtx, &pf_sctp_endpoints_mtx, "SCTP endpoints", MTX_DEF); +#define PF_SCTP_ENDPOINTS_LOCK() mtx_lock(&pf_sctp_endpoints_mtx) +#define PF_SCTP_ENDPOINTS_UNLOCK() mtx_unlock(&pf_sctp_endpoints_mtx) + /* * Queue for pf_intr() sends. */ @@ -309,6 +337,7 @@ static int pf_test_state_udp(struct pf_kstate **, static int pf_test_state_icmp(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *, u_short *); +static void pf_sctp_multihome_detach_addr(const struct pf_kstate *); static void pf_sctp_multihome_delayed(struct pf_pdesc *, int, struct pfi_kkif *, struct pf_kstate *, int); static int pf_test_state_sctp(struct pf_kstate **, @@ -1140,6 +1169,7 @@ pf_cleanup(void) m_freem(pfse->pfse_m); free(pfse, M_PFTEMP); } + MPASS(RB_EMPTY(&V_pf_sctp_endpoints)); uma_zdestroy(V_pf_sources_z); uma_zdestroy(V_pf_state_z); @@ -1359,6 +1389,8 @@ pf_detach_state(struct pf_kstate *s) struct pf_state_key *sks = s->key[PF_SK_STACK]; struct pf_keyhash *kh; + pf_sctp_multihome_detach_addr(s); + if (sks != NULL) { kh = &V_pf_keyhash[pf_hashkey(sks)]; PF_HASHROW_LOCK(kh); @@ -5848,7 +5880,7 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, int off, void *h, struct pf_pdesc *pd, u_short *reason) { struct pf_state_key_cmp key; - struct pf_state_peer *src; //, *dst; + struct pf_state_peer *src, *dst; struct sctphdr *sh = &pd->hdr.sctp; u_int8_t psrc; //, pdst; @@ -5871,9 +5903,11 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, if (pd->dir == (*state)->direction) { src = &(*state)->src; + dst = &(*state)->dst; psrc = PF_PEER_SRC; } else { src = &(*state)->dst; + dst = &(*state)->src; psrc = PF_PEER_DST; } @@ -5884,6 +5918,12 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, (*state)->timeout = PFTM_TCP_OPENING; } } + if (pd->sctp_flags & PFDESC_SCTP_INIT_ACK) { + MPASS(dst->scrub != NULL); + if (dst->scrub->pfss_v_tag == 0) + dst->scrub->pfss_v_tag = pd->sctp_initiate_tag; + } + if (pd->sctp_flags & PFDESC_SCTP_COOKIE) { if (src->state < SCTP_ESTABLISHED) { pf_set_protostate(*state, psrc, SCTP_ESTABLISHED); @@ -5930,37 +5970,222 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, return (PF_PASS); } +static void +pf_sctp_multihome_detach_addr(const struct pf_kstate *s) +{ + struct pf_sctp_endpoint key; + struct pf_sctp_endpoint *ep; + struct pf_state_key *sks = s->key[PF_SK_STACK]; + struct pf_sctp_source *i, *tmp; + + if (sks == NULL || sks->proto != IPPROTO_SCTP || s->dst.scrub == NULL) + return; + + PF_SCTP_ENDPOINTS_LOCK(); + + key.v_tag = s->dst.scrub->pfss_v_tag; + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep != NULL) { + /* XXX Actually remove! */ + TAILQ_FOREACH_SAFE(i, &ep->sources, entry, tmp) { + if (pf_addr_cmp(&i->addr, + &s->key[PF_SK_WIRE]->addr[s->direction == PF_OUT], + s->key[PF_SK_WIRE]->af) == 0) { + TAILQ_REMOVE(&ep->sources, i, entry); + free(i, M_PFTEMP); + break; + } + } + + if (TAILQ_EMPTY(&ep->sources)) { + RB_REMOVE(pf_sctp_endpoints, &V_pf_sctp_endpoints, ep); + free(ep, M_PFTEMP); + } + } + + /* Other direction. */ + key.v_tag = s->src.scrub->pfss_v_tag; + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep != NULL) { + TAILQ_FOREACH_SAFE(i, &ep->sources, entry, tmp) { + if (pf_addr_cmp(&i->addr, + &s->key[PF_SK_WIRE]->addr[s->direction == PF_IN], + s->key[PF_SK_WIRE]->af) == 0) { + TAILQ_REMOVE(&ep->sources, i, entry); + free(i, M_PFTEMP); + break; + } + } + + if (TAILQ_EMPTY(&ep->sources)) { + RB_REMOVE(pf_sctp_endpoints, &V_pf_sctp_endpoints, ep); + free(ep, M_PFTEMP); + } + } + + PF_SCTP_ENDPOINTS_UNLOCK(); +} + +static void +pf_sctp_multihome_add_addr(struct pf_pdesc *pd, struct pf_addr *a, uint32_t v_tag) +{ + struct pf_sctp_endpoint key = { + .v_tag = v_tag, + }; + struct pf_sctp_source *i; + struct pf_sctp_endpoint *ep; + + PF_SCTP_ENDPOINTS_LOCK(); + + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep == NULL) { + ep = malloc(sizeof(struct pf_sctp_endpoint), + M_PFTEMP, M_NOWAIT); + if (ep == NULL) { + PF_SCTP_ENDPOINTS_UNLOCK(); + return; + } + + ep->v_tag = v_tag; + TAILQ_INIT(&ep->sources); + RB_INSERT(pf_sctp_endpoints, &V_pf_sctp_endpoints, ep); + } + + /* Avoid inserting duplicates. */ + TAILQ_FOREACH(i, &ep->sources, entry) { + if (pf_addr_cmp(&i->addr, a, pd->af) == 0) { + PF_SCTP_ENDPOINTS_UNLOCK(); + return; + } + } + + i = malloc(sizeof(*i), M_PFTEMP, M_NOWAIT); + if (i == NULL) { + PF_SCTP_ENDPOINTS_UNLOCK(); + return; + } + + i->af = pd->af; + memcpy(&i->addr, a, sizeof(*a)); + TAILQ_INSERT_TAIL(&ep->sources, i, entry); + + PF_SCTP_ENDPOINTS_UNLOCK(); +} + static void pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, struct pf_kstate *s, int action) { struct pf_sctp_multihome_job *j, *tmp; + struct pf_sctp_source *i; int ret __unused;; struct pf_kstate *sm = NULL; struct pf_krule *ra = NULL; struct pf_krule *r = &V_pf_default_rule; struct pf_kruleset *rs = NULL; + bool do_extra = true; PF_RULES_RLOCK_TRACKER; +again: TAILQ_FOREACH_SAFE(j, &pd->sctp_multihome_jobs, next, tmp) { if (s == NULL || action != PF_PASS) goto free; + /* Confirm we don't recurse here. */ + MPASS(! (pd->sctp_flags & PFDESC_SCTP_ADD_IP)); + switch (j->op) { case SCTP_ADD_IP_ADDRESS: { + uint32_t v_tag = pd->sctp_initiate_tag; + + if (v_tag == 0) { + if (s->direction == pd->dir) + v_tag = s->src.scrub->pfss_v_tag; + else + v_tag = s->dst.scrub->pfss_v_tag; + } + + /* + * Avoid duplicating states. We'll already have + * created a state based on the source address of + * the packet, but SCTP endpoints may also list this + * address again in the INIT(_ACK) parameters. + */ + if (pf_addr_cmp(&j->src, pd->src, pd->af) == 0) { + break; + } + j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; PF_RULES_RLOCK(); + sm = NULL; + /* XXX: May generated unwanted abort if we try to insert a duplicate state. */ ret = pf_test_rule(&r, &sm, kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); - if (sm) { + if (ret != PF_DROP && sm != NULL) { /* Inherit v_tag values. */ - sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags; - sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_flags; + if (sm->direction == s->direction) { + sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_v_tag; + sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_v_tag; + } else { + sm->src.scrub->pfss_v_tag = s->dst.scrub->pfss_v_tag; + sm->dst.scrub->pfss_v_tag = s->src.scrub->pfss_v_tag; + } PF_STATE_UNLOCK(sm); + } else { + /* If we try duplicate inserts? */ + break; + } + + /* Only add the addres if we've actually allowed the state. */ + pf_sctp_multihome_add_addr(pd, &j->src, v_tag); + + if (! do_extra) { + break; } + /* + * We need to do this for each of our source addresses. + * Find those based on the verification tag. + */ + struct pf_sctp_endpoint key = { + .v_tag = pd->hdr.sctp.v_tag, + }; + struct pf_sctp_endpoint *ep; + + PF_SCTP_ENDPOINTS_LOCK(); + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep == NULL) { + PF_SCTP_ENDPOINTS_UNLOCK(); + break; + } + MPASS(ep != NULL); + + TAILQ_FOREACH(i, &ep->sources, entry) { + struct pf_sctp_multihome_job *nj; + + /* SCTP can intermingle IPv4 and IPv6. */ + if (i->af != pd->af) + continue; + + nj = malloc(sizeof(*nj), M_PFTEMP, M_NOWAIT | M_ZERO); + if (! nj) { + continue; + } + memcpy(&nj->pd, &j->pd, sizeof(j->pd)); + memcpy(&nj->src, &j->src, sizeof(nj->src)); + nj->pd.src = &nj->src; + // New destination address! + memcpy(&nj->dst, &i->addr, sizeof(nj->dst)); + nj->pd.dst = &nj->dst; + nj->m = j->m; + nj->op = j->op; + + TAILQ_INSERT_TAIL(&pd->sctp_multihome_jobs, nj, next); + } + PF_SCTP_ENDPOINTS_UNLOCK(); + break; } case SCTP_DEL_IP_ADDRESS: { @@ -5998,11 +6223,18 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, default: panic("Unknown op %#x", j->op); } - } + } -free: + free: + TAILQ_REMOVE(&pd->sctp_multihome_jobs, j, next); free(j, M_PFTEMP); } + + /* We may have inserted extra work while processing the list. */ + if (! TAILQ_EMPTY(&pd->sctp_multihome_jobs)) { + do_extra = false; + goto again; + } } static int @@ -6035,15 +6267,6 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, NULL, NULL, pd->af)) return (PF_DROP); - /* - * Avoid duplicating states. We'll already have - * created a state based on the source address of - * the packet, but SCTP endpoints may also list this - * address again in the INIT(_ACK) parameters. - */ - if (t.s_addr == pd->src->v4.s_addr) - break; - if (in_nullhost(t)) t.s_addr = pd->src->v4.s_addr; diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index d63cf0ebe54e..5f2b8e9d36ff 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1585,6 +1585,8 @@ pf_normalize_sctp_init(struct mbuf *m, int off, struct pf_pdesc *pd, return (1); } + dst->scrub->pfss_v_tag = pd->sctp_initiate_tag; + return (0); } From nobody Tue Nov 7 15:47:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszb4yTlz50Wmv; Tue, 7 Nov 2023 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszb44cdz3Jsw; Tue, 7 Nov 2023 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nji8/Y3qjP5GRKZbLQBPoT/FdyhG5SadKxAF6vgZmkw=; b=JI6QPyOOgPKcQKrDD2BugwhlM4Vmp+oZ57IMCJyiMAtmvsnosuOSy6yqXXsYxyeyVRh/dt yghVw+LR2MyW33yPyWw2z509EnJl2jCjizuRylS3P3F5ynS61BPfcN4KxO6uW7ARWzY/vF +4ERmG10BAqWa6IF/+rNq98I8YebKnyu3j+EmlsKUOt7cXDgovVTDqRu1ln+SrKxC7M1tu pE2ST0jBSKaHzLLIhhcnKtGsS81P5IS3JucZp+vD+GWENJD+JtnDWvLRFJqmD/qJZV9fyS oUj2leY3Fm9Eaa4sZz3NscBqS5JrwznjH9MTPArgyfLSfk/8rIHAPSJ+rKdcAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nji8/Y3qjP5GRKZbLQBPoT/FdyhG5SadKxAF6vgZmkw=; b=hOiUBu+HpvPAa1SCRkrtR4gm0h+xe5RfPmhLxuJWlMxInWL4+q6kmj6iO/dnBL2UrNHLww JHj9EIA4Qho1pAOKIJXwxgPKDdlyobqJU+Z5aNH1POjCBLRL47nQN+uZsUVXf1HNyKPBNz efy91CdyBCfsc+RJiSvjS1ZeGLo8OT/qkHV8Yrj8lZknU7kRYXVspYJtdCXiljS9yUYo15 toYtxIZKn+Nq5pPROMLVEqgfn/wl/YGmVcMWgpOydKBXKxw7A4eqygdoN2AKmBlA3TFtoC 0JtqcbXkv9K3o2ovX4PYV1Jxr+HojjCpDlYvk4ZVjB2854cYCCXQ7J2fRD8tWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372043; a=rsa-sha256; cv=none; b=YyJV2rjLHuxBIiVgJU5qHo+Sacsxc8hT+UURf3OR4B6Ag0L8G8n8/qFf4lfwbH3T8Rh+Gh 36Z9WZa5j5ZdolT00ByqMsQXiZKPocQsQ6GPlkfIbuVbWBXV/G6TAkfHNBV5M9e8ZZVeK5 iQWALSnCEENXWiTQD1ZBnCYplYsWUxf+6mSpbPn8+wMJWVoirzNZOg8WYtM9WehRY0rJqt C7lOPqUOfdjcVjj7CawysYg5olpW750VfiQc3Fshb4cz+4M62ks7CQcasxiWPTmlQMz9LQ 8slTs3rrVTjv+il1lYSsAqWksUIiuzpe2pUWkI7EDweTu0vtHP9M+UEv0k+dqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPszb35gLzwgf; Tue, 7 Nov 2023 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlNqI069736; Tue, 7 Nov 2023 15:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlNZ7069733; Tue, 7 Nov 2023 15:47:23 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:23 GMT Message-Id: <202311071547.3A7FlNZ7069733@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: d322e5d76aa3 - stable/14 - pf tests: ensure that we generate all permutations for SCTP multihome List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d322e5d76aa30934407bb9fe3b9e6fe5a1279f6a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d322e5d76aa30934407bb9fe3b9e6fe5a1279f6a commit d322e5d76aa30934407bb9fe3b9e6fe5a1279f6a Author: Kristof Provost AuthorDate: 2023-10-10 09:56:15 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:46:52 +0000 pf tests: ensure that we generate all permutations for SCTP multihome The initial multihome implementation was a little simplistic, and failed to create all of the required states. Given a client with IP 1 and 2 and a server with IP 3 and 4 we end up creating states for 1 - 3 and 2 - 3, as well as 3 - 1 and 4 - 1, but not for 2 - 4. Check for this. MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42362 (cherry picked from commit 483d5c4075e06e52d5daa23aef2b4f4a2eb64443) --- tests/sys/netpfil/pf/sctp.py | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index 5e6dca5dd64b..5db52dd993f2 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -360,6 +360,37 @@ class TestSCTP(VnetTestTemplate): states = ToolsHelper.get_output("/sbin/pfctl -ss") assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234.*SHUTDOWN", states) + + @pytest.mark.require_user("root") + def test_permutation(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet alias 192.0.2.4/24" % ifname) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet proto sctp to 192.0.2.0/24"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("192.0.2.3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1, but also to 192.0.2.4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.2:1234", states) + assert re.search(r"all sctp 192.0.2.4:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.4:.*192.0.2.2:1234", states) + class TestSCTPv6(VnetTestTemplate): REQUIRED_MODULES = ["sctp", "pf"] TOPOLOGY = { @@ -476,3 +507,33 @@ class TestSCTPv6(VnetTestTemplate): # Verify that the state is closing states = ToolsHelper.get_output("/sbin/pfctl -ss") assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\].*SHUTDOWN", states) + + @pytest.mark.require_user("root") + def test_permutation(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::4/64" % ifname) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet6 proto sctp to 2001:db8::0/64"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("2001:db8::3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 2001:db8::3 and 2001:db8::2 to 2001:db8::1, but also to 2001:db8::4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::2\[1234\]", states) + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) + assert re.search(r"all sctp 2001:db8::4\[.*2001:db8::2\[1234\]", states) + assert re.search(r"all sctp 2001:db8::4\[.*2001:db8::3\[1234\]", states) From nobody Tue Nov 7 15:47:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszb61kbz50WqT; Tue, 7 Nov 2023 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszb4sFnz3JyD; Tue, 7 Nov 2023 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwE/IzYt3QOkOsZsiZpFvJ4L/daTCGWBBCcdR7d1nBY=; b=B4ccrfS2eQjxxem6DZugicCJvgVBFqz5BOs4canb9zpD12kzqw+1SlFFVZKAD9zoA3nGjV ym/SNUO+C08IPmxBq6UifUpi8n0+nVI/wcT6bfy8fSaPjC6X01pIz3ugQyhFxwcrJjxzmc 6Ew4vvDS1U3kmOHPlDSrf8CVcq86vbwns4OwbMSfplQdRvan/xXLOcrNp0kqQkW5wppGgC EGYLrT1YgVgmTNQI9Rz5JezR4EhWaLBHDRzqTtyutAnASUWKKvMZMQzeisFSPF/WwH9L6H qkWbu+S9Pgpr0a29RmvW+fU8nXtKlBcR/ud0GauRu/3ggCCXqy1AxUjaqDVXnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwE/IzYt3QOkOsZsiZpFvJ4L/daTCGWBBCcdR7d1nBY=; b=ZC3ejTX37nVRyKsOxM4tmNJbVnvdAqEgfjCzEr5Bc/i9DZ82OCBSi56qkizs4jDiY/u682 HcBQ+nVooQbyo4Ar3JmYyF5sRz9B0gqtquo3XIM78NiNcYcopQsJUdLy61EWWtTADoxmKv yrPc1CLhWszpllXWWknN0NlPy6URHHbYZ+CntBBmyyIdOPD/T35nnhiCT/CwXJTWfoFolO YxwT5yDwsQ7gx9mx50IitmNfJATMLe0S21uBfHHlT7RGUKK3efdayrgYQdCLg75zspRGdb PMgyquEqEsBqPnsNCRuH50mdEnBSIVnpbyGxK9RVLNaHiLJZp7OgxnZ6KAkmOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372043; a=rsa-sha256; cv=none; b=p59se42Sw/X799NZFJHJlJtDAocEVv4UhDin3xNsTg3ICxFFjytyD/3Rbm0bEPJtvs+fmL bN3mJl8HU6a1FG+zmsn0Okek2FqGT7bRw9i28QG9LsLnkCQyz5WYyMyNG29DUoQhDs3CLI ofp8TMELByj29AkFxvmKODMNMy7Wn4A6/3B2h8xftSmmscDXcswxIbpH5dnJQJVcpFh/Bl 0pzliUDKM3OFOAJ6yVCNxBHLNUPaeS57ndSSzld2AuEafYold5ubrzmC5zyGcAA7/H9VET 7sNJxb/i9cY3b1uqU7GSZ/VJ8gaiB/S2118eOXgEGowB5PF5F0KKSTzXEsUPjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPszb3wQ8zwWC; Tue, 7 Nov 2023 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlNTK069810; Tue, 7 Nov 2023 15:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlNwU069807; Tue, 7 Nov 2023 15:47:23 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:23 GMT Message-Id: <202311071547.3A7FlNwU069807@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: f7bc2901f97f - stable/13 - pf: fix missing SCTP multihomed states List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f7bc2901f97f480950d3763962ad9ed743a838fc Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f7bc2901f97f480950d3763962ad9ed743a838fc commit f7bc2901f97f480950d3763962ad9ed743a838fc Author: Kristof Provost AuthorDate: 2023-10-17 16:10:39 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:25:02 +0000 pf: fix missing SCTP multihomed states The existing code to create extra states when SCTP endpoints supplied extra addresses missed a case. As a result we failed to generate all of the required states. Briefly, if host A has address 1 and 2 and host B has addres 3 and 4 we generated 1 - 3 and 2 - 3, as well as 1 - 4, but not 2 - 4. Store the list of endpoints supplied by each host and use those to generate all of the connection permutations. MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42361 (cherry picked from commit d6d38b02ee57920cc02a306a6d8d2aec9c4b759c) --- sys/netpfil/pf/pf.c | 253 ++++++++++++++++++++++++++++++++++++++++++++--- sys/netpfil/pf/pf_norm.c | 2 + 2 files changed, 240 insertions(+), 15 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 869c68ad308f..278aa07fab75 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -162,6 +162,34 @@ VNET_DEFINE(size_t, pf_allrulecount); VNET_DEFINE(struct pf_krule *, pf_rulemarker); #endif +struct pf_sctp_endpoint; +RB_HEAD(pf_sctp_endpoints, pf_sctp_endpoint); +struct pf_sctp_source { + sa_family_t af; + struct pf_addr addr; + TAILQ_ENTRY(pf_sctp_source) entry; +}; +TAILQ_HEAD(pf_sctp_sources, pf_sctp_source); +struct pf_sctp_endpoint +{ + uint32_t v_tag; + struct pf_sctp_sources sources; + RB_ENTRY(pf_sctp_endpoint) entry; +}; +static int +pf_sctp_endpoint_compare(struct pf_sctp_endpoint *a, struct pf_sctp_endpoint *b) +{ + return (a->v_tag - b->v_tag); +} +RB_PROTOTYPE(pf_sctp_endpoints, pf_sctp_endpoint, entry, pf_sctp_endpoint_compare); +RB_GENERATE(pf_sctp_endpoints, pf_sctp_endpoint, entry, pf_sctp_endpoint_compare); +VNET_DEFINE_STATIC(struct pf_sctp_endpoints, pf_sctp_endpoints); +#define V_pf_sctp_endpoints VNET(pf_sctp_endpoints) +static struct mtx_padalign pf_sctp_endpoints_mtx; +MTX_SYSINIT(pf_sctp_endpoints_mtx, &pf_sctp_endpoints_mtx, "SCTP endpoints", MTX_DEF); +#define PF_SCTP_ENDPOINTS_LOCK() mtx_lock(&pf_sctp_endpoints_mtx) +#define PF_SCTP_ENDPOINTS_UNLOCK() mtx_unlock(&pf_sctp_endpoints_mtx) + /* * Queue for pf_intr() sends. */ @@ -290,6 +318,7 @@ static int pf_test_state_udp(struct pf_kstate **, int, static int pf_test_state_icmp(struct pf_kstate **, int, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *, u_short *); +static void pf_sctp_multihome_detach_addr(const struct pf_kstate *); static void pf_sctp_multihome_delayed(struct pf_pdesc *, int, struct pfi_kkif *, struct pf_kstate *, int); static int pf_test_state_sctp(struct pf_kstate **, @@ -1100,6 +1129,7 @@ pf_cleanup(void) m_freem(pfse->pfse_m); free(pfse, M_PFTEMP); } + MPASS(RB_EMPTY(&V_pf_sctp_endpoints)); uma_zdestroy(V_pf_sources_z); uma_zdestroy(V_pf_state_z); @@ -1319,6 +1349,8 @@ pf_detach_state(struct pf_kstate *s) struct pf_state_key *sks = s->key[PF_SK_STACK]; struct pf_keyhash *kh; + pf_sctp_multihome_detach_addr(s); + if (sks != NULL) { kh = &V_pf_keyhash[pf_hashkey(sks)]; PF_HASHROW_LOCK(kh); @@ -5259,7 +5291,7 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, int off, void *h, struct pf_pdesc *pd, u_short *reason) { struct pf_state_key_cmp key; - struct pf_state_peer *src; //, *dst; + struct pf_state_peer *src, *dst; struct sctphdr *sh = &pd->hdr.sctp; u_int8_t psrc; //, pdst; @@ -5282,9 +5314,11 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, if (pd->dir == (*state)->direction) { src = &(*state)->src; + dst = &(*state)->dst; psrc = PF_PEER_SRC; } else { src = &(*state)->dst; + dst = &(*state)->src; psrc = PF_PEER_DST; } @@ -5295,6 +5329,12 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, (*state)->timeout = PFTM_TCP_OPENING; } } + if (pd->sctp_flags & PFDESC_SCTP_INIT_ACK) { + MPASS(dst->scrub != NULL); + if (dst->scrub->pfss_v_tag == 0) + dst->scrub->pfss_v_tag = pd->sctp_initiate_tag; + } + if (pd->sctp_flags & PFDESC_SCTP_COOKIE) { if (src->state < SCTP_ESTABLISHED) { pf_set_protostate(*state, psrc, SCTP_ESTABLISHED); @@ -5341,37 +5381,222 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, return (PF_PASS); } +static void +pf_sctp_multihome_detach_addr(const struct pf_kstate *s) +{ + struct pf_sctp_endpoint key; + struct pf_sctp_endpoint *ep; + struct pf_state_key *sks = s->key[PF_SK_STACK]; + struct pf_sctp_source *i, *tmp; + + if (sks == NULL || sks->proto != IPPROTO_SCTP || s->dst.scrub == NULL) + return; + + PF_SCTP_ENDPOINTS_LOCK(); + + key.v_tag = s->dst.scrub->pfss_v_tag; + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep != NULL) { + /* XXX Actually remove! */ + TAILQ_FOREACH_SAFE(i, &ep->sources, entry, tmp) { + if (pf_addr_cmp(&i->addr, + &s->key[PF_SK_WIRE]->addr[s->direction == PF_OUT], + s->key[PF_SK_WIRE]->af) == 0) { + TAILQ_REMOVE(&ep->sources, i, entry); + free(i, M_PFTEMP); + break; + } + } + + if (TAILQ_EMPTY(&ep->sources)) { + RB_REMOVE(pf_sctp_endpoints, &V_pf_sctp_endpoints, ep); + free(ep, M_PFTEMP); + } + } + + /* Other direction. */ + key.v_tag = s->src.scrub->pfss_v_tag; + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep != NULL) { + TAILQ_FOREACH_SAFE(i, &ep->sources, entry, tmp) { + if (pf_addr_cmp(&i->addr, + &s->key[PF_SK_WIRE]->addr[s->direction == PF_IN], + s->key[PF_SK_WIRE]->af) == 0) { + TAILQ_REMOVE(&ep->sources, i, entry); + free(i, M_PFTEMP); + break; + } + } + + if (TAILQ_EMPTY(&ep->sources)) { + RB_REMOVE(pf_sctp_endpoints, &V_pf_sctp_endpoints, ep); + free(ep, M_PFTEMP); + } + } + + PF_SCTP_ENDPOINTS_UNLOCK(); +} + +static void +pf_sctp_multihome_add_addr(struct pf_pdesc *pd, struct pf_addr *a, uint32_t v_tag) +{ + struct pf_sctp_endpoint key = { + .v_tag = v_tag, + }; + struct pf_sctp_source *i; + struct pf_sctp_endpoint *ep; + + PF_SCTP_ENDPOINTS_LOCK(); + + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep == NULL) { + ep = malloc(sizeof(struct pf_sctp_endpoint), + M_PFTEMP, M_NOWAIT); + if (ep == NULL) { + PF_SCTP_ENDPOINTS_UNLOCK(); + return; + } + + ep->v_tag = v_tag; + TAILQ_INIT(&ep->sources); + RB_INSERT(pf_sctp_endpoints, &V_pf_sctp_endpoints, ep); + } + + /* Avoid inserting duplicates. */ + TAILQ_FOREACH(i, &ep->sources, entry) { + if (pf_addr_cmp(&i->addr, a, pd->af) == 0) { + PF_SCTP_ENDPOINTS_UNLOCK(); + return; + } + } + + i = malloc(sizeof(*i), M_PFTEMP, M_NOWAIT); + if (i == NULL) { + PF_SCTP_ENDPOINTS_UNLOCK(); + return; + } + + i->af = pd->af; + memcpy(&i->addr, a, sizeof(*a)); + TAILQ_INSERT_TAIL(&ep->sources, i, entry); + + PF_SCTP_ENDPOINTS_UNLOCK(); +} + static void pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, struct pf_kstate *s, int action) { struct pf_sctp_multihome_job *j, *tmp; + struct pf_sctp_source *i; int ret __unused;; struct pf_kstate *sm = NULL; struct pf_krule *ra = NULL; struct pf_krule *r = &V_pf_default_rule; struct pf_kruleset *rs = NULL; + bool do_extra = true; PF_RULES_RLOCK_TRACKER; +again: TAILQ_FOREACH_SAFE(j, &pd->sctp_multihome_jobs, next, tmp) { if (s == NULL || action != PF_PASS) goto free; + /* Confirm we don't recurse here. */ + MPASS(! (pd->sctp_flags & PFDESC_SCTP_ADD_IP)); + switch (j->op) { case SCTP_ADD_IP_ADDRESS: { + uint32_t v_tag = pd->sctp_initiate_tag; + + if (v_tag == 0) { + if (s->direction == pd->dir) + v_tag = s->src.scrub->pfss_v_tag; + else + v_tag = s->dst.scrub->pfss_v_tag; + } + + /* + * Avoid duplicating states. We'll already have + * created a state based on the source address of + * the packet, but SCTP endpoints may also list this + * address again in the INIT(_ACK) parameters. + */ + if (pf_addr_cmp(&j->src, pd->src, pd->af) == 0) { + break; + } + j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; PF_RULES_RLOCK(); + sm = NULL; + /* XXX: May generated unwanted abort if we try to insert a duplicate state. */ ret = pf_test_rule(&r, &sm, pd->dir, kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); - if (sm) { + if (ret != PF_DROP && sm != NULL) { /* Inherit v_tag values. */ - sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags; - sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_flags; + if (sm->direction == s->direction) { + sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_v_tag; + sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_v_tag; + } else { + sm->src.scrub->pfss_v_tag = s->dst.scrub->pfss_v_tag; + sm->dst.scrub->pfss_v_tag = s->src.scrub->pfss_v_tag; + } PF_STATE_UNLOCK(sm); + } else { + /* If we try duplicate inserts? */ + break; + } + + /* Only add the addres if we've actually allowed the state. */ + pf_sctp_multihome_add_addr(pd, &j->src, v_tag); + + if (! do_extra) { + break; } + /* + * We need to do this for each of our source addresses. + * Find those based on the verification tag. + */ + struct pf_sctp_endpoint key = { + .v_tag = pd->hdr.sctp.v_tag, + }; + struct pf_sctp_endpoint *ep; + + PF_SCTP_ENDPOINTS_LOCK(); + ep = RB_FIND(pf_sctp_endpoints, &V_pf_sctp_endpoints, &key); + if (ep == NULL) { + PF_SCTP_ENDPOINTS_UNLOCK(); + break; + } + MPASS(ep != NULL); + + TAILQ_FOREACH(i, &ep->sources, entry) { + struct pf_sctp_multihome_job *nj; + + /* SCTP can intermingle IPv4 and IPv6. */ + if (i->af != pd->af) + continue; + + nj = malloc(sizeof(*nj), M_PFTEMP, M_NOWAIT | M_ZERO); + if (! nj) { + continue; + } + memcpy(&nj->pd, &j->pd, sizeof(j->pd)); + memcpy(&nj->src, &j->src, sizeof(nj->src)); + nj->pd.src = &nj->src; + // New destination address! + memcpy(&nj->dst, &i->addr, sizeof(nj->dst)); + nj->pd.dst = &nj->dst; + nj->m = j->m; + nj->op = j->op; + + TAILQ_INSERT_TAIL(&pd->sctp_multihome_jobs, nj, next); + } + PF_SCTP_ENDPOINTS_UNLOCK(); + break; } case SCTP_DEL_IP_ADDRESS: { @@ -5409,11 +5634,18 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, default: panic("Unknown op %#x", j->op); } - } + } -free: + free: + TAILQ_REMOVE(&pd->sctp_multihome_jobs, j, next); free(j, M_PFTEMP); } + + /* We may have inserted extra work while processing the list. */ + if (! TAILQ_EMPTY(&pd->sctp_multihome_jobs)) { + do_extra = false; + goto again; + } } static int @@ -5446,15 +5678,6 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, NULL, NULL, pd->af)) return (PF_DROP); - /* - * Avoid duplicating states. We'll already have - * created a state based on the source address of - * the packet, but SCTP endpoints may also list this - * address again in the INIT(_ACK) parameters. - */ - if (t.s_addr == pd->src->v4.s_addr) - break; - if (in_nullhost(t)) t.s_addr = pd->src->v4.s_addr; diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index a8ef4dc346b0..071387c12983 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1552,6 +1552,8 @@ pf_normalize_sctp_init(struct mbuf *m, int off, struct pf_pdesc *pd, return (1); } + dst->scrub->pfss_v_tag = pd->sctp_initiate_tag; + return (0); } From nobody Tue Nov 7 15:47:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszc6DkVz50Wv9; Tue, 7 Nov 2023 15:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszc52tkz3Jr6; Tue, 7 Nov 2023 15:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372044; h=from:from:reply-to:subject:subject: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/9nZ/7CqxF/k68o9GznxkYwH4Xt049f2k9/OWp6hEk=; b=VVlaUh0adU1OzTH1Lej3EE+xKh46fGuG4mUM4NlQ/koQPe8IlU8gfP1T/azdCJ05IR2y9U HFnLtetjxOpWznhW92IeRwD8INGyyLJ0p9BY6Y+sDT9rSn1AR1HKVLKXV7sbIfN7f63Fic ZKUazZNFhFkAZ4JD+VKzpBsUdaDBwQfDD5f5AKL4iEqMqGtgbQzuUjQjfv4yXEAs+V8eKk rxCm/Et/Dp6WJxjrRCVnlDsM771JQslzKggvl8XQh6zLMQdZ5tOmJIuVyZdJMAWZoSfMRX VvKqC+C66Cc8lZvZX6j/eBZ48roKjvPRJMqO19RCozhC7AYplCJlwyBNAHMM2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372044; h=from:from:reply-to:subject:subject: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/9nZ/7CqxF/k68o9GznxkYwH4Xt049f2k9/OWp6hEk=; b=YKBRJNDOBoQ3kBQlHGbGjeiuv+baCi8CBdIUPg10XreU3IlD89Hv8ljTxkgo8Vf4pM2uQ+ RsosxzTogrQv5c8iTcQKps+Mh+1fKNA0Y79Lmg7gkI7VBATI2/0kXGNRRecBQYnNkDcSEC 820cJlQueCRTDuNY7GkOrJCFzxJHFqIgo5//jWslkgvzeEPYZ5Uz1J/ZTHO9+h+sR7C6Bw W65eCXlAoCGBtL9oxtigimxvcwTnlIkwefuLVD3Y0sjIvnbFgEnnysG9IBiOSj/FNS20A9 Ru9WqjTjwmtiiEcZ6NhhUupwOhetcrKBEwWlXShDd6dawK7vnn8Nl/CpggegLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372044; a=rsa-sha256; cv=none; b=JlNcis7J5jkBejM4sp4r+1AdtAoyKUkqKklx+i7N5kRs4fR22ShDpMo/bDNDAz2101ak/0 eTYxEUkscePT03Ht+DQDvaxWi+xeoYgaUa9oFgtm4F8AmF5A5wX6unxxO/sxcdkFtm86in xGz2dc4iY1ify21shy7Aj8oBfl/myeVo/6zTaYX43zTTyLTXwKbCiBaMM5d5DbhHnE1Vwl 7bXU9/hpffOqzm47AU+G3+nYuQIqDXBoYMwqTX10L6w5ZSO08MaHRHej6tfHRsQrhOVk24 IWKWBE17TZYdB43wphJAK798iroBRaLPalBQWwCjD5rEOb+wWfcJHVX7NATObQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPszc3gF2zwC2; Tue, 7 Nov 2023 15:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlOqB069864; Tue, 7 Nov 2023 15:47:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlOg3069861; Tue, 7 Nov 2023 15:47:24 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:24 GMT Message-Id: <202311071547.3A7FlOg3069861@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: 228ae54114e1 - stable/14 - libpfctl: be more tolerant of kernel extensions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 228ae54114e1efbe82686090bed9d2c8071ecea0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=228ae54114e1efbe82686090bed9d2c8071ecea0 commit 228ae54114e1efbe82686090bed9d2c8071ecea0 Author: Kristof Provost AuthorDate: 2023-10-27 12:13:57 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:46:52 +0000 libpfctl: be more tolerant of kernel extensions Allow the kernel to supply more array elements than expected, but cut off when we hit what we think the maximum is. This will improve forward compatibility (i.e. old userspace with newer kernel). Reviewed by: zlei MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42392 (cherry picked from commit 2b1eb63fc9c6d6f64baaac59b7ea7c2a3228c03f) --- lib/libpfctl/libpfctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 403dbf809b89..03907698e7d2 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -145,9 +145,8 @@ pf_nvuint_32_array(const nvlist_t *nvl, const char *name, size_t maxelems, size_t elems; tmp = nvlist_get_number_array(nvl, name, &elems); - assert(elems <= maxelems); - for (size_t i = 0; i < elems; i++) + for (size_t i = 0; i < elems && i < maxelems; i++) numbers[i] = tmp[i]; if (nelems) From nobody Tue Nov 7 15:47:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszd0K3yz50X11; Tue, 7 Nov 2023 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszc5wSvz3JyS; Tue, 7 Nov 2023 15:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmGBjYJeXsToYwIFjVPc0HFxhwP90AA5K31thIWbamk=; b=eN3mLbhcFbjQvUT8Ks2lhBXxWksTytt2r9vJzFaeXtzY/DJxJDJfA39VZ2RFbOEGYbGicT G/R1o9VoGitTIJ7L0A375XAH71WpfkbxhfrG4YTr+EaLVq/+dzddaAuTR6QDlYrptW8W43 MBPaA67r17KSokzldUON/WKLHo8SCRZbDvoCBZeCTwcHhuugpR1GDUpghgrA1V6mFV024/ pW2jnuflnmjpYqDBIXsEnovz27om6pK911mLAKPlFp753WgXDNpK9vUVMIgT9QPpyy4P18 Q8ooewc/GpeodG2yD51IOWJ8dk1Yn4lr7cMrcACkE8a6GEHxjXGNd7Bxlwod9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmGBjYJeXsToYwIFjVPc0HFxhwP90AA5K31thIWbamk=; b=rmhwUdTfJXC+z+4pBvBPz+XiC4KX5yUAjNhWAW+HqTImj/90EZn5ng4o8ZvIDwVrL2M319 s5Tz7ekE92UcKfBoJHgdzTQPAbo+iL5humY5Xzvky7LO0MVxr6ovdyUJ9LyA4FrZ8y4R6r B9yOe7tem7k7RLUMUmymXQ+stUmjFtlNUo72SoSOdGiK1pB4biH1HVxbW5fIzCJm+2/+aj ZGm0LXFBsKQVFYHsZlWWlsazmJOAoXMNrGeG4dKKzgKAIxFOUfkoTdeEgQLYCBSxPdFzPX qcAoeiyw0A60unoEdtmEGAOCktCkNTrYA3aReC9YhDE6+0hAlLYJSzyuwMomYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372044; a=rsa-sha256; cv=none; b=V7fD3OHVb0my4KRSd+/tpQ2lsHd9KY43TLmZnkrQw0CZgT0kzBswFr+2BjWHSZMr5dsjZi T0iDRAkrAjw4zRD32lnuOklecVToKnxBP2oy3/GlCYo9+HiPTElD+nd0pFXcl/ZA4F9HjF kjDvBvjarWvFGzzWPBySStaZiJGQy/j9oadQ4yt0znCAz8H7cJQygjFVmBgDC2IwU4EkJG RfZoephEO4pLFSKznR1vamrddT6LhT3xOHRWBW8VpDnZjyz07LK/tQ2LU2Kt2W4yt7uiwP CCfSYfY4dJHO2kLIoCV5NCLlch+kT1KTVAQg5iRw28HT1bQPtJUgNTDtRuUTbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPszc4xD0zwQ9; Tue, 7 Nov 2023 15:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlOw5069925; Tue, 7 Nov 2023 15:47:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlOnh069922; Tue, 7 Nov 2023 15:47:24 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:24 GMT Message-Id: <202311071547.3A7FlOnh069922@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: dee71d8e6eab - stable/13 - pf tests: ensure that we generate all permutations for SCTP multihome List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: dee71d8e6eab162922d9fccf27511d05eef24cbb Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dee71d8e6eab162922d9fccf27511d05eef24cbb commit dee71d8e6eab162922d9fccf27511d05eef24cbb Author: Kristof Provost AuthorDate: 2023-10-10 09:56:15 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:25:02 +0000 pf tests: ensure that we generate all permutations for SCTP multihome The initial multihome implementation was a little simplistic, and failed to create all of the required states. Given a client with IP 1 and 2 and a server with IP 3 and 4 we end up creating states for 1 - 3 and 2 - 3, as well as 3 - 1 and 4 - 1, but not for 2 - 4. Check for this. MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42362 (cherry picked from commit 483d5c4075e06e52d5daa23aef2b4f4a2eb64443) --- tests/sys/netpfil/pf/sctp.py | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index 5e6dca5dd64b..5db52dd993f2 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -360,6 +360,37 @@ class TestSCTP(VnetTestTemplate): states = ToolsHelper.get_output("/sbin/pfctl -ss") assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234.*SHUTDOWN", states) + + @pytest.mark.require_user("root") + def test_permutation(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet alias 192.0.2.4/24" % ifname) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet proto sctp to 192.0.2.0/24"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("192.0.2.3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1, but also to 192.0.2.4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.2:1234", states) + assert re.search(r"all sctp 192.0.2.4:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.4:.*192.0.2.2:1234", states) + class TestSCTPv6(VnetTestTemplate): REQUIRED_MODULES = ["sctp", "pf"] TOPOLOGY = { @@ -476,3 +507,33 @@ class TestSCTPv6(VnetTestTemplate): # Verify that the state is closing states = ToolsHelper.get_output("/sbin/pfctl -ss") assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\].*SHUTDOWN", states) + + @pytest.mark.require_user("root") + def test_permutation(self): + # Test that we generate all permutations of src/dst addresses. + # Assign two addresses to each end, and check for the expected states + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::4/64" % ifname) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet6 proto sctp to 2001:db8::0/64"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("2001:db8::3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Check that we have a state for 2001:db8::3 and 2001:db8::2 to 2001:db8::1, but also to 2001:db8::4 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + print(states) + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::2\[1234\]", states) + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) + assert re.search(r"all sctp 2001:db8::4\[.*2001:db8::2\[1234\]", states) + assert re.search(r"all sctp 2001:db8::4\[.*2001:db8::3\[1234\]", states) From nobody Tue Nov 7 15:47:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszf1pBDz50Wqd; Tue, 7 Nov 2023 15:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszd6NDTz3JrQ; Tue, 7 Nov 2023 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8K2aQKXbEqY1TH69I6KAC9Xh75ldvMXjOePE4EwuoVI=; b=En2dO+AATqY1V2iMz/HQ7eTE6LK/pe2BqsANhyHD4kGrnR3hQJa1SFk44PUEPE09m5QPyE Imz1PChvC1/EVBUhvUy9Qh3PeEc6l7kqaMWFdKK97osA47tUY+RGw60SxtGJordb0R7eno SUHgLnvMTs2OEKc4HowjWAsU2menZqpLMbfW04VvYRfPUcdCugkV2sGBwxhW3XPyQO3STf 8fgucrXa6F5EZb/Y9VN9htttO3j/6j6hANOMbNHmziRBOZVnSEO1HUzGdvTI05uG4pxelY OJgR0EQFieCe8Mjk5bis84xyrZmCTgkhPbT6PdzOqA1+6xX05sh54iIeKHMKUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8K2aQKXbEqY1TH69I6KAC9Xh75ldvMXjOePE4EwuoVI=; b=IFFysL24xQG67o/igs6DyNgzGJ5bfcjZ2uoDxO1qAKCZowZoyQ719PCsC3jEHkwYCoUaZx x8AHMYKGKP5FZ44LIQWB7miZZ+l2975bGYEQkC0DiX7L+71u0ImWt6w7WQhm6URoZzryRi Ra0ZfnWjx4H9WSCLhFdOL+Ah8bty10TEiqoxUW8SIFMdT2SBDhDupk3XXgSCsOFcxGibW0 Vr9GvIpfL/DMF5j0FRjuWpA8PP+IzldBen9NRJNExq8aRrGOfZRcxxMtvPbbho6NdAdNLx 2jQR7bXxzfM4AQGzij2sU6U5GCNpMspaR9CP5xcgeM/PzibmUmWQajM6K0H+Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372045; a=rsa-sha256; cv=none; b=e4/oR9uyTO6V7GPoZpsxkpMdktTavaRhDp9yFNfMgKN1cyPiTAsQ/m8E5S01G8vcJJB8QR z3vY3y5/WiElVQvUwi3pS5zGSPaw3Yk+WYhBklJ2FSxbGxC2nIfHGi9UUr5FFHiYZEywby RAaCCSIoocNAgB7RvFp/yIXMbxhNK3u8Tdr80n3YFsUZ9aI1KQvFsYjoibvXaRMImGB5zW XwXQjKJPfS0DrDV3NFaSjMyC3NoEgx9UNhYA6OUxW9LrjX2zJo1n6TAvhs8GwAcxdzACDV lcMfPRYACoZNRn/PX8R/5/DimduR8vxvo+1hFipCQ7hf9/3cAV6MmgHRxRoEew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPszd5V60zwC4; Tue, 7 Nov 2023 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlPHe070012; Tue, 7 Nov 2023 15:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlPZE070009; Tue, 7 Nov 2023 15:47:25 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:25 GMT Message-Id: <202311071547.3A7FlPZE070009@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: c17db80ddd57 - stable/13 - libpfctl: be more tolerant of kernel extensions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c17db80ddd5743dce59552dba4bd7c243b748a6c Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c17db80ddd5743dce59552dba4bd7c243b748a6c commit c17db80ddd5743dce59552dba4bd7c243b748a6c Author: Kristof Provost AuthorDate: 2023-10-27 12:13:57 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:25:02 +0000 libpfctl: be more tolerant of kernel extensions Allow the kernel to supply more array elements than expected, but cut off when we hit what we think the maximum is. This will improve forward compatibility (i.e. old userspace with newer kernel). Reviewed by: zlei MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42392 (cherry picked from commit 2b1eb63fc9c6d6f64baaac59b7ea7c2a3228c03f) --- lib/libpfctl/libpfctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 2a77aeb0efad..bf25a45b792f 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -145,9 +145,8 @@ pf_nvuint_32_array(const nvlist_t *nvl, const char *name, size_t maxelems, size_t elems; tmp = nvlist_get_number_array(nvl, name, &elems); - assert(elems <= maxelems); - for (size_t i = 0; i < elems; i++) + for (size_t i = 0; i < elems && i < maxelems; i++) numbers[i] = tmp[i]; if (nelems) From nobody Tue Nov 7 15:47:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszf1rGnz50Wqf; Tue, 7 Nov 2023 15:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszd61Q6z3Jnh; Tue, 7 Nov 2023 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WwpRyIMRYpsXZtMuWnlAgV4vO07+TMZ6QjA0nr0njTY=; b=yiDkpUwVtORnhPhss+UEaDejQLvxSvlj7t5FiI4CuPE2YG5bCip+wki8lvhhoAv5pKuwAv 8BzBoeZwZ4Th7YEh18FTXPSXuZzCHGxXG1/XaaEPLxMq28JI0qi89qL0RZe+mHBNq8twiA GAyH6Y3K+BufgD5dPeG/dk3u/goYUJlnC47C0qD9Wzg4heB4WRuo4jawpVbv84f9Kezm96 sc57guAwl7aQnLu8rZMtBwaCw2vkolndPy4q54mshGAv06ILPrT35mor25kSJE+Gxsrimz /JuwxiACk9/RgLjoyDUk4XY3vTRHsc5BxmY/7kXXSi/X0FFSJnFGxa0KtUCowg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WwpRyIMRYpsXZtMuWnlAgV4vO07+TMZ6QjA0nr0njTY=; b=cfQLP65cQBj5y1VGIihnLelYHZT9mngngXT8NIiEGZQSnesxtV56rfsNJHseOEvoTIdE+l dMd2c/N+sHuik7UOZb0u3nWWKm2XOPNlIZETeq7wRh3qAUZNzNLy1qPpzCgCA239YRcnEg wWxGxKmL97FSPbyIIi7cw6pbb4v0LNP7FaPfZIfGdDlOEQhpFApc9xdFHCgt1JPNHZHJ4N 8EBd3EOfVtHNtIIK9FP4kjBBcvprP1lj/NPS23Cpsp6xCEkl+ZQVMYfDwnUYsf76yUFpea iETQ3mJgyf68dIFDHGN+eforhV2BFdpZAtkAKb3h7T8bdkGRHb8/CVCfy1f5jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372045; a=rsa-sha256; cv=none; b=w+xFD72C8YCxTsRue11uPshIIYXtLfQwG9D0I4Z0rroPf0hW1jNjvmcFmavT0HRslk+jJs hj/PeWCwmUOobghEp34odV83VHxBSRqxcS9gsCZDZN7WaXFu4M60GTM6ggnyj2yn0KLxWU vE9bPNliDfXPgIKimHHBRWHAg1Gfo31xSUDy0wkYGk/jGsHFm3S2w3Q48suSF6xdsmZEZG XnZCGF43EO0Z8jZ7Vf3sshqyiIZXUe3ZVVD4lA4jXIhJnmlW1hWRFAxbX4+ROpcti9uVN2 L9PI72Bs2czV65xb3jIiQMg1VJAmXRT0nWdqs7Gcux7c6cqaUhBWbUxEW5PA+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 4SPszd4yHJzwC3; Tue, 7 Nov 2023 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlP9a069964; Tue, 7 Nov 2023 15:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlPtL069961; Tue, 7 Nov 2023 15:47:25 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:25 GMT Message-Id: <202311071547.3A7FlPtL069961@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: 47b2432a5c20 - stable/14 - pf: support SCTP-specific timeouts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 47b2432a5c207314f8b5d9b570b26549ae895bf5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=47b2432a5c207314f8b5d9b570b26549ae895bf5 commit 47b2432a5c207314f8b5d9b570b26549ae895bf5 Author: Kristof Provost AuthorDate: 2023-10-27 14:45:07 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:46:52 +0000 pf: support SCTP-specific timeouts Allow SCTP state timeouts to be configured independently from TCP state timeouts. Reviewed by: tuexen MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42393 (cherry picked from commit ca9dbde88122beb079b55fb4580b200f73044da6) --- sbin/pfctl/pfctl.c | 5 +++++ sbin/pfctl/pfctl_parser.c | 5 +++++ sbin/pfctl/tests/files/pf1002.in | 5 +++++ sbin/pfctl/tests/files/pf1002.ok | 5 +++++ share/man/man5/pf.conf.5 | 19 ++++++++++++++++++- sys/netpfil/pf/pf.c | 14 +++++++++----- sys/netpfil/pf/pf.h | 41 +++++++++++++++++++++++++++++++--------- sys/netpfil/pf/pf_ioctl.c | 5 +++++ 8 files changed, 84 insertions(+), 15 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index bfa76b299a02..d5541571a135 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2234,6 +2234,11 @@ pfctl_init_options(struct pfctl *pf) pf->timeout[PFTM_TCP_CLOSING] = PFTM_TCP_CLOSING_VAL; pf->timeout[PFTM_TCP_FIN_WAIT] = PFTM_TCP_FIN_WAIT_VAL; pf->timeout[PFTM_TCP_CLOSED] = PFTM_TCP_CLOSED_VAL; + pf->timeout[PFTM_SCTP_FIRST_PACKET] = PFTM_TCP_FIRST_PACKET_VAL; + pf->timeout[PFTM_SCTP_OPENING] = PFTM_TCP_OPENING_VAL; + pf->timeout[PFTM_SCTP_ESTABLISHED] = PFTM_TCP_ESTABLISHED_VAL; + pf->timeout[PFTM_SCTP_CLOSING] = PFTM_TCP_CLOSING_VAL; + pf->timeout[PFTM_SCTP_CLOSED] = PFTM_TCP_CLOSED_VAL; pf->timeout[PFTM_UDP_FIRST_PACKET] = PFTM_UDP_FIRST_PACKET_VAL; pf->timeout[PFTM_UDP_SINGLE] = PFTM_UDP_SINGLE_VAL; pf->timeout[PFTM_UDP_MULTIPLE] = PFTM_UDP_MULTIPLE_VAL; diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 925848055bba..0268d1b07c79 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -192,6 +192,11 @@ const struct pf_timeout pf_timeouts[] = { { "tcp.finwait", PFTM_TCP_FIN_WAIT }, { "tcp.closed", PFTM_TCP_CLOSED }, { "tcp.tsdiff", PFTM_TS_DIFF }, + { "sctp.first", PFTM_SCTP_FIRST_PACKET }, + { "sctp.opening", PFTM_SCTP_OPENING }, + { "sctp.established", PFTM_SCTP_ESTABLISHED }, + { "sctp.closing", PFTM_SCTP_CLOSING }, + { "sctp.closed", PFTM_SCTP_CLOSED }, { "udp.first", PFTM_UDP_FIRST_PACKET }, { "udp.single", PFTM_UDP_SINGLE }, { "udp.multiple", PFTM_UDP_MULTIPLE }, diff --git a/sbin/pfctl/tests/files/pf1002.in b/sbin/pfctl/tests/files/pf1002.in index 5180e8395f9c..3fdde81be7de 100644 --- a/sbin/pfctl/tests/files/pf1002.in +++ b/sbin/pfctl/tests/files/pf1002.in @@ -1 +1,6 @@ set timeout interval 10 +set timeout sctp.first 11 +set timeout sctp.opening 12 +set timeout sctp.established 13 +set timeout sctp.closing 14 +set timeout sctp.closed 15 diff --git a/sbin/pfctl/tests/files/pf1002.ok b/sbin/pfctl/tests/files/pf1002.ok index 5180e8395f9c..3fdde81be7de 100644 --- a/sbin/pfctl/tests/files/pf1002.ok +++ b/sbin/pfctl/tests/files/pf1002.ok @@ -1 +1,6 @@ set timeout interval 10 +set timeout sctp.first 11 +set timeout sctp.opening 12 +set timeout sctp.established 13 +set timeout sctp.closing 14 +set timeout sctp.closed 15 diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 2bc57d4f7f5b..ce64df78ad62 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 21, 2023 +.Dd October 27, 2023 .Dt PF.CONF 5 .Os .Sh NAME @@ -283,6 +283,21 @@ can prevent blocking of such packets. The state after one endpoint sends an RST. .El .Pp +SCTP timeout are handled similar to TCP, but with its own set of states: +.Pp +.Bl -tag -width xxxx -compact +.It Ar sctp.first +The state after the first packet. +.It Ar sctp.opening +The state before the destination host ever sends a packet. +.It Ar sctp.established +The fully established state. +.It Ar sctp.closing +The state after the first SHUTDOWN chunk has been sent. +.It Ar sctp.closed +The state after SHUTDOWN_ACK has been exchanged and the connection is closed. +.El +.Pp ICMP and UDP are handled in a fashion similar to TCP, but with a much more limited set of states: .Pp @@ -3277,6 +3292,8 @@ fragmentation = [ "fragment reassemble" ] timeout-list = timeout [ [ "," ] timeout-list ] timeout = ( "tcp.first" | "tcp.opening" | "tcp.established" | "tcp.closing" | "tcp.finwait" | "tcp.closed" | + "sctp.first" | "sctp.opening" | "sctp.established" | + "sctp.closing" | "sctp.closed" | "udp.first" | "udp.single" | "udp.multiple" | "icmp.first" | "icmp.error" | "other.first" | "other.single" | "other.multiple" | diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 96e8a165692f..b80ec2bb303d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4906,7 +4906,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, case IPPROTO_SCTP: pf_set_protostate(s, PF_PEER_SRC, SCTP_COOKIE_WAIT); pf_set_protostate(s, PF_PEER_DST, SCTP_CLOSED); - s->timeout = PFTM_TCP_FIRST_PACKET; + s->timeout = PFTM_SCTP_FIRST_PACKET; break; case IPPROTO_ICMP: #ifdef INET6 @@ -5915,7 +5915,7 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, if (pd->sctp_flags & PFDESC_SCTP_INIT) { if (src->state < SCTP_COOKIE_WAIT) { pf_set_protostate(*state, psrc, SCTP_COOKIE_WAIT); - (*state)->timeout = PFTM_TCP_OPENING; + (*state)->timeout = PFTM_SCTP_OPENING; } } if (pd->sctp_flags & PFDESC_SCTP_INIT_ACK) { @@ -5927,16 +5927,20 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, if (pd->sctp_flags & PFDESC_SCTP_COOKIE) { if (src->state < SCTP_ESTABLISHED) { pf_set_protostate(*state, psrc, SCTP_ESTABLISHED); - (*state)->timeout = PFTM_TCP_ESTABLISHED; + (*state)->timeout = PFTM_SCTP_ESTABLISHED; } } if (pd->sctp_flags & (PFDESC_SCTP_SHUTDOWN | PFDESC_SCTP_ABORT | PFDESC_SCTP_SHUTDOWN_COMPLETE)) { if (src->state < SCTP_SHUTDOWN_PENDING) { pf_set_protostate(*state, psrc, SCTP_SHUTDOWN_PENDING); - (*state)->timeout = PFTM_TCP_CLOSING; + (*state)->timeout = PFTM_SCTP_CLOSING; } } + if (pd->sctp_flags & (PFDESC_SCTP_SHUTDOWN_COMPLETE)) { + pf_set_protostate(*state, psrc, SCTP_CLOSED); + (*state)->timeout = PFTM_SCTP_CLOSED; + } if (src->scrub != NULL) { if (src->scrub->pfss_v_tag == 0) { @@ -6216,7 +6220,7 @@ again: psrc = PF_PEER_DST; } pf_set_protostate(sm, psrc, SCTP_SHUTDOWN_PENDING); - sm->timeout = PFTM_TCP_CLOSING; + sm->timeout = PFTM_SCTP_CLOSING; PF_STATE_UNLOCK(sm); } break; diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h index d83aa5e579bd..dd9796b59ce9 100644 --- a/sys/netpfil/pf/pf.h +++ b/sys/netpfil/pf/pf.h @@ -66,14 +66,37 @@ enum { PF_PEER_SRC, PF_PEER_DST, PF_PEER_BOTH }; * Note about PFTM_*: real indices into pf_rule.timeout[] come before * PFTM_MAX, special cases afterwards. See pf_state_expires(). */ -enum { PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED, - PFTM_TCP_CLOSING, PFTM_TCP_FIN_WAIT, PFTM_TCP_CLOSED, - PFTM_UDP_FIRST_PACKET, PFTM_UDP_SINGLE, PFTM_UDP_MULTIPLE, - PFTM_ICMP_FIRST_PACKET, PFTM_ICMP_ERROR_REPLY, - PFTM_OTHER_FIRST_PACKET, PFTM_OTHER_SINGLE, - PFTM_OTHER_MULTIPLE, PFTM_FRAG, PFTM_INTERVAL, - PFTM_ADAPTIVE_START, PFTM_ADAPTIVE_END, PFTM_SRC_NODE, - PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED }; +enum { + PFTM_TCP_FIRST_PACKET = 0, + PFTM_TCP_OPENING = 1, + PFTM_TCP_ESTABLISHED = 2, + PFTM_TCP_CLOSING = 3, + PFTM_TCP_FIN_WAIT = 4, + PFTM_TCP_CLOSED = 5, + PFTM_UDP_FIRST_PACKET = 6, + PFTM_UDP_SINGLE = 7, + PFTM_UDP_MULTIPLE = 8, + PFTM_ICMP_FIRST_PACKET = 9, + PFTM_ICMP_ERROR_REPLY = 10, + PFTM_OTHER_FIRST_PACKET = 11, + PFTM_OTHER_SINGLE = 12, + PFTM_OTHER_MULTIPLE = 13, + PFTM_FRAG = 14, + PFTM_INTERVAL = 15, + PFTM_ADAPTIVE_START = 16, + PFTM_ADAPTIVE_END = 17, + PFTM_SRC_NODE = 18, + PFTM_TS_DIFF = 19, + PFTM_OLD_MAX = 20, /* Legacy limit, for binary compatibility with old kernels. */ + PFTM_SCTP_FIRST_PACKET = 20, + PFTM_SCTP_OPENING = 21, + PFTM_SCTP_ESTABLISHED = 22, + PFTM_SCTP_CLOSING = 23, + PFTM_SCTP_CLOSED = 24, + PFTM_MAX = 25, + PFTM_PURGE = 26, + PFTM_UNLINKED = 27, +}; /* PFTM default values */ #define PFTM_TCP_FIRST_PACKET_VAL 120 /* First TCP packet */ @@ -497,7 +520,7 @@ struct pf_rule { pf_osfp_t os_fingerprint; int rtableid; - u_int32_t timeout[PFTM_MAX]; + u_int32_t timeout[PFTM_OLD_MAX]; u_int32_t max_states; u_int32_t max_src_nodes; u_int32_t max_src_states; diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 65bab7195d46..6b8fbf77fd29 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -373,6 +373,11 @@ pfattach_vnet(void) my_timeout[PFTM_TCP_CLOSING] = PFTM_TCP_CLOSING_VAL; my_timeout[PFTM_TCP_FIN_WAIT] = PFTM_TCP_FIN_WAIT_VAL; my_timeout[PFTM_TCP_CLOSED] = PFTM_TCP_CLOSED_VAL; + my_timeout[PFTM_SCTP_FIRST_PACKET] = PFTM_TCP_FIRST_PACKET_VAL; + my_timeout[PFTM_SCTP_OPENING] = PFTM_TCP_OPENING_VAL; + my_timeout[PFTM_SCTP_ESTABLISHED] = PFTM_TCP_ESTABLISHED_VAL; + my_timeout[PFTM_SCTP_CLOSING] = PFTM_TCP_CLOSING_VAL; + my_timeout[PFTM_SCTP_CLOSED] = PFTM_TCP_CLOSED_VAL; my_timeout[PFTM_UDP_FIRST_PACKET] = PFTM_UDP_FIRST_PACKET_VAL; my_timeout[PFTM_UDP_SINGLE] = PFTM_UDP_SINGLE_VAL; my_timeout[PFTM_UDP_MULTIPLE] = PFTM_UDP_MULTIPLE_VAL; From nobody Tue Nov 7 15:47:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPszg2CkDz50Wxh; Tue, 7 Nov 2023 15:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPszg0RrGz3JxQ; Tue, 7 Nov 2023 15:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WxYgi7n04o+Cs8ZETBL0Sn5xKrL+9pnLnxBtDMEvMg=; b=a/a3ND+Y2O6SZ5D9ywDaOpZM3Puv0FFXBwqQWEhTp8xWmjNtqYb34mlsrn0HtD3bVpzxGc VmWhUxOsMWyrdMJbZEDMGNQzuo08aNZgPGDR5n/6lbkgz166vYTHzG7P0Rv4x0pqhlgsdx wWCoTvyBgEdTSRQsYgJ1jmH1DFmVcP4caOCjh03/z2ULK8tF1ndBSJVovb2eK6IHvd5MMA 6ZVPSWkzLxlyx+CW34XyLG/cIlsuKuY0qfCPeVedyeix9PtJ56lafVMMzOu98pxoxzsRze 6SuWR1Mtcd7qoo+ZPhpjs1GGRUjinDmlabzXJNvRHSSlWjHmCpzNpd3Y4Fyjig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WxYgi7n04o+Cs8ZETBL0Sn5xKrL+9pnLnxBtDMEvMg=; b=OrnkQgLPhaIHcplCrHP5b79JZh57CHRwiOyq4EeSaGgpsnf06n9I2N+IpX3+Vy3a3YL9hx FET5Pg6IOMsBaE0q3YCZkCrN4uHnz/6lgyLwNzTHxsNqcebHZxMVCTTXrwmCiDUD3yLiyb XeSRU9R3emdMaz9CPV9XojflkRCHsEsni507BBxyY/iilO6nw5bEjaBF0hN5ldWR8Suihx vkrUUjNC/7ZDiIqEOeOlgStkKcnoAwFhDlrVJ6atRXfzF2x+3jHnOZZSjBu+tfWpVY9Nbn fVIniMv6445ddMKuQCbE6om1OOuHgrhUHlrQZgTMIje5CKPT6x2so8jXz0HMlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372047; a=rsa-sha256; cv=none; b=VGlyxrAofuF6jh8eb2aBhphzBpQ8nqgBCJexpZEbbffcc+L2ULwjsRC/ToxwNzbrkWtqtg /2rFr5G07+Tm2DKnaB1xFnJI3i55hOeWiXvl5Y9XLh+J2iNLoPMBdEt75Am0TjbYIZ7i3D egad9QERjaovprsQb2VjA+XaFyVlgUzgmqjCklSS9mBhYthtusMkx/zxhdym8s+tLpqh4o oj+Kj6VBJFkq+qrf/lQ/5YRL9mPVN/TCGkdJu1b+zmxahO0nmqEmYfMMgwA50jAl9ssib3 faEAur5f6puqfBX5tE2g/au5QY2kO/vt2YhT/HD5qw6E+gmkOS1d5ocFRl43uQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPszf6Z6qzwgg; Tue, 7 Nov 2023 15:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlQ5F070089; Tue, 7 Nov 2023 15:47:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlQad070086; Tue, 7 Nov 2023 15:47:26 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:26 GMT Message-Id: <202311071547.3A7FlQad070086@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: 79b69575d838 - stable/13 - pf: support SCTP-specific timeouts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 79b69575d838f40a96b3ef68aa633a84da04c9df Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=79b69575d838f40a96b3ef68aa633a84da04c9df commit 79b69575d838f40a96b3ef68aa633a84da04c9df Author: Kristof Provost AuthorDate: 2023-10-27 14:45:07 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:25:02 +0000 pf: support SCTP-specific timeouts Allow SCTP state timeouts to be configured independently from TCP state timeouts. Reviewed by: tuexen MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42393 (cherry picked from commit ca9dbde88122beb079b55fb4580b200f73044da6) --- sbin/pfctl/pfctl.c | 5 +++++ sbin/pfctl/pfctl_parser.c | 5 +++++ sbin/pfctl/tests/files/pf1002.in | 5 +++++ sbin/pfctl/tests/files/pf1002.ok | 5 +++++ share/man/man5/pf.conf.5 | 19 ++++++++++++++++++- sys/netpfil/pf/pf.c | 14 +++++++++----- sys/netpfil/pf/pf.h | 41 +++++++++++++++++++++++++++++++--------- sys/netpfil/pf/pf_ioctl.c | 5 +++++ 8 files changed, 84 insertions(+), 15 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 645ba1d6fcaf..985cbe0771c0 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1856,6 +1856,11 @@ pfctl_init_options(struct pfctl *pf) pf->timeout[PFTM_TCP_CLOSING] = PFTM_TCP_CLOSING_VAL; pf->timeout[PFTM_TCP_FIN_WAIT] = PFTM_TCP_FIN_WAIT_VAL; pf->timeout[PFTM_TCP_CLOSED] = PFTM_TCP_CLOSED_VAL; + pf->timeout[PFTM_SCTP_FIRST_PACKET] = PFTM_TCP_FIRST_PACKET_VAL; + pf->timeout[PFTM_SCTP_OPENING] = PFTM_TCP_OPENING_VAL; + pf->timeout[PFTM_SCTP_ESTABLISHED] = PFTM_TCP_ESTABLISHED_VAL; + pf->timeout[PFTM_SCTP_CLOSING] = PFTM_TCP_CLOSING_VAL; + pf->timeout[PFTM_SCTP_CLOSED] = PFTM_TCP_CLOSED_VAL; pf->timeout[PFTM_UDP_FIRST_PACKET] = PFTM_UDP_FIRST_PACKET_VAL; pf->timeout[PFTM_UDP_SINGLE] = PFTM_UDP_SINGLE_VAL; pf->timeout[PFTM_UDP_MULTIPLE] = PFTM_UDP_MULTIPLE_VAL; diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index a3863cb23ac6..ed152eca0010 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -192,6 +192,11 @@ const struct pf_timeout pf_timeouts[] = { { "tcp.finwait", PFTM_TCP_FIN_WAIT }, { "tcp.closed", PFTM_TCP_CLOSED }, { "tcp.tsdiff", PFTM_TS_DIFF }, + { "sctp.first", PFTM_SCTP_FIRST_PACKET }, + { "sctp.opening", PFTM_SCTP_OPENING }, + { "sctp.established", PFTM_SCTP_ESTABLISHED }, + { "sctp.closing", PFTM_SCTP_CLOSING }, + { "sctp.closed", PFTM_SCTP_CLOSED }, { "udp.first", PFTM_UDP_FIRST_PACKET }, { "udp.single", PFTM_UDP_SINGLE }, { "udp.multiple", PFTM_UDP_MULTIPLE }, diff --git a/sbin/pfctl/tests/files/pf1002.in b/sbin/pfctl/tests/files/pf1002.in index 5180e8395f9c..3fdde81be7de 100644 --- a/sbin/pfctl/tests/files/pf1002.in +++ b/sbin/pfctl/tests/files/pf1002.in @@ -1 +1,6 @@ set timeout interval 10 +set timeout sctp.first 11 +set timeout sctp.opening 12 +set timeout sctp.established 13 +set timeout sctp.closing 14 +set timeout sctp.closed 15 diff --git a/sbin/pfctl/tests/files/pf1002.ok b/sbin/pfctl/tests/files/pf1002.ok index 5180e8395f9c..3fdde81be7de 100644 --- a/sbin/pfctl/tests/files/pf1002.ok +++ b/sbin/pfctl/tests/files/pf1002.ok @@ -1 +1,6 @@ set timeout interval 10 +set timeout sctp.first 11 +set timeout sctp.opening 12 +set timeout sctp.established 13 +set timeout sctp.closing 14 +set timeout sctp.closed 15 diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index fa7bdc9587b2..6168bc3e8089 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 21, 2023 +.Dd October 27, 2023 .Dt PF.CONF 5 .Os .Sh NAME @@ -281,6 +281,21 @@ can prevent blocking of such packets. The state after one endpoint sends an RST. .El .Pp +SCTP timeout are handled similar to TCP, but with its own set of states: +.Pp +.Bl -tag -width xxxx -compact +.It Ar sctp.first +The state after the first packet. +.It Ar sctp.opening +The state before the destination host ever sends a packet. +.It Ar sctp.established +The fully established state. +.It Ar sctp.closing +The state after the first SHUTDOWN chunk has been sent. +.It Ar sctp.closed +The state after SHUTDOWN_ACK has been exchanged and the connection is closed. +.El +.Pp ICMP and UDP are handled in a fashion similar to TCP, but with a much more limited set of states: .Pp @@ -3120,6 +3135,8 @@ fragmentation = [ "fragment reassemble" ] timeout-list = timeout [ [ "," ] timeout-list ] timeout = ( "tcp.first" | "tcp.opening" | "tcp.established" | "tcp.closing" | "tcp.finwait" | "tcp.closed" | + "sctp.first" | "sctp.opening" | "sctp.established" | + "sctp.closing" | "sctp.closed" | "udp.first" | "udp.single" | "udp.multiple" | "icmp.first" | "icmp.error" | "other.first" | "other.single" | "other.multiple" | diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 278aa07fab75..7bac94f77a32 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4336,7 +4336,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, case IPPROTO_SCTP: pf_set_protostate(s, PF_PEER_SRC, SCTP_COOKIE_WAIT); pf_set_protostate(s, PF_PEER_DST, SCTP_CLOSED); - s->timeout = PFTM_TCP_FIRST_PACKET; + s->timeout = PFTM_SCTP_FIRST_PACKET; break; case IPPROTO_ICMP: #ifdef INET6 @@ -5326,7 +5326,7 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, if (pd->sctp_flags & PFDESC_SCTP_INIT) { if (src->state < SCTP_COOKIE_WAIT) { pf_set_protostate(*state, psrc, SCTP_COOKIE_WAIT); - (*state)->timeout = PFTM_TCP_OPENING; + (*state)->timeout = PFTM_SCTP_OPENING; } } if (pd->sctp_flags & PFDESC_SCTP_INIT_ACK) { @@ -5338,16 +5338,20 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, if (pd->sctp_flags & PFDESC_SCTP_COOKIE) { if (src->state < SCTP_ESTABLISHED) { pf_set_protostate(*state, psrc, SCTP_ESTABLISHED); - (*state)->timeout = PFTM_TCP_ESTABLISHED; + (*state)->timeout = PFTM_SCTP_ESTABLISHED; } } if (pd->sctp_flags & (PFDESC_SCTP_SHUTDOWN | PFDESC_SCTP_ABORT | PFDESC_SCTP_SHUTDOWN_COMPLETE)) { if (src->state < SCTP_SHUTDOWN_PENDING) { pf_set_protostate(*state, psrc, SCTP_SHUTDOWN_PENDING); - (*state)->timeout = PFTM_TCP_CLOSING; + (*state)->timeout = PFTM_SCTP_CLOSING; } } + if (pd->sctp_flags & (PFDESC_SCTP_SHUTDOWN_COMPLETE)) { + pf_set_protostate(*state, psrc, SCTP_CLOSED); + (*state)->timeout = PFTM_SCTP_CLOSED; + } if (src->scrub != NULL) { if (src->scrub->pfss_v_tag == 0) { @@ -5627,7 +5631,7 @@ again: psrc = PF_PEER_DST; } pf_set_protostate(sm, psrc, SCTP_SHUTDOWN_PENDING); - sm->timeout = PFTM_TCP_CLOSING; + sm->timeout = PFTM_SCTP_CLOSING; PF_STATE_UNLOCK(sm); } break; diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h index 0b0e9f05251e..89162ded3ef0 100644 --- a/sys/netpfil/pf/pf.h +++ b/sys/netpfil/pf/pf.h @@ -66,14 +66,37 @@ enum { PF_PEER_SRC, PF_PEER_DST, PF_PEER_BOTH }; * Note about PFTM_*: real indices into pf_rule.timeout[] come before * PFTM_MAX, special cases afterwards. See pf_state_expires(). */ -enum { PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED, - PFTM_TCP_CLOSING, PFTM_TCP_FIN_WAIT, PFTM_TCP_CLOSED, - PFTM_UDP_FIRST_PACKET, PFTM_UDP_SINGLE, PFTM_UDP_MULTIPLE, - PFTM_ICMP_FIRST_PACKET, PFTM_ICMP_ERROR_REPLY, - PFTM_OTHER_FIRST_PACKET, PFTM_OTHER_SINGLE, - PFTM_OTHER_MULTIPLE, PFTM_FRAG, PFTM_INTERVAL, - PFTM_ADAPTIVE_START, PFTM_ADAPTIVE_END, PFTM_SRC_NODE, - PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED }; +enum { + PFTM_TCP_FIRST_PACKET = 0, + PFTM_TCP_OPENING = 1, + PFTM_TCP_ESTABLISHED = 2, + PFTM_TCP_CLOSING = 3, + PFTM_TCP_FIN_WAIT = 4, + PFTM_TCP_CLOSED = 5, + PFTM_UDP_FIRST_PACKET = 6, + PFTM_UDP_SINGLE = 7, + PFTM_UDP_MULTIPLE = 8, + PFTM_ICMP_FIRST_PACKET = 9, + PFTM_ICMP_ERROR_REPLY = 10, + PFTM_OTHER_FIRST_PACKET = 11, + PFTM_OTHER_SINGLE = 12, + PFTM_OTHER_MULTIPLE = 13, + PFTM_FRAG = 14, + PFTM_INTERVAL = 15, + PFTM_ADAPTIVE_START = 16, + PFTM_ADAPTIVE_END = 17, + PFTM_SRC_NODE = 18, + PFTM_TS_DIFF = 19, + PFTM_OLD_MAX = 20, /* Legacy limit, for binary compatibility with old kernels. */ + PFTM_SCTP_FIRST_PACKET = 20, + PFTM_SCTP_OPENING = 21, + PFTM_SCTP_ESTABLISHED = 22, + PFTM_SCTP_CLOSING = 23, + PFTM_SCTP_CLOSED = 24, + PFTM_MAX = 25, + PFTM_PURGE = 26, + PFTM_UNLINKED = 27, +}; /* PFTM default values */ #define PFTM_TCP_FIRST_PACKET_VAL 120 /* First TCP packet */ @@ -503,7 +526,7 @@ struct pf_rule { pf_osfp_t os_fingerprint; int rtableid; - u_int32_t timeout[PFTM_MAX]; + u_int32_t timeout[PFTM_OLD_MAX]; u_int32_t max_states; u_int32_t max_src_nodes; u_int32_t max_src_states; diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index bd005893f7c8..44b0bccc7489 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -354,6 +354,11 @@ pfattach_vnet(void) my_timeout[PFTM_TCP_CLOSING] = PFTM_TCP_CLOSING_VAL; my_timeout[PFTM_TCP_FIN_WAIT] = PFTM_TCP_FIN_WAIT_VAL; my_timeout[PFTM_TCP_CLOSED] = PFTM_TCP_CLOSED_VAL; + my_timeout[PFTM_SCTP_FIRST_PACKET] = PFTM_TCP_FIRST_PACKET_VAL; + my_timeout[PFTM_SCTP_OPENING] = PFTM_TCP_OPENING_VAL; + my_timeout[PFTM_SCTP_ESTABLISHED] = PFTM_TCP_ESTABLISHED_VAL; + my_timeout[PFTM_SCTP_CLOSING] = PFTM_TCP_CLOSING_VAL; + my_timeout[PFTM_SCTP_CLOSED] = PFTM_TCP_CLOSED_VAL; my_timeout[PFTM_UDP_FIRST_PACKET] = PFTM_UDP_FIRST_PACKET_VAL; my_timeout[PFTM_UDP_SINGLE] = PFTM_UDP_SINGLE_VAL; my_timeout[PFTM_UDP_MULTIPLE] = PFTM_UDP_MULTIPLE_VAL; From nobody Tue Nov 7 17:28:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPwDD4ptQz50sy2; Tue, 7 Nov 2023 17:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPwDD4Mplz3cqy; Tue, 7 Nov 2023 17:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699378108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y9YukV7jNebu+pO9YK8GsFswrJVofKFnqYXf+EnfV4I=; b=SzUJqyZ/8+wQtzxDDmtY2k31XCX7AaTpP957fPchnJN1B7oYVf5H+iq1eGFmzVrmmjMiC5 mGU7dMpOh/9CMvboI7AQUWeITKU7N0BSPMRl0KqenR8Mmih4zgZBBAVQEqP36c9LHFvY3v J8XP3dEWiBBt1ZROZPBi2OGs1WXA3xtAPs4/guHnq1mJ6qfFpO1QHRETgTw61vX2Mrcmo8 8xHRUXDL9RU8NkpWEHpnzoFxw0YDcaZUurOoA7ju0dP/TRrhhmRyAuUN9KLRDRgjwgM7tF qcmL/XdK2sHzhEX/n0kPFXujB3uJxvNNyGVtWVvSUj4mOwhX4g602af2TIilOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699378108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y9YukV7jNebu+pO9YK8GsFswrJVofKFnqYXf+EnfV4I=; b=hHNR4Vz5evNBPe8dNbVQboTJsFIglb9b9q5i0ZuB9hPZD9eU1l+mdYFV5mZ+mAB2zgrj17 zIk2Wo9sG4b0UWRtVS5TbuLXxVkxD+ywFiQtT62Ov1TJDvRITOM63+2mF+AECcl3PE1MM9 +CZT/hodZ8TLrZyzkfGK6JVCA8u8uvEQDKI9unsvx6ba39RCCxt/Qfe6EOQsvy6PRr4Hg7 j0E3zP3pKpmVXMgLdv2N9sw8mUeM5EFZ2JEKw3s3WNvSH+h9ZYbbqAgIP/KwGpn8MxZcC2 4tFpBBu0MSewZLhphOyOeoImaqraqXIgejhMGXN2KbtD2qCTQEXnPInjNRtDrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699378108; a=rsa-sha256; cv=none; b=mOk4/W/Jzs+v/wH52IA8EbseyLVr4rkzZ6IfVigRS180Sm2adLh6NfiapBmgIeijk6B9b3 m544sPQQARdRWr/p1vo3/RbPxLfGoUDxl2vkN0RCGJLhskXHOSfDFJPK8jxHd0yJh3/7/A ObdynSa0vNj7/QRQQhhLSkOyctPtpXokedcf4sttJoRd8wuZpO7JuM7KUXogMe79bFWQyW +DHdVXJQr93gzbRKN1Xwo491JVhBXLGx8zMc87pAHvhC4m0Ym61rXCcd8CWGUBVMvezN0I /2P5shx1UjZq0wZpTMDloGYQBrtAckeiNVEhz86ThG3YBBTDI+g8mIZxRxoBOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPwDD3Qpczysd; Tue, 7 Nov 2023 17:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7HSSLf037847; Tue, 7 Nov 2023 17:28:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7HSShE037844; Tue, 7 Nov 2023 17:28:28 GMT (envelope-from git) Date: Tue, 7 Nov 2023 17:28:28 GMT Message-Id: <202311071728.3A7HSShE037844@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: 4e0e01bf6511 - main - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4e0e01bf6511c28212d7dff94fe131a502e13026 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4e0e01bf6511c28212d7dff94fe131a502e13026 commit 4e0e01bf6511c28212d7dff94fe131a502e13026 Author: Ed Maste AuthorDate: 2023-11-07 14:16:13 +0000 Commit: Ed Maste CommitDate: 2023-11-07 16:03:34 +0000 fflush: correct buffer handling in __sflush Two additional stdio changes followed 86a16ada1ea6 and need to be reverted as part of the fflush fix. This reverts commit 6e13794fbe6e82c21365d0fd66769bf8b19c0197. This reverts commit bafaa70b6f9098d83d074968c8e6747ecec1e118. Fixes: d09a3bf72c0b ("fflush: correct buffer handling in __sflush") Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42491 --- lib/libc/stdio/fvwrite.c | 13 ++----------- lib/libc/stdio/wbuf.c | 12 ++---------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 63d17a8f8ffd..6162ca01aa63 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -51,7 +51,6 @@ int __sfvwrite(FILE *fp, struct __suio *uio) { size_t len; - unsigned char *old_p; char *p; struct __siov *iov; int w, s; @@ -135,12 +134,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ /* unneeded */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (len >= (w = fp->_bf._size)) { /* write directly */ w = _swrite(fp, p, w); @@ -179,12 +174,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (s >= (w = fp->_bf._size)) { w = _swrite(fp, p, w); if (w <= 0) diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index 7153350c99f1..9aab55a207cb 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -49,7 +49,6 @@ static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93"; int __swbuf(int c, FILE *fp) { - unsigned char *old_p; int n; /* @@ -85,15 +84,8 @@ __swbuf(int c, FILE *fp) } fp->_w--; *fp->_p++ = c; - old_p = fp->_p; - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { - if (__fflush(fp) != 0) { - if (fp->_p == old_p) { - fp->_p--; - fp->_w++; - } + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) + if (__fflush(fp) != 0) return (EOF); - } - } return (c); } From nobody Tue Nov 7 17:58:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPwvQ5fGGz4ym79; Tue, 7 Nov 2023 17:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPwvQ5Bgyz4G3w; Tue, 7 Nov 2023 17:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699379938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aG4fRcQMGsAjw7iOlwGsJMepewtQqdOB0WfJ9uHnAGE=; b=K5ErxGA7+Hg1g4FHwRktUZWyJWLKeThrcz3awAVoTMt5t175DoyoAEF1B4S0Ev+wOMmK4C R+EN1LRu5DCh40ArHWQJ0NNEwmLIJO5pGSkoIpIYThtHBCmE3YcSaR7MX/8IrcAmCrSNZ6 ud+xqcRmWy9r9zgDVyV+zXNbNsMwldrdrARHDAbvL7sr/2mSO5IyNXWpwJTyfkuQuufhvN TE9ea8ctFbC/HcmsGjxYq/6/EI3ooECbcTiwihWyCVBuGtgosDIOlA2+HxORRexpmyODm5 WXpWYdSpvvnR7zvKYylAnDPdx1v4fLhJMqwl0LMQxbYuC38LCTqhGxBV+ADZgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699379938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aG4fRcQMGsAjw7iOlwGsJMepewtQqdOB0WfJ9uHnAGE=; b=NZ8qHe/7ItA/G/4wV1qLu/7PaV8qemnaPpasaETI2tfyetSdJAiFG2Rm8um/n5IOyL0lf5 BwRl6+lh1WTuiWl8pCWxQCKDMgVo9rKBspmBKX4GHGQY0dxRggnsWIJUDIevRTs1Z0KGn2 iesJ3dRVGe5PoUArxWRe9PfHlDxLASAlZjnRPvqGHkFaGFCPs3fj8Owi7W39JMziigbumh VB4wAAWiQi20+iB2Sge3YM1r0Bvno+YeR8vFgSvrdaiHj6p96Zerg4uA1ZZobIWJm4qyf6 dpkUEk8JUkwklPZxvbwjwWfRk6v8xla94SihllBw0k9rO0170l4tse6hdFrSvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699379938; a=rsa-sha256; cv=none; b=rOsevyZtiKDvnZKdoGeNBiuvEbwdawh4IAB4SekHP9c8DwEpxaZfRxhDqmr06i0zbxgfyd 4fCD67jQ4KbhiOhiEHz7sG59VpS4ZnZDjPEOn0OcY0KXTcc2bijMuyG30OwTjLpyhmLni4 J4Y4WZI2c02rPT2gyJM7Ax2LRo7Wxrg9DDn+u07MYZkpPdkFVW0axmcbjeuNphpSfhBEVX N6ohw2unXS13fIEgLjUqHPx8A+FLQ9+Rtzwo8lHsBvu76EV0bl4XGbDmJliyv6HwCtjriP alF2rg7kWntdG8ok7QgBj70mfs37bUELcl1cBbM2tSVxfdKWCwQnP0LgbTQQpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPwvQ4H77z10Fs; Tue, 7 Nov 2023 17:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7HwwNj087484; Tue, 7 Nov 2023 17:58:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7Hww0Q087481; Tue, 7 Nov 2023 17:58:58 GMT (envelope-from git) Date: Tue, 7 Nov 2023 17:58:58 GMT Message-Id: <202311071758.3A7Hww0Q087481@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: abe12d2f4ce3 - stable/14 - libc: remove unused errno.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: abe12d2f4ce31c3da0961b1b0a58df11f5a41e19 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=abe12d2f4ce31c3da0961b1b0a58df11f5a41e19 commit abe12d2f4ce31c3da0961b1b0a58df11f5a41e19 Author: Ed Maste AuthorDate: 2023-11-07 15:00:35 +0000 Commit: Ed Maste CommitDate: 2023-11-07 17:29:20 +0000 libc: remove unused errno.h include errno.h was added in 44cf1e5eb470, which has been reverted. Fixes: d09a3bf72c0b ("fflush: correct buffer handling in __sflush") Sponsored by: The FreeBSD Foundation (cherry picked from commit 418f026bd5a5084c1c4e2e91ad38051f6caa928c) Approved by: so --- lib/libc/stdio/fvwrite.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 26245acca1c9..dd170ee3d7dc 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -36,7 +36,6 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -#include #include #include #include From nobody Tue Nov 7 17:58:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPwvR72xdz4ylvj; Tue, 7 Nov 2023 17:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPwvR6R43z4GDy; Tue, 7 Nov 2023 17:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699379939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ILRvpK3OeTyuvY1d4hqP1l7RwDElm6GOLltn/ihFVE=; b=pqAxDKekr1JNomEUJhPRL+9FKaq2NsLbkNK6jMzMCGKzj45upAXHcCRAOUrT1FKL24Ixtc m8pdH55YCFtO+qiYONkaWUsCAhVA5nfqz+gj9mei1aVW2Pl06qqAChNjLBf5iTXp7kcl9Z Zb05cDYuumHEzxwsZckgp1taoxyDx9emC7ADmEtKqkD2V0bqV45VLul1qT79PwsfLZpIIX h/dsSa35X5ju4jjkhkcnFzyL/VYgb3YWHzLN+EqDNDi5mCC+KPbJyibR1Sd4qvTz4T0ybq nChZV1h4H7F6sbSnIgdWlr/DRQ5CER8FoDVoabtVxA1/JP6KEjIxicY+zDEUGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699379939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ILRvpK3OeTyuvY1d4hqP1l7RwDElm6GOLltn/ihFVE=; b=txYijMGb0AfZ77Zg8vKXa5koCnk1WD+19nsanbCaQEiNQKczKvx4Gr5DfarQ7L0tCBel8K /cBGeDRHLwN7vMZ1SKhLIowZEYYhQ8jb4hfJsa7yZD+op+6IDqJFlqbkYBtD5A7zXr5E81 HxpttJR7Stv76aMoXykvK1z7HC4iR5hUQQlQ405k/sXuRhNMLgbj0CdNPP/rQBKE/CO1yI hqSrksd3X11DdwSnE47pzb+Im+5Qo1gdSxLCrrlgIr04sUnEH/YhgJVSAZdJjFPUxexGMT CD4db4iJjKJrEitYQwUStJA3lN2ADBeqhsWlrVHWJYgKe6ngx1+B71uzb61Fvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699379939; a=rsa-sha256; cv=none; b=jhzB5fxWPMdmboLrNve2pbCG71TPd7FF0EnN0YsYCrxvC0b17wPCZFzOM+ujm2C/WgsceM U2bjoedQEMaamSd09+j1swLB/90Mp4rfPTBaNG22qrgNiLNFmkT7p9nJ3IOs81ve+UU03u +KxvwC2gD7u7+3KiFYU+cQPmV9EJ7bAwzlzXm6MuTcrrHEzSqFp39t6icCZslquK5/5qCy Pk4353J7kN+snYYwH/n4JiCo0ozXp/reZIJ14s66KA3PytR/5WCPGPo2K0UEcKatNdLgho vOZX4J5G7K60ckK4zhIn2XZr/cnI+4jqm9+zFAE0Q5D54U7+GrfEP/3tvLsRIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPwvR5Fpnz10nw; Tue, 7 Nov 2023 17:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7HwxoS087535; Tue, 7 Nov 2023 17:58:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7HwxTd087532; Tue, 7 Nov 2023 17:58:59 GMT (envelope-from git) Date: Tue, 7 Nov 2023 17:58:59 GMT Message-Id: <202311071758.3A7HwxTd087532@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: d2c65a1c9486 - stable/14 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d2c65a1c948648f11342274029a3f18b90aa58d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c65a1c948648f11342274029a3f18b90aa58d2 commit d2c65a1c948648f11342274029a3f18b90aa58d2 Author: Ed Maste AuthorDate: 2023-11-07 14:16:13 +0000 Commit: Ed Maste CommitDate: 2023-11-07 17:31:34 +0000 fflush: correct buffer handling in __sflush Two additional stdio changes followed 86a16ada1ea6 and need to be reverted as part of the fflush fix. This reverts commit 6e13794fbe6e82c21365d0fd66769bf8b19c0197. This reverts commit bafaa70b6f9098d83d074968c8e6747ecec1e118. Fixes: d09a3bf72c0b ("fflush: correct buffer handling in __sflush") Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42491 (cherry picked from commit 4e0e01bf6511c28212d7dff94fe131a502e13026) Approved by: so --- lib/libc/stdio/fvwrite.c | 13 ++----------- lib/libc/stdio/wbuf.c | 12 ++---------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index dd170ee3d7dc..acf8f72076cf 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -52,7 +52,6 @@ int __sfvwrite(FILE *fp, struct __suio *uio) { size_t len; - unsigned char *old_p; char *p; struct __siov *iov; int w, s; @@ -136,12 +135,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ /* unneeded */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (len >= (w = fp->_bf._size)) { /* write directly */ w = _swrite(fp, p, w); @@ -180,12 +175,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (s >= (w = fp->_bf._size)) { w = _swrite(fp, p, w); if (w <= 0) diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index 808cfa588cfb..558322b4001e 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -50,7 +50,6 @@ static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93"; int __swbuf(int c, FILE *fp) { - unsigned char *old_p; int n; /* @@ -86,15 +85,8 @@ __swbuf(int c, FILE *fp) } fp->_w--; *fp->_p++ = c; - old_p = fp->_p; - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { - if (__fflush(fp) != 0) { - if (fp->_p == old_p) { - fp->_p--; - fp->_w++; - } + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) + if (__fflush(fp) != 0) return (EOF); - } - } return (c); } From nobody Tue Nov 7 18:44:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPxvX03RNz4yxMH; Tue, 7 Nov 2023 18:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPxvW6QHBz4Mt9; Tue, 7 Nov 2023 18:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699382647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Nsz9jC6gRcEG0PkLlnXc8zLKJXq+mxW8S72L0cMlnc=; b=hMpR4bNZ9UjFrn9S4+23D+u2xZ4+FyUrcQmjPgLhDaD9+rWwhpj8iDlJQfhCam019JKMwf /8DNq7RPrEzIvk9honsvysWqsQz1Cjry/YWD1lGaxBA5i/kuQJWlcvkCGOoSSZG/aLH+C7 Jh/18ckXuAK+p4+/rUXwe5udwYNXLkEOB36LaQQ9wHMrG6xLF1d1bp4GMOhYVWT6gjogBz iyaLlBaJqRz5iKAd5doCWKcArVWGlfjk/KM3FMWy56fM6e/Oray3+iZT8dP3lhfkQXuTVd 6uzvT1FvFbyrDx/5bmiarycmkL40jujn/bwwF54sEJ0QQFlLZwbsDNbu4DhOuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699382647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Nsz9jC6gRcEG0PkLlnXc8zLKJXq+mxW8S72L0cMlnc=; b=XTTpIflyogaCQdDmxc8ludfwlIeMtbciPGZNDxr3Xa5sF6/WO0rA/SvHQ8Tn+GCRg0sM2I tWtqxImTstss1Ce8aHjA/YIFmKg1t0cCiBSbuTB4llejvj9c9P44v0wX1nWk7QR3vM2EKz prf8tRRfKL8wPT+4dXLrMDWDZpQuRSoZK+4K33J1LYfJ9ooAIh5rMO13vTTDljp8sqUv1Q GejGuEMMg3nkHDBm4ZMf0kuX8GaZ9wseB4GnCfdnURZaUgJN81uexfGSbzBr05objhpAPm +XGNtXahoBEbNrbl/xmgWqlCKKsJAcm3wzIBa4Pg/r7CPbojWehxUqzrrBDzsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699382647; a=rsa-sha256; cv=none; b=YySnTKck8bJusUDG6ebQC90kCiirf+EkFJDRN0WLSiUcHOyfu/ns16JWvP7Hl7E+pV1mYj +qXf8ckJhzXjbioBvcEbNtbOnv4AqPzzg7Bh2O4fvuSkDppdUeCUWqoQ+LxbGhZAC8eACh LR9Bhn30WQl+Uf3DHA5DB/xM9vgKYnYdJ0yLtaZE8zzia3RyUXoZQnyrRpU41RQI33gJcd vqgAD4HABOvwam0McjQHHNvIgBuKO27dStThgicvnLgM2t1f0c7mPrNKMkcEsX7yW9wJdC djxCtsOQp55POiB619siogEagTJcUZ/mPpRAZquztF9exDJqLrkg2VSP9hGNjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPxvW5V0Yz11KV; Tue, 7 Nov 2023 18:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7Ii70s070836; Tue, 7 Nov 2023 18:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7Ii7vr070833; Tue, 7 Nov 2023 18:44:07 GMT (envelope-from git) Date: Tue, 7 Nov 2023 18:44:07 GMT Message-Id: <202311071844.3A7Ii7vr070833@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: 59ec3ffdd7ce - stable/13 - libc: remove unused errno.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 59ec3ffdd7ce85f32ea833e8024f7bacd36d4e97 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=59ec3ffdd7ce85f32ea833e8024f7bacd36d4e97 commit 59ec3ffdd7ce85f32ea833e8024f7bacd36d4e97 Author: Ed Maste AuthorDate: 2023-11-07 15:00:35 +0000 Commit: Ed Maste CommitDate: 2023-11-07 18:41:49 +0000 libc: remove unused errno.h include errno.h was added in 44cf1e5eb470, which has been reverted. Fixes: d09a3bf72c0b ("fflush: correct buffer handling in __sflush") Sponsored by: The FreeBSD Foundation (cherry picked from commit 418f026bd5a5084c1c4e2e91ad38051f6caa928c) (cherry picked from commit abe12d2f4ce31c3da0961b1b0a58df11f5a41e19) Approved by: so --- lib/libc/stdio/fvwrite.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 26245acca1c9..dd170ee3d7dc 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -36,7 +36,6 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -#include #include #include #include From nobody Tue Nov 7 18:44:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPxvY36zPz4yxPc; Tue, 7 Nov 2023 18:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPxvY0X2Sz4MtS; Tue, 7 Nov 2023 18:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699382649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KZxEroMRjPMmj/ozMY5kD4sENh6fXdaM+Ukq81xOHGs=; b=X43DhPyGb4ezAEka76VWn8fWTw3KSEfKbjiJj0BO/67T804EuJ0KvSsdPo+iM3wh0MX2G/ I6Qzy9c53f2dH8+pEXqSXGPqdV3SIKi70VZIK5Pu+MVLvLrX5c4srxds7aypqLECZP3kV3 LYyUh9UraEPYkmoCf93n9cEXoQ24c4QvdzWTcjL0lLGrizihw5vdAMDgiCsR07bGpieHad hNeMpfgCdksFPxsVyF5pFB5YW5CrV5o5GlWX62ztUXoH/pJcGb/l2h/S5GlLG8DWjA8Te4 jJbsauNBnv/Rooj2bukAEng8e98gBmPnZ2R+gxN9nkAQrAVoObr3ddI4QhtrNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699382649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KZxEroMRjPMmj/ozMY5kD4sENh6fXdaM+Ukq81xOHGs=; b=KZJh5R1t+pN0fd3P3ZWZXxeOs5idFUj30l46gD67CXDqaL9PsHPOGHSNZBY9BqmO6gNGy9 Rf73zQd1fhKjjLxpxnYRtmlJhggtPwnqS1aONpOc7pZbHU2v9IpveOraLzo1Z3iFnDikcD dGweI+TlVJruWuwv+0R8TT+B7ymdyvkhxZm2yGizJcqlxPT2XeaA1YrBegLl63kabG9UUt TXxaxoZRD76JNsPzA8oij4UWQobMoLL3lsh2r3m2h2vsZoNdyiXII3N+H8Ohh8kzo5T3wc Oh2EkUBzrB1XbFgnsEpS/2DW/Df7B6nmGhQI8ceJH4pAnbgZzyLP+Hjcr+WNeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699382649; a=rsa-sha256; cv=none; b=sJFkigeT2huuLQy/JeySIlrAvT+W+kdjbn915jwADj650HBt0vIca3usFjunItogbukdOh ssOSmzUJNVUNsCryZyUlWP2JDBPJ3Xpb+wZcYu4ySoa92NV5acBZNODQr7M2l7xSfDxkn7 cMFBay2gf12dvr9lJwZF6tf45Lq0IEIe9rS0Gzj6ogkTdTBr2WphHyZuil7iiazNEmaKn3 KYAUVOaJfZbC0nAhMf6W5BkAkXY8tZINj7nIM0qHEvb6DG+zz6T93idhrQYIK4uxlanf6h iQA5Nr18Te7o7KegITvnua+7ei1qC31exo61BC/FKpmcbpeKH4MQt07bHEM8TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPxvX6ScVz11tS; Tue, 7 Nov 2023 18:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7Ii8JX070887; Tue, 7 Nov 2023 18:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7Ii8Go070884; Tue, 7 Nov 2023 18:44:08 GMT (envelope-from git) Date: Tue, 7 Nov 2023 18:44:08 GMT Message-Id: <202311071844.3A7Ii8Go070884@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: 0b7939d725ba - stable/13 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0b7939d725ba0ca903c5f8a3ca6d74347eb88690 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0b7939d725ba0ca903c5f8a3ca6d74347eb88690 commit 0b7939d725ba0ca903c5f8a3ca6d74347eb88690 Author: Ed Maste AuthorDate: 2023-11-07 14:16:13 +0000 Commit: Ed Maste CommitDate: 2023-11-07 18:41:55 +0000 fflush: correct buffer handling in __sflush Two additional stdio changes followed 86a16ada1ea6 and need to be reverted as part of the fflush fix. This reverts commit 6e13794fbe6e82c21365d0fd66769bf8b19c0197. This reverts commit bafaa70b6f9098d83d074968c8e6747ecec1e118. Fixes: d09a3bf72c0b ("fflush: correct buffer handling in __sflush") Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42491 (cherry picked from commit 4e0e01bf6511c28212d7dff94fe131a502e13026) (cherry picked from commit d2c65a1c948648f11342274029a3f18b90aa58d2) Approved by: so --- lib/libc/stdio/fvwrite.c | 13 ++----------- lib/libc/stdio/wbuf.c | 12 ++---------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index dd170ee3d7dc..acf8f72076cf 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -52,7 +52,6 @@ int __sfvwrite(FILE *fp, struct __suio *uio) { size_t len; - unsigned char *old_p; char *p; struct __siov *iov; int w, s; @@ -136,12 +135,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ /* unneeded */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (len >= (w = fp->_bf._size)) { /* write directly */ w = _swrite(fp, p, w); @@ -180,12 +175,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (s >= (w = fp->_bf._size)) { w = _swrite(fp, p, w); if (w <= 0) diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index 808cfa588cfb..558322b4001e 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -50,7 +50,6 @@ static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93"; int __swbuf(int c, FILE *fp) { - unsigned char *old_p; int n; /* @@ -86,15 +85,8 @@ __swbuf(int c, FILE *fp) } fp->_w--; *fp->_p++ = c; - old_p = fp->_p; - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { - if (__fflush(fp) != 0) { - if (fp->_p == old_p) { - fp->_p--; - fp->_w++; - } + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) + if (__fflush(fp) != 0) return (EOF); - } - } return (c); } From nobody Tue Nov 7 19:53:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPzRv2x34z50ByQ; Tue, 7 Nov 2023 19:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPzRv21Hmz4YpW; Tue, 7 Nov 2023 19:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699386827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKI6ZWVrEbhF48v7b6+oxPigMiJ2DAT+gKnAQhTFGY8=; b=fU9g9nDd78apcCzTB0m4Rdx/TgPO7B5hTeSspdzfWzJGiZ6pU/9UcXVJ+sZZdP6yYXx7xn wPDE9t5Guli+l6bxn+7F4OzgF6JTVHY+APzIO2sh09z8mYbJQvC7HsDZExk77IwsKJP6x4 apGzas8Scuuk7EVF51rff8VmX/cskh2PPhWbBzb6iLxbw6DDfNtVOemCJpVmHsnNln4fkp Asn9utqOBleA8hfnf+7mdMi/0/inpWtzEQPUJLo17qsb7Ss/T8TQB0SZh22HyyVK4iHIld PXCmU+aSI5VOKlHR/dQtfaeDjw+cOCoDD/b93d0KRrGgMaYQTwWIfu7VdH09AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699386827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKI6ZWVrEbhF48v7b6+oxPigMiJ2DAT+gKnAQhTFGY8=; b=G/WaB49MLaeqFIgQzxxZm4slcr9YVXO8TMztHeRE2zMEiy3Ubx7ehHgqoL9+TSwlotbJZE z297plZ80+GqciflJBin6TBSFaqgBkj2hdNzgBq8V2swFTZRMPu64Amk8W11E2dWKLeTxV X8cEQhaebicl/vT2YLpaQqPNu+tprJGXWP2tyHRT7jjXGVbt1nDA3+b3qovuw5+3LEMMF9 KLsbwVqyCLVI4s/2wGEmif++XrQjEATz28ZfeZwxUspV1Du/qwK5NBRoM+l9jyoE6ZATX5 ig7Y2aYN7N7eBOawfivKK1sB0jlPelqlonhMgccWQbBiuklU8C2eRjuC4t10qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699386827; a=rsa-sha256; cv=none; b=Sa4t/Jn3Q+aK+rwFymag61IdPdUyJ9UtKGtbKYmAfaZQWhdFbRLFdeWARDvYNHmmOUZLho iRGf8eZk0m5pv60Z9JMfMUrJkfJwdMHouKTivZkRA9FImS295ohzNaYFkqyQ/0Nm0JZ3Pi F5eTTZztTA/FIZUBjaF+SCSoenC48w+01QaNZ25QS2NVgzImpbLu9Sl2cNhsAsErllL1qX YioAofIQA0GPZfN70T/ctIlKh+18BuRd35hCA2MjzhBv3mHsZa+uaZLEsFDUyZHckuRPL1 YHzXUMb4d+QotyFuP3PfLYANfuxOyacq3OZLAMw5TUurWN1RsDYdpwNZ+VPAzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPzRv144gz13HT; Tue, 7 Nov 2023 19:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7JrlYe086851; Tue, 7 Nov 2023 19:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7JrlXG086848; Tue, 7 Nov 2023 19:53:47 GMT (envelope-from git) Date: Tue, 7 Nov 2023 19:53:47 GMT Message-Id: <202311071953.3A7JrlXG086848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f7d16a627efa - main - certctl: Convert line endings before inspecting files. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7d16a627efa8ba610eb9b8a12dd67b6cdbb2542 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f7d16a627efa8ba610eb9b8a12dd67b6cdbb2542 commit f7d16a627efa8ba610eb9b8a12dd67b6cdbb2542 Author: Dag-Erling Smørgrav AuthorDate: 2023-11-07 19:52:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-11-07 19:53:09 +0000 certctl: Convert line endings before inspecting files. This ensures that certificate files or bundles with DOS or Mac line endings are recognized as such and handled identically to those with Unix line endings. PR: 274952 Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D42490 --- usr.sbin/certctl/certctl.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index 2ffa94bc7db7..997a7d835d53 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -71,6 +71,11 @@ cert_files_in() \) 2>/dev/null } +eolcvt() +{ + cat "$@" | tr -s '\r' '\n' +} + do_hash() { local hash @@ -181,7 +186,7 @@ do_scan() IFS="$oldIFS" for CFILE in $(cert_files_in "$@") ; do verbose "Reading $CFILE" - case $(egrep -c '^-+BEGIN CERTIFICATE-+$' "$CFILE") in + case $(eolcvt "$CFILE" | egrep -c '^-+BEGIN CERTIFICATE-+$') in 0) ;; 1) @@ -190,7 +195,7 @@ do_scan() *) verbose "Multiple certificates found, splitting..." SPLITDIR=$(mktemp -d) - egrep '^(---|[0-9A-Za-z/+=]+$)' "$CFILE" | \ + eolcvt "$CFILE" | egrep '^(---|[0-9A-Za-z/+=]+$)' | \ split -p '^-+BEGIN CERTIFICATE-+$' - "$SPLITDIR/x" for CERT in $(find "$SPLITDIR" -type f) ; do "$CFUNC" "$CERT" From nobody Tue Nov 7 21:18:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ1KL2mngz50Sn4; Tue, 7 Nov 2023 21:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ1KL2Kpmz4jDy; Tue, 7 Nov 2023 21:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699391894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PK8L0ITEMqGuOlsHICUtHlpiCgTdmJ8RoswfzyMesSY=; b=IJkTxMbCIgWtDmUJ0txkuuTWpfvaL1anyN8Icl/jARmRB+mEx3zA9oYy/LYUIFMt43EKHy ndPuct8oSYBNeqH9VsWbQY5HwuLn3NJGjITVYFwmwNYSZbSUl1DrqoaCLyikOptX+6vJFG 067osA+10mQ+nc5MBUKwL3tkVkkL2HqN/XLVqZMB3y/CPF/mMXavHJvVB4fHkzQFbhPwhk qI8k/BSt5XDaUUD3sB+AMEIOS3KLbivORuZtWCpajBSNzbF9CcECOoJhqYZ+ZRl0XrJNhZ p1Rz/b/u0ntioGmVbd48iW9maEhEiV4zEpUQCUhj2ARXHY0qSeuzjFlylh66Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699391894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PK8L0ITEMqGuOlsHICUtHlpiCgTdmJ8RoswfzyMesSY=; b=QQ3TyRQccno1OTVGQGhMG3mf034qD1tR0Vb5Vd7QEeaHkJM8bA2mS/1/pEJPIUv4XbRsbH pEbdCjLN7WXJsYuvWqPq2UV76x8Yh43WLkMUO6anv31yGY4GUIYGPqLFmmW2pACAgfYwnB mBUeUP7mYQMYhV4K/QsiNhQZ2txQIpHscvTBmyNd7u/xPy14pDrVbfhQjvQ93eSYvIC5Fr qvctPQZnguyOsrU4QLZ0U70nCz07UnBjw/Ne4CBlaHW6cEukeD+E/s1S1m6sS/8NrCgpej DiV3ghHLpUec1GJuQXKov4Vi+guL9nf+GEZzmerUPaoWjTyYkLlmePROZpDtlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699391894; a=rsa-sha256; cv=none; b=i1xo9y1iFpQYYMZWqlS80zSS+LHxGqCX3Blgw6ioY+5xdxM2Z93PycxJsXbvRdyDLQCvNn Hgfw0dd0AJotVB+O9UeojJ6kQyp9dfzbxPyPXdbQJUZmT3nRRi+4R3qfqKZrVXUCiCRcb2 kf7FuFW1/rZlxXhN1gTFchiQYqz025wr/v2T3yC57mHMLZ1hRLNDzOYiBbwSlUwhiHRjS8 IzWvzJL68c0MiDysoxILdDCAFMUwJg9QUEWrYND675Q5kr+9ehzoKn1E8yDS25xwnt7mzC CG3SCudyCL8+M9nGh6FjqYLhBifSjaMOrlS+HhJ0vBKpycYDzbtO7KoBUgcKJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ1KL1QFVz15G1; Tue, 7 Nov 2023 21:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7LIEcQ021647; Tue, 7 Nov 2023 21:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7LIEh7021644; Tue, 7 Nov 2023 21:18:14 GMT (envelope-from git) Date: Tue, 7 Nov 2023 21:18:14 GMT Message-Id: <202311072118.3A7LIEh7021644@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: d6e457328d0e - main - ping6(8): Add ping6(8) as MLINK to ping(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6e457328d0e57176b66ba5f5c614becca680fea Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=d6e457328d0e57176b66ba5f5c614becca680fea commit d6e457328d0e57176b66ba5f5c614becca680fea Author: Antranig Vartanian AuthorDate: 2023-11-07 21:14:59 +0000 Commit: Li-Wen Hsu CommitDate: 2023-11-07 21:17:37 +0000 ping6(8): Add ping6(8) as MLINK to ping(8) Reviewed by: chuck MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42203 --- ObsoleteFiles.inc | 1 - sbin/ping/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f08785ac77da..8d98dddb8c90 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -6737,7 +6737,6 @@ OLD_FILES+=usr/share/man/man4/if_hme.4.gz OLD_FILES+=usr/include/net/radix_mpath.h # 20201124: ping6(8) was merged into ping(8) -OLD_FILES+=usr/share/man/man8/ping6.8.gz OLD_FILES+=usr/tests/sbin/ping6/Kyuafile OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out OLD_FILES+=usr/tests/sbin/ping6/ping6_test diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile index 4713b01cac90..1483a93ace37 100644 --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -20,6 +20,7 @@ CFLAGS+= -DINET6 -DKAME_SCOPEID SRCS+= ping6.c LIBADD+= md LINKS= ${BINDIR}/ping ${BINDIR}/ping6 +MLINKS= ping.8 ping6.8 .endif .if ${MK_DYNAMICROOT} == "no" From nobody Wed Nov 8 00:45:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ5wy682kz4yvLm; Wed, 8 Nov 2023 00:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ5wy5N3Hz3R83; Wed, 8 Nov 2023 00:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TqTekpTpzNEss4luzw/5b7nZ+4P2bRA41BuN+CGsFo=; b=i1X+ZOjlpRGy5p6o2Spa3UHMuxX7unxEmNSPMGJr3qVti7cYyZ+oj19DwDg+7IN6bknPwX ohQ8v1rjlFZwbxf37N89DU2341gqo3DzbJzG4lNyEpUk6U1vyBq9jL7nfl0uC/FAriUg9u CzdrSaPQQ7RiX1gqk6tBag1MzCdJE8UjcIj1VO1UMkG/oZ4IH8NJTTpDwGcbSFu1mT06zE IL1Ywx8N/yWRK4KJQEAcuigX89BTU83/aZ87fJ4EJCTvGxU/Q6fQURn2GTcFNk8myrM3Fv I7Jwfc8nmY1sNyIUGlyNn0r1/xwMwKlUNn3Xo6OLcEh4hiWiGzgqd0x9hWvOgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TqTekpTpzNEss4luzw/5b7nZ+4P2bRA41BuN+CGsFo=; b=J4CJK0laGpIxGfWDGV5+tsM3aD1LwN0sHz+FdPdJ8xNflIOHndZrVfSlYklWcd+lyCWgo5 xQNMy6vSjWnROXXJ0NdWTj93DSGVZZkRY0J4cA273avDaIxVZ3TkEn0fDuMpJB3IpBmEWI 4MOtwHzqynU5vX2s7MeuLGZ4rs5uG7ECnlRjZL6al/E01DCv9iXmcJ4yov52cmg83q3cSu OiBxwdRXmrILAWl1CwL/In7dbog0LCDupmWx5d4GFJk7XCnDaIXcTm1xPV8yEUNjmkal0m jMp/klHL9kPjoinSzvyg/oQcPJpaG9JhA4qUwJS72WHs0hIrYS11DdMByCSWwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699404354; a=rsa-sha256; cv=none; b=MGp289IbbQ7eT4GqtebEyt59lUwzvfax7YSTlYIFK9I5A8NPHEIxGbykPa2yzEDMhbpP52 stTPpD7PNVPD9jhGtANpZHeyahuPc3AVCqCIuL3J1R2bVccEVf++egmht4ndRvYmqw21SG oYlw/kq1wZ9kEQRidaUaSMr5OPWTilE9GTHhIBowuBQy7DWQK7CGHIGEBsc5vLWvYc6Nic da8dwfmFbUIOoE6Ja9/kju7WUP1X2bp5UbYBCm5X9fS8ewKsBcG9yKWwpSaOiu9KSmA3Dx HTvGPb7GHrZpTsXpntlLtvyapGmFXTJpPvIgxQcocrBeLNminUpnLkcYZmcwew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ5wy4SB6z1BQf; Wed, 8 Nov 2023 00:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A80jsKD071168; Wed, 8 Nov 2023 00:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A80jsVZ071165; Wed, 8 Nov 2023 00:45:54 GMT (envelope-from git) Date: Wed, 8 Nov 2023 00:45:54 GMT Message-Id: <202311080045.3A80jsVZ071165@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: 1f9c4610dde5 - releng/14.0 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1f9c4610dde5ecda4ad219b19f16ec712bc1d793 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1f9c4610dde5ecda4ad219b19f16ec712bc1d793 commit 1f9c4610dde5ecda4ad219b19f16ec712bc1d793 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:08:03 +0000 Commit: Ed Maste CommitDate: 2023-11-08 00:45:25 +0000 fflush: correct buffer handling in __sflush This fixes CVE-2014-8611 correctly. The commit that purported to fix CVE-2014-8611 (805288c2f062) only hid it behind another bug. Two later commits, 86a16ada1ea6 and 44cf1e5eb470, attempted to address this new bug but mostly just confused the issue. This commit rolls back the three previous changes and fixes CVE-2014-8611 correctly. The key to understanding the bug (and the fix) is that `_w` has different meanings for different stream modes. If the stream is unbuffered, it is always zero. If the stream is fully buffered, it is the amount of space remaining in the buffer (equal to the buffer size when the buffer is empty and zero when the buffer is full). If the stream is line-buffered, it is a negative number reflecting the amount of data in the buffer (zero when the buffer is empty and negative buffer size when the buffer is full). At the heart of `fflush()`, we call the stream's write function in a loop, where `t` represents the return value from the last call and `n` the amount of data that remains to be written. When the write function fails, we need to move the unwritten data to the top of the buffer (unless nothing was written) and adjust `_p` (which points to the next free location in the buffer) and `_w` accordingly. These variables have already been set to the values they should have after a successful flush, so instead of adjusting them down to reflect what was written, we're adjusting them up to reflect what remains. The bug was that while `_p` was always adjusted, we only adjusted `_w` if the stream was fully buffered. The fix is to also adjust `_w` for line-buffered streams. Everything else is just noise. Fixes: 805288c2f062 Fixes: 86a16ada1ea6 Fixes: 44cf1e5eb470 Sponsored by: Klara, Inc. (cherry picked from commit 1f90b4edffe815aebb35e74b79e10593b31f6b75) (cherry picked from commit 1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd) (cherry picked from commit d09a3bf72c0b5f1779c52269671872368c99f02a) (cherry picked from commit 92709431b14df6c0687446247ac57cfc189ee827) (cherry picked from commit 418f026bd5a5084c1c4e2e91ad38051f6caa928c) (cherry picked from commit abe12d2f4ce31c3da0961b1b0a58df11f5a41e19) (cherry picked from commit 4e0e01bf6511c28212d7dff94fe131a502e13026) (cherry picked from commit d2c65a1c948648f11342274029a3f18b90aa58d2) Approved by: so Approved by: re (implicit) Security: FreeBSD-SA-23:15.stdio Sponsored by: The FreeBSD Foundation --- lib/libc/stdio/fflush.c | 27 ++++++++++----------------- lib/libc/stdio/fvwrite.c | 14 ++------------ lib/libc/stdio/wbuf.c | 12 ++---------- 3 files changed, 14 insertions(+), 39 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index a7f9348def50..61f23335106f 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -103,11 +103,11 @@ __weak_reference(__fflush, fflush_unlocked); int __sflush(FILE *fp) { - unsigned char *p, *old_p; - int n, t, old_w; + unsigned char *p; + int n, f, t; - t = fp->_flags; - if ((t & __SWR) == 0) + f = fp->_flags; + if ((f & __SWR) == 0) return (0); if ((p = fp->_bf._base) == NULL) @@ -119,26 +119,19 @@ __sflush(FILE *fp) * Set these immediately to avoid problems with longjmp and to allow * exchange buffering (via setvbuf) in user write function. */ - old_p = fp->_p; fp->_p = p; - old_w = fp->_w; - fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size; + fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); if (t <= 0) { - /* Reset _p and _w. */ - if (p > fp->_p) { + if (p > fp->_p) /* Some was written. */ memmove(fp->_p, p, n); - fp->_p += n; - if ((fp->_flags & (__SLBF | __SNBF)) == 0) - fp->_w -= n; - /* conditional to handle setvbuf */ - } else if (p == fp->_p && errno == EINTR) { - fp->_p = old_p; - fp->_w = old_w; - } + /* Reset _p and _w. */ + fp->_p += n; + if ((fp->_flags & __SNBF) == 0) + fp->_w -= n; fp->_flags |= __SERR; return (EOF); } diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index 81e7ba89a644..acf8f72076cf 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -36,7 +36,6 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -#include #include #include #include @@ -53,7 +52,6 @@ int __sfvwrite(FILE *fp, struct __suio *uio) { size_t len; - unsigned char *old_p; char *p; struct __siov *iov; int w, s; @@ -137,12 +135,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ /* unneeded */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (len >= (w = fp->_bf._size)) { /* write directly */ w = _swrite(fp, p, w); @@ -181,12 +175,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (s >= (w = fp->_bf._size)) { w = _swrite(fp, p, w); if (w <= 0) diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index acbe379ad90e..558322b4001e 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -50,7 +50,6 @@ static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93"; int __swbuf(int c, FILE *fp) { - unsigned char *old_p; int n; /* @@ -86,15 +85,8 @@ __swbuf(int c, FILE *fp) } fp->_w--; *fp->_p++ = c; - old_p = fp->_p; - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { - if (__fflush(fp) != 0) { - if (fp->_p == old_p && errno == EINTR) { - fp->_p--; - fp->_w++; - } + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) + if (__fflush(fp) != 0) return (EOF); - } - } return (c); } From nobody Wed Nov 8 00:45:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ5wz6fzhz4yvXJ; Wed, 8 Nov 2023 00:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ5wz62rPz3RBb; Wed, 8 Nov 2023 00:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ff0rTKAqnF4nPrMFvI5Gh1uFsPBW0cKY/y8zCOYXl8Y=; b=F+Ap34aX46qOfCyw0M3tsDhK8rqawgoiZWt6DaY4wGW3gLtbojWsP3jMkif1wLSqKt5Fxc 4c2hXcY+Mz9fsZh9Mks2xEvz//yJoIKdlW805K10ZM3Uax/9sOr26V4bRsH7c8XE4yFlai v7Tk8VZAd0fxbYOX9+lTbp9Pg37/Hh4YURZ9Td0aVaa+UFqlwWJ/DGzF+FL8klvDwmnBzB fl4LjglGZPI3M0IvPBfYvciQU4PYeVMgqPZGgzntwueStUGm8sDYn5OF2JUc12RU3rXaNR B3cb98Nk9Wq999m3jEOMoawclwP9qE67TC295vcRdJDaYM59hzf2T2XmRnH1Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ff0rTKAqnF4nPrMFvI5Gh1uFsPBW0cKY/y8zCOYXl8Y=; b=H70HE2yKqcreacRQImKdIaa7UYZtUybf4ySEZCLhLUY0whkM6PVJeLy9e9glzBccmeLZB2 ixM4/HAvftlkGtjCxTKb8vOTF5bIo+8RvJZLN05ZsX+pnWlnJe3jpA1Kut+1mvAHhxxeYX X735ky/uD0ZKK0yRqoUWwAy4DqpCCQitqXn2sHGWuecfuO10RrW3ezYZyTxSTJNhyaBEd9 F+4ERYu//bSEIKllYthURRwYd3TlnYEFqZvUFNjmZmAH4SSkArBvGJRlSDw5s3/LFWUZ4w AnlF7YcVcBXnTtIxogaKkTsXb6L/TR0DJ89XZbUCh45W+cE0RXBkNOyl305Tog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699404355; a=rsa-sha256; cv=none; b=uL/677r0/o6ZM4NTzr3iHoAwxgY4HsGObEjfSCdZa0Tn9InKREAfRQq8ayTM71IqaDH5xp wmNEQscDrbYngwUNMCd4AuD3gcQ9uonLIdwp7nPnW1wQn2GuG8VaBW5PcpcB50OLAKv9xG PR7UStN+LSbXFtxRtW2G0R/SNt+4ThUJJetYGdDXv7w3BFdfuCv2r1TjVs0b0tApXCXLhn 82+59bVeWFV2h7wRFiITcPhoS+5pq/nntyCqZ0Doy0tHKvjtrAQwhMTy/Bfj1+L+Ghtrcq mHSIqXNigqqXxTEW21BAZUmXMPWtxgqqS3TaXUZzGjwI3R9K5A0aLHXgyhFNRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ5wz5871z1BnZ; Wed, 8 Nov 2023 00:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A80jtSK071222; Wed, 8 Nov 2023 00:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A80jtvY071219; Wed, 8 Nov 2023 00:45:55 GMT (envelope-from git) Date: Wed, 8 Nov 2023 00:45:55 GMT Message-Id: <202311080045.3A80jtvY071219@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: 5f4fc91cc87c - releng/14.0 - cap_net: correct capability name from addr2name to name2addr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 5f4fc91cc87c99d9995fd05e6029960d692bb397 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f4fc91cc87c99d9995fd05e6029960d692bb397 commit 5f4fc91cc87c99d9995fd05e6029960d692bb397 Author: Mariusz Zaborski AuthorDate: 2023-10-23 21:03:51 +0000 Commit: Ed Maste CommitDate: 2023-11-08 00:45:34 +0000 cap_net: correct capability name from addr2name to name2addr Previously, while checking name2addr capabilities, we mistakenly used the addr2name set. This error could cause a process to inadvertently reset its limitations. Reported by: Shawn Webb (cherry picked from commit afd74c400075d94e01dd3430844bb290834660ef) (cherry picked from commit 765757c6301fa41c0b59108347c600fbc9020c39) Approved by: so Approved by: re (implicit) Security: FreeBSD-SA-23:16.cap_net Sponsored by: The FreeBSD Foundation --- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/tests/net_test.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index bbb2a666440f..a8f039f81843 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1232,7 +1232,7 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits, oldfunclimits = NULL; if (oldlimits != NULL) { oldfunclimits = dnvlist_get_nvlist(oldlimits, - LIMIT_NV_ADDR2NAME, NULL); + LIMIT_NV_NAME2ADDR, NULL); } cookie = NULL; diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index 5522f92516eb..dcb897de467b 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -783,6 +783,18 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); ATF_REQUIRE(cap_net_limit(limit) != 0); + /* Try to extend the limit. */ + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_0, NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + cap_close(capnet); } From nobody Wed Nov 8 00:53:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6586X7Pz4ywB0; Wed, 8 Nov 2023 00:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ65862vhz3S3B; Wed, 8 Nov 2023 00:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hrda63ZbMDLXv8oaH/qU2D+xb9AesFJFyIo8WH9wtu0=; b=jEsVO8kgQ+gZSborcbOFRDTEu6NjbMlHnUF5l7m/966bPQbjNnzUVN0hQZgRoENrAZyNUi DW2pwmRJnaCwfhEmXpzp7pzTN7JMppAZDhEw5AsOf/zUR1r8v1z6+xNqGJYP4fJJx7TXf1 KP9EHe8OObIg+rutBBMsKD1idqwgThE1CZzKuobSyBjxWuKe5HJU/wyUDOuS+wWDf9hKNZ WNY18YQkw58HwTms5qVvN6A0+eqJ9GnCq1RkWKhXYjarzL0i2TabLIpt9DWdsXI3CY7D13 NsiEeJPkZ4Y/ewG4Pp3J3BVs68LK4PnISBSi1MUe4CzaoehJNBmiod4rPZXVCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hrda63ZbMDLXv8oaH/qU2D+xb9AesFJFyIo8WH9wtu0=; b=Oc/c+ERHXzs7HZo6wLUAamuqooJMlk1roIpoRYaVPwKmaZ5xtge36LGO1t3dyM/0cInOk5 cT+RsKH1xq7XmlSbjpPHd0T8t0uqe57Hn8iubIK34jtRy6tMAVB22mv9biRV3k2LuTStbG dAgKbTIFZQV1edS4oRk298UzYvNtZCqz1naZZHbeGTXbUbbcHKvbY+sOs+nx78J51ksrhM d2ybJhEgi5/JXGUJoZv6r6p6vsAuB3s4m09gcw3vAkMPcTHc1c/uGs5i3pc57JGV923gqI SC0KaK+P0yWplb24PSZc+VWvA9ViYffmDesCp8MlT1EBGIeUcr1TPcJOGIMdsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699404780; a=rsa-sha256; cv=none; b=PLSQKYZ25TtOte0FDyq1EV9I9UdUDjtAkwW/iBFkhmM8cODpsPZlEXveHlu0lHMT/rARvN kbOxvpFJIhBH6ybhlROYHv5VygjHPgHeSvwoLWaVz9/+F2qdrgf9bIRQFof/U8KkG3bfkk yN7ph4b/D2mMF1Qm1Of7aHKxFPusY9V1yQL5I4fLsWyHTjWZ3Qt+vQeoVY2c2XSuPypH8f L30lmKLhETmwNKMIDJcF/5bMhPDOhP6pT+1ah6yW5HlssdUD9RTyvXe7hz1IWpDNM4rKBd 0580ZaMKXqsyagvgg2d8VFhF7noRLx9S+mdzO70ZoF7pHgTviRO0zPVqga7ShQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ658563Lz1C5c; Wed, 8 Nov 2023 00:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A80r0b9087348; Wed, 8 Nov 2023 00:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A80r0wu087345; Wed, 8 Nov 2023 00:53:00 GMT (envelope-from git) Date: Wed, 8 Nov 2023 00:53:00 GMT Message-Id: <202311080053.3A80r0wu087345@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: d51a39b13ee4 - releng/13.2 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d51a39b13ee4de5410f6c01a357eafc6248f6724 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d51a39b13ee4de5410f6c01a357eafc6248f6724 commit d51a39b13ee4de5410f6c01a357eafc6248f6724 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:08:03 +0000 Commit: Ed Maste CommitDate: 2023-11-08 00:48:03 +0000 fflush: correct buffer handling in __sflush This fixes CVE-2014-8611 correctly. The commit that purported to fix CVE-2014-8611 (805288c2f062) only hid it behind another bug. Two later commits, 86a16ada1ea6 and 44cf1e5eb470, attempted to address this new bug but mostly just confused the issue. This commit rolls back the three previous changes and fixes CVE-2014-8611 correctly. The key to understanding the bug (and the fix) is that `_w` has different meanings for different stream modes. If the stream is unbuffered, it is always zero. If the stream is fully buffered, it is the amount of space remaining in the buffer (equal to the buffer size when the buffer is empty and zero when the buffer is full). If the stream is line-buffered, it is a negative number reflecting the amount of data in the buffer (zero when the buffer is empty and negative buffer size when the buffer is full). At the heart of `fflush()`, we call the stream's write function in a loop, where `t` represents the return value from the last call and `n` the amount of data that remains to be written. When the write function fails, we need to move the unwritten data to the top of the buffer (unless nothing was written) and adjust `_p` (which points to the next free location in the buffer) and `_w` accordingly. These variables have already been set to the values they should have after a successful flush, so instead of adjusting them down to reflect what was written, we're adjusting them up to reflect what remains. The bug was that while `_p` was always adjusted, we only adjusted `_w` if the stream was fully buffered. The fix is to also adjust `_w` for line-buffered streams. Everything else is just noise. Fixes: 805288c2f062 Fixes: 86a16ada1ea6 Fixes: 44cf1e5eb470 Sponsored by: Klara, Inc. (cherry picked from commit 1f90b4edffe815aebb35e74b79e10593b31f6b75) (cherry picked from commit 1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd) (cherry picked from commit ccdd8337f9cbd7d34e2e95df1440dd5f7225d0b4) (cherry picked from commit d09a3bf72c0b5f1779c52269671872368c99f02a) (cherry picked from commit 92709431b14df6c0687446247ac57cfc189ee827) (cherry picked from commit 6cb5690b3495741e9ece6f42ba4a85732932aa83) (cherry picked from commit 418f026bd5a5084c1c4e2e91ad38051f6caa928c) (cherry picked from commit abe12d2f4ce31c3da0961b1b0a58df11f5a41e19) (cherry picked from commit 59ec3ffdd7ce85f32ea833e8024f7bacd36d4e97) (cherry picked from commit 4e0e01bf6511c28212d7dff94fe131a502e13026) (cherry picked from commit d2c65a1c948648f11342274029a3f18b90aa58d2) (cherry picked from commit 0b7939d725ba0ca903c5f8a3ca6d74347eb88690) Approved by: so Approved by: re (implicit) Security: SA-23:15.stdio Sponsored by: The FreeBSD Foundation --- lib/libc/stdio/fflush.c | 27 ++++++++++----------------- lib/libc/stdio/fvwrite.c | 14 ++------------ lib/libc/stdio/wbuf.c | 12 ++---------- 3 files changed, 14 insertions(+), 39 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index f59565abd369..75f145fae6a3 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -105,11 +105,11 @@ __weak_reference(__fflush, fflush_unlocked); int __sflush(FILE *fp) { - unsigned char *p, *old_p; - int n, t, old_w; + unsigned char *p; + int n, f, t; - t = fp->_flags; - if ((t & __SWR) == 0) + f = fp->_flags; + if ((f & __SWR) == 0) return (0); if ((p = fp->_bf._base) == NULL) @@ -121,26 +121,19 @@ __sflush(FILE *fp) * Set these immediately to avoid problems with longjmp and to allow * exchange buffering (via setvbuf) in user write function. */ - old_p = fp->_p; fp->_p = p; - old_w = fp->_w; - fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size; + fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); if (t <= 0) { - /* Reset _p and _w. */ - if (p > fp->_p) { + if (p > fp->_p) /* Some was written. */ memmove(fp->_p, p, n); - fp->_p += n; - if ((fp->_flags & (__SLBF | __SNBF)) == 0) - fp->_w -= n; - /* conditional to handle setvbuf */ - } else if (p == fp->_p && errno == EINTR) { - fp->_p = old_p; - fp->_w = old_w; - } + /* Reset _p and _w. */ + fp->_p += n; + if ((fp->_flags & __SNBF) == 0) + fp->_w -= n; fp->_flags |= __SERR; return (EOF); } diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c index b1b363e6f80d..50b32b8eca6e 100644 --- a/lib/libc/stdio/fvwrite.c +++ b/lib/libc/stdio/fvwrite.c @@ -38,7 +38,6 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93"; #include __FBSDID("$FreeBSD$"); -#include #include #include #include @@ -55,7 +54,6 @@ int __sfvwrite(FILE *fp, struct __suio *uio) { size_t len; - unsigned char *old_p; char *p; struct __siov *iov; int w, s; @@ -139,12 +137,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ /* unneeded */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (len >= (w = fp->_bf._size)) { /* write directly */ w = _swrite(fp, p, w); @@ -183,12 +177,8 @@ __sfvwrite(FILE *fp, struct __suio *uio) COPY(w); /* fp->_w -= w; */ fp->_p += w; - old_p = fp->_p; - if (__fflush(fp) == EOF) { - if (old_p == fp->_p && errno == EINTR) - fp->_p -= w; + if (__fflush(fp)) goto err; - } } else if (s >= (w = fp->_bf._size)) { w = _swrite(fp, p, w); if (w <= 0) diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c index 666bbf87aadd..deb111162741 100644 --- a/lib/libc/stdio/wbuf.c +++ b/lib/libc/stdio/wbuf.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); int __swbuf(int c, FILE *fp) { - unsigned char *old_p; int n; /* @@ -88,15 +87,8 @@ __swbuf(int c, FILE *fp) } fp->_w--; *fp->_p++ = c; - old_p = fp->_p; - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { - if (__fflush(fp) != 0) { - if (fp->_p == old_p && errno == EINTR) { - fp->_p--; - fp->_w++; - } + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) + if (__fflush(fp) != 0) return (EOF); - } - } return (c); } From nobody Wed Nov 8 00:53:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ65B0ZjTz4ywbW; Wed, 8 Nov 2023 00:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ65974Rqz3SbH; Wed, 8 Nov 2023 00:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4G2u94cqk4r7VTTW9MUnq3/F6emHaBLPLdUGIrbQKZE=; b=jcC1MOKdIrfz8CZetqTMgpmTscMYhuGpQvq0MGAA1DSpWfVHyKL5ys5xgudKpdXBhhkuR9 QCcedVSJNkfZp/1DxqwWJx9w0X3A2EQveF8bmQX24eeISYQPYkSTbJVknxoDZkV0foISvz jWT6HiVw5qvlfM8CGP664BVd6KQhp44l/p5XxdsRKC+9E6YxDSI7yhKXRBRWaucKvpw1eQ jrvpYfuzyFdA+19FAuyNVjn4gUwfMBohOAdhYqPfVJUGkgE3HT1YHD3+QsqmMF2KwuU19A nIFvSN/2fvRNVHMnymu18HtXWqXdpOQeWkVqyeBpASZCjljv7UZDEhL1tSduPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699404782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4G2u94cqk4r7VTTW9MUnq3/F6emHaBLPLdUGIrbQKZE=; b=wq+BcjYjPmu0K0+4RZ+brhjNjGKe5Yyb1bj0ad9qx/6lFY6xX5nMM43KVRK604yc08MSTQ GWPwCck4crK6PepS9titklXJ5z+Inf3tvTdutINn919yWYOqM6tlQgB/Gr+6qhLO4YTWET U6wFqX3RAaL7NlY7HrCWg4+adeI/SYYdRJeP6akuIukada+UvMu4eW7vtZb8rUJlZ7IrAF t28XHXWBwCK0JXXZ81mM3Gg1bvNOEcWg9K2Rc1w6UiuDYBos5JltHZ67IBoJbnTzdyKTpi GbjO3zABUhV4sa+YKbwBR7aTQDqzgWWsa8+WPfhu2r2GgEna6/bS6CEWaT6VXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699404782; a=rsa-sha256; cv=none; b=pt2T89Qx+J8PDhQI1RNMA6gDANKiVg1D9jMHP1XpkH6rofa3okBDWjKD4S3xrfpncULKnw 1e0mHAvTd72mts4iOwJe17XgFaQGV07veMnTypiUKZSY9fNqSNJWrNfOT3VBGL/W/H2+uL LTots1CQgm56V1r2ozhKDUJRVKV+gC+gJLVd4Af/AMxjiIKblv6Vj8sdObuLyd9bF1ScIX BKVmGMKoW2/x7fiyPGjQor+rdv18dNOD6dioxKYKWDx9Cfgp9BlnuuHJvwgZ4mrLrP0bP4 zOJ/dbF7yVGdAA+tGlrWFgt5Md+Mf1EB/JhIWTPajpSbF5B5+L9ztTC2vBaf3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6595xdtz1BRR; Wed, 8 Nov 2023 00:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A80r177087399; Wed, 8 Nov 2023 00:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A80r1dU087396; Wed, 8 Nov 2023 00:53:01 GMT (envelope-from git) Date: Wed, 8 Nov 2023 00:53:01 GMT Message-Id: <202311080053.3A80r1dU087396@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: acd860c3622d - releng/13.2 - cap_net: correct capability name from addr2name to name2addr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: acd860c3622d2591f4eeaaf241094c311c5c642a Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=acd860c3622d2591f4eeaaf241094c311c5c642a commit acd860c3622d2591f4eeaaf241094c311c5c642a Author: Mariusz Zaborski AuthorDate: 2023-10-23 21:03:51 +0000 Commit: Ed Maste CommitDate: 2023-11-08 00:49:31 +0000 cap_net: correct capability name from addr2name to name2addr Previously, while checking name2addr capabilities, we mistakenly used the addr2name set. This error could cause a process to inadvertently reset its limitations. Reported by: Shawn Webb (cherry picked from commit afd74c400075d94e01dd3430844bb290834660ef) (cherry picked from commit 765757c6301fa41c0b59108347c600fbc9020c39) (cherry picked from commit 114c6d9bef765a47ebcb8e65d1c935cbcbe51002) Approved by: so Approved by: re (implicit) Security: SA-23:16.cap_net Sponsored by: The FreeBSD Foundation --- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/tests/net_test.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index c6abaa69faf6..ca9434adc6f7 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1234,7 +1234,7 @@ verify_name2addr_newlimits(const nvlist_t *oldlimits, oldfunclimits = NULL; if (oldlimits != NULL) { oldfunclimits = dnvlist_get_nvlist(oldlimits, - LIMIT_NV_ADDR2NAME, NULL); + LIMIT_NV_NAME2ADDR, NULL); } cookie = NULL; diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index 49cb0da44a4e..34661339340a 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -708,6 +708,18 @@ ATF_TC_BODY(capnet__limits_name2addr_hosts, tc) limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); ATF_REQUIRE(cap_net_limit(limit) != 0); + /* Try to extend the limit. */ + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + + limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR); + ATF_REQUIRE(limit != NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_0, NULL); + cap_net_limit_name2addr(limit, TEST_DOMAIN_1, NULL); + ATF_REQUIRE(cap_net_limit(limit) != 0); + cap_close(capnet); } From nobody Wed Nov 8 01:00:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6Fw2ZcDz4yxdc; Wed, 8 Nov 2023 01:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6Fw1vMWz3TCN; Wed, 8 Nov 2023 01:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nypDRlbtmv2H3ZjaooR9jI+e29NziSI35hpv77VJXbU=; b=ZBVzLy8mjjnVUQ8/LBKwFZzwqpurP7RAN1gZg6aO15iTtbX84M5QzLWs2jP9eAnPtNBgOR vvF3kCzKhcVG3AwnfbCmjrAftkqvirkdp1C7NjOvzAphZXxw2eENZBHAXR4NgXDySlip9j NIVoBgaW4oncEDZ3FstD2h1hvyZSegtgXfZwbJ98Loj6upNU6d2vGmxR08WZ7BVOUsZ9xK K3voyTlcSpg9fqapdFBue+uCKIFf3mRUme1AeGsWGBBIPAkPsJ1PACm6KzFre7FevcVt1M VPMEu3qbFarQmXRTfmf9/Uj4Ae7OOrW2cF2ig0CDtlcZyPRYjaDKI0TwY7TFbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nypDRlbtmv2H3ZjaooR9jI+e29NziSI35hpv77VJXbU=; b=XnTrpfqWBDXjOE9qpz+UM+dxSwkeW3pcY3Qy5h+RoS80XkY4/6Tb80JB0T8s/HUwL8makp SiuSqF/dfHW6XWaDjKyLsa/n6kWlJ/i6WKeC9UI8EfSx27PUvFk/5tR93Q7DB+YLyrdDhM ygl2evufE3yR+HTc7gr5oOSvb/ZZUDI+juehdfhtEB/N3JAGgjg9n9YAnJBYjrJTUqWbc4 BTExmXXtfziP4mwqH/G004c6Fm8ETNbCEnfZC5dNp1I+V3X8+y1v8kUa7FgBtJ1jWB6x5j OA2XHXJJK8y6F2T94Ba8qDEpN+27vjhtzzMpoBE+8YhaeNux3b7U5MAfuX5xag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405236; a=rsa-sha256; cv=none; b=jKW/XY+9RL8rG50iNBbZlMeUSUd1Ws7t64Rmkcll+BtVeAkUMDmtsxGB0+T3TfCPRrwdF7 EKX+p3vjDKtRExrmd7Z24zG4S7SDzNPyFFw2g2x5koQx1owRmFvP4NfRRXZedWFruMBY2v iJi3VGITLfdmIqukgHPFneBkaTcP5u+8sp5Hzy3d6doHvNxiZnJHsRzpRVAFXYvLD7rsiX BDecWUqgypHcwVTAi5886eXlWnepSQOuFoxO5zze108w8nZQdJgOjMzFl4iVMiNu8ib7HP aeQxIMPV/EV8Go109AXeunSN5s1noJ3d8ThObmqcDb+JqOGFTT7ikpi9Uk7fsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6Fw0zYhz1C5k; Wed, 8 Nov 2023 01:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A810aOv098098; Wed, 8 Nov 2023 01:00:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A810a2h098085; Wed, 8 Nov 2023 01:00:36 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:00:36 GMT Message-Id: <202311080100.3A810a2h098085@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: e79edfaf68c5 - releng/13.2 - freebsd-update: create deep BEs by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: e79edfaf68c542c8545670e911ae83ca0e3493b5 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e79edfaf68c542c8545670e911ae83ca0e3493b5 commit e79edfaf68c542c8545670e911ae83ca0e3493b5 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Ed Maste CommitDate: 2023-11-08 00:59:45 +0000 freebsd-update: create deep BEs by default The -r flag to bectl needs to go away, and we need to just do the right thing. In the meantime, we can apply an -r in freebsd-update as a minimal fix to stop creating partial backups in these (non-default) deep BE setups. PR: 267535 (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) (cherry picked from commit 80f747781f125576de40ab8b3d8d70b351ef0518) Approved by: so Security: FreeBSD-EN-23:13 --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 0c4053715b70..42cd2087a3ba 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -918,7 +918,7 @@ install_create_be () { echo -n "Creating snapshot of existing boot environment... " VERSION=`freebsd-version -ku | sort -V | tail -n 1` TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"` - bectl create ${VERSION}_${TIMESTAMP} + bectl create -r ${VERSION}_${TIMESTAMP} if [ $? -eq 0 ]; then echo "done."; else From nobody Wed Nov 8 01:00:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6Fx3gw5z4yxXx; Wed, 8 Nov 2023 01:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6Fx30HFz3TJr; Wed, 8 Nov 2023 01:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUtFFR9LfJmZGQmMknwrFJTA749tTL1d/FOB3elhWf0=; b=ABu0gyotDL4QEWFYKXnu8d+23WaOuds5qd+GjBl69fJyXkDIFIicamIJX0MfEBnug9c9VJ RTSSEXve/nDUcSKoKEkXoxUFt9R3ShKFx/sO3ogl6jMNIcip6pOx0tZOXo7ygxzNAvx9xN pinc4QkqBg8HSFsTAAry90J9QrrrVKTAAZsUXcd0HHUZdv3vRWz3j0zd6not1j5N842Nzz rkoLAHvHiI+URYbjO17TGv3RyjjSfNQee9a5IEfplngzZXPV7aowf4HuxSVf2Ttz0to4el kkUCB2IlJPjNdC6oCkVvb0yV5nuNcfatlj/L+xP2r2fDgSOs44gMW/jqXA9YFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUtFFR9LfJmZGQmMknwrFJTA749tTL1d/FOB3elhWf0=; b=Rm4UtnVc8tTXcym2rnCi/mrK4UU2iBVrJtwRV9NuLXSXxDzeGMro5Z2V8Ufi0JJCD+1AxO 6erEmt0V8s+LUc36VE+PeBHJ9jSCCVRlQoR11cvlVEGB4NSwE7hKIrbJQGbmNCWd+OBlbl MxdieQAXn3VGCRQMtnNrvGpAC1OE5pZNeAzajBHW6HaQJoYeNvSQM2oIQnbzghTJpfDf+f mYeIH7Elwjys6s2l3ASYZrsfFstGjBozxNQ0Q4pBUfDoEPdKYeuI2fzRgLAcRGOykkqUcR yXHqqXF+Zk2fshtEpRn1pPaAOElg3e8sKR7p0QEGllt/7u5PPGyGkOsWV+iYlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405237; a=rsa-sha256; cv=none; b=Oj1q0UBAuEOeQDrPMaS8pfNOoGNBDYx1teYVb+2uSSDw5uYqm9jQn3DL7OEXe6pfpVG8Sz BO/326tSLZd43mA5WoPBtQXFhS0jd8erqvPKP+futxHgPq+YYoW3RHMeRnsx6yVudUYUQG 3MgVjJNOWngmrnVutMAcm9HHePmd/iO01hvKzdHxTCyfzHvK2IBRGVoeSsgx1iVAhcEGdH rQaTGI1vYwLBT1zADypkVVsKcWpbo0ISarpBhr2Rcz/tVRgeVPN/U4owtGeol9SDKDKGFp B+zCyhUCGx3fUh2kOwSQJRNrpjoTrvHuPUpFtr7zA0lRmZSCMlc/K69CyOnMKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6Fx1zCsz1BRV; Wed, 8 Nov 2023 01:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A810bKm099152; Wed, 8 Nov 2023 01:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A810b03099149; Wed, 8 Nov 2023 01:00:37 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:00:37 GMT Message-Id: <202311080100.3A810b03099149@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: 67264bfe4992 - releng/13.2 - regcomp: use unsigned char when testing for escapes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 67264bfe499223cd9864b53975462e3eb57cde2c Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=67264bfe499223cd9864b53975462e3eb57cde2c commit 67264bfe499223cd9864b53975462e3eb57cde2c Author: Christos Zoulas AuthorDate: 2023-08-30 20:37:24 +0000 Commit: Ed Maste CommitDate: 2023-11-08 00:59:51 +0000 regcomp: use unsigned char when testing for escapes - cast GETNEXT to unsigned where it is being promoted to int to prevent sign-extension (really it would have been better for PEEK*() and GETNEXT() to return unsigned char; this would have removed a ton of (uch) casts, but it is too intrusive for now). - fix an isalpha that should have been iswalpha PR: 264275, 274032 Reviewed by: kevans, eugen (previous version) Obtained from: NetBSD (cherry picked from commit 3fb80f1476c7776f04ba7ef6d08397cef6abcfb0) (cherry picked from commit ac695744e2cfb461a64018276fb94999fb0cad9c) Approved by: so Security: FreeBSD-EN-23:14 --- lib/libc/regex/regcomp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index 970a448b649a..bdc1c3379fd3 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -830,10 +830,10 @@ p_simp_re(struct parse *p, struct branchc *bc) handled = false; assert(MORE()); /* caller should have ensured this */ - c = GETNEXT(); + c = (uch)GETNEXT(); if (c == '\\') { (void)REQUIRE(MORE(), REG_EESCAPE); - cc = GETNEXT(); + cc = (uch)GETNEXT(); c = BACKSL | cc; #ifdef LIBREGEX if (p->gnuext) { @@ -994,7 +994,7 @@ p_count(struct parse *p) int ndigits = 0; while (MORE() && isdigit((uch)PEEK()) && count <= DUPMAX) { - count = count*10 + (GETNEXT() - '0'); + count = count*10 + ((uch)GETNEXT() - '0'); ndigits++; } @@ -1304,7 +1304,7 @@ may_escape(struct parse *p, const wint_t ch) if ((p->pflags & PFLAG_LEGACY_ESC) != 0) return (true); - if (isalpha(ch) || ch == '\'' || ch == '`') + if (iswalpha(ch) || ch == '\'' || ch == '`') return (false); return (true); #ifdef NOTYET From nobody Wed Nov 8 01:03:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6K30D73z4yxxs; Wed, 8 Nov 2023 01:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6K26YKQz3Vn0; Wed, 8 Nov 2023 01:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHjgy+mkFsZuBbM5sBAwLo2SDWIlZnjC7sxEyykncLk=; b=J8S8FUmIIUR9/lLGFOMz8wcfqAJop+jrF8YmqGYFVZdOpFXt9Zt5VekNRN0b1hPKwpZWmY mk2l35aNHU36i+I6HkvOdS2R3O1K2JCZOwSgY1jvs2L1by4ziPV1oddtcS6mUfqjfuLkTO plGH1tIIAhNoiobCR9N5fpxHHXO/iycZqm2OhkgbTPAKomJ3W/VzSy/8p9AZkPI3aBTMV+ kxcNlDyhriUKcCdCWRYZxMUsP9sA1lt73zwZJsO25DaYw8P5OHfTNiFxnuRx1iHtNsZpME HktMWSZ/ldXnVZwsQKwfptMf9dxB3DcO603LQbiu9PUEuB9nggdet7mtijug0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHjgy+mkFsZuBbM5sBAwLo2SDWIlZnjC7sxEyykncLk=; b=Jxt8vZeouaK/Xb4xqP+uUiO4hFDDceWEX8IdD6QgYhFGIVn+kLaUdVihd8x7CHo2f++D23 pQbFhoXYMjV809TdvBnknpW1jWeZNgQbOZ10KmT1edcYWgMUZGDvcPM330HsrpRqeI8e2A iCPVrgyVmMaxHzvy3bI09KwDjo4zYPDs9jNyc1hdqeysPxFQXpgtx7JyZDi51a4AiogV9x T9iudgth6gLsZLQFxwkXUII7Z/EegvfKM3GKJDma6fTH46TMjVVFMkpvQt1SsCfN3V47Bj NALKnIu3h2bzBTq9eEODbUlGt5SjAx5FhcNcTO0XQNY/9omw6yjz4UnSDAxhUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405398; a=rsa-sha256; cv=none; b=rwLT1uv5/Tm7ATs9aNTUx+kmtECkffkGeNZmtkXXcSOSPddFMqE2HLAK8czC86xh3HdTHN oJ4ID1W4VrTzNs46SdzBj0UYrFlautoCRZs128ZUprrsQbGi5V81sJ2LOVx8gkBveAgjAA 0k4pu/fCz++rC3a+rQtCp0bt9A+TgvsQQXBv6MmBkNClqrai01Qd+cGb1aiRCpDw4uyGln 2k40vob/ueQQRGlD59noIS2udvy+O822uWQ5GosrPx+cpiEV671oerJVyuxmfceVS7dgKu VqLwJH2pYMir+sFvKGQDF9NhLT/Iqv9MEZSq78FAT154BBwIrVTnY3+FYcOwyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6K25gJvz1CKd; Wed, 8 Nov 2023 01:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A813Ivl004908; Wed, 8 Nov 2023 01:03:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A813ImR004905; Wed, 8 Nov 2023 01:03:18 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:03:18 GMT Message-Id: <202311080103.3A813ImR004905@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: 9b3e17e15f94 - releng/12.4 - fflush: correct buffer handling in __sflush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 9b3e17e15f942d1c5d4eaaa327d1eea7d4c9e233 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9b3e17e15f942d1c5d4eaaa327d1eea7d4c9e233 commit 9b3e17e15f942d1c5d4eaaa327d1eea7d4c9e233 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:08:03 +0000 Commit: Ed Maste CommitDate: 2023-11-08 01:01:23 +0000 fflush: correct buffer handling in __sflush This fixes CVE-2014-8611 correctly. The commit that purported to fix CVE-2014-8611 (805288c2f062) only hid it behind another bug. Two later commits, 86a16ada1ea6 and 44cf1e5eb470, attempted to address this new bug but mostly just confused the issue. This commit rolls back the three previous changes and fixes CVE-2014-8611 correctly. The key to understanding the bug (and the fix) is that `_w` has different meanings for different stream modes. If the stream is unbuffered, it is always zero. If the stream is fully buffered, it is the amount of space remaining in the buffer (equal to the buffer size when the buffer is empty and zero when the buffer is full). If the stream is line-buffered, it is a negative number reflecting the amount of data in the buffer (zero when the buffer is empty and negative buffer size when the buffer is full). At the heart of `fflush()`, we call the stream's write function in a loop, where `t` represents the return value from the last call and `n` the amount of data that remains to be written. When the write function fails, we need to move the unwritten data to the top of the buffer (unless nothing was written) and adjust `_p` (which points to the next free location in the buffer) and `_w` accordingly. These variables have already been set to the values they should have after a successful flush, so instead of adjusting them down to reflect what was written, we're adjusting them up to reflect what remains. The bug was that while `_p` was always adjusted, we only adjusted `_w` if the stream was fully buffered. The fix is to also adjust `_w` for line-buffered streams. Everything else is just noise. Fixes: 805288c2f062 Fixes: 86a16ada1ea6 Fixes: 44cf1e5eb470 Sponsored by: Klara, Inc. (cherry picked from commit 1f90b4edffe815aebb35e74b79e10593b31f6b75) (cherry picked from commit 1e99535be2ea9c0ef8bc57fc885e9c01fa95d2dd) (cherry picked from commit ccdd8337f9cbd7d34e2e95df1440dd5f7225d0b4) (cherry picked from commit 95fbce59c9f4ed4015b19a88491a37dac9d4e7d5) (cherry picked from commit d09a3bf72c0b5f1779c52269671872368c99f02a) (cherry picked from commit 92709431b14df6c0687446247ac57cfc189ee827) (cherry picked from commit 6cb5690b3495741e9ece6f42ba4a85732932aa83) (cherry picked from commit 3a2ea31568c81f7b29710abd3d3e1ada2fbeb6c9) Approved by: so Security: SA-23:15.stdio Sponsored by: The FreeBSD Foundation --- lib/libc/stdio/fflush.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c index f7d2fbdc28e5..75f145fae6a3 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -106,10 +106,10 @@ int __sflush(FILE *fp) { unsigned char *p; - int n, t; + int n, f, t; - t = fp->_flags; - if ((t & __SWR) == 0) + f = fp->_flags; + if ((f & __SWR) == 0) return (0); if ((p = fp->_bf._base) == NULL) @@ -122,19 +122,18 @@ __sflush(FILE *fp) * exchange buffering (via setvbuf) in user write function. */ fp->_p = p; - fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size; + fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size; for (; n > 0; n -= t, p += t) { t = _swrite(fp, (char *)p, n); if (t <= 0) { - /* Reset _p and _w. */ - if (p > fp->_p) { + if (p > fp->_p) /* Some was written. */ memmove(fp->_p, p, n); - fp->_p += n; - if ((fp->_flags & (__SLBF | __SNBF)) == 0) - fp->_w -= n; - } + /* Reset _p and _w. */ + fp->_p += n; + if ((fp->_flags & __SNBF) == 0) + fp->_w -= n; fp->_flags |= __SERR; return (EOF); } From nobody Wed Nov 8 01:03:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6K41rt1z4yy1F; Wed, 8 Nov 2023 01:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6K40TJZz3Vvd; Wed, 8 Nov 2023 01:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8duLdvoa7iY0IUJ/mBpaWuKyxIKlwPuiB00Dmine+q8=; b=E+KelGazR3EJtHATm5/bjtA8NNfmQBxq94XXNTGGf69oIKPvVP+32p+3OZ0NDFapoET1bH 7rO81pegnz/nb7x7Oi9x/DqGeS8E3SYCBoBX5fwL8RTChISc2qJ5PgKyFN+BFcZgbJK5z1 CYaMXBbHyjNsQMgm0B3BMSJgW8g3RnJI4ckLNy3TdcUAvj7uSLBoSCttbJvVXINZQNFKoV FtDn+35E3GzwNPJzKQF5lbciO65Z+WzUrmquY4BpaBmvvqunPOW5rnKlwQd3x6tfyLd7eV FwECYIKzGtO5y8qhEOcJEBIO914eXnQ0tjKljCNja/b81/Qm39AS5KECvfl3YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8duLdvoa7iY0IUJ/mBpaWuKyxIKlwPuiB00Dmine+q8=; b=ahlZwZmWb02tyhL+adHnhTuW4UbdyPhXK+3dHEN4JZrzCSpSD+agUF2uZeRu6Q2/z8Y6r/ F5I2GfC4+pwBP8SCyN2p1nxaRGZAKi/yAxyVrfGUDAcsqrzzJao0lH5D0W/LWvZLLM5OkO v6+tA/556Tlj09DZsnzNpiAkHWzyc/XO0xdHi211EPbthsleE/gO7DL+JGFuuLf7XauLkr XOibeqeMeJWLc6U8L3ieyuPs40MAImUN6QRpCEMnGEzRMJgKUxjPZp1e1OX7epyXcb2bk1 35e70hww3wBaEFpYII213og8zfrcvPYUiWbCjf/3W4OI8koO1ZONeoM6CPpL3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405400; a=rsa-sha256; cv=none; b=TKxfprPfxKkDSeHY1BNIXs2Blf3kUhFdDrIrkWLaWk3HiPRNPDx+oV5fr5R2R+LQ5he8qY S4uDupcYLbHu9cxxpkrEv6ktfnYqOMG5RnIlkl6RVIL1kcukHinjQG1arUPggWS3fj+4j6 PismU9Wp6Pf3tXwOMO8xUGMJQv19U6IXqStouJqisIlmye7oK1RxMS1fmY0dLPg5UYuOoC M6MNcjcmXxWnRqRowPDL9eqC7WKo45OclRRUGDnNg4O9QQ031eYf85cbhuxiedJ5XP+8SU PTbYpsiR1WlNetaTb2FulOEDcTXo5nsKoC2J9lMDENWvc5uHL7pZgK1mBG9+Hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6K36gfMz1Bs8; Wed, 8 Nov 2023 01:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A813Jth004953; Wed, 8 Nov 2023 01:03:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A813J0j004950; Wed, 8 Nov 2023 01:03:19 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:03:19 GMT Message-Id: <202311080103.3A813J0j004950@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: e648a628a66a - releng/12.4 - freebsd-update: create deep BEs by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: e648a628a66a09973154b442ac1266316be20506 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e648a628a66a09973154b442ac1266316be20506 commit e648a628a66a09973154b442ac1266316be20506 Author: Kyle Evans AuthorDate: 2023-10-12 02:51:07 +0000 Commit: Ed Maste CommitDate: 2023-11-08 01:01:37 +0000 freebsd-update: create deep BEs by default The -r flag to bectl needs to go away, and we need to just do the right thing. In the meantime, we can apply an -r in freebsd-update as a minimal fix to stop creating partial backups in these (non-default) deep BE setups. PR: 267535 (cherry picked from commit 989c5f6da99081b1f2b76ec09e91078e531e1250) (cherry picked from commit 5c2a559876d123ba386612319bf42e7b32dee590) Approved by: so Security: FreeBSD-EN-23:13 --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 324e838fd8a7..b9eb1066c58e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -918,7 +918,7 @@ install_create_be () { echo -n "Creating snapshot of existing boot environment... " VERSION=`freebsd-version -ku | sort -V | tail -n 1` TIMESTAMP=`date +"%Y-%m-%d_%H%M%S"` - bectl create ${VERSION}_${TIMESTAMP} + bectl create -r ${VERSION}_${TIMESTAMP} if [ $? -eq 0 ]; then echo "done."; else From nobody Wed Nov 8 01:03:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6K527PCz4yyMC; Wed, 8 Nov 2023 01: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6K518txz3Vss; Wed, 8 Nov 2023 01: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=1699405401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzXVCzfACLxgDpKGaJnDJl5Dt5fIOkyn9MxyfwcnK8E=; b=Yu20rsRDlQv2/2e0tj03WBw+fZem6KcS4QynwYnQAVUQBPCR6styQYBeeGEgDt6+9YET3j a2azy+Pb5WOC5O13YftI1cdAmZ54ZyY6YnecVe/Ci5sGJ1DYA1CqMyO5jiWN8pzjfUFgmt jCxZ2dolE4wnuJ5ZZg+TTLqZxW2a1S0O8+/rl/xmJ0N2BcWfNVQqb4fPorB9k1GC3ffncZ Ias5P/RgVCVCBlmQ9zaV3abc1iT1Qjtw5F5FVxLnkNpY/VWJ1gxT07dfel3mmJAReDoPoi 5vZSYacLhngq5ZG5uiJYf1EhcmS2FaylbEEdAfVETKSgciKyq4xlmMg/32CviQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzXVCzfACLxgDpKGaJnDJl5Dt5fIOkyn9MxyfwcnK8E=; b=ljsS+5524XACH+AjBPTfg5weMbh7uu1Vod5L+2BsgffQGrHnQxUetXTjc/guA613TQJl9h /TdBnyrl2N+WuBZeiYrPW/RSkatTMOKIsMyNCgxis+OjlL/U26mTSbYE9qh/YnOTpbgsy1 k95REMgztrOGKgC3BLJCd12Liko9bFTcelzipS49rPmxoEiHREtH6ng181FeBwCGw4rXz6 BMJNUl/gtb9leFv3X4Ylhh5NCs8lPr9zciwxVyo4pVljLNTCH+VPVCIu5YY2geb99Gd+wV xeVBc+lL+2CXiT8GV4els4kWHH48zd4JHDo58Ei6Cw1A/yBUO15SYvqFZeyHVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405401; a=rsa-sha256; cv=none; b=wLWvzKZgnZ+BeiFjuRlxlHMO7Wvnr/SMScff9K2m8r2M9nQmO7xpt7rocxF8+/95/pNVLt 6PoV9b+p2QByOpcKq41UCLtvardG3bA1Kc/FxiFolZbjPLl7Mb/qEjzGlJjrPGChMwqMXR ij8OBpWNdoqwuZ7TqZsmIGsSU1nAKglPzSORknq4w8RkCflkU5SN+hsDjJxfBTYmN2TrIx wtwBDp4WL1XAscYRkSzn11zUmigZ4+6n1Stzw3gnmDXrrIoGYfJsQ0szKVPNVbnpR7U6YO NFCSGHtb4LB/GnE7ru+IjjLJtmhbpgYgZn/TkE/MioHxXwBbpFVIGTzmRJY4Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6K50CM4z1CBn; Wed, 8 Nov 2023 01:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A813KG1005004; Wed, 8 Nov 2023 01:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A813Kfq005001; Wed, 8 Nov 2023 01:03:20 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:03:20 GMT Message-Id: <202311080103.3A813Kfq005001@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: 5e0387e2ec6e - releng/12.4 - regcomp: use unsigned char when testing for escapes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 5e0387e2ec6ed9b14b3c6088c19079db15a52eae Auto-Submitted: auto-generated The branch releng/12.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5e0387e2ec6ed9b14b3c6088c19079db15a52eae commit 5e0387e2ec6ed9b14b3c6088c19079db15a52eae Author: Christos Zoulas AuthorDate: 2023-08-30 20:37:24 +0000 Commit: Ed Maste CommitDate: 2023-11-08 01:02:08 +0000 regcomp: use unsigned char when testing for escapes - cast GETNEXT to unsigned where it is being promoted to int to prevent sign-extension (really it would have been better for PEEK*() and GETNEXT() to return unsigned char; this would have removed a ton of (uch) casts, but it is too intrusive for now). - fix an isalpha that should have been iswalpha PR: 264275, 274032 Reviewed by: kevans, eugen (previous version) Obtained from: NetBSD (cherry picked from commit 3fb80f1476c7776f04ba7ef6d08397cef6abcfb0) (cherry picked from commit 56b09feb23d98fcd0c4aed8d4f907a5a2f6b5ea9) Approved by: so Security: FreeBSD-EN-23:14 --- lib/libc/regex/regcomp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index fc66ea32046a..e93ea02f5873 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -814,10 +814,10 @@ p_simp_re(struct parse *p, struct branchc *bc) handled = false; assert(MORE()); /* caller should have ensured this */ - c = GETNEXT(); + c = (uch)GETNEXT(); if (c == '\\') { (void)REQUIRE(MORE(), REG_EESCAPE); - cc = GETNEXT(); + cc = (uch)GETNEXT(); c = BACKSL | cc; #ifdef LIBREGEX if (p->gnuext) { @@ -978,7 +978,7 @@ p_count(struct parse *p) int ndigits = 0; while (MORE() && isdigit((uch)PEEK()) && count <= DUPMAX) { - count = count*10 + (GETNEXT() - '0'); + count = count*10 + ((uch)GETNEXT() - '0'); ndigits++; } @@ -1288,7 +1288,7 @@ may_escape(struct parse *p, const wint_t ch) if ((p->pflags & PFLAG_LEGACY_ESC) != 0) return (true); - if (isalpha(ch) || ch == '\'' || ch == '`') + if (iswalpha(ch) || ch == '\'' || ch == '`') return (false); return (true); #ifdef NOTYET From nobody Wed Nov 8 01:11:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6VM2bkyz500Cw; Wed, 8 Nov 2023 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6VM290Qz3XYc; Wed, 8 Nov 2023 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SgBSxMbJy6sspmRnTabVuDjZSmdZeD+c9v2p5QUxleU=; b=gew2dCWAekg0rjcRtWq+B0X0jw1g/y5gF8d62+JNUO5qylM1Y+GkZMnQJ1yFzBvnUuF6dl 1p3+NjWk2Cjqq4TbOPV28VqMXHs+wCZpaSNnef5Bp2rI4uaBXZ5EeNTO0JO2f9Ow/amxeg LT+n4e9A6+UH+0d5UlBGw3/IluqhlcX9//IMqKN8mn8fPvX9KFsnoKsptfI2dobVybbNjk GMhJtW/J8L4FmD2y2G4/lTn/HpUHDvvuV0vQlyr3b2JD5t+AVvC39yTO/hc/iyiojcr4jU n6A1PthJAYRcio4HAABp3qdQ7bZV0El7OmGm9Gxis6IZfHfgmO7rMk45sCI54w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SgBSxMbJy6sspmRnTabVuDjZSmdZeD+c9v2p5QUxleU=; b=mIbhsNA2VxdW40mjeBRGi9SCHUZdfV6cb3bWzZ7ePBchA/tNH4IWk9gA9BqxC6ZZvC25qL InjF/FaVkuw4SQtGCyMBl+AYD7QLKWpnkEx7e/XWdvBF7J9zrq4KT2G37mld5JB/F9sEZh 8caafLFNj4sDhL/rdVJF5DsJODfClgp8zCN2q1AYl31pvBtwuUyuPVbHEphb52RA8yElqe tRiyHVolTiC67qAJLDH34tGW8iiidMG+W0GNI/5UcOiX0WbnFf5JjbWrf8Pm0pbC1nm5jP bMV8SzMvRvrggs07uNSAMd7Znbyr1dgy8B8ZmxQQnC7I/u0Cnta2a1hmNybCKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405883; a=rsa-sha256; cv=none; b=r9AaFxx3FdU8BdG3KXb43s3VkbJU3m1lk/Qx7ZEgqfH2MvzwAYaR0ZyiQ6PAnA/QsJUgwp KdfJDh1Ai3+/KQuItwDY4WN+b6oK+aW3yYCBr9rRj2sJFrXFpeuX7191tdMjUvlV06Wxrh /RleBBeTqK8I/c6hYAqlfX4CyhcduMnXCLk00ATUy7GzNxErQK50q0NCaWPO6IPyuxs5J2 lGMf4IVfIEL1ZwGevfmCDpAUKO5o4n7ktXMzd26Mgch+GpaKd1hMTnRPpPapxXePCSv0c6 vFsHsoWG3pRPmzcKqnnTdhNbBbxP/PoDDO0bLjdGw7Vixv0l5iMsTJAMdc2PBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6VM1FZbz1CTW; Wed, 8 Nov 2023 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A81BNRt020646; Wed, 8 Nov 2023 01:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A81BNJ9020643; Wed, 8 Nov 2023 01:11:23 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:11:23 GMT Message-Id: <202311080111.3A81BNJ9020643@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: 3a088f485f74 - releng/13.2 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 3a088f485f74e0d50dc67c735b2e79faa2300926 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3a088f485f74e0d50dc67c735b2e79faa2300926 commit 3a088f485f74e0d50dc67c735b2e79faa2300926 Author: Ed Maste AuthorDate: 2023-11-08 01:08:10 +0000 Commit: Ed Maste CommitDate: 2023-11-08 01:08:10 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 14 ++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index a31fdd8cb027..180f20d04fd5 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,20 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20231108: + 13.2-RELEASE-p5 EN-23:13.freebsd-update + EN-23:14.regcomp + SA-23:15.stdio + SA-23:16.cap_net + + freebsd-update does not handle deep boot environments [EN-23:13.freebsd-update] + + Incorrect regular expression escape handling [EN-23:14.regcomp] + + libc stdio buffer overflow [SA-23:15.stdio] + + Incorrect libcap_net limitation list manipulation [SA-23:16.cap_net] + 20231003: 13.2-RELEASE-p4 FreeBSD-EN-23:12.freebsd-update FreeBSD-SA-23:12.msdosfs diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index c5c5d09070b8..c2780964a97b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Nov 8 01:11:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6VT2yxqz5007P; Wed, 8 Nov 2023 01:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6VT1q6cz3Xtd; Wed, 8 Nov 2023 01:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ncuv7cPlflXROLszjvjr6onXcMuM5wdQdYdSjCdK5oc=; b=xQhK6955y7UKskTIFoXSwZouOgBVHhYir6EkYF9vsxfGXu3vrOu8Q0Xj1yE9ObaklJHqlD Bc5t4wd3+LUj3TJ1+mqtrJ0Zwla8st5VjndS2DB6OW77O2SLKhJ/n0J9D19SJXmSV1P6Kg QxO5p47c/SRF4RTYWiQOpdgEKaM18eqyFqAPPhfCofC2XOLrjw02LdqgluLbn1ANi2AVbH 35k+5OTHpurvWEn3XIwi2cwxdoFNzsSXBB7XRetENlQy2xGWXae/ZogM8w3XcfYVx6b17+ RwESnrdlZOweoqr9/dIgzAAiItzii5Y5Ae3o8zpc4SeSZWqmdO+u4GPSU1AURw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699405889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ncuv7cPlflXROLszjvjr6onXcMuM5wdQdYdSjCdK5oc=; b=TIEAkz2QruKiDhBCAYNwOeatST3sntxU90eQeiMrwSu4hptOsEWKRkgcRvwJZ/KVNXOkqy R+JO3WkPl641uGf0H6JpRHByKURxqlIKSvrrW454ZO8mFwiMCyZRf7Aq6uDs14DTXbYal+ GNklKGNq6IyZ8sKGq5MI7XCtgmc7m4BaKTp/4fo9pihOpSe5m3mP0s9HMuMCIyic5WqzyW hBJxRoUVnDq/d2TLKGJe86eeQ1V6xSaR+9D7NAzpyuTBO099qRiThBsBQCd5jVObDdxdd5 T8wU1h/JHlXjtmzj56Tj6cwIZwkATwZNOcRGfAg7iOwLRnQa8Pak3fo/g9kSLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699405889; a=rsa-sha256; cv=none; b=NUopMziJ0OSCs4No75bcJgdlyFB7odnv2Qlal286iAHumI/m1i6M8ezmVtdLZ8vL4TIbeJ xG8hNyJ9SBUjGTRQHgyDQiiAa3fp6gUYclCwd4wLJNIeH95nIm2aVG+O+C44bUQFPhgrhh 2IfUCqRkBbQ6z1jw021aQxym/UN3kxuhRK3jGWDk8E9e9Nul+NZ5x0RKuPlYWKIEBZy1Ji RvtBgAMkawuyvAwo6ZYy+19+6Lm+oftoaUf9fL5pvKtDht65E3kjQ+1b7jlXl2hccoc0nN amewriqYe0+YKvoxehmPtv/TyQ8nlp+a1PvyheM2YwMN59iYAFScF2pjYSXvkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6VT0M5zz1Bsf; Wed, 8 Nov 2023 01:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A81BS0T020783; Wed, 8 Nov 2023 01:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A81BSet020780; Wed, 8 Nov 2023 01:11:28 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:11:28 GMT Message-Id: <202311080111.3A81BSet020780@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: 69dcabf10d54 - releng/12.4 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 69dcabf10d54ae7e5b8e7d6fadd14705bc0aeead Auto-Submitted: auto-generated The branch releng/12.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=69dcabf10d54ae7e5b8e7d6fadd14705bc0aeead commit 69dcabf10d54ae7e5b8e7d6fadd14705bc0aeead Author: Ed Maste AuthorDate: 2023-11-08 01:10:14 +0000 Commit: Ed Maste CommitDate: 2023-11-08 01:10:14 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 11 +++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 100c281c3786..21d537fdb85d 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,17 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20231108: + 12.4-RELEASE-p7 EN-23:13.freebsd-update + EN-23:14.regcomp + SA-23:15.stdio + + freebsd-update does not handle deep boot environments [EN-23:13.freebsd-update] + + Incorrect regular expression escape handling [EN-23:14.regcomp] + + libc stdio buffer overflow [SA-23:15.stdio] + 20231003: 12.4-RELEASE-p6 FreeBSD-EN-23:09.freebsd-update FreeBSD-EN-23:12.freebsd-update diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index fa6d3e9340b8..f255e0441e13 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.4" -BRANCH="RELEASE-p6" +BRANCH="RELEASE-p7" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Nov 8 01:19:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQ6gD65W2z501S8; Wed, 8 Nov 2023 01:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQ6gD5bxhz3Yrs; Wed, 8 Nov 2023 01:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699406344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Beimao0vxM63F56zG5Nva4C+T/96y8fv1Mh9Dg1X+go=; b=pXPAOtwdGnQvl9PkxnInMM6vdfhjd6CAJK/q7/A1n2oUkYu8ABe9xIT2Nglqa5J+n4yw+5 YcC7EBCKEaMBzjt0gmkorUch8lcD4Loi9RchaumwE2QVd9aBdstXPQUJpbzWLdNhO6Y6rX opCyIfwruznRECrP1dFTd10Brby+CNV01Tp7zbZADUpKjAj+9xbAO7qjPMNitIiR0vIlbx Y+8+S/H9In7EYdWuLf+IG9luoecCYs25JwBBI9JVZIDBDaqt4Xf1JlVNFEZPYHiGYqLLfQ gTY1dXsvD+aGolnE8Kz0X5B4nWs9HzK4sDxIcn0zub7ZGC51KWDqlFtw7o6fJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699406344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Beimao0vxM63F56zG5Nva4C+T/96y8fv1Mh9Dg1X+go=; b=ga43i2tvKoViyJKaDyiTsKWwl3U9l8ffruiiwmsUAC7Gd+g34cZhaNmCHJ+hC36Zy3Ipqo npqZgT+wfz7i+4C4rj4cXAvVG3Db/Pe+mllCwDUbKHu21GSC/eVz37lKQrm01PHoseABvV kfD96YddObLUOieYgNqcTy2Tn+UF/mBdHbCN45ECA1pHl6xgVmSp0jGtpuuSregfCCCfFR jaVECv8EHj46aRiyjjiV1hJgF3ju5I7MpdVCmJypi6kmIOnbriqpE5CFJQ3/KWcWpHq7XI D9V20N3jjsVWtJztlyIA/r81MNuN5S+W0Tz/FR37LI2KPiEyrox2erlatFx2kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699406344; a=rsa-sha256; cv=none; b=DN1TUKqR8bbFg6pezNoBGYLHYImXcNXaBnToJcY5LcZI8uPUnbeJh/JoYJ+POw1+dAZNGL jxEvBufO6GE2TCpCiYmo2+0v6s1bRrU9bOFallY2SV5sj+ksY80h2fBXqnNhFgpfGszKHG VE+rEYNRhg4MPHJks4EJU5/OtPgmRoVhtiuZd9RhiPSx3752lkodBoswGGqy/djoYPstXW LMmN10E3OlX8peOp5cs+yT4ygR7Rlb0aUPFFbRa2tZxY6Vkt6V2sj+zP6alQWM8iSh3Qb5 MpFMwnMmRrNdysKCbCZS3H6tTdNu5pyTuTOyN4705yx1uvosVx9d79F4Y0SkYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQ6gD4gDHz1CTq; Wed, 8 Nov 2023 01:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A81J45v023051; Wed, 8 Nov 2023 01:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A81J46A023048; Wed, 8 Nov 2023 01:19:04 GMT (envelope-from git) Date: Wed, 8 Nov 2023 01:19:04 GMT Message-Id: <202311080119.3A81J46A023048@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: 2d8b79fe6036 - releng/14.0 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 2d8b79fe6036efbc6f00fe97ca482fab039f854e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2d8b79fe6036efbc6f00fe97ca482fab039f854e commit 2d8b79fe6036efbc6f00fe97ca482fab039f854e Author: Ed Maste AuthorDate: 2023-11-08 01:18:52 +0000 Commit: Ed Maste CommitDate: 2023-11-08 01:18:52 +0000 Add UPDATING entries and bump version. Approved by: so Approved by: re (implicit) --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index fe80f259cb12..58eeafa44bba 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20231108: + 14.0-RC4-p1 SA-23:15.stdio + SA-23:16.cap_net + + libc stdio buffer overflow [SA-23:15.stdio] + + Incorrect libcap_net limitation list manipulation [SA-23:16.cap_net] + 20230824: __FreeBSD_version 1400097 after the branching stable/14 from main. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 7b9891253fe7..b40c56ae759c 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RC4" +BRANCH="RC4-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Nov 8 06:21:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQFNR4ygkz500xQ for ; Wed, 8 Nov 2023 06:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQFNR4X2mz4fp2; Wed, 8 Nov 2023 06:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699424503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vN3gjmjgIjl8LIe9z1LIGRg4+IbahuqxgPM4W5ivIlo=; b=f0/eWoG/yWmOCwX9b7k/1l/S4mXA/BKPwmFNAzAt9yOQZjz4wlM0G00WaL3MSWMRjMM5iu y8tKyJ4wUwxSC432CGYrR/CNDX2cXEjBesnEt2fPeCFlKV1iiAFThVZyUfeISGEJt3JgE0 D/4mMh2/aS1G5s9pT8BYdh6f6jeEIxeaobUW/+J7UkQB3cU8d85+1+fhboulgLMRETiucX 3tW68mRRAic8dKqKSxoA/v7vz1K80trYaNCzJgpFGvPWqe0PlhAcrK122CWykpXL/hwMLl j+XllfG6pMUm8oniaf4LgrnXiZh158grewuhuUgBZnilTAGFHNIaUNHke7PtCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699424503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vN3gjmjgIjl8LIe9z1LIGRg4+IbahuqxgPM4W5ivIlo=; b=wC7rWXDGIMKBJGCxj6BuelSeWOULz4kHZ1yxiGf8gNK1cjDZB9tUg+EgpDCaHG8b3S6iyj FhPGS+2o/ac3AgtGGwRfwMRnW35FzgnmeboqR7mMkfJ9K2wInXAzLrSijvF27LicDHVkPv hah4joZ5EZ9noDVGKWuOYsOKMe2eQyKSCyTbIPV/wOzS0vaxim6Xv9ZHj1S18+Kq9eQ37f F9xfO/AxwaVPJ6poIbhfwq+oYLTNEauQs8uMIFpH5QyyuirutOlAdY/clGe69v6+lh9TCl UAZRt2vclMVqELBM6AsGv6Or1UQW/0fov5tnUHrRLArdW3JTMDKaX+x640sjyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699424503; a=rsa-sha256; cv=none; b=YcTrkO/oTOnYxTfr06yk+c3ArNtakLD41d8qE6wznOpVFLDtFyqFtLtAro6dpKxDEnqiCu Tbf7/Zz6NFZThHObkDSyW1BOC6hlmsGIj/1elF1e+48woFEwqQ9t0eB46hF4iTnEltYuLf SH+RcOYRRxK8ZdIJQe6iRj6yvuN3owDJQaDw0BdXZKTI+MAuQxllrXeFj8Q5pvMYkavjZR h7gFFrXaO0MHAOJ8B39rJvZcmPnQ7DtHYbl1gbbP03PVnNMLiS68prAtMGPqgsnHjp2ueG VRtbkVaiAZkeK/d8SbKdATmH8IXGY5GiO8SghpJ7GXBkmvlj8j0s8iCRveQhKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQFNR3bjnz7LW; Wed, 8 Nov 2023 06:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A86Lhsh037597; Wed, 8 Nov 2023 06:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A86Lhk8037596; Wed, 8 Nov 2023 06:21:43 GMT (envelope-from git) Date: Wed, 8 Nov 2023 06:21:43 GMT Message-Id: <202311080621.3A86Lhk8037596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 41e55b476bcf..9198de8f1079 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 9198de8f1079a8bbb837de3e3f8e236777b1375d X-Git-Oldrev: 41e55b476bcfc90f1ad81c02c5375367fdace9e9 X-Git-Newrev: 9198de8f1079a8bbb837de3e3f8e236777b1375d Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=41e55b476bcf..9198de8f1079 052777406601 Use env var for sed 3bd4df384152 Improve ZFS objset sync parallelism 2a154b84847d Fix accounting error for pending sync IO ops in zpool iostat 358ce2cf28a9 zed: misc vdev_enc_sysfs_path fixes f4cd1bac7236 Make abd_raidz_gen_iterate() pass an initialized pointer to the callback 9ce567c6fffd Fix dkms installation of deb packages created with Alien. e36ff84c338d Update the kstat dataset_name when renaming a zvol 58398cbd0351 FreeBSD: Optimize large kstat outputs 020f6fd093b6 FreeBSD: Implement taskq_init_ent() 78ac86882484 Remove obsolete_counts from grub2 compatibility list 3d86999c759f sa_lookup() ignores buffer size. dc45a00eac35 Add kern.features.zfs 9198de8f1079 Linux 6.6 compat: fix implicit conversion error with debug build From nobody Wed Nov 8 08:06:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQHhr2kXKz50R1j; Wed, 8 Nov 2023 08:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQHhr2Frcz4Pys; Wed, 8 Nov 2023 08:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699430764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpUHEelAsAYAa8LFMDFMnqHtAUkuI3z9/4mx9VcTxGw=; b=i42pGPY0WGW/QpLSdXAqKxScxi/vZf3b0c1lF/4paIzV/NfmGQIRBiWRkxkm2Jegi+PsSU S9JyhGQPTdOoq6SSyPMBrnoX3RHVTG5P7iT7G+/mysFH6g9fp/OX6RHNaccGwL1XOU3YD5 KeL/k/0tYZVzgUKcXbFF/8Dg8lpnvo55CBnLPjlIKcBQgpb2LaPladi0RcoUrQFwkwBpUd yf/XAoXydk9fLlIveMz0Zf2epQ541iGBSeHCqgrYK3V4Mm70B/mPIauIfdNE9SCZ45O1ef vcYCpTDvTX7zILL7+dCxZG1XzvQWZtqF0rqp9cj3hY6NZcnVlQmjXOmDvbeG0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699430764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpUHEelAsAYAa8LFMDFMnqHtAUkuI3z9/4mx9VcTxGw=; b=OOyZ/zsyqiF2+Lrlt7C2FFowpd7blhtZwCk9CygKl/ZySxb1tvkrcwRhdD8FTV1gx93vtF wtrlm2ngVmqEKXzbgQrCv0Ail5CzARGsEWCtxRjK9IKqSFrKN7u+ZWYu5UZrJ6MrTbECso xn4RP2wUfHsEgqssmIbweQseleZFOesep8MPRJm8vRU7Ihs/VONh7irHt1v/r2wlojyiGH ojEWOpjlQ8fOLaE9IpTtx2iPBNq6ACx9VvgoumhoH2lH47i6rC2oRcH+EIm4BSTdoyPPU5 iK3VOCi6OuczZqcBuby3fDEDpbk2wxPVf8P8btStnFKQtM9RUc/IQ5KXKTbSlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699430764; a=rsa-sha256; cv=none; b=wn309UCuGRIBnD8W+AIv5IJMnzCe6VvDzIdhGutw5af4VpClaBVQpN1vCrQnU2vM3XYl9K 4XuYKIQ5r9azrAKpt21KbV+zXZkIwoYN1FXOkNE+6OlBV9xzaRT6alKZxOvnQQtlqavO3e KEk876mGCyPDXQHPcKw7D+ev2mY+LDxGxd3BVEZ5MoqGx7FHkX00TbhPwclqGE090nnoMq aJd0cdB2MyFoFSIaZ3E7RXuQ/bh+65snBIHXd8dvHxP8AWXi1O0iaHB1QHT4lOFONu88XP PdpdA+TJ08UUSTdt2R2Vp8TrKx867SmOMAItN9o4KytR7pad9UmH1q6oI4hYoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQHhr1JbYz9kS; Wed, 8 Nov 2023 08:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8864FD007817; Wed, 8 Nov 2023 08:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8864ML007814; Wed, 8 Nov 2023 08:06:04 GMT (envelope-from git) Date: Wed, 8 Nov 2023 08:06:04 GMT Message-Id: <202311080806.3A8864ML007814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Oskar Holmlund Subject: git: f25b0d6dd75d - main - UART: Remove ingenic xburst (mips) code from ns8250 driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f25b0d6dd75d41cbb27d1cc40bb53185672281e0 Auto-Submitted: auto-generated The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=f25b0d6dd75d41cbb27d1cc40bb53185672281e0 commit f25b0d6dd75d41cbb27d1cc40bb53185672281e0 Author: Oskar Holmlund AuthorDate: 2023-11-08 08:03:55 +0000 Commit: Oskar Holmlund CommitDate: 2023-11-08 08:03:55 +0000 UART: Remove ingenic xburst (mips) code from ns8250 driver Since ingenic JZ4780 SOC support has been removed there is no need to support ingenic quirks in the UART driver. Invert of commit b192bae67ea835b7e431225bad375b5d5fe4297f Reviewed by: imp, manu Approved by: imp, manu (mentor) Differential Revision: https://reviews.freebsd.org/D42497 --- sys/dev/ic/ns16550.h | 3 --- sys/dev/uart/uart_dev_ns8250.c | 43 ++++++------------------------------------ 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h index 76a680a410b9..290a55ca7346 100644 --- a/sys/dev/ic/ns16550.h +++ b/sys/dev/ic/ns16550.h @@ -162,9 +162,6 @@ #define FIFO_XMT_RST FCR_XMT_RST #define FCR_DMA 0x08 #define FIFO_DMA_MODE FCR_DMA -#ifdef CPU_XBURST -#define FCR_UART_ON 0x10 -#endif #define FCR_RX_LOW 0x00 #define FIFO_RX_LOW FCR_RX_LOW #define FCR_RX_MEDL 0x40 diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index 3787c6ed4c9b..96062fe759d3 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -233,9 +233,6 @@ ns8250_flush(struct uart_bas *bas, int what) int drain = 0; fcr = FCR_ENABLE; -#ifdef CPU_XBURST - fcr |= FCR_UART_ON; -#endif if (what & UART_FLUSH_TRANSMITTER) fcr |= FCR_XMT_RST; if (what & UART_FLUSH_RECEIVER) @@ -327,10 +324,6 @@ ns8250_probe(struct uart_bas *bas) { u_char val; -#ifdef CPU_XBURST - uart_setreg(bas, REG_FCR, FCR_UART_ON); -#endif - /* Check known 0 bits that don't depend on DLAB. */ val = uart_getreg(bas, REG_IIR); if (val & 0x30) @@ -352,7 +345,7 @@ static void ns8250_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, int parity) { - u_char ier, val; + u_char ier; if (bas->rclk == 0) bas->rclk = DEFAULT_RCLK; @@ -369,11 +362,7 @@ ns8250_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, uart_barrier(bas); /* Disable the FIFO (if present). */ - val = 0; -#ifdef CPU_XBURST - val |= FCR_UART_ON; -#endif - uart_setreg(bas, REG_FCR, val); + uart_setreg(bas, REG_FCR, 0); uart_barrier(bas); /* Set RTS & DTR. */ @@ -552,9 +541,6 @@ ns8250_bus_attach(struct uart_softc *sc) ns8250->busy_detect = bas->busy_detect; ns8250->mcr = uart_getreg(bas, REG_MCR); ns8250->fcr = FCR_ENABLE; -#ifdef CPU_XBURST - ns8250->fcr |= FCR_UART_ON; -#endif if (!resource_int_value("uart", device_get_unit(sc->sc_dev), "flags", &ivar)) { if (UART_FLAGS_FCR_RX_LOW(ivar)) @@ -847,7 +833,6 @@ ns8250_bus_probe(struct uart_softc *sc) struct uart_bas *bas; int count, delay, error, limit; uint8_t lsr, mcr, ier; - uint8_t val; bas = &sc->sc_bas; @@ -880,11 +865,7 @@ ns8250_bus_probe(struct uart_softc *sc) * done. Since this is the first time we enable the FIFOs, we reset * them. */ - val = FCR_ENABLE; -#ifdef CPU_XBURST - val |= FCR_UART_ON; -#endif - uart_setreg(bas, REG_FCR, val); + uart_setreg(bas, REG_FCR, FCR_ENABLE); uart_barrier(bas); if (!(uart_getreg(bas, REG_IIR) & IIR_FIFO_MASK)) { /* @@ -898,11 +879,7 @@ ns8250_bus_probe(struct uart_softc *sc) return (0); } - val = FCR_ENABLE | FCR_XMT_RST | FCR_RCV_RST; -#ifdef CPU_XBURST - val |= FCR_UART_ON; -#endif - uart_setreg(bas, REG_FCR, val); + uart_setreg(bas, REG_FCR, FCR_ENABLE | FCR_XMT_RST | FCR_RCV_RST); uart_barrier(bas); count = 0; @@ -912,11 +889,7 @@ ns8250_bus_probe(struct uart_softc *sc) error = ns8250_drain(bas, UART_DRAIN_RECEIVER|UART_DRAIN_TRANSMITTER); if (error) { uart_setreg(bas, REG_MCR, mcr); - val = 0; -#ifdef CPU_XBURST - val |= FCR_UART_ON; -#endif - uart_setreg(bas, REG_FCR, val); + uart_setreg(bas, REG_FCR, 0); uart_barrier(bas); goto describe; } @@ -947,11 +920,7 @@ ns8250_bus_probe(struct uart_softc *sc) ier = uart_getreg(bas, REG_IER) & 0xe0; uart_setreg(bas, REG_IER, ier); uart_setreg(bas, REG_MCR, mcr); - val = 0; -#ifdef CPU_XBURST - val |= FCR_UART_ON; -#endif - uart_setreg(bas, REG_FCR, val); + uart_setreg(bas, REG_FCR, 0); uart_barrier(bas); count = 0; goto describe; From nobody Wed Nov 8 08:18:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQHz83FXtz50V0D; Wed, 8 Nov 2023 08:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQHz831Vhz4RRm; Wed, 8 Nov 2023 08:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699431508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TTgI5ciT5bjzVMxwTHyhfCCfxZKEndFyMOi+p3OPTDw=; b=Nz3HPvpwmXRNqOur1DZuhCqu7bI3ZoyoG4LsoA7bZdSV9REXt5SNzV9eg1M5uWPCrPvU4q QpwQFcWQiIw5h+VoGwFiznq3SWCM7WiTCb0LIaSyYsQJjEq7xuH+DbxK5eVNH5AAc/138M zrsXYum6hLCtAwTeieDb1QYbvsj/9xyvXa9tRUfmAd+RaVkVTMeYRGw6DGOWfkjThLltwD yAEALNBv1UP8/mn3Jm1DSRQpAqWtGK9bwvkBdOqodbMsSNDHJu7u3XgLlg0hejPA4P2F60 pNMVLuNS7LCM9QMB/CV3HJxbEf9mTlm9dfpp3PtvwFM+uKkDpKyEqEiJhj4kTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699431508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TTgI5ciT5bjzVMxwTHyhfCCfxZKEndFyMOi+p3OPTDw=; b=YJVOjIPmFJfIxgJmlqcrqUWTlk+9UXWp2mDtmw0Cdn0qZavqE33lH7/MGfM+hj3pWtd1Wi OBamaMs8XTnATz14JNKDezeP102U02eU5sVpye5/1VRr/HNrE9xBRSjsxabeS92gnPasd6 gUgymyDAU8n0h4r2Pt2mC5SkaJzjUu945FdaYINDxh1PzmMdDm24/xRUwF/a/88aFs3rwr /UkbSU32tx+p/Op33RsE/NPFaq5A2wxUxxfrBFhFn0B4cer0IJVQZ9DpjMmi3UKiath/zR YCBJe761xEv2VmLHil1sAJ0Lv5x+7g0G4JiEYriIm1bh9NaT49iGYD03FzI7bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699431508; a=rsa-sha256; cv=none; b=st9A029WSrt+pLqqyVrIGDtxKYQfg9GkU9Di2peNtNegS2al7YGQWrw199oxRPz6Z6SKDt tsDNFwFYkol4yaGgJYxJlKp1RrYyKZmQcpSdSyPP0nJosyeIp7Q36cRWIO7ukIYs5qsvzF DCbqgrof3U1sm/28Mwr2HpRObtpsi5Hys9ZECmrJrY05avn8jDvauYrTGkLYHxpYT4pNiR JoDfgmAL1IViNqJDK9EKX4v9VssqEsMoIHX3WX7326v6Q/3Q7FHiJxB99088/NmM58d/Xw ogo8nuyH5X6ZaIHyAht7eqP487YFGMI/V4xBqPSpbTLjmKFI4qxtIb4dy99cvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQHz81xtCzB51; Wed, 8 Nov 2023 08:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A88IS9D024768; Wed, 8 Nov 2023 08:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A88IP2P024765; Wed, 8 Nov 2023 08:18:25 GMT (envelope-from git) Date: Wed, 8 Nov 2023 08:18:25 GMT Message-Id: <202311080818.3A88IP2P024765@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: 14c2e0a0c57e - main - zfs: merge openzfs/zfs@9198de8f1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 14c2e0a0c57e48a41433fdca668fac8882fb04df Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=14c2e0a0c57e48a41433fdca668fac8882fb04df commit 14c2e0a0c57e48a41433fdca668fac8882fb04df Merge: f25b0d6dd75d 9198de8f1079 Author: Martin Matuska AuthorDate: 2023-11-08 08:16:01 +0000 Commit: Martin Matuska CommitDate: 2023-11-08 08:17:55 +0000 zfs: merge openzfs/zfs@9198de8f1 Notable upstream pull request merges: #15197 3bd4df384 Improve ZFS objset sync parallelism #15455 020f6fd09 FreeBSD: Implement taskq_init_ent() #15476 3d86999c7 sa_lookup() ignores buffer size #15478 2a154b848 Fix accounting error for pending sync IO ops in zpool iostat #15484 dc45a00ea Add kern.features.zfs #15486 e36ff84c3 Update the kstat dataset_name when renaming a zvol #15491 f4cd1bac7 Make abd_raidz_gen_iterate() pass an initialized pointer to the callback #15495 58398cbd0 FreeBSD: Optimize large kstat outputs Obtained from: OpenZFS OpenZFS commit: 9198de8f1079a8bbb837de3e3f8e236777b1375d sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 4 + sys/contrib/openzfs/cmd/zed/zed_event.c | 31 ++++ .../openzfs/cmd/zpool/compatibility.d/grub2 | 1 - sys/contrib/openzfs/cmd/zpool/zpool.d/ses | 12 +- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 4 + sys/contrib/openzfs/configure.ac | 2 +- sys/contrib/openzfs/include/libzutil.h | 2 + .../openzfs/include/os/freebsd/spl/sys/taskq.h | 6 +- .../openzfs/include/os/linux/spl/sys/taskq.h | 2 + sys/contrib/openzfs/include/sys/dataset_kstats.h | 1 + sys/contrib/openzfs/include/sys/spa.h | 5 + sys/contrib/openzfs/include/sys/spa_impl.h | 12 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 5 +- sys/contrib/openzfs/include/sys/zfs_context.h | 2 + sys/contrib/openzfs/include/sys/zio.h | 6 + sys/contrib/openzfs/lib/libzfs/libzfs.abi | 7 + sys/contrib/openzfs/lib/libzpool/taskq.c | 30 ++++ .../lib/libzutil/os/freebsd/zutil_import_os.c | 9 + .../lib/libzutil/os/linux/zutil_import_os.c | 17 +- sys/contrib/openzfs/man/man4/zfs.4 | 22 ++- .../openzfs/module/os/freebsd/spl/spl_kstat.c | 38 ++--- .../openzfs/module/os/freebsd/spl/spl_taskq.c | 112 ++++++++++-- .../openzfs/module/os/freebsd/zfs/kmod_core.c | 3 + .../openzfs/module/os/freebsd/zfs/zvol_os.c | 1 + .../openzfs/module/os/linux/spl/spl-taskq.c | 36 ++++ .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 2 + sys/contrib/openzfs/module/zfs/abd.c | 9 +- sys/contrib/openzfs/module/zfs/dataset_kstats.c | 12 ++ sys/contrib/openzfs/module/zfs/dbuf.c | 9 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 138 +++++++++++---- sys/contrib/openzfs/module/zfs/dnode_sync.c | 1 + sys/contrib/openzfs/module/zfs/dsl_dataset.c | 5 +- sys/contrib/openzfs/module/zfs/dsl_pool.c | 31 ++-- sys/contrib/openzfs/module/zfs/sa.c | 3 +- sys/contrib/openzfs/module/zfs/spa.c | 190 +++++++++++++++++---- sys/contrib/openzfs/module/zfs/spa_misc.c | 14 +- sys/contrib/openzfs/module/zfs/vdev_queue.c | 7 +- sys/contrib/openzfs/module/zfs/zio.c | 43 +++-- sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in | 90 +++++++++- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 42 files changed, 755 insertions(+), 177 deletions(-) diff --cc sys/contrib/openzfs/include/os/freebsd/spl/sys/taskq.h index b23a939b3aa7,d84136ed4b9d..fa6ff84a0134 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/taskq.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/taskq.h @@@ -117,6 -120,6 +120,7 @@@ void taskq_resume(taskq_t *) #endif /* _KERNEL */ #ifdef _STANDALONE ++typedef void taskq_t; typedef int taskq_ent_t; #define taskq_init_ent(x) #endif /* _STANDALONE */ diff --cc sys/modules/zfs/zfs_config.h index 5344d981882b,000000000000..dd1a926d286c mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1149 -1,0 +1,1149 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ *** 262 LINES SKIPPED *** From nobody Wed Nov 8 12:31:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQPbQ6RcVz50JvC; Wed, 8 Nov 2023 12:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQPbQ5zQvz3XhG; Wed, 8 Nov 2023 12: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=1699446706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDp5s4nePnoVfmi1WNY0iyeKdJZOfUa6MOuG3j5BCfo=; b=aF3tq2Ma9jPrF7xH3klSYDWEogD7eK9M4rcIOPvPdaHeEJBGzavbwZE0udBMI9TArh4/YL 1OKc5epM5T9syK8EXuwgMl5l8+1oSP95XKc7DLpvd1SO5v7LJk1e3GmLkI3e4MQTyBQVm9 QzNeGoKjO8XFKV4yA9udsXpXWCNkK5sZe7vIFhpRp2Opo3g6B0AVaSmv3Sup73IJXCQpSU 4JLQokPMuwgtKAeUyWBrNYGra59Bc76pf4W/D9fid+uMY5mOoPfXyeFzS57oviYCO4q6Ye EP2SD1VczUs1ullTGKCeycZDTLuDLFJ2C4My7Bbup1idP6E5SyRR+/81BALxjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699446706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDp5s4nePnoVfmi1WNY0iyeKdJZOfUa6MOuG3j5BCfo=; b=qJzKLIxmUGlOPqabK7qkPJ+HCsFSIT7epEf+HlHU6PzuIbSS+AvaEi+jeX27akVZ10rMHE Jk34VKXABFo370XcIyVLaC0vgACk7Gm+bhUjjI+5LUOJuaEdp9v0YKv0FXcjmkvWBgmsoY ZMCyeq0Ifl6wucwA8qaEcmFGSbRikZ69hkhHMdyYXTnNTDSCQ2/xhuFsJ683v53T23qNST r7JaSysMlyyvZriTmbbJzvFAW5l7Y2NOeIXTRS7zm9d8A8tW5K4AMzEnwy4VbGQDccgYNv McfjJnVDxYc0+nr4zHASojQp8/dU6TV9DwuvFFXb5jydlF99+GJzEfIFls+3EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699446706; a=rsa-sha256; cv=none; b=X2b0jgmfdaYxB5uuFXrpf11lTtCl5kvMLge4Ds+Ug7140TBmMWZeYj8KgVnE9Cvb8vu94Z LuytXLC3RJQhhNv3HZlm2kopQGjraEr3nF/Zv20C11KwxrRgf9x3DzpeI1EFu+2rqkoZEX Lgu4/KxUgP+pRL18n67NimX2sAlN0tG0qXTC8A1HT/OFlOYBZbDtKrf0wnspffnQzkOllX Z066V2y5sgopjSAYQAy3C7P+O6KD/dsYx3SzDo6vefPTrKD3H9Zy5WAIqyGi1X7W1mqzlS 8U67nQzY/9tTRT0delFyRFbwpnLFt45KMK8MDmUKMzcTshg8jXgEarG+CEWTzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQPbQ53XHzYHL; Wed, 8 Nov 2023 12:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8CVkXe056762; Wed, 8 Nov 2023 12:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8CVkD3056759; Wed, 8 Nov 2023 12:31:46 GMT (envelope-from git) Date: Wed, 8 Nov 2023 12:31:46 GMT Message-Id: <202311081231.3A8CVkD3056759@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: 50565cf514d3 - main - makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 50565cf514d32ee02a24f420551c7e65631b0716 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=50565cf514d32ee02a24f420551c7e65631b0716 commit 50565cf514d32ee02a24f420551c7e65631b0716 Author: Mark Johnston AuthorDate: 2023-11-08 12:00:43 +0000 Commit: Mark Johnston CommitDate: 2023-11-08 12:04:12 +0000 makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags This flag was leftover from testing and should have been removed. PR: 274938 MFC after: 3 days Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/zfs/fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c index b0a4c639f256..9413241da0c7 100644 --- a/usr.sbin/makefs/zfs/fs.c +++ b/usr.sbin/makefs/zfs/fs.c @@ -403,8 +403,8 @@ fs_populate_sattrs(struct fs_populate_arg *arg, const fsnode *cur, } daclcount = nitems(aces); - flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_NO_EXECS_DENIED | - ZFS_ARCHIVE | ZFS_AV_MODIFIED; /* XXX-MJ */ + flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_ARCHIVE | + ZFS_AV_MODIFIED; gen = 1; gid = sb->st_gid; mode = sb->st_mode; From nobody Wed Nov 8 12:31:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQPbS0bSwz50Jk4; Wed, 8 Nov 2023 12:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQPbS07YZz3Xhl; Wed, 8 Nov 2023 12:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699446708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KR+3VvAgI4B6AS0XQoU0XbjqqwHYywLfdYuM3v2jsR8=; b=eLUH0xbSlBlFMVxM+0xbq8bWKxccjsHTNTOneiiYXTsvFx75sheeLnIsAR/l/MtgGccLzB 6KYgZ6E1b5qhUFS4lujTXBvDcAYjxrg5sYBv4jA5SuyPoiwWmIoGFythptE5Co7AMXlALK cYteA6Qmh7sm2ZyQAcuD/x/zsQ7ov9Fhd1mZMua2I6WZ5QdsW10A4HIFbi3PJjuuumlpIQ FxLZSPfEsEmdTX1HocQKrB8BZUe5ED0OLm3mwNafNemeMEX3Veoe/k4/yrnbp1YEy536X3 rPrSMMzXsSpqdcC5tYCGV0jEN4XUc9rymwnk+j8NEvFhPS8DzaV2LEk3o3lIEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699446708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KR+3VvAgI4B6AS0XQoU0XbjqqwHYywLfdYuM3v2jsR8=; b=XqiSYqvRuUKr6mxWH67ppOH/bsDgQ0pXR9CQvePjeEwBem1VAmih1p7U/Xk5VVFFwi3Jf4 9icx1ssn9odkhK82h09wlNhcwBULFhSQrOfIsAbikyyB6aEEhtn9eq9xmVM7OIj2LccKWF hO7rTSu6smrW2jBeEZQHZBsTlJKOCXt98gut6aBdoU++6BiBueZJZccMf9iAxtfvnAooD6 eVZB2AuK/kPeUITAfLbl36ewoAXufyDfKo73lED1ZZvoM4x0eMrvswfsX98iUtS3BcNYp0 s2XM4jBQPo+lJZ43n+HCsf6GkTnXVaVsDA8xx0j0AfSBDva2Zbpi10SGjna7EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699446708; a=rsa-sha256; cv=none; b=P/BOE8F4if4feH4QZaTsyt8DGzawVcGXMQNWDXyi7A4dWFFKdSsyvTlMLiH604DE29E5cu n+aCKvgWqFB73ElKOB9nHP3378KS1z8XOGqd0Iy9JfSl9AYlV+xQk8FR8/TAPC8MKsK0hY xhFBNMv4rnpWegSLJwzOfP5x/9Z20AArwpGlT3cODcqGeu7+bheZKHF3wh22GXTtLUCIfJ MwF8R1zYk0KJTLhvMjfnIIphGA0SI611zgJ9xIT4pVrymbrQFNksS3H7AU+MhlImPaUNdU upg4pFRM94WT87jW2g/z1/67+VbQ1fMpBb22E1/AYIfi2KpxzoW7I52XYvI1QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQPbR6L1bzYKt; Wed, 8 Nov 2023 12:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8CVlhR056825; Wed, 8 Nov 2023 12:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8CVla9056822; Wed, 8 Nov 2023 12:31:47 GMT (envelope-from git) Date: Wed, 8 Nov 2023 12:31:47 GMT Message-Id: <202311081231.3A8CVla9056822@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: 7e5002e3d603 - main - makefs/zfs: Add a regression test which checks file access permissions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7e5002e3d6038b69e23f6c1982caf20cd62139f7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7e5002e3d6038b69e23f6c1982caf20cd62139f7 commit 7e5002e3d6038b69e23f6c1982caf20cd62139f7 Author: Mark Johnston AuthorDate: 2023-11-08 12:04:33 +0000 Commit: Mark Johnston CommitDate: 2023-11-08 12:18:58 +0000 makefs/zfs: Add a regression test which checks file access permissions MFC after: 3 days Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 1811b1bc8a8c..6e20ae33b354 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -794,6 +794,49 @@ used_space_props_cleanup() common_cleanup } +# Verify that file permissions are set properly. Make sure that non-executable +# files can't be executed. +atf_test_case perms cleanup +perms_body() +{ + local mode + + create_test_dirs + cd $TEST_INPUTS_DIR + + for mode in $(seq 0 511); do + mode=$(printf "%04o\n" $mode) + echo 'echo a' > $mode + atf_check chmod $mode $mode + done + + cd - + + atf_check $MAKEFS -s 1g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + + check_image_contents + + for mode in $(seq 0 511); do + mode=$(printf "%04o\n" $mode) + if [ $(($mode & 0111)) -eq 0 ]; then + atf_check -s not-exit:0 -e match:"Permission denied" \ + ${TEST_INPUTS_DIR}/$mode + fi + if [ $(($mode & 0001)) -eq 0 ]; then + atf_check -s not-exit:0 -e match:"Permission denied" \ + su -m tests -c ${TEST_INPUTS_DIR}/$mode + fi + done + +} +perms_cleanup() +{ + common_cleanup +} + atf_init_test_cases() { atf_add_test_case autoexpand @@ -817,6 +860,7 @@ atf_init_test_cases() atf_add_test_case soft_links atf_add_test_case root_props atf_add_test_case used_space_props + atf_add_test_case perms # XXXMJ tests: # - test with different ashifts (at least, 9 and 12), different image sizes From nobody Wed Nov 8 12:31:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQPbT1tp2z50KBY; Wed, 8 Nov 2023 12:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQPbT1K61z3Xt0; Wed, 8 Nov 2023 12:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699446709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ceNK342Qdf1sOkEGsAQHWsNpErENK+Y5xqdJGBJcCsU=; b=L7vEelTqXh4bk9v0R8t6NOpN4YohBBATFxohVBqy131KS9FjZOr2ngqJcVmR3NLUNtcFrZ SF0A3+aIAuqm6CSJcMgpkzsvD1AGmsjR+2UxlQheAPxZ2xT6qcid49moswA8xvB4L7BYon oyhcS5LP+nYF8RpOZp+a5cuSODQyQ9WJGuhoWpofoDwDWTl1+aP7g9xTcrhC9CGwyQpxH/ pqdHkR+PZyvRo7IIoBaBxQEytDUkW8b4/FFs+D83mYc9pj2cEwR955BHko+8TK8YPZN5wG O/3dGZlR9uyg1YYXRcG8p/IWd3DDEeP2fgq+4S8AQV0X5rtxOLmML/SoK6jNYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699446709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ceNK342Qdf1sOkEGsAQHWsNpErENK+Y5xqdJGBJcCsU=; b=e6xLLKdiwQIX84CWWa2uKlCo3sHlhUSCq9ccaEZ4BoVAOuMUhic2ZLgejb6N1qdi154qUX 8Rx5LrTgEby2pwEC8Gm2HFb1yZ0SsXu4Ky/l8XeT1my/sO0LLmAeewSlpBOWJlyhKss06D oT2cMdImNb+BU17RaJkq4o8NaMDBJcic7UVRqFr2QIPjqDICJwbxWNjL99jpX0Rx8fptCn ozKGb9UvZ63JWV1ol6DLNerNB3zUi5P3BWzK/ATWGNMuPIwrgjQAqrg4d7kCYZumouDzeU c6m7ONYyW9QnLJ4Js8jBoi3O4r45NNtM842+cyIDGMlV8TjzNQfH/0VG2RKHew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699446709; a=rsa-sha256; cv=none; b=lqQnhyfkA6TbmaziF17sMkah1gslyZNhBmPP6xdt729zX02mGSG6Pl3PwLeCKgE1SIragH 9OzErnn22878J76GWNzZ7Bu0SwMZstcP3cUv1/IDeTNSMWeUp3ascTWT1XbjdkFSbrRR4x y5zJteURm9DAH/d+ksm21ijT5kHK8FkJTbJRCgcoxkeNndFmtK5p+oVgcbJru5Y98VkHFB Yfv3YfYsgaHjxmmz3ym/f1KuFwfnaB9NBQ/DNeUC9JttGdqWLJqw/qmphEI3MMkT+AHasw OZqWDFABpT3J3Klp7SFZXzS8Te5bqru/Jg1tEInrzEqxHLmBPu7z11IKFe9n5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQPbT0HZkzYPC; Wed, 8 Nov 2023 12:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8CVm6W056885; Wed, 8 Nov 2023 12:31:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8CVmkK056882; Wed, 8 Nov 2023 12:31:48 GMT (envelope-from git) Date: Wed, 8 Nov 2023 12:31:48 GMT Message-Id: <202311081231.3A8CVmkK056882@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: d0941ed9b5c3 - main - riscv: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d0941ed9b5c39d92d0aa75bc253506cb59a2e9a1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0941ed9b5c39d92d0aa75bc253506cb59a2e9a1 commit d0941ed9b5c39d92d0aa75bc253506cb59a2e9a1 Author: Bojan Novković AuthorDate: 2023-11-08 10:20:06 +0000 Commit: Mark Johnston CommitDate: 2023-11-08 12:19:15 +0000 riscv: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping Let pmap_enter_l2() create wired mappings. In particular, allocate a leaf PTP for use during demotion. This is the last pmap which requires such a change ahead of reverting commit 64087fd7f372. Reviewed by: markj Sponsored by: Google, Inc. (GSoC 2023) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41633 --- sys/riscv/riscv/pmap.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index f6923363c484..223bf0243964 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -2685,6 +2685,8 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, ("pmap_demote_l2_locked: oldl2 is not a leaf entry")); if ((oldl2 & PTE_A) == 0 || (mpte = pmap_remove_pt_page(pmap, va)) == NULL) { + KASSERT((oldl2 & PTE_SW_WIRED) == 0, + ("pmap_demote_l2_locked: page table page for a wired mapping is missing")); if ((oldl2 & PTE_A) == 0 || (mpte = vm_page_alloc_noobj( (VIRT_IN_DMAP(va) ? VM_ALLOC_INTERRUPT : 0) | VM_ALLOC_WIRED)) == NULL) { @@ -3217,6 +3219,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, pd_entry_t *l2, *l3, oldl2; vm_offset_t sva; vm_page_t l2pg, mt; + vm_page_t uwptpg; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -3274,6 +3277,24 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, ("pmap_enter_l2: non-zero L2 entry %p", l2)); } + /* + * Allocate leaf ptpage for wired userspace pages. + */ + uwptpg = NULL; + if ((new_l2 & PTE_SW_WIRED) != 0 && pmap != kernel_pmap) { + uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED); + if (uwptpg == NULL) { + return (KERN_RESOURCE_SHORTAGE); + } + uwptpg->pindex = pmap_l2_pindex(va); + if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + return (KERN_RESOURCE_SHORTAGE); + } + pmap_resident_count_inc(pmap, 1); + uwptpg->ref_count = Ln_ENTRIES; + } if ((new_l2 & PTE_SW_MANAGED) != 0) { /* * Abort this mapping if its PV entry could not be created. @@ -3290,6 +3311,16 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, pmap_invalidate_page(pmap, va); vm_page_free_pages_toq(&free, true); } + if (uwptpg != NULL) { + mt = pmap_remove_pt_page(pmap, va); + KASSERT(mt == uwptpg, + ("removed pt page %p, expected %p", mt, + uwptpg)); + pmap_resident_count_dec(pmap, 1); + uwptpg->ref_count = 1; + vm_page_unwire_noq(uwptpg); + vm_page_free(uwptpg); + } CTR2(KTR_PMAP, "pmap_enter_l2: failed to create PV entry" " for va %#lx in pmap %p", va, pmap); From nobody Wed Nov 8 16:58:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQWWf6Y9mz50S5B; Wed, 8 Nov 2023 16:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQWWf5hlsz3Fwk; Wed, 8 Nov 2023 16:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699462734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ecVt4SE4UwvuPujauFyaZZrYRAH6LFfZ/YXf8HoqgaU=; b=i4B+UDF/K1O+y/rAtW2CVn++Jpe+SDpm0DL4vAMqj0AHwVMMqRGSRPLNbwhG97YtHuu0KQ ngYVwt5JVxRsfe4uBfS8d87OSdbl7sIN5nJtk/eBYwgCaS5WTWUdFUXbSYRkUzPkkAA4CK r0rx8MlHbhMDtziXZLaV5//WwhLU9uz4VedvjVl4/OyBjtU1G6gfTMckjNI7vJ2ekJmnP/ icVuTK8H8GF74+eFS5VDI4mGEOUQsw4paL+iSuxcY6AkEr84mP+pWm43DR5qgjEUVk3iQA ORKJaheJBFqNUsf2tqpkh00eo43WVO8PJzCT1bj1hJJp+oXdBZ6sFQBe+7gxZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699462734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ecVt4SE4UwvuPujauFyaZZrYRAH6LFfZ/YXf8HoqgaU=; b=AA1NMY7vD7omRZzbwGijyUvxtrJvNrURPezutgeRoe0US61gy0jydQFPLLS5Ww/C3VIahk MtqYTH6WAcpzyrelZKK8If2n3jahNkzEIO/m7SCNIokrBfTSVyF65DMwBsgPLg3MkpF6tC V0KatbfV6bmkng5Pg+t+nTsfr90bNCc0w2dfF7jq+hBdn0XaXnmtf2Afl405z8p7jh+Es1 kwgUlNSTdXEOiXz1kK5ccUO79Im1OXXnTZrh60YJQqzIzr4NSvKO/qSMQ1cuVIGVthgqao GR27ddhnXcGfMaD+65/2ytbzjQ+DXhSwRdL8PZ1P3h8fCQWNBWGlVLfIOYC7KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699462734; a=rsa-sha256; cv=none; b=ZAJAgD0n1cYNi0Fuix9XvfmqhHuuq9xRfDZlynGytYd4lxtVnvodS3JcuLeZbHt89kMnc5 aorZzLF9CJ6w0w5AkwfpxUgpuAAtek2p2PN5f8sSbOO6eck1Jf+t/RI1CCZhVTZj8DCG2D SvlnSNgsESpL/bQnYqTnUUJl9U0/N/1VVrz+bXm+56VeU6EWU7o+LysoitAdx8tMN3obve 2jEhYbt5KGwam1W96Xew5PMnpD7YBfKYIhvA0u+GY9Hl2fw18bUA3Ok+jOgcKVSBOR/gzI eOpXXsoW3okBuM5eFnXAmGYFcjHfkwiKnoy67neyUvr15eZxX62Cz6lNGoE57g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQWWf4lRHzhCC; Wed, 8 Nov 2023 16:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8GwsQU094548; Wed, 8 Nov 2023 16:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8GwsRM094545; Wed, 8 Nov 2023 16:58:54 GMT (envelope-from git) Date: Wed, 8 Nov 2023 16:58:54 GMT Message-Id: <202311081658.3A8GwsRM094545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 85247ee6a2ba - main - tcpdump: decode pfsync packets on network interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85247ee6a2ba1c2dd0053e9be9055efa4be1438e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=85247ee6a2ba1c2dd0053e9be9055efa4be1438e commit 85247ee6a2ba1c2dd0053e9be9055efa4be1438e Author: Luiz Amaral AuthorDate: 2023-11-08 15:12:14 +0000 Commit: Kristof Provost CommitDate: 2023-11-08 15:12:14 +0000 tcpdump: decode pfsync packets on network interfaces When print-ip-demux.c was introduced on ee67461e, the pfsync_ip_print function was missed, causing tcpdump to treat pfsync packets on network interfaces as an unknown protocol. MFC after: 1 week Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42504 --- contrib/tcpdump/print-ip-demux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/tcpdump/print-ip-demux.c b/contrib/tcpdump/print-ip-demux.c index a0a6fbd11f3a..758601910881 100644 --- a/contrib/tcpdump/print-ip-demux.c +++ b/contrib/tcpdump/print-ip-demux.c @@ -216,6 +216,12 @@ again: } break; +#ifdef HAVE_NET_IF_PFLOG_H + case IPPROTO_PFSYNC: + pfsync_ip_print(ndo, bp, length); + break; +#endif + case IPPROTO_NONE: ND_PRINT("no next header"); break; From nobody Wed Nov 8 21:56:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQf6k13dJz50RsZ; Wed, 8 Nov 2023 21:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQf6k0Zt7z4cJ7; Wed, 8 Nov 2023 21:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699480574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZaOUP8vU5yPt+BbuZh89B2wUG38TME1mqww68YKeSg=; b=CE72olXDJqDrwtkpr0+WlnhiURYakAIr5Pv4zGJbJf0/sJitHHWi9SddSOEBEPnsRuwmok sx0AC2lTGNrOxGjZd5fDa/WOWeK8FlZseK0aCVipXnxPWMkZiHvUIMM+GuSqxt3PaS73Ek 1Goss9jb5HFluudQCkDGlpQq2+Fi3n7xu/ekwoifX9VLT1W8tDU5rQlsxvg2AuL8tTUpTf AyGeD5LqYWSNofrKsQIFbR9zq9YYID6ifE+tMDiohyUEghPye24fTGumECvHFW2LBIU3X3 TeKQemhFcRctzJOOmu7tUZ+aSFV4jJ6oK/YxBR8V6OkElsNLQGTxAe8FyEjAQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699480574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZaOUP8vU5yPt+BbuZh89B2wUG38TME1mqww68YKeSg=; b=vc/ztrfFfeZX9rqPRp/oZKVu6ilzy+mWN3vQahXDbXgCUQh5vDkbTvHwjTdm2z2YJ7YMpK Y+PCnwBSdwkwQ/w7ZQHb3bqTidIbXZD/tfUW+1qr+6CXYqWtRwYMSLSmI6BBij4skOYrCb bUzN1Wz+rWidI2G87Ju2ZD6VCwXFh8GCZUEHhX89ACV6vezCbmg2uWkrcVdhh2neyxhmaW hSzsMS5hVDuFczMq68CSC2qmWWb1heIG2mOMH5MMEAJ8IxVwzeUmtRjSUDziJ6nQtDVvTZ AnnSCa9VPzpN8ZAI71GOf7Ou5NTt0FzgcfJ/bEI31pk9Ba6LuPRF3wgXccFjzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699480574; a=rsa-sha256; cv=none; b=XzyvhCOx7oXREO0MByU8AP4bXJawqz23+3czOXziJUT2fozb8igm3XHcZrExBAvMiHxR5a x78tapEGCEHoElegBa1dhiH+tYSo5jIbU1R4xAqA8A8DPGgdrJzpPuVHnjOuv9bLiVDXqT LEw0T7Uc1RSAO9JnFJ0tagOM35h3i057IP+P64q9weOSdezz9Cslo3G0G/L0rBI0b53eg6 dOP1DNnRuMTmMKoDioxGRrtqsZOs+n0P7phhyKNI0N2fep20p2tBB9+fduXOZyDVS05w0Z hAXv75V7+MEFJH6+90KtFlP+eESjXaKVv70o6Q53s8FAh9Z63e0MYOE81TFhdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQf6j6lJJzphK; Wed, 8 Nov 2023 21:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8LuDCR095326; Wed, 8 Nov 2023 21:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8LuDdd095323; Wed, 8 Nov 2023 21:56:13 GMT (envelope-from git) Date: Wed, 8 Nov 2023 21:56:13 GMT Message-Id: <202311082156.3A8LuDdd095323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a6246a50b634 - main - pf: fix double free if pf_ioctl_addrule() fails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6246a50b63450d0fe34e3429807bd5aba8cc2ac Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a6246a50b63450d0fe34e3429807bd5aba8cc2ac commit a6246a50b63450d0fe34e3429807bd5aba8cc2ac Author: Kristof Provost AuthorDate: 2023-11-08 14:06:15 +0000 Commit: Kristof Provost CommitDate: 2023-11-08 20:58:52 +0000 pf: fix double free if pf_ioctl_addrule() fails If pf_ioctl_addrule() returns an error it will have freed the rule itself. There's no need for the caller to free it again. PR: 274915 Reported by: Dave Cottlehuber MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_nl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index bf3d23051c05..fe5ded0e86a4 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -632,9 +632,6 @@ pf_handle_addrule(struct nlmsghdr *hdr, struct nl_pstate *npt) attrs.anchor, attrs.anchor_call, nlp_get_cred(npt->nlp)->cr_uid, hdr->nlmsg_pid); - if (error != 0) - pf_krule_free(attrs.rule); - return (error); } From nobody Wed Nov 8 22:43:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQg9R0LlQz50dhv; Wed, 8 Nov 2023 22:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQg9Q6sHGz4kZq; Wed, 8 Nov 2023 22:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699483419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eR9/toA2GPrIMP3PqaIdi08i/naGq81lmMhY2xfAIzM=; b=LyX8fmtycFHYJShiMxARYhbV9JcAUCDi9KAy2k9a4ll8f2GM3QNJau9WjmuJ0zEgmjQ/eh nP9mmxr8ycfKWRApRePx0IMZQSMyOht4POa4zwsYVYHfWk2AlT+X3uzDmJoR30p9ygQn4T VWfFDxqBz7+BIf/aSNX2qj8/KzisYvNcZL8iKpTWm0WaBPFIf2072XeaqXym9EpMcKHAh6 yQ0PwyxvdZDG7xRQZEe4y0uPzrZs+NKHAS5TyXkao54voQBVJ5m3tCxjKLCTWjZZos8B4z R+b7HlZFQ39abX0gKwjeQlKQBmViVNMFSLeXI5pLF45WTzbwCfei7pBxGcxi0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699483419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eR9/toA2GPrIMP3PqaIdi08i/naGq81lmMhY2xfAIzM=; b=IZV1kkoclwkRghn4xN19xz9NihN0/6g8/BgifmoaKVdA1i0Ms2BJzeTXXkswOwnV0/eLr6 LTrqxq2HGgu9D4nm0V5Q2v9IuZPuBcevvdEjtDxZ2mCJs3w7RVLNNWFQml9xokh+FsqVGp BKPQG4WpgxJ/WHZF4mLdRNYId+wsTsjC9JY/fsS3dI95f/0ww6uYEv9EpZbLyEupHZEn1C oGoFN2cvVQgDvmJXCnzRb3FVIjlaW9d4+UmJb3y+H29bUFaRVAkDsGBVVM+qN6iUkDN4kp mjL5CDN2lMFsMzVjF09fsg9LeJaswPA4iqg1xGYNFCp0DWWUGuf/tZ6CcP2snw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699483419; a=rsa-sha256; cv=none; b=jwCmyQpsc448Mw4ztGrt412zb9XG3gg62kSlq1nSM98laDSZvdbS5X/apW3N5cQUh0mahd PFHhOtCfG73UsGmlF7yI4ANfrMxjq+VPK56lVzSB8U85aq3Pb/4OM/OpvvaBbSXiQFQ44r lYJ4HhfzAF5JYPUCVhefbSFyKczf1Zf2Z+QlqvbLxv5GUTkJON9BWrnIqOOX9k8quGYuQw n74eS1athnhhtOajqHtCA4oqnMWJpvHwZNIdCfm99WP1hoQmi0bGNDA0R2qou5VSQz5Qth aVrgBGvKHRMXEV+mfXZZ3VTEnM7+u/ULS9mcL6KnmM3m3M7eavBTfY8uqd68Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQg9Q5wgvzrYx; Wed, 8 Nov 2023 22:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8MhcNM079290; Wed, 8 Nov 2023 22:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8Mhc71079287; Wed, 8 Nov 2023 22:43:38 GMT (envelope-from git) Date: Wed, 8 Nov 2023 22:43:38 GMT Message-Id: <202311082243.3A8Mhc71079287@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: b2b381d365fc - main - cam: Add human readable statuses for some CAM_ status 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b2b381d365fc214a7d4ab126f57a7f86f0f1df5e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b381d365fc214a7d4ab126f57a7f86f0f1df5e commit b2b381d365fc214a7d4ab126f57a7f86f0f1df5e Author: Warner Losh AuthorDate: 2023-11-08 22:38:16 +0000 Commit: Warner Losh CommitDate: 2023-11-08 22:38:16 +0000 cam: Add human readable statuses for some CAM_ status values. CAM_NVME_STATUS and CAM_REQ_SOFTTIMEOUT were missing, though the latter hasn't been used yet. The former is being used and showing up in dmesg output as Unknown 0x420. Fixes: f564de00f794 Fixes: 774ab87cf27b Sponsored by: Netflix --- sys/cam/cam.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/cam/cam.c b/sys/cam/cam.c index 09bef8ee3a83..01a5b3c3b36c 100644 --- a/sys/cam/cam.c +++ b/sys/cam/cam.c @@ -87,10 +87,12 @@ const struct cam_status_entry cam_status_table[] = { { CAM_REQ_TERMIO, "CCB request terminated by the host" }, { CAM_UNREC_HBA_ERROR, "Unrecoverable Host Bus Adapter Error" }, { CAM_REQ_TOO_BIG, "The request was too large for this host" }, - { CAM_REQUEUE_REQ, "Unconditionally Re-queue Request", }, + { CAM_REQUEUE_REQ, "Unconditionally Re-queue Request" }, { CAM_ATA_STATUS_ERROR, "ATA Status Error" }, { CAM_SCSI_IT_NEXUS_LOST,"Initiator/Target Nexus Lost" }, { CAM_SMP_STATUS_ERROR, "SMP Status Error" }, + { CAM_REQ_SOFTTIMEOUT, "Completed w/o error, but took too long" }, + { CAM_NVME_STATUS_ERROR, "NVME Status Error" }, { CAM_IDE, "Initiator Detected Error Message Received" }, { CAM_RESRC_UNAVAIL, "Resource Unavailable" }, { CAM_UNACKED_EVENT, "Unacknowledged Event by Host" }, From nobody Thu Nov 9 00:43:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQjr16V81z4yrVx; Thu, 9 Nov 2023 00:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQjr15d9rz3JFm; Thu, 9 Nov 2023 00:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699490625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CZfaO8TA7Flfu8sc8cAJmu3nC4SEB5j4v1KQigbRKys=; b=IRGRphe5z6i3IDJ04d6KSfQtblW+aHPgeZH35ROHWox6EceHGJ0MUA2jQbVyOnuA5BJXxy 4yZhWhgijKMXN007mcJoOcoVosxscZ+setcUjV0QmNiGpsckkmZ8S+nevWrZOB+h68PWy5 wJ/VG31M4MvL5b2XYp2YS5WdONbfEbtwah6zqxq7JlmCYjcg6/S26tvUmzAlJKcoBXli3G QCWG5t/XZc03AaKQXy7hUH0Qy7WO2ulGPnjXMzJ3DnT/ih83l4LQyKxf7JQ2kAVZhzP6hf A9tExf0L62ORu1H6g64gV2BDhqYkJTEf7wXKZ1zaQj80Q7EO4DZu5h+4LRhAog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699490625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CZfaO8TA7Flfu8sc8cAJmu3nC4SEB5j4v1KQigbRKys=; b=fnQpZAERvJOkCvS8d06j0Slv4pYuQxIvm3kyK82x/ZBFvvSeUeWV5npcs/t7u46iys2cMc M56PjyP9FJn6rXIHPMorHZ0xr5HLUuKTnG7fXCb5smJdTvGFBQDYw2ivuZwU0S27X72231 HVIN3+tKQEOMn1iqF5yNk6UW7V1Su4HGYyJ5cyOwvoKmNdWXz7QlDMsmUQPSwGgCCbEzuS kdhV7LFskcck064I9pt4Qsh94yDReHc6yyjEebrx5L/lXnXvn43y84YxYxyGCJYKwWbDDk bQwp9hwANb7JBuWJehA2SDgISXiPy/zxSMY5hJJmAFkqTPWOmZsBRF0iBE8UrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699490625; a=rsa-sha256; cv=none; b=r56FklVCBaYyinRTtGD8C3MPnKSxkOVmFB0LLRZJkjC/DA5gd1XOqFo6h8DNAgXjd03BQI ik+4Xu2zhTTkd+bTUGmfmxU6ipUYUcjIkIWl6dIc2R1/7Tbb0RuZRS4gvofijpG4BkoI/w LreNISJBmaxXYxvzt5aSgcOj6lektBnuiG++cDUjHNSs0uyfn5DRVo55cuTS6rPlDKT52n gX/OX+VxLd+eUSVTrFggONC3cNT2mz3xYCpqvjS3KbTU/egtUvdQvbI0OibaQG4YuWH2MT u2AS2CGybvH/Uiq9mvVvi2dUsHcox8bm7DAJdckqt72FnRLOSxX2T/BQP8qmtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQjr14hrXzvQs; Thu, 9 Nov 2023 00:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A90hjOC079167; Thu, 9 Nov 2023 00:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A90hjxP079164; Thu, 9 Nov 2023 00:43:45 GMT (envelope-from git) Date: Thu, 9 Nov 2023 00:43:45 GMT Message-Id: <202311090043.3A90hjxP079164@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: 5fb425aa00df - main - dirdeps: Update liblldb dependencies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5fb425aa00df7c1282e03544f93676d447475be0 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=5fb425aa00df7c1282e03544f93676d447475be0 commit 5fb425aa00df7c1282e03544f93676d447475be0 Author: Ka Ho Ng AuthorDate: 2023-11-09 00:43:25 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-09 00:43:25 +0000 dirdeps: Update liblldb dependencies Sponsored by: Juniper Networks, Inc. MFC after: 3 days Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D42480 --- lib/clang/liblldb/Makefile.depend | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/clang/liblldb/Makefile.depend b/lib/clang/liblldb/Makefile.depend index b411ca49268d..3b2fbcc7b889 100644 --- a/lib/clang/liblldb/Makefile.depend +++ b/lib/clang/liblldb/Makefile.depend @@ -9,9 +9,13 @@ DIRDEPS = \ lib/libc++ \ lib/libedit \ lib/libexecinfo \ + lib/libkvm \ + lib/liblzma \ + lib/libz \ lib/msun \ - lib/ncurses/ncursesw \ - lib/ncurses/panelw \ + lib/ncurses/panel \ + lib/ncurses/tinfo \ + usr.bin/clang/lldb-tblgen.host \ .include From nobody Thu Nov 9 00:43:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQjr30MQPz4yrkW; Thu, 9 Nov 2023 00:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQjr26sTsz3Jfq; Thu, 9 Nov 2023 00:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699490627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ZOxMv/gzF1iS3uDhh9GtXigVMv5Ei1cf1W4H/zDeJ8=; b=xUR4bDoon+Ou3dmTWRAujIPzFJyiZytzEaI0grr+DfSyYF3Gl5URIyuwRQUwMXb1+TLST3 A9qhuqJ8xaLP8p0AaMHkMFSudZJ57V0y790oytkkWjGLQYwR6KHfEwJ5CKdvUelV8eYC2L zks2TiBZHs/Z8SfvtD3jjFa0OCEcNENDQkgILYEQD6uUoHDeGtM55gAAdSdMC9Gw/yeDEJ 52XAbw1XJwMwYrac2lExnUm6rCXbV7t9cFHjA8z+CANpDeOtZdzdEYHyYwmXicFPGiWpCr A1AqcfFXGbATFzsCjpUCPEB7ph77H3WubLEE1Pqb1hOaRFyMFxdeEice9VasnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699490627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ZOxMv/gzF1iS3uDhh9GtXigVMv5Ei1cf1W4H/zDeJ8=; b=t7jCzHMAvB2z9OdfXpZIgxJR1684Zj09XGwFQqzmoRoZ9/uhBA/f3V9ntJXGkiEoBqayF8 BCxRCDoztgUzYOxAgMcS2dQKat4YcdKmQX/S/39+kB/GccWle11EDVhmBw37HDvvEed3Tc 0f7wxzcKmxW7XXwzDkKHc0HtZerF6xzYFlLxwCHhEi7FHcmE4nF8yukmqIE5h+mE1GyQZA H6DtR5TISW9EYoySSqIv1hvgFONlfrRnbGDVvJZX1HtQ5OL504PqldFWv7MhFZlx65h2Di zVJxADTTBwmaiY8XvRgCxLZvnfZaRjXaftC0ozb4en0DuC+VZPULy552zijUqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699490627; a=rsa-sha256; cv=none; b=yzx0qHciA0YyucMPgyNhfinSXO78zSKCVMrjCK9hbvJFEvh8hjpyzMP5WqPLu7pI0jmP6A flsWPkR0w6Udntqh3RrapXECgRZuAEb28NF/TQvk84oY2WpT0umwIZF+h9McwAv/SnNceM g1gAw8BDr56KrYk9JpauY0dGsG1BM64O6SyziNFrNVsDJqLnCAZrNJ16MxFOZj2qpYZD27 cgcWApP8UEE1DGmrnUFX8UHDnd1QypvLI5LrMzYTY5/SM2jHxyic44cuzH4gPCiwELMazb w0xIAShP6+a2quAXC0FXC6Jtl92/WQo7g2/mi51ul4RsbW8uG0xx63n8L2JCuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQjr25ypnzvFZ; Thu, 9 Nov 2023 00:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A90hkmN079209; Thu, 9 Nov 2023 00:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A90hk6d079206; Thu, 9 Nov 2023 00:43:46 GMT (envelope-from git) Date: Thu, 9 Nov 2023 00:43:46 GMT Message-Id: <202311090043.3A90hk6d079206@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: f5b3e686292b - main - dirdeps: Update clang-tblgen dependencies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f5b3e686292b6502878c64c3c154908024e06eb6 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b3e686292b6502878c64c3c154908024e06eb6 commit f5b3e686292b6502878c64c3c154908024e06eb6 Author: Ka Ho Ng AuthorDate: 2023-11-09 00:43:29 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-09 00:43:29 +0000 dirdeps: Update clang-tblgen dependencies This unbreaks clang-tblgen build against the host pseudo platform. Sponsored by: Juniper Networks, Inc. MFC after: 3 days Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D42481 --- usr.bin/clang/clang-tblgen/Makefile.depend.host | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend.host b/usr.bin/clang/clang-tblgen/Makefile.depend.host index e41a35dcde12..5ae6e1d38324 100644 --- a/usr.bin/clang/clang-tblgen/Makefile.depend.host +++ b/usr.bin/clang/clang-tblgen/Makefile.depend.host @@ -1,6 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + lib/clang/libclangminimal \ lib/clang/libllvmminimal \ From nobody Thu Nov 9 10:33:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQywY703Vz50BZC for ; Thu, 9 Nov 2023 10:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SQywY6Tngz4HQr; Thu, 9 Nov 2023 10:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699526013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAYr/DfTmtsL9ugDhND/KyKp1DdeIBpPl620vuWl7ds=; b=j+V19WWrMXyYsqIHagveEh+pHPQIbbyrpkXpDtWuohy98/OQCHb521DHUGgEVaB3njPT+w Xik6VYPCCpdsKD0yV51KyLrrsa1FNThbDFnb54HKiXV36cAuLNig26yYg8T69kmMHCaYzk Z7f6+nqDfZm3EBXlBPRGjKFavuSy6C9XTnF/GtaqozyY8NwXoxTF41LkW0pfaMZGSBacxF 37+wVOgb2O6qBy4GlhqhOh32QYz3kHUTjdJNwUvIHGIgFqtOYmna0Q3LKyx8ynBzR7ht5n RtgKWgL/QTQWGqAiobRuWdGqDEff7cZgZSbG+iehJh1hs54dGD563e2AUxdJqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699526013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAYr/DfTmtsL9ugDhND/KyKp1DdeIBpPl620vuWl7ds=; b=Rezm0sDMjA3BxgFW3v5yaBscw8lU5XVgP/YR30qEIeuMNh3GHG5+MGqln8Q4V4k9JTpb9P QH0uvBmNQXb4kIpnV1J4QPMaSGKT8f+REKsGyH4+7eUBBSN1rsG4QnqqF4P2+hNTg81LLp pcK6Gg6Rc8CP9wLzdwZ1670Kkze7xqYz+i9sV8XKf4WnCzDGFQaxpbinD/iIV+3EI+0hhe Pd0JWVpslOoLxY2LBVMNM2myW1ZOr+rTflJxx4HTdUUd6dp4i/ZChpIaBTF4qACz6Ata/s VJ+ayvmvrBFAsyJSaguXgXVN2fBN1SFPUPSEdvajACMYoByUj4rawG2TKN043Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699526013; a=rsa-sha256; cv=none; b=dkbO6l1C07CZIaytUtsjxr9wtbbVGLeXMLjy3wCtlLNbQ5LL9gC6Vz1AmgdDHqcLiyn6/v ulfjCda2UtldoQh55F+6DM5SzntNpsLjjGhwTn+QPCCoaEcM0+VFI10x733t0qh4fVQQ48 daCsrYV+4LeEpaXJz/e3r3KXygqsDqjSqQVQA5B1ppfTdhd+/cbDqTm3x/lpqmi19Vnwlk GsQwEdMy4lZjgFiNNwLzk5A/odsb0fJ69Nyun1fE6EQjv5QnRxU60lEIy/wub3z8A/fZoF JB2+bV4d/6FQn5NbOF6f4GNru2jIqJW84rT6mdEdHdIn6vtggmVzClRAVaHJ0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQywY5Xhpz1B0y; Thu, 9 Nov 2023 10:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9AXXuf064388; Thu, 9 Nov 2023 10:33:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9AXX48064387; Thu, 9 Nov 2023 10:33:33 GMT (envelope-from git) Date: Thu, 9 Nov 2023 10:33:33 GMT Message-Id: <202311091033.3A9AXX48064387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 9198de8f1079..887a3c533b94 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 887a3c533b94a4b70075e310f15c45b9dee19410 X-Git-Oldrev: 9198de8f1079a8bbb837de3e3f8e236777b1375d X-Git-Newrev: 887a3c533b94a4b70075e310f15c45b9dee19410 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=9198de8f1079..887a3c533b94 5caeef02fa53 RAID-Z expansion feature 3a81bf4ad282 Workaround to allow openzfs-zfs-dkms install on Ubuntu a160c153e2f4 Linux: reject read/write mapping to immutable file only on VM_SHARED 1c1be60fa21e Unbreak FreeBSD world build after 3bd4df384 887a3c533b94 Increase L2ARC write rate and headroom From nobody Thu Nov 9 12:21:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR1KX3td9z50dbQ; Thu, 9 Nov 2023 12:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR1KX3Y76z4XkJ; Thu, 9 Nov 2023 12:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699532512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty8rGRRPmHdXmgDhONZ6RjaQPe1eWmKp1Zr7CdXQSSI=; b=C61He9jlG2FXJgHxW+zKBTqZvZUxq1VA/4GMKZtXzPpo8dgT0Piq+ot0DeJJJeh+9Cq7wX qpPQDCYGBJmWBZq6ctNTBfW1issz0RkXbkYu6bui7tvGofWpDZUhAiWzZwu8HkpNuw4E6R Nz/a2esB3B5dkwOYkTpcVHw2mMreIE1ARHEop8IIfmNKAN0IH/a1bBPEYgpaIp5y6RM+sz ewTSDLuQ4nVTGZ5oA9oR54SvQEHzd58KAU41UK8j5PfTy+x7Lxf8dFBvjdpFKw2FE4Veq3 4sjhWKCrRGrucE7FECtP4G7P8aSkeePCs4KzHslTrU1KLKrygVBy+k4+sAV9uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699532512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty8rGRRPmHdXmgDhONZ6RjaQPe1eWmKp1Zr7CdXQSSI=; b=LAkDHsILwzZAtNhRqbrXqtYBPFd54t83y2CoZ1YgIfZ7+n6+O5q8WUUac8FnT37BdKu/Dy T09JCPoM+cr0+wabZB27DJo8OIejMFQ4xz9TBZy50YPJtlYrDloYhC8nuIviMqr461+P9v Z4lbRZ1KLlPytA+o9qGeNDCtpxh90U3IKt8/n0gn40zBNSPm06jT0YbjBelEjIlvfTjOT5 WU/hrw7mJbbz2LLA3Wwum8H0FuUCl+l2d6MrMPQW2GgnacPtZ3D5lWAlXVrUzGA62wx7ws IsXXp0fZ8eGnOBfpWJ1ursyei2aJgq3FrErEgi5vQ6laibecYmU19x0NLsY9vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699532512; a=rsa-sha256; cv=none; b=O7XtBRxHooGTzvD7Abd0tu9EIjwsf4YIGS8SMb7o8H3dn/uVejvtyNErf7p7TxHO0VvmFs whkRm+CPFiHwFNuoLuhXgRPI1XRaxs8SqH/sGPkB4RYEUT9xN1ItkOFX+k/5jK5NttnkM7 HNARHklDQ3v8G6xXtbxb6mYwC+uMncq7Vw4Al5x+5hrKN2kvC2C5jTsQUlvV11FcFHV8Dd Z7QIWLY0DOFlrhNbGUPvc9nhceOtzA/9v/bHf+r8BSziNstW/58Nx31zLw9HX6+JHwdMEB VV+0daHOCyHvOAy6bse6A61TP4EmOFuF85SKBkr2KGtNv9FbX4TJ9i22dgulTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR1KX2dZFz1MZ; Thu, 9 Nov 2023 12:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9CLqGS044316; Thu, 9 Nov 2023 12:21:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9CLppr044313; Thu, 9 Nov 2023 12:21:51 GMT (envelope-from git) Date: Thu, 9 Nov 2023 12:21:51 GMT Message-Id: <202311091221.3A9CLppr044313@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: e716630d4cf8 - main - zfs: merge openzfs/zfs@887a3c533 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e716630d4cf89e69ec3f675ebfceee09f1a85e05 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e716630d4cf89e69ec3f675ebfceee09f1a85e05 commit e716630d4cf89e69ec3f675ebfceee09f1a85e05 Merge: f5b3e686292b 887a3c533b94 Author: Martin Matuska AuthorDate: 2023-11-09 10:42:33 +0000 Commit: Martin Matuska CommitDate: 2023-11-09 12:19:17 +0000 zfs: merge openzfs/zfs@887a3c533 Notable upstream pull request merges: #15022 5caeef02f RAID-Z expansion feature #15457 887a3c533 Increase L2ARC write rate and headroom #15504 1c1be60fa Unbreak FreeBSD world build after 3bd4df384 Obtained from: OpenZFS OpenZFS commit: 887a3c533b94a4b70075e310f15c45b9dee19410 cddl/lib/libzpool/Makefile | 1 + sys/contrib/openzfs/cmd/raidz_test/raidz_bench.c | 12 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.c | 196 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.h | 3 - sys/contrib/openzfs/cmd/zdb/zdb.c | 5 + sys/contrib/openzfs/cmd/zpool/zpool_main.c | 148 +- sys/contrib/openzfs/cmd/ztest.c | 912 ++++++- sys/contrib/openzfs/contrib/debian/control | 1 - .../contrib/pyzfs/libzfs_core/_constants.py | 2 + .../pyzfs/libzfs_core/_error_translation.py | 3 + .../contrib/pyzfs/libzfs_core/exceptions.py | 6 + sys/contrib/openzfs/include/libzfs.h | 1 + sys/contrib/openzfs/include/sys/fs/zfs.h | 25 + sys/contrib/openzfs/include/sys/spa_impl.h | 4 + sys/contrib/openzfs/include/sys/uberblock_impl.h | 35 + sys/contrib/openzfs/include/sys/vdev.h | 10 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 6 +- sys/contrib/openzfs/include/sys/vdev_raidz.h | 101 +- sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 47 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 1 + sys/contrib/openzfs/include/zfeature_common.h | 1 + sys/contrib/openzfs/lib/libzfs/libzfs.abi | 371 ++- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 47 +- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 5 + .../openzfs/lib/libzfs_core/libzfs_core.abi | 12 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 1 + sys/contrib/openzfs/man/man1/ztest.1 | 22 +- sys/contrib/openzfs/man/man4/zfs.4 | 25 +- sys/contrib/openzfs/man/man7/zpool-features.7 | 32 +- sys/contrib/openzfs/man/man8/zpool-attach.8 | 53 +- sys/contrib/openzfs/man/man8/zpool-wait.8 | 6 +- sys/contrib/openzfs/module/Kbuild.in | 1 + .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 59 + .../openzfs/module/os/linux/zfs/vdev_label_os.c | 45 + .../openzfs/module/os/linux/zfs/zfs_debug.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 4 +- .../openzfs/module/zcommon/zfeature_common.c | 5 + sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 12 +- sys/contrib/openzfs/module/zfs/dsl_scan.c | 1 - sys/contrib/openzfs/module/zfs/metaslab.c | 12 +- sys/contrib/openzfs/module/zfs/spa.c | 240 +- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 3 + sys/contrib/openzfs/module/zfs/vdev.c | 114 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 28 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 12 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 51 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2688 ++++++++++++++++++-- sys/contrib/openzfs/module/zfs/vdev_trim.c | 17 +- sys/contrib/openzfs/scripts/zloop.sh | 63 +- sys/contrib/openzfs/tests/runfiles/common.run | 6 +- .../openzfs/tests/zfs-tests/include/tunables.cfg | 3 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 10 +- .../functional/cli_root/zpool_get/zpool_get.cfg | 1 + .../tests/functional/raidz/raidz_002_pos.ksh | 34 +- .../tests/functional/raidz/raidz_003_pos.ksh | 41 - .../tests/functional/raidz/raidz_004_pos.ksh | 41 - .../functional/raidz/raidz_expand_001_pos.ksh | 215 ++ .../functional/raidz/raidz_expand_002_pos.ksh | 115 + .../functional/raidz/raidz_expand_003_neg.ksh | 102 + .../functional/raidz/raidz_expand_003_pos.ksh | 141 + .../functional/raidz/raidz_expand_004_pos.ksh | 121 + .../functional/raidz/raidz_expand_005_pos.ksh | 177 ++ .../functional/raidz/raidz_expand_006_neg.ksh | 78 + .../functional/raidz/raidz_expand_007_neg.ksh | 86 + sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 67 files changed, 5748 insertions(+), 884 deletions(-) diff --cc cddl/lib/libzpool/Makefile index d05babdc26e0,000000000000..c801cf571e88 mode 100644,000000..100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@@ -1,336 -1,0 +1,337 @@@ + +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +# ZFS_COMMON_SRCS +.PATH: ${ZFSTOP}/module/zfs +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/module/unicode +# LUA_SRCS +.PATH: ${ZFSTOP}/module/lua +# ZSTD_SRCS +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress + +.PATH: ${ZFSTOP}/module/os/linux/zfs + +.PATH: ${ZFSTOP}/lib/libzpool + +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack +.else +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern +ATOMIC_SRCS= opensolaris_atomic.c +.endif + +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" +# Don't waste GOT entries on small data. +PICFLAG= -fPIC +.endif + +PACKAGE= zfs +LIB= zpool + +USER_C = \ + kernel.c \ + taskq.c \ + util.c + +KERNEL_C = \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_zstd.c \ + zpool_prop.c \ + zprop_common.c \ + abd.c \ + abd_os.c \ + aggsum.c \ + arc.c \ + arc_os.c \ + blake3_zfs.c \ + blkptr.c \ + bplist.c \ + bpobj.c \ + bptree.c \ + bqueue.c \ + btree.c \ + brt.c \ + cityhash.c \ + dbuf.c \ + dbuf_stats.c \ + ddt.c \ + ddt_zap.c \ + dmu.c \ + dmu_diff.c \ + dmu_object.c \ + dmu_objset.c \ + dmu_recv.c \ + dmu_redact.c \ + dmu_send.c \ + dmu_traverse.c \ + dmu_tx.c \ + dmu_zfetch.c \ + dnode.c \ + dnode_sync.c \ + dsl_bookmark.c \ + dsl_dataset.c \ + dsl_deadlist.c \ + dsl_deleg.c \ + dsl_dir.c \ + dsl_crypt.c \ + dsl_pool.c \ + dsl_prop.c \ + dsl_scan.c \ + dsl_synctask.c \ + dsl_destroy.c \ + dsl_userhold.c \ + edonr_zfs.c \ + entropy_common.c \ + error_private.c \ + fm.c \ + fse_compress.c \ + fse_decompress.c \ + gzip.c \ + hist.c \ + hkdf.c \ + huf_compress.c \ + huf_decompress.c \ + lzjb.c \ + lz4.c \ + lz4_zfs.c \ + metaslab.c \ + mmp.c \ + multilist.c \ + objlist.c \ + pathname.c \ + pool.c \ + range_tree.c \ + refcount.c \ + rrwlock.c \ + sa.c \ + sha2_zfs.c \ + skein_zfs.c \ + spa.c \ + spa_checkpoint.c \ + spa_config.c \ + spa_errlog.c \ + spa_history.c \ + spa_log_spacemap.c \ + spa_misc.c \ + spa_stats.c \ + space_map.c \ + space_reftree.c \ + txg.c \ + trace.c \ + uberblock.c \ + unique.c \ + vdev.c \ + vdev_draid.c \ + vdev_draid_rand.c \ + vdev_file.c \ + vdev_indirect_births.c \ + vdev_indirect.c \ + vdev_indirect_mapping.c \ + vdev_initialize.c \ + vdev_label.c \ ++ vdev_label_os.c \ + vdev_mirror.c \ + vdev_missing.c \ + vdev_queue.c \ + vdev_raidz.c \ + vdev_raidz_math_aarch64_neon.c \ + vdev_raidz_math_aarch64_neonx2.c \ + vdev_raidz_math_avx2.c \ + vdev_raidz_math_avx512bw.c \ + vdev_raidz_math_avx512f.c \ + vdev_raidz_math.c \ + vdev_raidz_math_scalar.c \ + vdev_rebuild.c \ + vdev_removal.c \ + vdev_root.c \ + vdev_trim.c \ + xxhash.c \ + zap.c \ + zap_leaf.c \ + zap_micro.c \ + zcp.c \ + zcp_get.c \ + zcp_global.c \ + zcp_iter.c \ + zcp_set.c \ + zcp_synctask.c \ + zfeature.c \ + zfs_byteswap.c \ + zfs_chksum.c \ + zfs_debug.c \ + zfs_fm.c \ + zfs_fuid.c \ + zfs_sa.c \ + zfs_znode.c \ + zfs_racct.c \ + zfs_ratelimit.c \ + zfs_rlock.c \ + zil.c \ + zio.c \ + zio_checksum.c \ + zio_compress.c \ + zio_crypt.c \ + zio_inject.c \ + zle.c \ + zrlock.c \ + zstd_common.c \ + zstd_compress.c \ + zstd_compress_literals.c \ + zstd_compress_sequences.c \ + zstd_compress_superblock.c \ + zstd_ddict.c \ + zstd_decompress.c \ + zstd_decompress_block.c \ + zstd_double_fast.c \ + zstd_fast.c \ + zstd_lazy.c \ + zstd_ldm.c \ + zstd_opt.c \ + zthr.c + +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += vdev_raidz_math_sse2.c \ + vdev_raidz_math_ssse3.c \ + zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ + -DHAVE_AVX512BW +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +LUA_C = \ + lapi.c \ + lauxlib.c \ + lbaselib.c \ + lcode.c \ + lcompat.c \ + lcorolib.c \ + lctype.c \ + ldebug.c \ + ldo.c \ + lfunc.c \ + lgc.c \ + llex.c \ + lmem.c \ + lobject.c \ + lopcodes.c \ + lparser.c \ + lstate.c \ + lstring.c \ + lstrlib.c \ + ltable.c \ + ltablib.c \ + ltm.c \ + lvm.c \ + lzio.c + +UNICODE_C = u8_textprep.c uconv.c + +SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} + +WARNS?= 2 +CFLAGS+= \ + -DIN_BASE \ + -I${ZFSTOP}/include \ + -I${ZFSTOP}/lib/libspl/include \ + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ + -I${SRCTOP}/sys \ + -I${ZFSTOP}/include/os/freebsd/zfs \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ + -I${ZFSTOP}/module/icp/include \ + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ + -DHAVE_ISSETUGID \ + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ + -I${SRCTOP}/sys/modules/zfs \ + -I${ZFSTOP}/include/os/freebsd/zfs \ + -DLIB_ZPOOL_BUILD -DZFS_DEBUG \ + +# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look +# into libthr private structures. That's sooo evil, but it's only for +# ZFS debugging tools needs. +CFLAGS+= -DWANTS_MUTEX_OWNED +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include +CFLAGS.gcc+= -fms-extensions + +LIBADD= md pthread z spl icp nvpair avl umem + +# atomic.S doesn't like profiling. +MK_PROFILE= no + +CSTD= c99 + +# Since there are many asserts in this library, it makes no sense to compile +# it without debugging. + +CFLAGS+= -g -DDEBUG=1 + +# Pointer values are used as debugging "tags" to mark reference count +# ownerships and in some cases the tag reference is dropped after an +# object is freed. +CFLAGS.dbuf.c= ${NO_WUSE_AFTER_FREE} +CFLAGS.entropy_common.c= -fno-tree-vectorize +CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.error_private.c= -fno-tree-vectorize +CFLAGS.error_private.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.fse_compress.c= -fno-tree-vectorize +CFLAGS.fse_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.fse_decompress.c= -fno-tree-vectorize +CFLAGS.fse_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.hist.c= -fno-tree-vectorize +CFLAGS.hist.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_compress.c= -fno-tree-vectorize +CFLAGS.huf_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_decompress.c= -fno-tree-vectorize +CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.pool.c= -fno-tree-vectorize +CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.xxhash.c= -fno-tree-vectorize +CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress.c= -fno-tree-vectorize +CFLAGS.zstd_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_literals.c= -fno-tree-vectorize +CFLAGS.zstd_compress_literals.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_sequences.c= -fno-tree-vectorize +CFLAGS.zstd_compress_sequences.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_superblock.c= -fno-tree-vectorize +CFLAGS.zstd_compress_superblock.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_double_fast.c= -fno-tree-vectorize +CFLAGS.zstd_double_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_fast.c= -fno-tree-vectorize +CFLAGS.zstd_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_lazy.c= -fno-tree-vectorize +CFLAGS.zstd_lazy.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_ldm.c= -fno-tree-vectorize +CFLAGS.zstd_ldm.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_opt.c= -fno-tree-vectorize +CFLAGS.zstd_opt.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_ddict.c= -fno-tree-vectorize +CFLAGS.zstd_ddict.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress.c= -fno-tree-vectorize +CFLAGS.zstd_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress_block.c= -fno-tree-vectorize +CFLAGS.zstd_decompress_block.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} + +.include diff --cc sys/contrib/openzfs/module/os/linux/zfs/vdev_label_os.c index 000000000000,3d965b89a962..3d965b89a962 mode 000000,100644..100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/vdev_label_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/vdev_label_os.c diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh index 000000000000,063d7fa735df..063d7fa735df mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh index 000000000000,004f3d1f9255..004f3d1f9255 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh index 000000000000,4d85c46897b8..4d85c46897b8 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh index 000000000000,712b25261773..712b25261773 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh index 000000000000,2be55dae4254..2be55dae4254 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh index 000000000000,a31a7d254bfe..a31a7d254bfe mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_006_neg.ksh index 000000000000,35ba8bde2392..35ba8bde2392 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_006_neg.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_006_neg.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_007_neg.ksh index 000000000000,78294cb9e516..78294cb9e516 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_007_neg.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/raidz/raidz_expand_007_neg.ksh diff --cc sys/modules/zfs/zfs_config.h index dd1a926d286c,000000000000..686ab2e3f80d mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1149 -1,0 +1,1149 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ *** 656 LINES SKIPPED *** From nobody Thu Nov 9 14:35:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4Hf3krZz5184j; Thu, 9 Nov 2023 14:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4Hf3GXMz3PD6; Thu, 9 Nov 2023 14:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZVCYwX/fAbmcNHOTTaPyHIiBJvxzbxVETE4jKJE7N+A=; b=gu7r89AmnPJTlotmpFLppaDQ/GR3ZFeGb4CyQPRJL6P9BVzjOOqgsMgMcr5pEcgKEBuw3p mHh1Vwr/5y1qCAU8l0uzVvmFIUijUKWJLZdyMNdzCRijXs/5JDUrchn+LYxkj/x58Zt2Oy a1myC8FbpqojacQv5K7lSxQ6vV4kSXI/7Jrn4z8p4rbuvycZoC1cFzO+3ph99Dazf7flyZ XT74jWRgLGh0vYvcH8uHZNqjIwvrtkJwlWjK1cC5qYsgtQwV8gvoQcaBH1yyqycYHQTWUO 9NND7n3ZFXdQgUVtHooe7AUTyIuRrXCmxehnS5YpKwclcMIBaaHUhESlr7SHEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZVCYwX/fAbmcNHOTTaPyHIiBJvxzbxVETE4jKJE7N+A=; b=ERI1Hq9pIkaQT1zpCYJphYSO7pB3W+HRKSYaSToYN4jnNGAi9/N7zNnBw6pSgp80HaQ0YM 1e0dVXl7t2vdaINxlsw05H7X3uHxi9sTOgmgvJINNtgKf9PsLGy0gqdpE/njZ071C+OVLH F8ZXgW7jU42GUUC1jcqG/pr2oSj3Msyin+xtAaOwyhw+mfGPIK4K3CP2Ut+MWAavsDnI4K LPYvKVb9SA2H0aiuvf4rJPdC0oR+bi8y6jNqTY3gE7j+e+xcJdF2lF3iSzsV6KVkm1Gt6C MK/bhNWSeZNsctHu+Xm8u0hotSkKidO9VPbzW+JDoorcii6AqkBIH3m8GWJzGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540526; a=rsa-sha256; cv=none; b=TEnPpsERovmlevFZOdr06Y4w5Z8Ixcfk10YmSpayBRpwpWDtr7sd0Mjh4fvw0DF1XTSdCW J1yggdAmiIZuwK+yR+Zb5V4nC8RPNI0PIDppSLweRSrkAnQ2rJ36x0Ew45cBDmrgB/530T sB4yTOh7upYeppqqb9lXSKQsk9ChPYijU3BJlTGfimYEB5jI+q/v/qTUBh4fiatcAfBm7a Cq/D1oczpf8zMxjQWaJId6Kv6TjpsXI9jvZlzxMx34C9ive0DQHDwNiWhYKblh9DIvBke1 mhyVvd9CY0/Q3jZ/oSSsgWDn3dDut3I6RJArVgH6F84yh1Dhwx0AOI3o66bgsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4Hf2KGBz4R9; Thu, 9 Nov 2023 14:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EZQHI063759; Thu, 9 Nov 2023 14:35:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EZQ28063756; Thu, 9 Nov 2023 14:35:26 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:35:26 GMT Message-Id: <202311091435.3A9EZQ28063756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0d2ab4a4ced0 - main - pf: add hashtable row count SDT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d2ab4a4ced0f153a6b6a58ca3cfa6efbeeec7a2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d2ab4a4ced0f153a6b6a58ca3cfa6efbeeec7a2 commit 0d2ab4a4ced0f153a6b6a58ca3cfa6efbeeec7a2 Author: Kristof Provost AuthorDate: 2023-11-09 12:39:56 +0000 Commit: Kristof Provost CommitDate: 2023-11-09 13:21:53 +0000 pf: add hashtable row count SDT This allows us to figure out how many states each hashrow contains. That can be important to know when debugging performance issues. A simple probe could be: dtrace -n 'pf:purge:state:rowcount { @counts["states per row"] = quantize(arg1); }' dtrace: description 'pf:purge:state:rowcount ' matched 1 probe ^C states per row value ------------- Distribution ------------- count -1 | 0 0 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 8257624 1 | 14321 2 | 0 MFC after: 1 week Sponsored by: Modirum MDPay --- sys/netpfil/pf/pf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 4990dce653b1..d5a9583d83f8 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -137,6 +137,7 @@ SDT_PROBE_DEFINE3(pf, eth, test_rule, mismatch, SDT_PROBE_DEFINE2(pf, eth, test_rule, match, "int", "struct pf_keth_rule *"); SDT_PROBE_DEFINE2(pf, eth, test_rule, final_match, "int", "struct pf_keth_rule *"); +SDT_PROBE_DEFINE2(pf, purge, state, rowcount, "int", "size_t"); /* * Global variables @@ -2174,6 +2175,7 @@ pf_purge_expired_states(u_int i, int maxcheck) struct pf_idhash *ih; struct pf_kstate *s; struct pf_krule_item *mrm; + size_t count; V_pf_status.states = uma_zone_get_cur(V_pf_state_z); @@ -2181,6 +2183,7 @@ pf_purge_expired_states(u_int i, int maxcheck) * Go through hash and unlink states that expire now. */ while (maxcheck > 0) { + count = 0; ih = &V_pf_idhash[i]; /* only take the lock if we expect to do work */ @@ -2203,10 +2206,13 @@ relock: mrm->r->rule_ref |= PFRULE_REFS; if (s->rt_kif) s->rt_kif->pfik_flags |= PFI_IFLAG_REFS; + count++; } PF_HASHROW_UNLOCK(ih); } + SDT_PROBE2(pf, purge, state, rowcount, i, count); + /* Return when we hit end of hash. */ if (++i > pf_hashmask) { V_pf_status.states = uma_zone_get_cur(V_pf_state_z); From nobody Thu Nov 9 14:39:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4N82Y8xz4yvtR; Thu, 9 Nov 2023 14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4N82L4Rz3Pwb; Thu, 9 Nov 2023 14: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=1699540760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jjhiM5luoHtK41QelFLa05iHgBCkTZSDBGdBLyxgbJQ=; b=YZSyIzmUSPuiPSWQ0IOaLsUMw2hzl4rrHsCkpK1Lflqc7BjyNh+p1qpR5o2NnDPDuQiTKT rxK40Di63N5QrQEOxcnbxDbRYooNhbxSVJTXWyiP5zj+y3sYEcBZ1tzVwRg3Oi+imW0mxw 7t4SdmKFAzK70RC2oi+YffDoBAdifLWvgNhtu8sPM7sfbV/hfUjDp9CtJSSLepojVliNgW GRBI8IjYlFDIV7YanFsXoJOuUbxtzk4aiIBh4J9jZq2Ujqe7rcnHrvK2uwTNUnVdo8hdQv DBgaIF56oKF9uD4pgaCoJHTSoKw1+lR5r9WiPO7diVF5XJ1tklWq/u0b90unsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jjhiM5luoHtK41QelFLa05iHgBCkTZSDBGdBLyxgbJQ=; b=HFgEqjWzu3WqpcAKJ389RLQp/YkgSp6ewPzIlUUh/rgk9oWfHgVQbi3PJvaguYd69vkR5H lanl+BqOMxRa1IMl13xUpKPiqolMsIbABPuvvnvxaE0jN0wQII6joT4Qs033XzFMl2ryKK nLN083aqYmPxWNKHPGzAJ0ovNPOlHBPh+TTrhWhN4LeG38mb3s8dE1ArXblCL+GAMogP2R 9SR313d6STvRhCypa46U4Wp+jBK+WKEkpU3B2y43Ph2+OjOsM8IkVHgO34tQY/PI9h0iLe 7BHFZILmTGsmFOPRO/LPXAGT27ShyilLNyeoz+9QJUHBBusPwdMNSjTkNnbd/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540760; a=rsa-sha256; cv=none; b=REFHS3wKO7g3ApS8iyxEfeg31Aje9fc2YM3s9/fK8BhKu9gOELAdj0dkyhQr+9IJKcVKkP Oh7SQSXepl99akU21QM2zYiOuWtV4JwOqYq8XvmUAhMHgSpLIjkJ0UV7NSLHfbTCDA90DO +UJKzGHc2mvbXyc+bFLGvFxh4S6UgSnulAx89wQxlaHao/LBl/+lDVqFFgFxCiydUJyR4N oN+3mBO8oAak90lzg0XHK8mjBzwjOaWp4ahy7ni9zXgzd9SWb2byCL1x1zHLPMfW0MXnYm CqCUBv4e1ej3MZ1SgAlNUZc8kcB5orFMeEKi8OC+t6hCoHxRhLMxLp4F6QyipA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4N81LRdz4cH; Thu, 9 Nov 2023 14:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EdKsA064421; Thu, 9 Nov 2023 14:39:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EdK2L064418; Thu, 9 Nov 2023 14:39:20 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:39:20 GMT Message-Id: <202311091439.3A9EdK2L064418@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: 2f3f9c9d54bb - stable/14 - pf: fix pf divert-to loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f3f9c9d54bb274dfb5de40f4ce7ca944d4e05a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2f3f9c9d54bb274dfb5de40f4ce7ca944d4e05a5 commit 2f3f9c9d54bb274dfb5de40f4ce7ca944d4e05a5 Author: Igor Ostapenko AuthorDate: 2023-10-19 10:12:15 +0000 Commit: Kristof Provost CommitDate: 2023-11-09 09:55:45 +0000 pf: fix pf divert-to loop Resolved conflict between ipfw and pf if both are used and pf wants to do divert(4) by having separate mtags for pf and ipfw. Also fix the incorrect 'rulenum' check, which caused the reported loop. While here add a few test cases to ensure that divert-to works as expected, even if ipfw is loaded. divert(4) PR: 272770 MFC after: 3 weeks Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D42142 (cherry picked from commit fabf705f4b5aff2fa2dc997c2d0afd62a6927e68) --- sys/netinet/ip_divert.c | 31 ++- sys/netinet/ip_var.h | 10 + sys/netpfil/pf/pf.c | 32 ++- tests/sys/netpfil/pf/Makefile | 4 + tests/sys/netpfil/pf/divapp.c | 149 ++++++++++++++ tests/sys/netpfil/pf/divert-to.sh | 413 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 625 insertions(+), 14 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index dd0a8b74c013..ad95a1ce0d76 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -171,11 +171,19 @@ divert_packet(struct mbuf *m, bool incoming) u_int16_t nport; struct sockaddr_in divsrc; struct m_tag *mtag; + uint16_t cookie; NET_EPOCH_ASSERT(); mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); - if (mtag == NULL) { + if (mtag != NULL) { + cookie = ((struct ipfw_rule_ref *)(mtag+1))->rulenum; + nport = htons((uint16_t) + (((struct ipfw_rule_ref *)(mtag+1))->info)); + } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { + cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; + nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + } else { m_freem(m); return; } @@ -216,7 +224,7 @@ divert_packet(struct mbuf *m, bool incoming) divsrc.sin_len = sizeof(divsrc); divsrc.sin_family = AF_INET; /* record matching rule, in host format */ - divsrc.sin_port = ((struct ipfw_rule_ref *)(mtag+1))->rulenum; + divsrc.sin_port = cookie; /* * Record receive interface address, if any. * But only for incoming packets. @@ -265,7 +273,6 @@ divert_packet(struct mbuf *m, bool incoming) } /* Put packet on socket queue, if any */ - nport = htons((uint16_t)(((struct ipfw_rule_ref *)(mtag+1))->info)); SLIST_FOREACH(dcb, &V_divhash[DIVHASH(nport)], dcb_next) if (dcb->dcb_port == nport) break; @@ -304,6 +311,7 @@ div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, const struct ip *ip; struct m_tag *mtag; struct ipfw_rule_ref *dt; + struct pf_divert_mtag *pfdt; int error, family; if (control) @@ -390,13 +398,30 @@ div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, return (EAFNOSUPPORT); } + mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL); + if (mtag == NULL) { + /* this should be normal */ + mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, + sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); + if (mtag == NULL) { + m_freem(m); + return (ENOBUFS); + } + m_tag_prepend(m, mtag); + } + pfdt = (struct pf_divert_mtag *)(mtag+1); + if (sin) + pfdt->idir = sin->sin_port; + /* Reinject packet into the system as incoming or outgoing */ NET_EPOCH_ENTER(et); if (!sin || sin->sin_addr.s_addr == 0) { dt->info |= IPFW_IS_DIVERT | IPFW_INFO_OUT; + pfdt->ndir = PF_DIVERT_MTAG_DIR_OUT; error = div_output_outbound(family, so, m); } else { dt->info |= IPFW_IS_DIVERT | IPFW_INFO_IN; + pfdt->ndir = PF_DIVERT_MTAG_DIR_IN; error = div_output_inbound(family, so, m, sin); } NET_EPOCH_EXIT(et); diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 06560fb52afe..a8c687682af9 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -326,6 +326,16 @@ extern void (*ip_divert_ptr)(struct mbuf *m, bool incoming); extern int (*ng_ipfw_input_p)(struct mbuf **, struct ip_fw_args *, bool); extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); + +/* pf specific mtag for divert(4) support */ +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +struct pf_divert_mtag { + uint16_t idir; // initial pkt direction + uint16_t ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter +}; +#define MTAG_PF_DIVERT 1262273569 + #endif /* _KERNEL */ #endif /* !_NETINET_IP_VAR_H_ */ diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b80ec2bb303d..eb2e09b2e6f2 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7855,7 +7855,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, u_short action, reason = 0; struct mbuf *m = *m0; struct ip *h = NULL; - struct m_tag *ipfwtag; + struct m_tag *mtag; struct pf_krule *a = NULL, *r = &V_pf_default_rule, *tr, *nr; struct pf_kstate *s = NULL; struct pf_kruleset *ruleset = NULL; @@ -7945,21 +7945,26 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, off = h->ip_hl << 2; if (__predict_false(ip_divert_ptr != NULL) && - ((ipfwtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL)) != NULL)) { - struct ipfw_rule_ref *rr = (struct ipfw_rule_ref *)(ipfwtag+1); - if (rr->info & IPFW_IS_DIVERT && rr->rulenum == 0) { + ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL)) { + struct pf_divert_mtag *dt = (struct pf_divert_mtag *)(mtag+1); + if ((dt->idir == PF_DIVERT_MTAG_DIR_IN && dir == PF_IN) || + (dt->idir == PF_DIVERT_MTAG_DIR_OUT && dir == PF_OUT)) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { action = PF_DROP; goto done; } pd.pf_mtag->flags |= PF_MTAG_FLAG_PACKET_LOOPED; - m_tag_delete(m, ipfwtag); } if (pd.pf_mtag && pd.pf_mtag->flags & PF_MTAG_FLAG_FASTFWD_OURS_PRESENT) { m->m_flags |= M_FASTFWD_OURS; pd.pf_mtag->flags &= ~PF_MTAG_FLAG_FASTFWD_OURS_PRESENT; } + m_tag_delete(m, mtag); + + mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); + if (mtag != NULL) + m_tag_delete(m, mtag); } else if (pf_normalize_ip(m0, kif, &reason, &pd) != PF_PASS) { /* We do IP header normalization and packet reassembly here */ action = PF_DROP; @@ -8241,17 +8246,19 @@ done: if (__predict_false(ip_divert_ptr != NULL) && action == PF_PASS && r->divert.port && !PACKET_LOOPED(&pd)) { - ipfwtag = m_tag_alloc(MTAG_IPFW_RULE, 0, - sizeof(struct ipfw_rule_ref), M_NOWAIT | M_ZERO); - if (ipfwtag != NULL) { - ((struct ipfw_rule_ref *)(ipfwtag+1))->info = + mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, + sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); + if (mtag != NULL) { + ((struct pf_divert_mtag *)(mtag+1))->ndir = ntohs(r->divert.port); - ((struct ipfw_rule_ref *)(ipfwtag+1))->rulenum = dir; + ((struct pf_divert_mtag *)(mtag+1))->idir = + (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : + PF_DIVERT_MTAG_DIR_OUT; if (s) PF_STATE_UNLOCK(s); - m_tag_prepend(m, ipfwtag); + m_tag_prepend(m, mtag); if (m->m_flags & M_FASTFWD_OURS) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { @@ -8279,6 +8286,9 @@ done: ("pf: failed to allocate divert tag\n")); } } + /* this flag will need revising if the pkt is forwarded */ + if (pd.pf_mtag) + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_PACKET_LOOPED; if (pd.act.log) { struct pf_krule *lr; diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 44fe95680dfb..c9adab5626d4 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -2,10 +2,12 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf +BINDIR= ${TESTSDIR} TESTS_SUBDIRS+= ioctl ATF_TESTS_SH+= altq \ anchor \ + divert-to \ dup \ ether \ forward \ @@ -45,6 +47,8 @@ ATF_TESTS_PYTEST+= sctp.py # Tests reuse jail names and so cannot run in parallel. TEST_METADATA+= is_exclusive=true +PROGS= divapp + ${PACKAGE}FILES+= CVE-2019-5597.py \ CVE-2019-5598.py \ daytime_inetd.conf \ diff --git a/tests/sys/netpfil/pf/divapp.c b/tests/sys/netpfil/pf/divapp.c new file mode 100644 index 000000000000..908c41eaa67f --- /dev/null +++ b/tests/sys/netpfil/pf/divapp.c @@ -0,0 +1,149 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Igor Ostapenko + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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. + */ + +/* Used by tests like divert-to.sh */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + + +struct context { + unsigned short divert_port; + bool divert_back; + + int fd; + struct sockaddr_in sin; + socklen_t sin_len; + char pkt[IP_MAXPACKET]; + ssize_t pkt_n; +}; + +static void +init(struct context *c) +{ + c->fd = socket(PF_DIVERT, SOCK_RAW, 0); + if (c->fd == -1) + errx(EX_OSERR, "init: Cannot create divert socket."); + + memset(&c->sin, 0, sizeof(c->sin)); + c->sin.sin_family = AF_INET; + c->sin.sin_port = htons(c->divert_port); + c->sin.sin_addr.s_addr = INADDR_ANY; + c->sin_len = sizeof(struct sockaddr_in); + + if (bind(c->fd, (struct sockaddr *) &c->sin, c->sin_len) != 0) + errx(EX_OSERR, "init: Cannot bind divert socket."); +} + +static ssize_t +recv_pkt(struct context *c) +{ + fd_set readfds; + struct timeval timeout; + int s; + + FD_ZERO(&readfds); + FD_SET(c->fd, &readfds); + timeout.tv_sec = 3; + timeout.tv_usec = 0; + + s = select(c->fd + 1, &readfds, 0, 0, &timeout); + if (s == -1) + errx(EX_IOERR, "recv_pkt: select() errors."); + if (s != 1) // timeout + return -1; + + c->pkt_n = recvfrom(c->fd, c->pkt, sizeof(c->pkt), 0, + (struct sockaddr *) &c->sin, &c->sin_len); + if (c->pkt_n == -1) + errx(EX_IOERR, "recv_pkt: recvfrom() errors."); + + return (c->pkt_n); +} + +static void +send_pkt(struct context *c) +{ + ssize_t n; + char errstr[32]; + + n = sendto(c->fd, c->pkt, c->pkt_n, 0, + (struct sockaddr *) &c->sin, c->sin_len); + if (n == -1) { + strerror_r(errno, errstr, sizeof(errstr)); + errx(EX_IOERR, "send_pkt: sendto() errors: %d %s.", errno, errstr); + } + if (n != c->pkt_n) + errx(EX_IOERR, "send_pkt: sendto() sent %zd of %zd bytes.", + n, c->pkt_n); +} + +int +main(int argc, char *argv[]) +{ + struct context c; + int npkt; + + if (argc < 2) + errx(EX_USAGE, + "Usage: %s [divert-back]", argv[0]); + + memset(&c, 0, sizeof(struct context)); + + c.divert_port = (unsigned short) strtol(argv[1], NULL, 10); + if (c.divert_port == 0) + errx(EX_USAGE, "divert port is not defined."); + + if (argc >= 3 && strcmp(argv[2], "divert-back") == 0) + c.divert_back = true; + + + init(&c); + + npkt = 0; + while (recv_pkt(&c) > 0) { + if (c.divert_back) + send_pkt(&c); + npkt++; + if (npkt >= 10) + break; + } + + if (npkt != 1) + errx(EXIT_FAILURE, "%d: npkt=%d.", c.divert_port, npkt); + + return EXIT_SUCCESS; +} diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh new file mode 100644 index 000000000000..0a37cea78ad3 --- /dev/null +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -0,0 +1,413 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Igor Ostapenko +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +# +# pf divert-to action test cases +# +# -----------| |-- |----| ----| |----------- +# ( ) inbound |pf_check_in| ) -> |host| -> ( ) |pf_check_out| outbound ) +# -----------| | |-- |----| ----| | |----------- +# | | +# \|/ \|/ +# |------| |------| +# |divapp| |divapp| +# |------| |------| +# +# The basic cases: +# - inbound > diverted | divapp terminated +# - inbound > diverted > inbound | host terminated +# - inbound > diverted > outbound | network terminated +# - outbound > diverted | divapp terminated +# - outbound > diverted > outbound | network terminated +# - outbound > diverted > inbound | e.g. host terminated +# +# When a packet is diverted, forwarded, and possibly diverted again: +# - inbound > diverted > inbound > forwarded +# > outbound | network terminated +# - inbound > diverted > inbound > forwarded +# > outbound > diverted > outbound | network terminated +# +# Test case naming legend: +# in - inbound +# div - diverted +# out - outbound +# fwd - forwarded +# ipfwon - with ipfw enabled, which allows all +# + +. $(atf_get_srcdir)/utils.subr + +divert_init() +{ + if ! kldstat -q -m ipdivert; then + atf_skip "This test requires ipdivert" + fi +} + +ipfw_init() +{ + if ! kldstat -q -m ipfw; then + atf_skip "This test requires ipfw" + fi +} + +assert_ipfw_is_off() +{ + if kldstat -q -m ipfw; then + atf_skip "This test is for the case when ipfw is not loaded" + fi +} + +atf_test_case "ipfwoff_in_div" "cleanup" +ipfwoff_in_div_head() +{ + atf_set descr 'Test inbound > diverted | divapp terminated' + atf_set require.user root +} +ipfwoff_in_div_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000" + + jexec div $(atf_get_srcdir)/divapp 2000 & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is expected to "eat" the packet + atf_check -s not-exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_in_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div" "cleanup" +ipfwon_in_div_head() +{ + atf_set descr 'Test inbound > diverted | divapp terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_body() +{ + ipfwoff_in_div_body "ipfwon" +} +ipfwon_in_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_in_div_in" "cleanup" +ipfwoff_in_div_in_head() +{ + atf_set descr 'Test inbound > diverted > inbound | host terminated' + atf_set require.user root +} +ipfwoff_in_div_in_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 divert-back & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_in_div_in_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div_in" "cleanup" +ipfwon_in_div_in_head() +{ + atf_set descr 'Test inbound > diverted > inbound | host terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_in_body() +{ + ipfwoff_in_div_in_body "ipfwon" +} +ipfwon_in_div_in_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_out_div" "cleanup" +ipfwoff_out_div_head() +{ + atf_set descr 'Test outbound > diverted | divapp terminated' + atf_set require.user root +} +ipfwoff_out_div_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq no state" \ + "pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is expected to "eat" the packet + atf_check -s not-exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_out_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_out_div" "cleanup" +ipfwon_out_div_head() +{ + atf_set descr 'Test outbound > diverted | divapp terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_out_div_body() +{ + ipfwoff_out_div_body "ipfwon" +} +ipfwon_out_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_out_div_out" "cleanup" +ipfwoff_out_div_out_head() +{ + atf_set descr 'Test outbound > diverted > outbound | network terminated' + atf_set require.user root +} +ipfwoff_out_div_out_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq no state" \ + "pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 divert-back & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_out_div_out" "cleanup" +ipfwon_out_div_out_head() +{ + atf_set descr 'Test outbound > diverted > outbound | network terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_out_div_out_body() +{ + ipfwoff_out_div_out_body "ipfwon" +} +ipfwon_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_in_div_in_fwd_out_div_out" "cleanup" +ipfwoff_in_div_in_fwd_out_div_out_head() +{ + atf_set descr 'Test inbound > diverted > inbound > forwarded > outbound > diverted > outbound | network terminated' + atf_set require.user root +} +ipfwoff_in_div_in_fwd_out_div_out_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + # host router site + epair0=$(vnet_mkepair) + epair1=$(vnet_mkepair) + + vnet_mkjail router ${epair0}b ${epair1}a + ifconfig ${epair0}a 192.0.2.1/24 up + jexec router sysctl net.inet.ip.forwarding=1 + jexec router ifconfig ${epair0}b 192.0.2.2/24 up + jexec router ifconfig ${epair1}a 198.51.100.1/24 up + test $ipfwon && jexec router ipfw add 65534 allow all from any to any + + vnet_mkjail site ${epair1}b + jexec site ifconfig ${epair1}b 198.51.100.2/24 up + jexec site route add default 198.51.100.1 + test $ipfwon && jexec site ipfw add 65534 allow all from any to any + + route add -net 198.51.100.0/24 192.0.2.2 + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + # Should be routed without pf + atf_check -s exit:0 -o ignore ping -c3 198.51.100.2 + + jexec router pfctl -e + pft_set_rules router \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2001 no state" \ + "pass out inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2002 no state" + + jexec router $(atf_get_srcdir)/divapp 2001 divert-back & + indivapp_pid=$! + jexec router $(atf_get_srcdir)/divapp 2002 divert-back & + outdivapp_pid=$! + # Wait for the divappS to be ready + sleep 1 + + # Both divappS are NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 198.51.100.2 + + wait $indivapp_pid && wait $outdivapp_pid +} +ipfwoff_in_div_in_fwd_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div_in_fwd_out_div_out" "cleanup" +ipfwon_in_div_in_fwd_out_div_out_head() +{ + atf_set descr 'Test inbound > diverted > inbound > forwarded > outbound > diverted > outbound | network terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_in_fwd_out_div_out_body() +{ + ipfwoff_in_div_in_fwd_out_div_out_body "ipfwon" +} +ipfwon_in_div_in_fwd_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "ipfwoff_in_div" + atf_add_test_case "ipfwoff_in_div_in" + atf_add_test_case "ipfwon_in_div" + atf_add_test_case "ipfwon_in_div_in" + + atf_add_test_case "ipfwoff_out_div" + atf_add_test_case "ipfwoff_out_div_out" + atf_add_test_case "ipfwon_out_div" + atf_add_test_case "ipfwon_out_div_out" + + atf_add_test_case "ipfwoff_in_div_in_fwd_out_div_out" + atf_add_test_case "ipfwon_in_div_in_fwd_out_div_out" +} From nobody Thu Nov 9 14:39:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4N93kGKz4yvl2; Thu, 9 Nov 2023 14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4N937wXz3Q5K; Thu, 9 Nov 2023 14: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=1699540761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cHDtvtmoAGfoseK8SJFja+8z9MbQp5NzH6UmvMMmnI=; b=VGLVUinTCAMSKCTazX9gWrubQPCYwYMXxADvhYg7RXl7zZL9Ufzl67naMmWI0/JCrYyIoU 2FG3hHowZSRT05np5T4u/3suw0BVQc2U7faRgUuE3dMrkPyCX1yiekhQWFnO6En2JVEyMQ Qrm72JF+RcG/UMQYpUuJwInimmf1zYeu+YeHrxtAjWfwWoCOnMWKgHTqFwEEbc8EfQEf5W qz5PiGiSSUtReJU4tI+4/q24rkqGuX1R9zg8KL6OL7wihXMQHpm4TZHeihh15AeRunsSv7 okWGLrvCuiL7GSjtoChPA5H8DwgeV3S5Hgc9M1e4/6IyWdryKp6/TN1g45kK9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cHDtvtmoAGfoseK8SJFja+8z9MbQp5NzH6UmvMMmnI=; b=WAA5ENbxruJ+MCN7W8JaOSi/Xc6Le5vm/9tOSmIvanrN8t15QlJXi+g79ZDK2vD3E2LaoR ToRNnSf2e5HY4KRLrXLQ7rjuGdoviy1oB672Bi/UOisGuVBXUTa0NNHbGKlQZM6KQoGmLH t/KLe3kDC3d4wjCg9FKvMdGuJ1Rnr+kvotT9aFCVpNu4jkp4xo4IYTFH8qNrjPXtW39fR8 V9E0UX82/KCP11N33DVPBp3fyS6iGbldlZxa1qMoAM3+pzN3hHA3SUtyu+9Fs+Tyb5wjG8 rT9sVtYORq6bGm1lCb7dcX3E7s98RIxp/g/nXvo/zcXHDpQpeOPLYU1LpvTHyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540761; a=rsa-sha256; cv=none; b=PfT4ZxPoGlOrXicQ9wdoZ8BQpMLxys74mXytlf0TVN9zOFUEvn/Eh5RJYJxKPCyvwc4k6O EWKdn9MC7E+DZhuJCpz1E7OoY9gxKGtCDJrwAYcuG2OGEtBd0vMC1xpnZlzYB6dWRdt/K1 9LUJuKIqzXsZKmqkwR3gkYb25EUWkTJ4zqOvBQugyJ4VwoZKvoin5k6N4G+uOcQWXd0XQU S8cE9bOR3oAmttHwjPtnOs3ovXPau3hjTzEBRhgX77jLeehuXsNxEMrHRyvU8IWCVCr0Kt nAlwvixGMZt39ExRtBJ1UV1VR0oPYFsTkeehYeSdpZE1PtRl0IPH81U+ko3b3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4N91xPYz4cK; Thu, 9 Nov 2023 14:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EdLRX064483; Thu, 9 Nov 2023 14:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EdLp4064479; Thu, 9 Nov 2023 14:39:21 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:39:21 GMT Message-Id: <202311091439.3A9EdLp4064479@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: 3903a749c8bf - stable/14 - pf: use an enum for packet direction in divert tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3903a749c8bfcb50f85711ec95eecb8ce50644d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3903a749c8bfcb50f85711ec95eecb8ce50644d9 commit 3903a749c8bfcb50f85711ec95eecb8ce50644d9 Author: Kristof Provost AuthorDate: 2023-10-20 07:13:56 +0000 Commit: Kristof Provost CommitDate: 2023-11-09 09:56:20 +0000 pf: use an enum for packet direction in divert tag The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN instead of 1 when looking at a structure. And compilation time failure if anybody sets it to a wrong value. Using "port" instead of "ndir" when assigning a port improves readability of code. Suggested by: glebius MFC after: 3 weeks X-MFC-With: fabf705f4b (cherry picked from commit c1146e6ad67fb866c2472a1cbe5609fd939fd5ef) --- sys/netinet/ip_divert.c | 2 +- sys/netinet/ip_var.h | 14 ++++++++++---- sys/netpfil/pf/pf.c | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index ad95a1ce0d76..78ca36fc2a0f 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming) (((struct ipfw_rule_ref *)(mtag+1))->info)); } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; - nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + nport = htons(((struct pf_divert_mtag *)(mtag+1))->port); } else { m_freem(m); return; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a8c687682af9..a8a9adc1d4c6 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -328,11 +328,17 @@ extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); /* pf specific mtag for divert(4) support */ -enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +__enum_uint8_decl(pf_mtag_dir) { + PF_DIVERT_MTAG_DIR_IN = 1, + PF_DIVERT_MTAG_DIR_OUT = 2 +}; struct pf_divert_mtag { - uint16_t idir; // initial pkt direction - uint16_t ndir; // a) divert(4) port upon initial diversion - // b) new direction upon pkt re-enter + __enum_uint8(pf_mtag_dir) idir; // initial pkt direction + union { + __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter + uint16_t port; /* Initial divert(4) port */ + }; }; #define MTAG_PF_DIVERT 1262273569 diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index eb2e09b2e6f2..4990dce653b1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8249,7 +8249,7 @@ done: mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); if (mtag != NULL) { - ((struct pf_divert_mtag *)(mtag+1))->ndir = + ((struct pf_divert_mtag *)(mtag+1))->port = ntohs(r->divert.port); ((struct pf_divert_mtag *)(mtag+1))->idir = (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : From nobody Thu Nov 9 14:39:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4NB6L4Qz4yvyN; Thu, 9 Nov 2023 14:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4NB4J5wz3Q0d; Thu, 9 Nov 2023 14: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=1699540762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZgyfEktxtpfNrVNYKDMwz6GloX/dAGlEBRzi/VsQjY=; b=EB955uUtEnkyKW0CxZISLMtwpbpPNGV6W3iZDBif5YOfYiDeJ5Me2ZAoRArM+yIK62u3od AMb7DDNiGUXeALer7Tf4H6+cylbzZxN5S9GCt9ionSTQUfa1uqBbYpNFVWllGvWyi/xSm7 8gd/tD496lt+2HblpD0ts9YHztnbTkD55kyMJbOumwycCh1k8Y64ZzpdsJjts7WTNRJW4A pc84+c5otE4U7IQy5WMEII/cCf/lC1D8v/oCX1NjhTwpmaxBuhUI/hsPRKc/eT/CakSi2A gO/kLUMPOjGu9sBSPzWLR6EwaIbawJldNGYr9ZW1wYiopEgyPIp7wikUO24xJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZgyfEktxtpfNrVNYKDMwz6GloX/dAGlEBRzi/VsQjY=; b=EWzZS1Qu3jU3R8Z5V+2w0i6+DF1F7T7nK8N0q2sAwkEho7qKY/CFQAyfZyHLfOc+3nqbK1 dYUWUWV6aBtXXReD9xbPFRr7ssAZ5x2shx5TM7HvlApfkHYak+YEZrSGbykElqwGME8aXg ngIsZjBPAmg+tlrtx77J7IqSNT9NZXNQfqp509b7/dqnaoBlrHETplduTCrCm0B6haycMl dUF/z7t+qYpEBUwbXULCREwJhhwZ23BJLwzlOAdD2z8ruEB1wtI2zdX1JtWQicGOOyzQSO HCe+Vs+ge+I9NR2SCLDsWiICwO2kd423E33l+GSxG5sOupo+nUTwj1Wdtg4azQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540762; a=rsa-sha256; cv=none; b=pQ9HXsodx/JUInXO0KdtrermqBHxDY7fa9sU9GDIg9NnEmTvjDuajwd/OzgePZFnyrHtrJ aMwmYY3IDEFa+XwZxwq8CXxcOfg8RxqK/Z1NRkfuiET7c2JzLLoO/yhAX37zTzTkTm5KRX pDAkEC333ybyVCflXhpbkmRSAfDKIbbXG2Ri3hokca2twvVbZ0npSOjyTlrGfdZ0CIFFUl mg1QU9XSdRTa6eBkuXqH7KlzucvQWs3xoS9HQ6In1OVusldN6Ba/FyHmQ7EBK2W2/fBrKk XuA3SWb9vieI2XyLMo+JQfGdWD8IHhJ9Th7ZeNSJyulu41VxidhqAYVN2uJi5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4NB3NkPz4cL; Thu, 9 Nov 2023 14:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EdMXk064524; Thu, 9 Nov 2023 14:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EdMe3064521; Thu, 9 Nov 2023 14:39:22 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:39:22 GMT Message-Id: <202311091439.3A9EdMe3064521@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: 46a96d68f63f - stable/14 - ip_var.h: align comment style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 46a96d68f63fc7ba53642df43fc48c88d08e56ee Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=46a96d68f63fc7ba53642df43fc48c88d08e56ee commit 46a96d68f63fc7ba53642df43fc48c88d08e56ee Author: Igor Ostapenko AuthorDate: 2023-11-01 12:21:16 +0000 Commit: Kristof Provost CommitDate: 2023-11-09 09:56:26 +0000 ip_var.h: align comment style MFC after: 2 weeks Reviewed by: kp Pull Request: https://github.com/freebsd/freebsd-src/pull/883 (cherry picked from commit b68d2789f0d745d420203ca7dae9408f81cc7206) --- sys/netinet/ip_var.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a8a9adc1d4c6..3220679d749f 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -333,11 +333,10 @@ __enum_uint8_decl(pf_mtag_dir) { PF_DIVERT_MTAG_DIR_OUT = 2 }; struct pf_divert_mtag { - __enum_uint8(pf_mtag_dir) idir; // initial pkt direction + __enum_uint8(pf_mtag_dir) idir; /* initial pkt direction */ union { - __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon initial diversion - // b) new direction upon pkt re-enter - uint16_t port; /* Initial divert(4) port */ + __enum_uint8(pf_mtag_dir) ndir; /* new dir after re-enter */ + uint16_t port; /* initial divert(4) port */ }; }; #define MTAG_PF_DIVERT 1262273569 From nobody Thu Nov 9 14:40:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4PV4hNXz4ywFw; Thu, 9 Nov 2023 14:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4PV4Ck5z3Qrb; Thu, 9 Nov 2023 14:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEptvHbxibNocBLLvFD5YPzWgoodmLe5upTPukuvOe0=; b=r5zLMerJpWDjNeZbEQAxZWSo2xMPs7GmM2ifE/PN0IvF2TNlZ7VTKaq090C1ux5rwV0ntB KNdzU6sAn2FU6NKgbzzwyWXb+fOoJVofHtiOSDoA8q80wAKT/7kz/iAj/yXz/8WqGyOGwb tHiwigIV5NFMEFCrZ+e4E79pwjNeMrULwwX/qvy2j+9jdHQarbd3pZwe+Q7T2o+oHerBW7 gSRwnJGWJIelCeYXuqo9B2foyCyJD3hh6/AQc2djzFzG8TzxMowYo9LXhBeyyYMQJkxtWZ azxkIrfrO3otxnYvzwSR1+YPdQJ8y7ppXz5Hdm3y/f8cOhO5zS7Dty2gTY00jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEptvHbxibNocBLLvFD5YPzWgoodmLe5upTPukuvOe0=; b=NVumtjiK2GsPF8Uor1hQOvstVHo5hLry+jBlEjlaPBBW19P+eGH2zMAm9BOg+ujQt5uLX4 fplx20p2zfO67XVI76U7+VPWivh3gVGQ1jatm1FiYlAnKy2pcWxGo3sRwKExYSC+CpsjIu NXmT0dpiWCwbpMqe4UtDeDRIc7c+vumDHbF5hk5Q0NYmmXHb8+EEQoDG4EnRkyOmuWBeUF tcyN531wN/fOwwFt0vpeTlM3X3MgIS3kQk1S7Umh4BmO8dkzAohub5lyhcCUJq1EqGZVkS T54kZiuzJpRfCB7/9hRF9bUH4B/BKYSUe/3goUgTD6sw2N+3+5rjLx64FGlTvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540830; a=rsa-sha256; cv=none; b=b6lSgj21s2Hhjvu68TZ5/IdSyokn6+014BQybdXdXKp3hrWYtk2mvw9i4RVWqbAaShdnzl Uq8QHX9wY8GEe4M1VQomm0nGMXfzuvzg609Jm5K/XchhE/ZGRuRiT+nTZV5v2uqpSOWMUW k6RwJloGdtMBB70gHBbSC9PN/4V3IRvLbeHuFUeRsyUAMk9tZZC4uCqKYqhyJNJNlTNO0r +3pjZwaKg0DRn4QBiU+r1O6eKB7yeFbjzkA/mX7NMed2Gwz6rdBNzk+wQagrHNc2uEV56l r1+7bfs4t9/16o/6MGMrNl2+4SzzOQ7yi3tb9hdcBFvqvN8N5CBTmqCQ35BBqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4PV3GT9z4F6; Thu, 9 Nov 2023 14:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EeUwF073301; Thu, 9 Nov 2023 14:40:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EeUj5073298; Thu, 9 Nov 2023 14:40:30 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:40:30 GMT Message-Id: <202311091440.3A9EeUj5073298@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: 3c3a703ee657 - stable/14 - amd64: Remove PMAP_INLINE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3c3a703ee6572fa38768f14329154a10a490379b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3c3a703ee6572fa38768f14329154a10a490379b commit 3c3a703ee6572fa38768f14329154a10a490379b Author: Mark Johnston AuthorDate: 2023-11-02 18:30:10 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 14:39:57 +0000 amd64: Remove PMAP_INLINE With clang it expands to "inline"; clang in practice may inline externally visible functions even without the hint. So just remove the hints and let the compiler decide. No functional change intended. pmap.o is identical before and after this patch. Reviewed by: alc MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42446 (cherry picked from commit 2b084923824e0d5133fe5aff580b4e562fe7dd19) --- sys/amd64/amd64/pmap.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index eedbf8fd8067..233069d37bfb 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -338,16 +338,6 @@ safe_to_clear_referenced(pmap_t pmap, pt_entry_t pte) return (FALSE); } -#if !defined(DIAGNOSTIC) -#ifdef __GNUC_GNU_INLINE__ -#define PMAP_INLINE __attribute__((__gnu_inline__)) inline -#else -#define PMAP_INLINE extern inline -#endif -#else -#define PMAP_INLINE -#endif - #ifdef PV_STATS #define PV_STAT(x) do { x ; } while (0) #else @@ -1560,7 +1550,7 @@ pt_entry_t vtoptem __read_mostly = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1) << 3; vm_offset_t PTmap __read_mostly = (vm_offset_t)P4Tmap; -PMAP_INLINE pt_entry_t * +pt_entry_t * vtopte(vm_offset_t va) { KASSERT(va >= VM_MAXUSER_ADDRESS, ("vtopte on a uva/gpa 0x%0lx", va)); @@ -3623,7 +3613,7 @@ pmap_invalidate_all(pmap_t pmap) } } -PMAP_INLINE void +void pmap_invalidate_cache(void) { @@ -3974,7 +3964,7 @@ pmap_kextract(vm_offset_t va) * Add a wired page to the kva. * Note: not SMP coherent. */ -PMAP_INLINE void +void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { pt_entry_t *pte; @@ -4000,7 +3990,7 @@ pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) * Remove a page from the kernel pagetables. * Note: not SMP coherent. */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { pt_entry_t *pte; From nobody Thu Nov 9 14:40:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4PW6rgBz4yw0Z; Thu, 9 Nov 2023 14:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4PW4yr6z3Qxk; Thu, 9 Nov 2023 14:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+l/6iIUii5KFcLIZ0Cw1mywByMiJsAxwJb0E/XGL7k0=; b=dAm7VasoBMtkJzGpCXv1jSMZLL2j8IiNZzVjVgZbrL4ZGGrAFRQJkrNp0a/SwUxBkPj1Rc rKkB5rAU/V3WncQ+Ktt8RYP2WpyCT04xMPp0yzsPzjc6C7tqz+MN6fNXHTdo6DeI+dtpMl CUsvyECd1TStRAaLdsywpWuMpePPZ49B0+uoooFVoykB/57kG8cTgKgPjem/zxXyRvLPoJ F+GMu3nntiPXDANUv8I/sf8BofbXcHbA5J8Grk1BcZRL4ze0guuMqpO7djqaqjvS0bNBZT JoC4IKQa1Xk0lbUhXyITqREuDXPd0O16hMJcPwM8tYHKwqE/7DOcNF7TZ307HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+l/6iIUii5KFcLIZ0Cw1mywByMiJsAxwJb0E/XGL7k0=; b=aQYNT6q0Fo2Y6bBFMJ4OudBceHZkl/rG+lICc+4L/MwLnHyomzfxJyT3DZpKPDTBefvhub iIAak/0/Dkw6KoiLD3cgII1u10JpJsIoI6gXtL3+2gLi2aCZw13hEV3J1ZCRXurvL7dXSz DQG9x85e0bLxes0vxSuf3tiWaYZ/5QkbsGo2M7cfUxyCqDddlRMXCWlFmXOWBO0kFkmjG3 qkGZm1/29GPVUdLCSktH2jeJsY8GKy8uqDWYV/hnDv1F+3dp4JO1fpdh43KEmMWIZciBem J3UWc7zryti7GsHepoVoB3fhpr44niZFU8pb8nHFy/wWtcSADtdA2CnASdX64Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540831; a=rsa-sha256; cv=none; b=rYqVv0mNr8WIIP1foceGTdZ1IFFEtZvV01f9h0Iak/R/XhciJcy+9aG+KMaWup3YLWlzO7 q6SG9hAvTRayO9mNZ02hPWXlKnIzzK2yqDSWMhxR/cNHJb1WywGcpMAYoSPgbXOZiVSq7M hO6PxSc9Tk1AvupOpSgy1YoXiClzo5l73RygYQRNSg9+1pYnbVwVq81DLTZYfi/skmFd3m 0y1Fi0X0F+JAGYdXX1/STn0L5dwdqpkrpVjCsRRbvTRZ1dq3rbeAwhDZayLL39kmysynMx P6i6KlpEfUpKZrqACny3nOPY3kmpnPqUyWS46tQ7EefuxXOM3K621De3kg/Wbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4PW43JHz4cP; Thu, 9 Nov 2023 14:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EeVtZ073340; Thu, 9 Nov 2023 14:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EeVrE073337; Thu, 9 Nov 2023 14:40:31 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:40:31 GMT Message-Id: <202311091440.3A9EeVrE073337@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: 00c537586fdf - stable/14 - riscv: Retire PMAP_INLINE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 00c537586fdf5044f0cd52e566d4c18163b61e77 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=00c537586fdf5044f0cd52e566d4c18163b61e77 commit 00c537586fdf5044f0cd52e566d4c18163b61e77 Author: Mark Johnston AuthorDate: 2023-11-02 18:33:20 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 14:40:04 +0000 riscv: Retire PMAP_INLINE pmap_kremove() is not called from within pmap.c, so there's no reason to inline it. No functional change intended. Reviewed by: alc, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42287 (cherry picked from commit 953345922398ae6c029713087c8494a346d90c85) --- sys/riscv/riscv/pmap.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 49ee54b37918..1d1d0fc839ca 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -173,16 +173,6 @@ #define NUL1E (Ln_ENTRIES * NUL0E) #define NUL2E (Ln_ENTRIES * NUL1E) -#if !defined(DIAGNOSTIC) -#ifdef __GNUC_GNU_INLINE__ -#define PMAP_INLINE __attribute__((__gnu_inline__)) inline -#else -#define PMAP_INLINE extern inline -#endif -#else -#define PMAP_INLINE -#endif - #ifdef PV_STATS #define PV_STAT(x) do { x ; } while (0) #define __pv_stat_used @@ -1054,7 +1044,7 @@ pmap_kenter_device(vm_offset_t sva, vm_size_t size, vm_paddr_t pa) * Remove a page from the kernel pagetables. * Note: not SMP coherent. */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { pt_entry_t *l3; From nobody Thu Nov 9 14:41:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4QR4WVwz4yw9v; Thu, 9 Nov 2023 14:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4QR07ylz3Rtq; Thu, 9 Nov 2023 14:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnTtRuxX+2ik/Mels5s2ct2RE+yVNCnG+3L3gW+a4Uw=; b=rMta8epIHkMumWNsc82OSysbwAI1hBigbVGahrTnI1Z2Z6jX5lXteJ0FlZA/Av+16Tp+Vy Zxp2ZGiBfugP9Jz48YBtNjWiohpcnbJgUJkk8rSgGNgyFApsF+H47AdGOP33CohfLt8x5k lYolGGkWT2K1/SYzXpN3aeLYlUJQ3RJnTkNR6x0AOou8mNuxVQIumFA+VnML72brJ7PWiW Yzh+s7+F+mR2WVFrxmF7lrZ5PPk59Vg1ANfqjboNqb2CLWZL1fm5tNeYxWIs/Mbtw4ltBu ANizK+42RK9/xIPRuyGFHSCOE/5oTYE9BNFhoyFvyV/vKo+c0f6e696AQxuWgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnTtRuxX+2ik/Mels5s2ct2RE+yVNCnG+3L3gW+a4Uw=; b=HykvKy6LItQDTvXsaE5qRVwWIklpEKlraoUZXd0LejtNlZEVx/MxCl0RqS+IfCZH0bbn3T diCynCYXNmmP/DsEUMuUcENf2t8H5mPtwDgBIpi6itQRzJXbAMaoH+JFbKeMcY4LpDtT1c D27iWB+HeHe8HaxZpDB0BpQJT1CUlrGujy88T6nE2kHhQ8XJfsMKgZjhJeSyAXbzs2keqG QC4x6nimRpsX486vdal/CAvfUFgaIdUAJxJOz2+qcpVOIFUDBsjIE7tXmINUBxdsm1UXPH 6ukj7+e90WCGcElXeN70I6y+rE539K97K3gnhTO4aN2WscT6IDAE92LJ4DvG8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540879; a=rsa-sha256; cv=none; b=DWW31wrrj37F1kDaICdK0OwrYvaV36+H4XKhUXl52++1QvAfSD0m0jAmN6i1vWpmIr1mDq D9foECafOxz/rvyzFDqvOPj4ws4WKJx4p+HcG5tW5UbOBwxfkFQglFB69rWHONftLMXL76 GuBkVsnXTeH7lFRkPtSztZ1OrTz4lnZAGFCFiz6EqXKUMajXDdak7+514a7CPs1gLjtpjE PEZKx06mxH9bTGFYFuQ6TUZgW8H5LRJfkNH7nQ50EUlv4qMNI1gcfvtMvPPtzZ0/ZHY5I4 Yof+FIbD0+Pv4MFxHe6UitZQaJpk+3g4GEWWtQima0FXBxHWxk8KYsMOj+8ApQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4QQ6LlQz4cg; Thu, 9 Nov 2023 14:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EfIto078560; Thu, 9 Nov 2023 14:41:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EfIQe078557; Thu, 9 Nov 2023 14:41:18 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:41:18 GMT Message-Id: <202311091441.3A9EfIQe078557@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: a8043cc0d49b - stable/14 - makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23 commit a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23 Author: Mark Johnston AuthorDate: 2023-11-08 12:00:43 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 14:41:09 +0000 makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags This flag was leftover from testing and should have been removed. PR: 274938 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 50565cf514d32ee02a24f420551c7e65631b0716) --- usr.sbin/makefs/zfs/fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c index b0a4c639f256..9413241da0c7 100644 --- a/usr.sbin/makefs/zfs/fs.c +++ b/usr.sbin/makefs/zfs/fs.c @@ -403,8 +403,8 @@ fs_populate_sattrs(struct fs_populate_arg *arg, const fsnode *cur, } daclcount = nitems(aces); - flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_NO_EXECS_DENIED | - ZFS_ARCHIVE | ZFS_AV_MODIFIED; /* XXX-MJ */ + flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_ARCHIVE | + ZFS_AV_MODIFIED; gen = 1; gid = sb->st_gid; mode = sb->st_mode; From nobody Thu Nov 9 14:41:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4QS3Gw3z4ywPZ; Thu, 9 Nov 2023 14:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4QS1DBHz3RXL; Thu, 9 Nov 2023 14:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GCeVQZBBkb/NxqiR6NHyJEOmuz60P1XpqPYXL4w8kU=; b=xVzeHby1j03S7ihA/XkvHLt1VX++2JMBtiesM1bt+4CAemSs8wZXoCI9gEw/NVZOmmfMk4 DXFnP509ekNm+18EACb62NNeLOtKJsQASRQYTBrLW4ZdJhTT+dGGT6Z0eiAN0J/vY6IDCZ VIjyvtMg2VB0MgW17m7uiZduXoMbsCDEwWWhUHlZaDqBzgSMx1sZMQgmI7I5+SYTPl3qsJ eX93SJ8RIBa6GcfXJ4zmkBes3VqqOi6UaXW8u7Oa3U48aIN+/Nj3DKvQMA2jtaeTKd7ol2 gpbIJ2tSlBbFIuKzLA4AHsw0mUi+G+hRDmCUMB10wfX/G9VMy6lhbrR/9VaJjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6GCeVQZBBkb/NxqiR6NHyJEOmuz60P1XpqPYXL4w8kU=; b=VV7ZcJFWYAepCD312Yi4ef/yp+7lKYMSRqoDNufKQ09r4Z+S+qyx18+Q8We74rh5Urereq FTg2kddKFOB/FIbtaWrY9Qx3ONzFZD384Ncsrnr9U9EWgdS0OdECVSLwo7ZKSxotc50Zjy AZ9NSke3Pnc8HEil19PrrWBKiYTnYX2MQEpxg9mOtDKuN/SEQBnatIqFIOcDJXHFZhxBBC cD41pSbFWTho9nXbkCbZU0GOwe5BlrT1ETj+AYFsBZ4ftQFS1f891lS2wFaQAN3Pb+O1ji SEt4UPYP7q6L4cG2EyBAK95U3gd3alXMgAApUPDuVOeu0t99QAD/al4G2NoaGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540880; a=rsa-sha256; cv=none; b=NI08Z6aLBo+8+6rjvuCM/7lIOx9WlaIvSyqp9cqIU4emoJSQHwmqV5mxIDVeUyDRhFIsvS 1HuGnjHQtsnP84S47SXL34//R5rzWqKBydKU8PHxVF8mo1Ru5NijO7va/6kYyPtfjJDJIc rEbA+SCk8mt2Q8aNQDywrUhxUyXvcR/bl2RJXZQmJASp9LtR2fTqLm32g3Gt2k4s0YqAvR FN5zj8yud1PClvfSj/zkQqFP3n3W/r9Qsv1oWmeLmtbAOJxqgaBoF7Zt0iBxo3Z9LvVVqT gSCCMoD6nnGHqqbwodVoy2PFu193mlBkwvxAx1Dbcnl/GsNOvdCZVARmY4qncQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4QS0Dg2z4fT; Thu, 9 Nov 2023 14:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EfJjh078617; Thu, 9 Nov 2023 14:41:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EfJqv078614; Thu, 9 Nov 2023 14:41:19 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:41:19 GMT Message-Id: <202311091441.3A9EfJqv078614@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: 5a36abc20348 - stable/14 - makefs/zfs: Add a regression test which checks file access permissions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5a36abc2034805cec066cf0ac54ec4d25e4a22c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5a36abc2034805cec066cf0ac54ec4d25e4a22c4 commit 5a36abc2034805cec066cf0ac54ec4d25e4a22c4 Author: Mark Johnston AuthorDate: 2023-11-08 12:04:33 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 14:41:10 +0000 makefs/zfs: Add a regression test which checks file access permissions MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 7e5002e3d6038b69e23f6c1982caf20cd62139f7) --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 1811b1bc8a8c..6e20ae33b354 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -794,6 +794,49 @@ used_space_props_cleanup() common_cleanup } +# Verify that file permissions are set properly. Make sure that non-executable +# files can't be executed. +atf_test_case perms cleanup +perms_body() +{ + local mode + + create_test_dirs + cd $TEST_INPUTS_DIR + + for mode in $(seq 0 511); do + mode=$(printf "%04o\n" $mode) + echo 'echo a' > $mode + atf_check chmod $mode $mode + done + + cd - + + atf_check $MAKEFS -s 1g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + + check_image_contents + + for mode in $(seq 0 511); do + mode=$(printf "%04o\n" $mode) + if [ $(($mode & 0111)) -eq 0 ]; then + atf_check -s not-exit:0 -e match:"Permission denied" \ + ${TEST_INPUTS_DIR}/$mode + fi + if [ $(($mode & 0001)) -eq 0 ]; then + atf_check -s not-exit:0 -e match:"Permission denied" \ + su -m tests -c ${TEST_INPUTS_DIR}/$mode + fi + done + +} +perms_cleanup() +{ + common_cleanup +} + atf_init_test_cases() { atf_add_test_case autoexpand @@ -817,6 +860,7 @@ atf_init_test_cases() atf_add_test_case soft_links atf_add_test_case root_props atf_add_test_case used_space_props + atf_add_test_case perms # XXXMJ tests: # - test with different ashifts (at least, 9 and 12), different image sizes From nobody Thu Nov 9 14:46:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4XC1Hksz4yxhc; Thu, 9 Nov 2023 14:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4XC0csqz3Sps; Thu, 9 Nov 2023 14:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699541179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OLyJitw3DU4pq/ekFs04Oth3op7xM+dOmPVgNX0NXk=; b=pmYVNO4GWC37Zn0xKdZjliyBWykQhoVk2ekCVMzqE8g0ghsnGzj39mfnwg292FvsiSnRwI 3YNiw3TNPyMQfuPd6muNmY3voycTrZWbNL3QX/dIpFSCpup+LHiHbN3oSwH8OB047H+Xxm aAPc26cdZMjpL1otL7sc0pU7lZZcnjJv72hsDAYhlje4uNUyqxRQM9GONYH4+vg0gtsqUs rDV5Io9G8xx+puJZ0FEIPwlQ/YPdZUl3aQR7gBFLKWSQhILM7G1o3m8KHd0Pa88QbbZ9vx 37lNuJ2Sv6l1tSY/EknEKXXVfc0c54fKmdzealZR+BcjvAhD115EPPg0Vpue5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699541179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OLyJitw3DU4pq/ekFs04Oth3op7xM+dOmPVgNX0NXk=; b=f7igk8sD5JnF5gBiAxpsig4u0gNXXmfssCErPvXaFpynSJ4F1Y/m9AWcAykOLz6iXAoLiK /uWuUL3UrbgLY+leIOMY7KB+xbS+1oTVWRnYPNdK25fu5m4GaK4+Z0X1pyayxSmsR4HaFa ZlmZfyocV3LoOu51qiIiRNbJW6tr41B/FqbAunXS3tOP06sz+J+xtQUcCX3yX3tawtavEH FJ1oQ6S3mRPYuZja+Ig4YrmSvsMXjvKsN0rkrw0o3ZwywI45aV4x8N6J2639NohjtO+BHs sOVGnLT41Nm/SHn68KWQyTpH/SYxijHfQ806MuDHlvktl57JcEEP/CX9JJKeWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699541179; a=rsa-sha256; cv=none; b=EumeGsIhWrJELARHeWTn1ouZwMP2fXyREZQT44AG3aIPCo8JlQihbDoDn5bI5qz8x1YYuY KG1r9YZyHuxjwxeGkXVEwjh8H+Nsq1z3OBUPxW1SUHakJp/8VGfysCz87YI/iyHGi9E45E rEu/Bewyw38Idp5lEA9KBQZoRYS2mG7V7rml1kJOZLZd895dyp4woKqzedqgzN9wO0AgwJ 8Z1qm+d+SdcG1lS5jHo1gNhweDe3Kdh6CCPIuPep3YT8epLXrZkEx/Os0e4ZQVNEcgp4oO uKjGEm+RCkdeJgxfN7YER/UPHL9WSrJjLjniGqWgu92toHWSqnrAwXNUTfLX8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4XB6g2yz4qJ; Thu, 9 Nov 2023 14:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EkIVA081784; Thu, 9 Nov 2023 14:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EkIMG081781; Thu, 9 Nov 2023 14:46:18 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:46:18 GMT Message-Id: <202311091446.3A9EkIMG081781@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: ff69d13a50d1 - main - if_tuntap: support receive checksum offloading for tap interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ff69d13a50d1d07601de0885fd94f6a09a7ba383 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ff69d13a50d1d07601de0885fd94f6a09a7ba383 commit ff69d13a50d1d07601de0885fd94f6a09a7ba383 Author: Michael Tuexen AuthorDate: 2023-11-09 10:37:27 +0000 Commit: Michael Tuexen CommitDate: 2023-11-09 10:37:27 +0000 if_tuntap: support receive checksum offloading for tap interfaces When enabled, pretend that the IPv4 and transport layer checksum is correct for packets injected via the character device. This is a prerequisite for adding support for LRO, which will be added next. Then packetdrill can be used to test the LRO code in local mode. Reviewed by: rscheff, zlei MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42477 --- sys/net/if_tuntap.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index a865c23cb372..30d1d84b2f59 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -977,6 +977,8 @@ tuncreate(struct cdev *dev) ifp->if_flags = iflags; IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen); ifp->if_capabilities |= IFCAP_LINKSTATE; + if ((tp->tun_flags & TUN_L2) != 0) + ifp->if_capabilities |= IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6; ifp->if_capenable |= IFCAP_LINKSTATE; if ((tp->tun_flags & TUN_L2) != 0) { @@ -1784,9 +1786,35 @@ tunwrite_l2(struct tuntap_softc *tp, struct mbuf *m, return (0); } - if (vhdr != NULL && virtio_net_rx_csum(m, &vhdr->hdr)) { - m_freem(m); - return (0); + if (vhdr != NULL) { + if (virtio_net_rx_csum(m, &vhdr->hdr)) { + m_freem(m); + return (0); + } + } else { + switch (ntohs(eh->ether_type)) { +#ifdef INET + case ETHERTYPE_IP: + if (ifp->if_capenable & IFCAP_RXCSUM) { + m->m_pkthdr.csum_flags |= + CSUM_IP_CHECKED | CSUM_IP_VALID | + CSUM_DATA_VALID | CSUM_SCTP_VALID | + CSUM_PSEUDO_HDR; + m->m_pkthdr.csum_data = 0xffff; + } + break; +#endif +#ifdef INET6 + case ETHERTYPE_IPV6: + if (ifp->if_capenable & IFCAP_RXCSUM_IPV6) { + m->m_pkthdr.csum_flags |= + CSUM_DATA_VALID_IPV6 | CSUM_SCTP_VALID | + CSUM_PSEUDO_HDR; + m->m_pkthdr.csum_data = 0xffff; + } + break; +#endif + } } /* Pass packet up to parent. */ From nobody Thu Nov 9 14:49:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR4bv07yvz4yyHQ; Thu, 9 Nov 2023 14:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR4bt6pBMz3TPW; Thu, 9 Nov 2023 14:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699541371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+pKcVEzLs7exjj7PpqzcfQ/N1Df0X6Mn8CeorEi5sU=; b=epDqMWokT/3yz9MRjbRf1Qm28Yslbg1XenuJPr6YiDMiKKJQwu31tbvDEjBRF68YJVSWBy 2PeVBYStlF2/iLTKCxWKLij8EPsOSRbqOoKr4FaMRJeu2x4+u9QFoKlQ+Lp6/AH9uameeF 3QLpUyRh03PPlbyJfp+lYJhnIE4hTjzYSuF1kOAMwsGCA3E+/+T3AAMdz2H/53aiJ/EwBx uSEvJSub/2AgCsYaB8Z4LqrjwF3JJGNq5aVQAY6Lp79iFLIV6TXEWADmlALiz64z5h7j9t ygPNiwMG25wufjTQal5FPmTUnN46TtpRrmXNV1Ysy7+JZW587dJrDPcLwLEZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699541371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+pKcVEzLs7exjj7PpqzcfQ/N1Df0X6Mn8CeorEi5sU=; b=CyBhPUzqTo+5fmtlsPNT2feEl9QoRaBFMH1JX3toHB+s6Z+gJQiB1z3m6xZLIxF2nSEtg3 r6zLCFslIDbg4RNyD/d2ltD8dRClgC6bYsA3VdIsVkpbB39khsT1bKC8FV2xzoCJSVPgut aKE8dWyGFXfIlB8YPwuqXgu6LNv3tVllJEh31ykABiiGCg9uk9BBqoM08+fs8EpOWi5NYi gyecznsffT4LjvrFdxuvCfqm5TTMPSZyOf2tHYNbfRbqDMt0njkeMJkDVFvJIQqjaj/x+4 tpNrtY/Sczp2J2wVHDmmfanPPJvO9dmQkW8PV1jv94aRAAT52Gxvc7ItbfD9+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699541371; a=rsa-sha256; cv=none; b=TxPSvmMNoIEE2ZkpMe0qyl1/ou+303QTLeHrHsmDOLQ1C2x0Z6X48V/zJd2GQvvIudh/z5 dGaRWvpn8IAlgLfvtnHcTAeMqMG3Wcc+uK1qWQYXUZfODuQ+hPE4weg+v5gnJMN6Zzl8la 284BhBh19yKbq6wva8+2p9TY/0I/Gw6bMu1jrdBiSDpJi9NLgqDaXw2MNZre5FDjp+Pauh enrQ5GSmPgPpMO0zzmhxwS3ta5kI+kfZXgJ0pkPaYwVGqaP/nw3klDieZ/JJDbhJKJQG4k tmWideWJrdW+XmqMTRru9vJ2p+/xYod+LZ3etjn6qFfebv8p2kpOTdVTLXZK3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR4bt5s5Qz4v8; Thu, 9 Nov 2023 14:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EnUOA082311; Thu, 9 Nov 2023 14:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EnUlZ082308; Thu, 9 Nov 2023 14:49:30 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:49:30 GMT Message-Id: <202311091449.3A9EnUlZ082308@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: 44669b765049 - main - if_tuntap: remove redundant check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44669b76504991ef3ac10ef10bc0fa931ae79c45 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=44669b76504991ef3ac10ef10bc0fa931ae79c45 commit 44669b76504991ef3ac10ef10bc0fa931ae79c45 Author: Michael Tuexen AuthorDate: 2023-11-09 10:43:54 +0000 Commit: Michael Tuexen CommitDate: 2023-11-09 10:43:54 +0000 if_tuntap: remove redundant check eh can't be NULL, so there is no need to check for it. Reported by: zlei MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/net/if_tuntap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 30d1d84b2f59..8881bbaec070 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1779,7 +1779,7 @@ tunwrite_l2(struct tuntap_softc *tp, struct mbuf *m, eh = mtod(m, struct ether_header *); - if (eh && (ifp->if_flags & IFF_PROMISC) == 0 && + if ((ifp->if_flags & IFF_PROMISC) == 0 && !ETHER_IS_MULTICAST(eh->ether_dhost) && bcmp(eh->ether_dhost, IF_LLADDR(ifp), ETHER_ADDR_LEN) != 0) { m_freem(m); From nobody Thu Nov 9 15:17:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR5Cv2qn7z5055x; Thu, 9 Nov 2023 15:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR5Cv2Mnqz3YFs; Thu, 9 Nov 2023 15:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699543035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYs3PsGMizl5en0cypCC/j0SDyJNm7VCgYtfYjVtiPQ=; b=DP2M9pHfO1SVWtAaEYlU0Lmd0U2zzbw8zN3qbXW0MqOMOHWZtXfme+w9kMFHvIHqTiqIjG y87IRY8X/4avARhUgyrClmD4uvCaHmZRxgwsg0Zm1yTByFNqYZAhMZeI8ZcmJmRLCavkyw uGQ7xnqYI+XXAs+7kGLUn4iwOc3p09cxlvhnETtGuGY+PqTSl4oSlaMlD4lvDyLxYAw4zv siJGlVE3FzFiaYqRe+jKnG+S+0i1ol+dgrkForqjByBetATRp7K8eg/W5Uir1L9R0YOV0n baZVmvziEFWPVY8MQAP7jvFRE5rZ4jawt8752fbss5ynfvpNEizFdmbHdlbzTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699543035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYs3PsGMizl5en0cypCC/j0SDyJNm7VCgYtfYjVtiPQ=; b=YhyYbGQJiqqCIAy88G5WtCZemq2Lf9n5ocrSn2GQbrB3eEKppdsHwv14sPC6rKuR7or3KW F1S/Uee/heocPUb/Uy70lGgc1IzH3N+SNEj/66GPh1BnfR+JaUWVdtH97IEE2cB9kkYmSs 9tdmfDsjFc5elMHtyOLhnvchPzelQdlfFPh87zLhGx+DWiXrYqnh1fuHOqH0kA/AoEkKU7 oIljmwMWMjVa6qWNlIYs+a5+b3MV8YugWfvBYldq8VMvRp/wwhAg4ci65Hb4ScZ6L2f5To /PvpW1hylnOmODtwHdxP6dneZI9VD6aNR5cfgIJ2PRkFoUdw8Ps358xSgAyqoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699543035; a=rsa-sha256; cv=none; b=MjSG/yxMjVfCsBIh6IRG0ocAJsw+B52eYQdxjmiF3rid2OBR3oTpWm8w3RAvSAqB9bJPw7 6ri0jf0gXSsZ2YyQfMxFlI5f8Fhgt5zciyLNXWFG0VRqmgS4WJFdtDQjX8mxZI3BRBuENk vWGn/nGDqfw/cHp/CG9geVuDSexQVNlf90QY+E8++rBfwJZP26QvnTKxekEPxhB0ldNto6 xBjxDiglNX+S0zdFzGYPAKwIoshT6MN1kbJ2DaXfpSoyhcwJ60bj3rZIvhm/oihIaRbwkk 4PEQMLTbYq9C+oLLCcly1KOWX4Qt+cfBpbvCoAamjwjPsz5E2EUo7leLAdRysg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR5Cv1FJDz5bf; Thu, 9 Nov 2023 15:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9FHFYW032902; Thu, 9 Nov 2023 15:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9FHFF2032899; Thu, 9 Nov 2023 15:17:15 GMT (envelope-from git) Date: Thu, 9 Nov 2023 15:17:15 GMT Message-Id: <202311091517.3A9FHFF2032899@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: e4078494f344 - main - vm_fault: Revert commit 64087fd7f372 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e4078494f344bcba8709216bd601efa3dd05f6b3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4078494f344bcba8709216bd601efa3dd05f6b3 commit e4078494f344bcba8709216bd601efa3dd05f6b3 Author: Bojan Novković AuthorDate: 2023-11-09 15:04:48 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 15:14:05 +0000 vm_fault: Revert commit 64087fd7f372 The underlying issue that originally triggered a kernel panic was addressed and the fix was ported to all relevant pmaps, so the safeguards placed in vm_fault.c can be removed now. Reviewed by: alc, kib, markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42517 --- sys/vm/vm_fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index dd044d27f00f..58761e97f5f8 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -386,7 +386,7 @@ vm_fault_soft_fast(struct faultstate *fs) rounddown2(vaddr, pagesizes[m_super->psind]) >= fs->entry->start && roundup2(vaddr + 1, pagesizes[m_super->psind]) <= fs->entry->end && (vaddr & (pagesizes[m_super->psind] - 1)) == (VM_PAGE_TO_PHYS(m) & - (pagesizes[m_super->psind] - 1)) && !fs->wired && + (pagesizes[m_super->psind] - 1)) && pmap_ps_enabled(fs->map->pmap)) { flags = PS_ALL_VALID; if ((fs->prot & VM_PROT_WRITE) != 0) { @@ -619,7 +619,7 @@ vm_fault_populate(struct faultstate *fs) psind = m->psind; if (psind > 0 && ((vaddr & (pagesizes[psind] - 1)) != 0 || pidx + OFF_TO_IDX(pagesizes[psind]) - 1 > pager_last || - !pmap_ps_enabled(fs->map->pmap) || fs->wired)) + !pmap_ps_enabled(fs->map->pmap))) psind = 0; npages = atop(pagesizes[psind]); From nobody Thu Nov 9 16:29:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR6qT3xSZz50P6k; Thu, 9 Nov 2023 16:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR6qT3LVdz4HdM; Thu, 9 Nov 2023 16:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699547381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8oRAS8Z/kGzRJq3f25fLO/QwZKNbUbnPD5ZhrJas4JI=; b=UG6n41vJzh/RUAD35i67qxn8JW+fdVxz3YiBOpGyAe749Rn5epgLRaq0hFp1/bqKiSdRTk h0gKISvr3CaWDU6dP3q9LfFNCcQc4+Vbc2cMYidAo4bmkuH34yYNuncfc9MhidJ/XDIv+K mIl/KFzJZQTJBJIbwIBgSrK92wEhSlOP7gH/1vrxmUfSU3DLjmILNTVdvsx9XZLSz7qfhX eDaMjrp9QTg5At/rQ+4qmLE29V7ziZT7mixXO2Qq4MxL3URTvbFqCGbc9hlp/vpFZLsz7t XUmV+ghm9ifpE7mfy5Q03V/7yXMqY32xyXXGqEAzTwN3G9EmI7/755+XW9qWSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699547381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8oRAS8Z/kGzRJq3f25fLO/QwZKNbUbnPD5ZhrJas4JI=; b=owMRHm8qeikzkd83Fy3+CJVrnNg/96rkQsDb7jx3okH7MnGNWyfRK/+Hq1xJUMMBHBxb6x yEKV09H8fasreVyJnlpFooXjIW390K+5C8IwFfuNO0n2+nA+N0NkatlPn3PNtXKP6cZtNj MREnGISmF4/TPS0KHFU2HHV3uyqTJIjVsMNbm0AW8zOC8+axFuSlLQ33m3yELvKgMm+nOF /f9tuvKE/LO0xenuMBUaVctV85LqFcGZTf4JtnqOZl3z2n3y+v8XoMwg5geR20M45hwvYv Gv27BHM8cziawRXY1k/p/pB6IjqVa4bJijpIBUvXA2EXGXqPZtY12/pQvXDwlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699547381; a=rsa-sha256; cv=none; b=uRog87D5Iv3jZIVtBVvIPJf4s6UulhycDeckTD0gKELvkXB3rqF4vWYwr1IBAtnhp6CYz6 SKwxzA80woFKAKnJRXD03/ZmD7eL894TXDVSfaP+u22qnN1ZHmw567xgheB1wWIW9ypoIy Gb4JwyaxzbociROwWB66jd236EUCuqsT6O77HRQOaW4+nKhJOC7ivZ6GyogDbmrMLbYEVl 10Vfs92ur23E7ScYuT1dL1rWs3hAGBe989QeejPlt89UPhF8NEncrsKTaoMZfqwWPBQl4T M77Xl84cNxIGRnTrXgrRNCMKJQTPHvhmLiC9+xrejfFrUEj4viseKb+RmK7g8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR6qT2Pptz7X2; Thu, 9 Nov 2023 16:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9GTfkI049696; Thu, 9 Nov 2023 16:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9GTfVt049693; Thu, 9 Nov 2023 16:29:41 GMT (envelope-from git) Date: Thu, 9 Nov 2023 16:29:41 GMT Message-Id: <202311091629.3A9GTfVt049693@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: ac3db6ea0e96 - releng/14.0 - makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ac3db6ea0e968338bbe68c0d89505242b246d66f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ac3db6ea0e968338bbe68c0d89505242b246d66f commit ac3db6ea0e968338bbe68c0d89505242b246d66f Author: Mark Johnston AuthorDate: 2023-11-08 12:00:43 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 16:26:33 +0000 makefs/zfs: Don't set ZFS_NO_EXECS_DENIED in file flags This flag was leftover from testing and should have been removed. Approved by: re (cperciva) PR: 274938 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 50565cf514d32ee02a24f420551c7e65631b0716) (cherry picked from commit a8043cc0d49bec7bebc4afc43b8bf5f6ab730b23) --- usr.sbin/makefs/zfs/fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c index b0a4c639f256..9413241da0c7 100644 --- a/usr.sbin/makefs/zfs/fs.c +++ b/usr.sbin/makefs/zfs/fs.c @@ -403,8 +403,8 @@ fs_populate_sattrs(struct fs_populate_arg *arg, const fsnode *cur, } daclcount = nitems(aces); - flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_NO_EXECS_DENIED | - ZFS_ARCHIVE | ZFS_AV_MODIFIED; /* XXX-MJ */ + flags = ZFS_ACL_TRIVIAL | ZFS_ACL_AUTO_INHERIT | ZFS_ARCHIVE | + ZFS_AV_MODIFIED; gen = 1; gid = sb->st_gid; mode = sb->st_mode; From nobody Thu Nov 9 18:21:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SR9Jq2WV7z50qPV; Thu, 9 Nov 2023 18:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SR9Jq246Wz4dGG; Thu, 9 Nov 2023 18:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699554107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f0Z3ljKUnHW9f7SZe4OtvAwNI5jCTAYt6bl53n/bEiM=; b=A3AzLcNlH1tHbQh4M/aoIodX8qoufE6RMd+0gmN6UFAS7qFiELWx3Ea3+8AokFl3fkYDqd lC6PPhSsYMhSBQQutE1UZfOyLTP46bWf5l7qUZ6CGW0WgS3M3Pb01k74IcYgRX7O5gKr0S 5U/KBA4FowYj6X1DZ2kdKEn5cT1m3DynEkR1Q1Bk32XjqCQ6q2mypdXyNfD8xK9demCYBa x70UCmwmkRU/DocHuEUwlJtrWmssJpNOIPSoys9IBe8LwSzWO8w43UiItEIlzmS07y1cHu OHQ8pVpDdmcJ6fWmaUskEPWnoZqDN2FzN+RgsJJnNpZnJHb8vGru0WSqmMFZHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699554107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f0Z3ljKUnHW9f7SZe4OtvAwNI5jCTAYt6bl53n/bEiM=; b=xC9Jyk0VU7fbHf+V+nOkk+FpB2Cfa4bkAkW3PzBY7NVTYHuygSxwtn2Tu1XMV0l4EskWLV 24D5dnQFr4HbGMpOstH9Yp+xh9MQCuMFXdnSRTJ4tto2uUCVAGWumKqn8atErqjRiqXzgt 8HfcLICqB46PIdz5KzEz9Qs4hOpoYc0kdisu2YDnJys3GYaQkffGa7enAW5NGy/vUjfj3V UKq89DmOFIXESnL+YeTyJgrCxnaWOELSfyRbhlFxFu5Y5OT2mRjHpiFVk8cbkxHYbQJLMa 97HSHb/FDVQPXZ4BKrUxCkA5R8h5IzwrpX0dP8f+J9TSMS1RaqUM5TtgXCNtzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699554107; a=rsa-sha256; cv=none; b=CteIC1FLZbtX93bZBWXhbVL/AUbnMrFRdZBUpgZtErp1gYtLdveDW7ZuL3Uc3b2FdVKRPU NlCd3iiA/U77L1VAqgLGm4wgWYlpegHtgkBAAshi/kM6G0lmIhCiCKC8ttlOgK8mwvNsOn +HPVwIUE9YKxOhd3oAjppXuYhhIlRy5r8uudqVKmeQ649gTXl0IbzT96zMbksv+jkETFuY vhbBpYA4pUeu/vTT/Y1nR13+jOEPoua0q7FPz/VEAomRcXdfn2xeAz/a0gDPAnatJp1T6d uXSww+QhkJRuWvc8tlOvNuhAE+jNXB3X6YPCLKKecvfJDT6l2lp2DVeaFTQW+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SR9Jq17ldzB6S; Thu, 9 Nov 2023 18:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9ILlVu044947; Thu, 9 Nov 2023 18:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9ILlAJ044944; Thu, 9 Nov 2023 18:21:47 GMT (envelope-from git) Date: Thu, 9 Nov 2023 18:21:47 GMT Message-Id: <202311091821.3A9ILlAJ044944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 7c566d6cfc7b - main - uma: Micro-optimize memory trashing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c566d6cfc7bfb913bad89d87386fa21dce8c2e6 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=7c566d6cfc7bfb913bad89d87386fa21dce8c2e6 commit 7c566d6cfc7bfb913bad89d87386fa21dce8c2e6 Author: Alexander Motin AuthorDate: 2023-11-09 18:07:46 +0000 Commit: Alexander Motin CommitDate: 2023-11-09 18:07:46 +0000 uma: Micro-optimize memory trashing Use u_long for memory accesses instead of uint32_t. On my tests on amd64 this by ~30% reduces time spent in those functions thanks to bigger 64bit accesses. i386 still uses 32bit accesses. MFC after: 1 month --- sys/vm/uma_dbg.c | 62 ++++++++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index 36567f3b3968..76dd2bfde2fe 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -53,7 +53,7 @@ #include #include -static const uint32_t uma_junk = 0xdeadc0de; +static const u_long uma_junk = (u_long)0xdeadc0dedeadc0de; /* * Checks an item to make sure it hasn't been overwritten since it was freed, @@ -64,27 +64,20 @@ static const uint32_t uma_junk = 0xdeadc0de; int trash_ctor(void *mem, int size, void *arg, int flags) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return (0); #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { -#ifdef INVARIANTS - panic("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#else - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); -#endif - return (0); - } + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + panic("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + } return (0); } @@ -97,17 +90,15 @@ trash_ctor(void *mem, int size, void *arg, int flags) void trash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) return; #endif - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } @@ -140,8 +131,7 @@ int mtrash_ctor(void *mem, int size, void *arg, int flags) { struct malloc_type **ksp; - uint32_t *p = mem; - int cnt; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -151,15 +141,16 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) size -= sizeof(struct malloc_type *); ksp = (struct malloc_type **)mem; ksp += size / sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - - for (p = mem; cnt > 0; cnt--, p++) - if (*p != uma_junk) { - printf("Memory modified after free %p(%d) val=%x @ %p\n", - mem, size, *p, p); - panic("Most recently used by %s\n", (*ksp == NULL)? - "none" : (*ksp)->ks_shortdesc); - } + + e = p + size / sizeof(*p); + for (; p < e; p++) { + if (__predict_true(*p == uma_junk)) + continue; + printf("Memory modified after free %p(%d) val=%lx @ %p\n", + mem, size, *p, p); + panic("Most recently used by %s\n", (*ksp == NULL)? + "none" : (*ksp)->ks_shortdesc); + } return (0); } @@ -172,8 +163,7 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) void mtrash_dtor(void *mem, int size, void *arg) { - int cnt; - uint32_t *p; + u_long *p = mem, *e; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -181,9 +171,9 @@ mtrash_dtor(void *mem, int size, void *arg) #endif size -= sizeof(struct malloc_type *); - cnt = size / sizeof(uma_junk); - for (p = mem; cnt > 0; cnt--, p++) + e = p + size / sizeof(*p); + for (; p < e; p++) *p = uma_junk; } From nobody Thu Nov 9 18:54:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRB2v5zqpz4yysm; Thu, 9 Nov 2023 18:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRB2v5747z3FP1; Thu, 9 Nov 2023 18:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699556087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EF07jvBfuXlfZRRY7VOE/6LyRKJfCmhKozvvdu4ts5s=; b=WnSCtPzMY4Y3LfKTysEzEkIMZA4aaqgtEzsUEda+/rpzSCbe9YY51CpIfEwbuuWj3sD9o8 0emyDPZIqKS/QpSXxpitUIB8MYXEvj93f+TiY9p9eD8sFyHPbhPii/5K78rvOHqISvkqwB 2B4+RhBAmWlaqr2lRC7ZIr4ir67WlbKN1oodDCGeEy0oFp7zQgniBKAJ/Kl+eA+0uzGTg3 R7pyXqUIKLhL36sGG6Dz/G1i8rZuM93+YwXmx+sDz8cfQPk5qm08NUa4tz+0nxHrvRG/zh g3heWScLg7E6bFa+NDaFv9OGGr0T+4aZphTNHaAmV1nsSVJYK6BiruFYTOCelw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699556087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EF07jvBfuXlfZRRY7VOE/6LyRKJfCmhKozvvdu4ts5s=; b=m4tf4QoooB0YONIgX8uqpLnr3zuGwHwWMbKHN+yc3DDSZVuF6Q1s5jIWq42tkUfHQjvthg GckHOixrguGg9UUjcbXvz67+Z163dqJb1yfzz2CpxYClR6QtyP0/gGASW6iOQ3zpaX93jE dyw1b2g4Ci4ENqRmdP39BzEsRB8XEANCX5ggroXFEkJ4eklO3BItmIucGejP05Lqqa60aF UprpgsY1V7NzH5OwSq3j9z27VpOP0XikUPXXmrZwokJnfbcB4ltsy0e/dFj4cqI/feJ/FN uNk4tMdRLLEYIoz5YPbDVr18y4eXdO4GqpU1BTqz9Z47P1xOKwiexQWz7J3fxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699556087; a=rsa-sha256; cv=none; b=HiJrc0oNRZOY7B6u3wflDEmoh//Dn+jDvbYmmiaR16jGSkNwsPH4W/BelkkghbxeUiJkQS hcm4+ry/dFXQ0tTiHy5biCNhZexIg77iBGlx1RT+Bx37B2ZQ/EF3eJOW5Ixvzx+n2UOeVW xfuKi7j1uKJ2q21A28qy3/UpEEM/zMaXBDTM7NkfCblH8icrcHFR/SXP/OuxccYVk9Bs9g S/HW7yDLfN2JFhAd2URCBdRQlNdlGj/yldYDamrJNCsL4NI7bJTig+XvmGITRESRB/DqGD SGu01Gy1L5h0bk7Oo0lmmxyaACICq1yy8nK3M9JkEbFyCAW27lhgLAmdErSSCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRB2v4BQHzCPW; Thu, 9 Nov 2023 18:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9IslwN098937; Thu, 9 Nov 2023 18:54:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9IslxB098934; Thu, 9 Nov 2023 18:54:47 GMT (envelope-from git) Date: Thu, 9 Nov 2023 18:54:47 GMT Message-Id: <202311091854.3A9IslxB098934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 1f8a5187ffdd - main - ktls: Remove unneeded vm/uma_dbg.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f8a5187ffdd9eb7d78e699f948f7bab3abf60e9 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=1f8a5187ffdd9eb7d78e699f948f7bab3abf60e9 commit 1f8a5187ffdd9eb7d78e699f948f7bab3abf60e9 Author: Alexander Motin AuthorDate: 2023-11-09 18:53:07 +0000 Commit: Alexander Motin CommitDate: 2023-11-09 18:53:07 +0000 ktls: Remove unneeded vm/uma_dbg.h include It was used in original implementation, but is no longer. MFC after: 2 weeks --- sys/kern/uipc_ktls.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 5d8165ae3e8b..c996157dbc41 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -72,7 +72,6 @@ #endif #include #include -#include #include #include #include From nobody Thu Nov 9 20:22:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRCzX2yrCz50MJK; Thu, 9 Nov 2023 20:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRCzX2WWfz3Vk2; Thu, 9 Nov 2023 20:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5eQTQ3LQzKApadCU5+iYE8WhOA0U1zsYaipJkrQfj4=; b=CmPM9e1ONi0WtOZMzAVuRVIJF4vDwuxe7x2zqXLamR08MLwyVuj6Rj14wyZCAgIP8F9kKm 7kBjtXZaKUjuVq20lnhqUU7WRgGNCGYMzICY3BjJ8Nio8JPPJqlCU+149f3uXbrYEdF6y1 H8/Jnkf2415rFZY0wVoMimVIeo+nZYmhzmSTeBi99oTc51HFrRRaZSpW4eFKYP5xFfwQoV wtfKZW3fy8ibXVdnRmJy0r8R/BjEMkLnvWeppri3ayahGsuWgrZzwF4pJTXxw5qboHriBa y+LHGS8BnJ8GgfW4U78WKm0msAfrqzjTmgg73ppmW/lLRX+1NUch30iDFqhJAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5eQTQ3LQzKApadCU5+iYE8WhOA0U1zsYaipJkrQfj4=; b=whIMrBE9tU4CN6HR611xnKu7sSUmr7KA3ah7Ufr5lmRC/rCD82q7rRmrzZWLlU47/qvWQM HqR8JyKAvjzGuhhSgBm/DhcG3nbo1zaOe69uURatXawInCCImWvs8IZr8uYrxlwEdR6Bij nElT3Piaee1hzfA3fOLMzM7rKejL/ADQZrntWFB6s4FJayaw/EGeNh5M6WBuG1EY2ZA1fu 1j0XBWz7xKRtjSIvYys6IhlO/10vo5ZnHh/5MWDBrNKspWPDexsTjJl9paAVTQbLWSZCMH YrdKWJqnNI9Ed7A+k3SBVNa/2BAszKf5Y/T6ti1gUihpUdB8DsMV9aratyzomA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699561320; a=rsa-sha256; cv=none; b=OrJBwhwww3X52xMBk5ubq45vI655FbM7r75CNf3hdPG85E8bfR6JI0wUXyiURkxykQ8/xo z80cZF8wdYT7Luc5t01MnbgJVvPYQmRgE+iB7iiA4tTfiq2JUqPRiKAcp+YHv2fALZy4fh 9qyO3lsns5mKj38cdaG3i3qLQViZd+Dc7x4CSrq4lafGbRfoSHLNbeiK84PkwgQEPKsAGB cnFEX8jyfHm86vfPET9WaiXFs6OK0kox3WlIlnF4p/MgOaybT0XJdt3y30oBVOMNCayJuy muG4vL3obwnSTDtL/+AqzAQ3offPe4carAzGCluwgsWUgJSeDAnRrnTV0V7r5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRCzX1ZBWzTpB; Thu, 9 Nov 2023 20:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9KM004049008; Thu, 9 Nov 2023 20:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9KM0N7049005; Thu, 9 Nov 2023 20:22:00 GMT (envelope-from git) Date: Thu, 9 Nov 2023 20:22:00 GMT Message-Id: <202311092022.3A9KM0N7049005@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: af21145f33d7 - main - pf_purge_expired_states(): fix build without SDT probes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: af21145f33d75c8d754b2371d03c181cd0c730e7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=af21145f33d75c8d754b2371d03c181cd0c730e7 commit af21145f33d75c8d754b2371d03c181cd0c730e7 Author: Konstantin Belousov AuthorDate: 2023-11-09 20:17:53 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-09 20:17:53 +0000 pf_purge_expired_states(): fix build without SDT probes Sponsored by: The FreeBSD Foundation --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index d5a9583d83f8..6e6b0b20130d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2175,7 +2175,7 @@ pf_purge_expired_states(u_int i, int maxcheck) struct pf_idhash *ih; struct pf_kstate *s; struct pf_krule_item *mrm; - size_t count; + size_t count __unused; V_pf_status.states = uma_zone_get_cur(V_pf_state_z); From nobody Thu Nov 9 20:22:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRCzY4Dlcz50Lld; Thu, 9 Nov 2023 20:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRCzY3j02z3Vww; Thu, 9 Nov 2023 20:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcVtYmr8nW2zR2uOH00cvbCQ0LR7/P4YvBPQlCm2LGY=; b=uHawMn3rvGjBOGSwQ0qSxU28vs2NLeFnRFehF29ljcinwV3OSF1Fk0KvLa2oGLQXstgl1F NZWUc+/XIzOwlc6IY2Q2er0L27IexXcCO8MhxIqntb3LiobU30MX7mFVk3CqibQsMVakv+ O+OsUJ4P1FjtUmnfW4lhGM73/MuaVfwZXU5L5yvyyOYppwxNkKwTrdc4OXqalR+oG33lbM nehUEnru10imj8C3O8Tf3o0ZCXH+8gXDnttGRX5J6WUee/nFhCNZtl0x2BbpmzGrRzqQ4/ NM10BDRqzedxIxVxR8GPdsWcf/kwKUBaG6q32gk9aIJTA7Zu+czJC08RK9D9tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcVtYmr8nW2zR2uOH00cvbCQ0LR7/P4YvBPQlCm2LGY=; b=uX64EsRGVwih8A9QWqSQdSoSc5SIZEoQKy1qN1p0VHjR/9jL2juo0tLLNgaL/zedgcj883 ipvzO6swUebz5w+HexoGdnzWZw35tYFNnBr5aQnNrghoD7idZYduY7zoLAK588WVi6dkM2 p9IvO0ocnetuZo9fcPcwGCw5WhYVqQ21NpFgdo5C4/XQ3Hi6Fj7mWPOGL6JNrLPGkHFR1q EQr6ZpNa8EjvoIpiswRtlgSdE55htaXUu+fsLfDHosYYLmwt5S0WBndqJW/tKCrjzjvalw cDWcU+2g0HbD5/B4hs299td3P/Sqiw8D7gcuAhChu4dn4GA8CuRo/zGUTb4H3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699561321; a=rsa-sha256; cv=none; b=eABOhhcxwrHACNq2GG3zJDUNpqaouCIRgBJQdJEKc1FPaBdWgjDYoAymbGZf9YTDbFAHbK CXaa7cR+VMgWr+MTQY6lc0/7/HruPWy1j4bdQ2ufwTawKbHA98TyAjSCE6JdMG2qaLUxTX /ZqL6luaeKNnxFrl40giwKFEuglMopsW4FBKFD7t15P+28V+VoQInthk4yTOhuzpo3uij6 taleiK5SiIXdxxL+KOWKsbtflutHcPQqSoaQjDn+QNaIIJXyU2Xj4m1ZxajfJUOBWsN9hI 7ZdjRXDVWbWn4bPnZG/VDGC9ej9xWzAId0SarRNMLATc06oBRli4E4GxrbObBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRCzY2X38zVXV; Thu, 9 Nov 2023 20:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9KM1bt049069; Thu, 9 Nov 2023 20:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9KM13G049066; Thu, 9 Nov 2023 20:22:01 GMT (envelope-from git) Date: Thu, 9 Nov 2023 20:22:01 GMT Message-Id: <202311092022.3A9KM13G049066@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: ede4c412b3ea - main - vfs_domount_update(): ensure that 'goto end' 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ede4c412b3ea9289ef42c664b01b6b5ff7eac434 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ede4c412b3ea9289ef42c664b01b6b5ff7eac434 commit ede4c412b3ea9289ef42c664b01b6b5ff7eac434 Author: Konstantin Belousov AuthorDate: 2023-11-09 20:18:47 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-09 20:18:47 +0000 vfs_domount_update(): ensure that 'goto end' works We need to vfs_op_enter()/vn_seqc_write_start() before jumping to cleanup. PR: 274992 Reported by: trasz Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 --- sys/kern/vfs_mount.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index aa4642c0ba8c..1a559bfd998e 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1380,6 +1380,8 @@ vfs_domount_update( VOP_UNLOCK(vp); rootvp = NULL; + vfs_op_enter(mp); + vn_seqc_write_begin(vp); if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, &fsid_up_len) == 0) { @@ -1394,9 +1396,6 @@ vfs_domount_update( vfs_deleteopt(*optlist, "fsid"); } - vfs_op_enter(mp); - vn_seqc_write_begin(vp); - MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp); From nobody Thu Nov 9 20:24:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRD2h0WJhz50Mrt; Thu, 9 Nov 2023 20:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRD2h03jVz3X7d; Thu, 9 Nov 2023 20:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46RHA+yoA02Fhnu1E0GDa18tWRqBUYEr2vXTr1fuaMU=; b=wZUDFyEStzzxOxgX31HPP2XI5daP0YaxuS3ug9cI0QmXlntnhHfI60Fehw06rW0+QzKPCC 6ITGOuocuk6JIwutHkrWy5dFuAqQLnk9rMp9csZC5AAY8V245FA1PIF4eJGWD7A4P+AsEP Hh2K84N4gvT/kS9T1YbCdVv97+8lT6sg5TWWPj0PmRm6dYUTQXDjRjY3S9BxDI2xTkKDU1 HBtZTFyeEaxnszlqFSJ6PMl3pN3FF5EgIiPdwpS9EcSPkzYHo39Q+6Cwq6z7fgXMr2NOYp XtyTkOtdWWOSoSMK93YEJy7PnCuTan1slGgJ+OWkuuCkGwS/qIcMogG8mXadCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699561484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46RHA+yoA02Fhnu1E0GDa18tWRqBUYEr2vXTr1fuaMU=; b=ND4mrAETIx5qR1WeWaXTMIS9O9jVHCX9oEcr/zw7cGKiZbDZB82B7GrCLWy34xK/zIihOk fJ8BF7di8p7BokFqXid7LLIcbb6+s0SfYN45tDgobIalftDBxrNPHgsNNw5tS0xWSkEkDe UzrxfKL6VWk6K156rLF4aJAJJ/NX3uTruJwbC0wk5RPOjhOxQLDNRsKjd7nzz+A4SFyaBj wOLX8usx0wHGuqVwg4RNm2P5A30eP5gpTj5O/B0WdNfEiyZeVVPxOupGolqYHMaDNiDY1I nGDAZBDOfflkvz1Dg6PI14Eb15c7c/bYGupdJ44Upky1V9Jp/0TJqfonk35lTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699561484; a=rsa-sha256; cv=none; b=jMAdwpIn1Fe9+ytL6juiJF6RDCCMf2+N6hgnm3RwI0DNfRUClTa4XML+sjeuT3My5OzGJW xOd/MRqpAQzMDfZiDiDbap1AKlJ+g7VQtJDDq+HCufsUeN5NolV3babE8IFg/4UHvda/W/ 28TkHIrtwxqJu60NBZOqB7BBjTCTYuD34Rk/2ZIY4RQjN35QEbP6RZoYO0LjlSrs+9sD/A hnMRN1r8gwMXSEO8H7PXDAzLyLwP9bxIUqkC8NWBtcGjCD2ZAjbyXXo1pjp5WtQTcFQ3dM ndM/3WKKo/hV2eAD4uo5hluzcTyZWx4IkOxuJG7IDaAQugKjzYVhYhUbHOs+mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRD2g6Dh9zTtv; Thu, 9 Nov 2023 20:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9KOhhK049596; Thu, 9 Nov 2023 20:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9KOhvF049593; Thu, 9 Nov 2023 20:24:43 GMT (envelope-from git) Date: Thu, 9 Nov 2023 20:24:43 GMT Message-Id: <202311092024.3A9KOhvF049593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6e5b1ff71e01 - main - libc: enable initial-exec (IE) as default thread-local storage model on arm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e5b1ff71e01bd48172483cb6df921f84300ea3a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6e5b1ff71e01bd48172483cb6df921f84300ea3a commit 6e5b1ff71e01bd48172483cb6df921f84300ea3a Author: R. Christian McDonald AuthorDate: 2023-11-09 20:22:21 +0000 Commit: Kristof Provost CommitDate: 2023-11-09 20:24:23 +0000 libc: enable initial-exec (IE) as default thread-local storage model on arm As suggested by jrtc27@ in https://reviews.freebsd.org/D42415, this patch enables IE as default thread-local storage model in libc on arm. Reviewed by: kib Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42445 --- lib/libc/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 7540eb8c21ad..e817104642b8 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -54,11 +54,7 @@ CFLAGS+=${CANCELPOINTS_CFLAGS} # Use a more efficient TLS model for libc since we can reasonably assume that # it will be loaded during program startup. -.if ${LIBC_ARCH} == "aarch64" || ${LIBC_ARCH} == "amd64" || \ - ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "riscv" || \ - ${LIBC_ARCH:Mpowerpc*} != "" CFLAGS+= -ftls-model=initial-exec -.endif # # Link with static libcompiler_rt.a. From nobody Thu Nov 9 21:01:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRDsd5gvkz50WNV; Thu, 9 Nov 2023 21:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRDsd5F74z3cWF; Thu, 9 Nov 2023 21: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=1699563717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVsg5O6J/sDZFfHkEaIqcyT9a5otDY9cNwiCJ/Z7CG8=; b=b4gkhq2S924zjqfTaVIkoJTLD1/qzsb8Vm2JArBdGf8k92twGwHZWZ5vrwbtpFPRC7KvnQ jhI8cT0ZX36ETD7Uv+Unv1/dEIvdC9pNocs2gTuUMrvti6MIMoOe+OjeAdWA27fXf+qQIF nnRK6wjJoVE2WYVLL2OMUGmWZ6JFK1e7mE1MukvW/5PV1vmgnhVhApXcZHXjvmFUSpE+fa lu1GYGslD/dwpxXYVx8Guzui1s0CtGw1s07oL2WTfH9QB32berEJZ/ZCAi3HBxZpzWDVuO GB58vJN1PehcrqzydJs+OM9B9wMUFss+wCkBrdiasGq35wNip2Q2ljw9lu+aMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699563717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uVsg5O6J/sDZFfHkEaIqcyT9a5otDY9cNwiCJ/Z7CG8=; b=vR0VROhd4Cy6uwKAorYj9esi5B1ZUBczE7sdP6CCHfLQZJAF58O5/x7eRHZ38EBxVlULSM ltnd/n48SnfhXx2yW/gym1PgoBxXbtFSrK/MpzGklzLjSCsG1N2FDk7pySQlKLT1hvXAq6 LbfKT+1f8zI+89ZGs4V+8onLpZnxiUus+E4ZL7HcJKKfhaFc/bX+0UPQfrPQ22SmP9IdsE eHg5pWShp7qEBFjkuguu1mo0IZxq2M+HpvRJOS5qKz+NKRdWQle4TyXwFT4v/Nd4CmYYuR e07NW2wbpuNte0mMoilRCmHaSgx/5OgBwFIFawtzfYwomTx5poYQmB3fHhjDcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699563717; a=rsa-sha256; cv=none; b=SGlEqXoGbwxHSrKhY/GJI0m7cCq/QzPZGI6veSiW+XaA81MUzkuszqU6AgPAb6dk0NPOhf Wy8vwM+s4TgaqjbFAeK0B8M+rx4oFhfJZV0pi7w2RBUHbBwZkrfAZjyIYd68x9AYCMs2mM LxUncUtygY9z/onqhgAvcXexyOPp1w3DeFDAHkBxTE21V94ODQA0vrnC8UhfLyfyy3XoB7 Qh+vuuXh9+dpZSpqSxFzz7JNo4tY7jqpNdvU7C8rWQrvB/gNx1yBufjiwfXu4CBhxYhXtY KmytHxhVa3/GzVapHQIwasHFJdVcaX+en0CgHjYl1m2DD9ydoccUeHjO+Kk+6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRDsd3zRHzWLG; Thu, 9 Nov 2023 21:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9L1vCE013307; Thu, 9 Nov 2023 21:01:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9L1vu1013283; Thu, 9 Nov 2023 21:01:57 GMT (envelope-from git) Date: Thu, 9 Nov 2023 21:01:57 GMT Message-Id: <202311092101.3A9L1vu1013283@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: 14105aae555c - main - nlm: Fix error messages for failed remote rpcbind contact List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 14105aae555cc22554d87ab041ee736c086f5ef1 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=14105aae555cc22554d87ab041ee736c086f5ef1 commit 14105aae555cc22554d87ab041ee736c086f5ef1 Author: Tom Jones AuthorDate: 2023-09-25 18:33:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-11-09 20:54:28 +0000 nlm: Fix error messages for failed remote rpcbind contact In case of a remote rpcbind connection timeout, the NFS kernel lock manager emits an error message along the lines of: NLM: failed to contact remote rpcbind, stat = 5, port = 28416 In the Bugzilla PR, Garrett Wollman identified the following problems with that error message: - The error is in decimal, which can only be deciphered by reading the source code. - The port number is byte-swapped. - The error message does not identify the client the NLM is trying to communicate with. Fix the shortcomings of the current error message by: - Printing out the port number correctly. - Mentioning the remote client. The low-level decimal error remains an outstanding issue though. It seems like the error strings describing the error codes live outside of the kernel code currently. PR: 244698 Reported by: wollman Approved by: allanjude Sponsored by: National Bureau of Economic Research Sponsored by: Klara, Inc. Co-authored-by: Mateusz Piotrowski <0mp@FreeBSD.org> --- sys/nlm/nlm_prot_impl.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sys/nlm/nlm_prot_impl.c b/sys/nlm/nlm_prot_impl.c index a5b917b07f8b..216c4ac82b53 100644 --- a/sys/nlm/nlm_prot_impl.c +++ b/sys/nlm/nlm_prot_impl.c @@ -343,6 +343,12 @@ nlm_get_rpc(struct sockaddr *sa, rpcprog_t prog, rpcvers_t vers) bool_t tryagain = FALSE; struct portmap mapping; u_short port = 0; + struct sockaddr_in *sin4; + char namebuf[INET_ADDRSTRLEN]; +#ifdef INET6 + struct sockaddr_in6 *sin6; + char namebuf6[INET6_ADDRSTRLEN]; +#endif /* * First we need to contact the remote RPCBIND service to find @@ -489,8 +495,26 @@ again: } /* Otherwise, bad news. */ - NLM_ERR("NLM: failed to contact remote rpcbind, " - "stat = %d, port = %d\n", (int) stat, port); + switch (ss.ss_family) { + case AF_INET: + sin4 = (struct sockaddr_in *)&ss; + inet_ntop(ss.ss_family, &sin4->sin_addr, + namebuf, sizeof namebuf); + NLM_ERR("NLM: failed to contact remote rpcbind, " + "stat = %d, host = %s, port = %d\n", + (int) stat, namebuf, htons(port)); + break; +#ifdef INET6 + case AF_INET6: + sin6 = (struct sockaddr_in6 *)&ss; + inet_ntop(ss.ss_family, &sin6->sin6_addr, + namebuf6, sizeof namebuf6); + NLM_ERR("NLM: failed to contact remote rpcbind, " + "stat = %d, host = %s, port = %d\n", + (int) stat, namebuf6, htons(port)); + break; +#endif + } CLNT_DESTROY(rpcb); return (NULL); } From nobody Fri Nov 10 00:03:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRJtb6LzRz4yyrZ; Fri, 10 Nov 2023 00:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRJtb5VsGz4XxR; Fri, 10 Nov 2023 00:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699574583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4czOTn5069vLWxaKE9ohhBGlyR7n4OIS3a9nh+TkjnM=; b=MqTmbsF5Tk5ElCN57UNwfj0BUwBxyrwTIjLyO6KDWxZgqfKgyfqZn7GuqWjlEka9aJ40Fr D148xc1V3yQM2qshIZOgQPc24EBj/3OzA8n8e6g8iQuKPBGcOs7c+S1pL37QZ8BGRhiyS2 ogiMiywN1Eep4IRs0os5EjT2675lnJmIaPy7lrprlbT8O0NkBI8s3hAzspdw2NIAhSWvhS kcc8IP4ZiB+/qzfAdgcBKAzFx9BDHUdf6wg1FLONV5dPp4fRlGrQp6fy3JmEnhNu38DF51 9+O2mVU0Ybjz4J8WuJkXQ6VQQb7K280ct7xnfkzrRtUvmkZDPYPR2UlSPT5vww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699574583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4czOTn5069vLWxaKE9ohhBGlyR7n4OIS3a9nh+TkjnM=; b=QV+HtCChUVCSaB3XcqhafOd5E+kn7mTcJsSGBf5iGGa6niyEEZpC/INnd8tilTRuxTS0yj vOHLWwOEJBChsBUlHHwqOpaSWirLQQGTO4WIgSQTyMpDqkBM5Lz6r3+zI/IHOZn/MpPxAq Zau7RmWgK1gpzTYI0x2XdZCo0pDWQIa7z/qVlPpda6PrFad8kglOBa7jEQaSpd0xQKEpQn UCtW8Lh3JpyZhCJMvkgVl9FVkWsZilBgZCu1q2N72FDfZEG3BA9T2Qof59m24hGaaoErKo rjlt+2VwLOtHyVClqNnLrrvltoDQvTS3M14geA8sMdYSEp/fermH/50wxzElew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699574583; a=rsa-sha256; cv=none; b=cTR4DfqhzSaRNeUZlYZC/h4CgD8rChypR+mR9pkRNgD1rgKkf3f+zQY6qb8T8iVNhkqGAP +C5lLdu5RLJiSGzl7tgXzF4A7ti2P3CrhVgNIZArx5Jkh6jlTCiIDFdZR1H6r5AqvKH4oV ynfdFodRk6tMn6YGW9XRuwjViFuFCS6gJ7HUt4mJh+QpaPhFhgR2fzIyMCM7A0Rix9bn7J 1xLnjKlV7L4oQJQxy3bgR5FZ8cqk9Dra9s8KpzwI9kAC1T7mWGb4FaLhNul8XUCbNNx2cR VU6NCepyrevKoTiY8RhGMKcvb3yDG2psilS1keK1t/Wopa8Lsogg0hq8fMST7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRJtb4ZWSzbB1; Fri, 10 Nov 2023 00:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA033JW016196; Fri, 10 Nov 2023 00:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA0333v016193; Fri, 10 Nov 2023 00:03:03 GMT (envelope-from git) Date: Fri, 10 Nov 2023 00:03:03 GMT Message-Id: <202311100003.3AA0333v016193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: f9716eee8ab4 - releng/14.0 - release: update releng/14.0 to -RELEASE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f9716eee8ab45ad906d9b5c5233ca20c10226ca7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=f9716eee8ab45ad906d9b5c5233ca20c10226ca7 commit f9716eee8ab45ad906d9b5c5233ca20c10226ca7 Author: Glen Barber AuthorDate: 2023-11-09 23:38:09 +0000 Commit: Glen Barber CommitDate: 2023-11-09 23:38:09 +0000 release: update releng/14.0 to -RELEASE - Add UPDATING entry anticipating the announcement date. - Set a static __FreeBSD_version in crtbrand.S. - Update BRANCH to reflect RELEASE. Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- UPDATING | 3 +++ lib/csu/common/crtbrand.S | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 58eeafa44bba..c32c3b7ec940 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20231114: + FreeBSD 14.0-RELEASE. + 20231108: 14.0-RC4-p1 SA-23:15.stdio SA-23:16.cap_net diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index 0ed86bfba2b2..9ed2d10f5210 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -43,7 +43,7 @@ .4byte NT_FREEBSD_ABI_TAG 1: .asciz NOTE_FREEBSD_VENDOR 2: .p2align 2 -3: .4byte __FreeBSD_version +3: .4byte 1400097 4: .section .note.GNU-stack,"",%progbits diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index b40c56ae759c..a2b89f3caca7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RC4-p1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Nov 10 00:57:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRL4x1kj6z50CN2; Fri, 10 Nov 2023 00:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRL4w6bWFz3C94; Fri, 10 Nov 2023 00:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699577824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=No40kC4l/4A0XNO7uONwlZpv6EtGlZE3OMxBQqz41Nk=; b=CorjdP+SHNhPRHZmfeWu9nYjGtKnpfYxfWbbWj5FEEPTVzY4MtUZfX8qyh4QvzagGBFkfj ZuNHMAsMdvlS6bO2v4Qb6VW0KuuuUNGL462Ypeuw5RP1cYeBI/F2SPYTaJ3xs1NnTQzHij 9Jyj3gcuKTnxPEQI5w48eqd7R3I6mCaodZUV6KJCJXdBAGrNZhD9RxB8J5994wH+Otwi/H opN6X31piPv/lL1ya90sgDeeZ5y5L3WZlwcmo6Ed6jWjcZ0UuqC7eSJDs06lZpufG7Hl00 6OcWL57MqSoPtjZmLBvBvrSHvLZyigTExpLGAD+k9cNDRBa0cxvJgnkSyke23Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699577824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=No40kC4l/4A0XNO7uONwlZpv6EtGlZE3OMxBQqz41Nk=; b=J1fp0exB3YC95IW2s3HJgg7Qgp33+EUrNB9JhNvk4ho3bXXuLcAEbDJ7bCYMXVGhhY8mhr qp4KAMsox5MyDb3ZWf/fY/K2KMuA55PeZ7fzEJvXlgIhRNeFT0BVxBPKPy1/rMRVZv6lV8 kAhSGWwTL4pmxMhnxkPJtPuUtrPYIcksyN70r4V72MnUV9qwkdq5Q+3La9Ql4xZyNystUc f/FSEBuvIhZ6X2kuP/Tu7XkTnCVa90SqdwQUsVwXH2bBdw9ebyP45bQmQ6l+0BzthlL6EY /p8cGc2w1cHmlX9xxNss69YmeXrKXDmIX9DKti4gTVLzhgorOjnwmdQBnDRbDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699577824; a=rsa-sha256; cv=none; b=SUbEdGrw0wHZynm7ZxYuW/8O1zJsPA/D4QLVbUMl4Ddz797+Y/EAFcXZLul4DR1dpddkvS HqRrDUMXSINZsl1Gs+LP3fdFOuFoChm3yzRHEP3eqrLJBbjl5i7wrf3oxcsn2iR1K65Td3 vI+1bsSJmyxvlRvYXPTWlgdTyEDc2pOjxPm8GTJvjji6VU6MSoekTLAV1LwBYWIWH+CS66 a2Ct4ah0nWMSd+ziNRLqn2OEUkOF+9JOBRRQzF2znK7AcGwBjPZGyeTQiTsuTtF4pCBVUA AezZTQsgZBaHp9o+MzZiJb7+sveMj5uciDzCqdLldOd2DouXmIsOpV3UiWsDzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRL4w5fq8zdPN; Fri, 10 Nov 2023 00:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA0v4iY099666; Fri, 10 Nov 2023 00:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA0v46k099663; Fri, 10 Nov 2023 00:57:04 GMT (envelope-from git) Date: Fri, 10 Nov 2023 00:57:04 GMT Message-Id: <202311100057.3AA0v46k099663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: a03c23931eec - main - uma: Improve memory modified after free panic messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a03c23931eec567b0957c2a0b1102dba8d538d98 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a03c23931eec567b0957c2a0b1102dba8d538d98 commit a03c23931eec567b0957c2a0b1102dba8d538d98 Author: Alexander Motin AuthorDate: 2023-11-10 00:46:26 +0000 Commit: Alexander Motin CommitDate: 2023-11-10 00:46:26 +0000 uma: Improve memory modified after free panic messages - Pass zone pointer to trash_ctor() and report zone name in the panic message. It may be difficult to figyre out zone just by the item size. - Do not pass user arguments to internal trash calls, pass thezone. - Report malloc type name in the same unified panic message. - Report corruption offset from the beginning of the items instead of the full pointer. It makes panic message shorter and more readable. --- sys/kern/kern_malloc.c | 4 +-- sys/kern/kern_mbuf.c | 6 ++--- sys/vm/uma_core.c | 4 +-- sys/vm/uma_dbg.c | 67 ++++++++++++++++++++++++++++++++++---------------- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 07f59f733e6a..da7408edd186 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -650,7 +650,7 @@ void * size = (size & ~KMEM_ZMASK) + KMEM_ZBASE; indx = kmemsize[size >> KMEM_ZSHIFT]; zone = kmemzones[indx].kz_zone[mtp_get_subzone(mtp)]; - va = uma_zalloc(zone, flags); + va = uma_zalloc_arg(zone, zone, flags); if (va != NULL) { size = zone->uz_size; if ((flags & M_ZERO) == 0) { @@ -690,7 +690,7 @@ malloc_domain(size_t *sizep, int *indxp, struct malloc_type *mtp, int domain, size = (size & ~KMEM_ZMASK) + KMEM_ZBASE; indx = kmemsize[size >> KMEM_ZSHIFT]; zone = kmemzones[indx].kz_zone[mtp_get_subzone(mtp)]; - va = uma_zalloc_domain(zone, NULL, domain, flags); + va = uma_zalloc_domain(zone, zone, domain, flags); if (va != NULL) *sizep = zone->uz_size; *indxp = indx; diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 0897ac4cc2db..60c638735ec4 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -703,7 +703,7 @@ mb_dtor_pack(void *mem, int size, void *arg) KASSERT(m->m_ext.ext_size == MCLBYTES, ("%s: ext_size != MCLBYTES", __func__)); KASSERT(m->m_ext.ext_type == EXT_PACKET, ("%s: ext_type != EXT_PACKET", __func__)); #if defined(INVARIANTS) && !defined(KMSAN) - trash_dtor(m->m_ext.ext_buf, MCLBYTES, arg); + trash_dtor(m->m_ext.ext_buf, MCLBYTES, zone_clust); #endif /* * If there are processes blocked on zone_clust, waiting for pages @@ -782,7 +782,7 @@ mb_zfini_pack(void *mem, int size) #endif uma_zfree_arg(zone_clust, m->m_ext.ext_buf, NULL); #if defined(INVARIANTS) && !defined(KMSAN) - trash_dtor(mem, size, NULL); + trash_dtor(mem, size, zone_clust); #endif } @@ -804,7 +804,7 @@ mb_ctor_pack(void *mem, int size, void *arg, int how) MPASS((flags & M_NOFREE) == 0); #if defined(INVARIANTS) && !defined(KMSAN) - trash_ctor(m->m_ext.ext_buf, MCLBYTES, arg, how); + trash_ctor(m->m_ext.ext_buf, MCLBYTES, zone_clust, how); #endif error = m_init(m, how, type, flags); diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 661c98b272da..d185f12448ee 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -3468,7 +3468,7 @@ item_ctor(uma_zone_t zone, int uz_flags, int size, void *udata, int flags, skipdbg = uma_dbg_zskip(zone, item); if (!skipdbg && (uz_flags & UMA_ZFLAG_TRASH) != 0 && zone->uz_ctor != trash_ctor) - trash_ctor(item, size, udata, flags); + trash_ctor(item, size, zone, flags); #endif /* Check flags before loading ctor pointer. */ @@ -3510,7 +3510,7 @@ item_dtor(uma_zone_t zone, void *item, int size, void *udata, #ifdef INVARIANTS if (!skipdbg && (zone->uz_flags & UMA_ZFLAG_TRASH) != 0 && zone->uz_dtor != trash_dtor) - trash_dtor(item, size, udata); + trash_dtor(item, size, zone); #endif } kasan_mark_item_invalid(zone, item); diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index 76dd2bfde2fe..c256e62875c0 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -53,18 +53,22 @@ #include #include +#include + static const u_long uma_junk = (u_long)0xdeadc0dedeadc0de; /* * Checks an item to make sure it hasn't been overwritten since it was freed, * prior to subsequent reallocation. * - * Complies with standard ctor arg/return + * Complies with standard ctor arg/return. arg should be zone pointer or NULL. */ int trash_ctor(void *mem, int size, void *arg, int flags) { + struct uma_zone *zone = arg; u_long *p = mem, *e; + int off; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -73,19 +77,22 @@ trash_ctor(void *mem, int size, void *arg, int flags) e = p + size / sizeof(*p); for (; p < e; p++) { - if (__predict_true(*p == uma_junk)) - continue; - panic("Memory modified after free %p(%d) val=%lx @ %p\n", - mem, size, *p, p); + if (__predict_false(*p != uma_junk)) + goto dopanic; } return (0); + +dopanic: + off = (uintptr_t)p - (uintptr_t)mem; + panic("Memory modified after free %p (%d, %s) + %d = %lx\n", + mem, size, zone ? zone->uz_name : "", off, *p); + return (0); } /* * Fills an item with predictable garbage * * Complies with standard dtor arg/return - * */ void trash_dtor(void *mem, int size, void *arg) @@ -106,7 +113,6 @@ trash_dtor(void *mem, int size, void *arg) * Fills an item with predictable garbage * * Complies with standard init arg/return - * */ int trash_init(void *mem, int size, int flags) @@ -116,10 +122,10 @@ trash_init(void *mem, int size, int flags) } /* - * Checks an item to make sure it hasn't been overwritten since it was freed. + * Checks an item to make sure it hasn't been overwritten since it was freed, + * prior to freeing it back to available memory. * * Complies with standard fini arg/return - * */ void trash_fini(void *mem, int size) @@ -127,11 +133,19 @@ trash_fini(void *mem, int size) (void)trash_ctor(mem, size, NULL, 0); } +/* + * Checks an item to make sure it hasn't been overwritten since it was freed, + * prior to subsequent reallocation. + * + * Complies with standard ctor arg/return. arg should be zone pointer or NULL. + */ int mtrash_ctor(void *mem, int size, void *arg, int flags) { - struct malloc_type **ksp; + struct uma_zone *zone = arg; u_long *p = mem, *e; + struct malloc_type **ksp; + int off, osize = size; #ifdef DEBUG_MEMGUARD if (is_memguard_addr(mem)) @@ -139,17 +153,31 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) #endif size -= sizeof(struct malloc_type *); - ksp = (struct malloc_type **)mem; - ksp += size / sizeof(struct malloc_type *); e = p + size / sizeof(*p); for (; p < e; p++) { - if (__predict_true(*p == uma_junk)) - continue; - printf("Memory modified after free %p(%d) val=%lx @ %p\n", - mem, size, *p, p); - panic("Most recently used by %s\n", (*ksp == NULL)? - "none" : (*ksp)->ks_shortdesc); + if (__predict_false(*p != uma_junk)) + goto dopanic; + } + return (0); + +dopanic: + off = (uintptr_t)p - (uintptr_t)mem; + ksp = (struct malloc_type **)mem; + ksp += size / sizeof(struct malloc_type *); + if (*ksp != NULL && INKERNEL((uintptr_t)*ksp)) { + /* + * If *ksp is corrupted we may be unable to panic clean, + * so print what we have reliably while we still can. + */ + printf("Memory modified after free %p (%d, %s, %p) + %d = %lx\n", + mem, osize, zone ? zone->uz_name : "", *ksp, off, *p); + panic("Memory modified after free %p (%d, %s, %s) + %d = %lx\n", + mem, osize, zone ? zone->uz_name : "", (*ksp)->ks_shortdesc, + off, *p); + } else { + panic("Memory modified after free %p (%d, %s, %p) + %d = %lx\n", + mem, osize, zone ? zone->uz_name : "", *ksp, off, *p); } return (0); } @@ -158,7 +186,6 @@ mtrash_ctor(void *mem, int size, void *arg, int flags) * Fills an item with predictable garbage * * Complies with standard dtor arg/return - * */ void mtrash_dtor(void *mem, int size, void *arg) @@ -181,7 +208,6 @@ mtrash_dtor(void *mem, int size, void *arg) * Fills an item with predictable garbage * * Complies with standard init arg/return - * */ int mtrash_init(void *mem, int size, int flags) @@ -206,7 +232,6 @@ mtrash_init(void *mem, int size, int flags) * prior to freeing it back to available memory. * * Complies with standard fini arg/return - * */ void mtrash_fini(void *mem, int size) From nobody Fri Nov 10 00:57:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRL5n4CwRz50Ccj; Fri, 10 Nov 2023 00:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRL5n3kl6z3CLj; Fri, 10 Nov 2023 00:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699577869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Bx1nujhpxpooVSIF/XeCa1irlPKugkvnWG/Een4gm0=; b=YwHHFP6dqe2R2XszAeY0npqL1/twIg+/lRq1xVAFXtutVyr5T+IotT7RkE/ocS+wiBHGle bfla4vtWw6Raqp4EeWMng3K42bCpnQYn218OKEpux3EEdiZ58s0QzGhP28Zp3YPofpNNIl PHuCj/5ilQstrabuJ1wTJjSYmo73KZy6l9UYXWe+ooyKFFPvBiVvTJsFnDKCjg5bm5u1FI Lpbiw0KlRVIjY8IN83rKsOYIRk5Bz26HVFsm56i8QQdYbWreYt4ZCUdYSTPtmglIoHBM3t fYXquBVf/5XjuPLQu6LVnC5hGXbSYv2wT9wXOR2IkejEesssR9nb+oHRk1mxLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699577869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Bx1nujhpxpooVSIF/XeCa1irlPKugkvnWG/Een4gm0=; b=bo1VaYDRzNZ6N9d/sRJAz/uB+ICLsHGu2BKdChDetuZXK3EwJsrQWaNm8rV/OXRL6d2E4X TlYDEsjB/5hIW0NPDUfefaS/9KUiRygBbzBpCcvL03/h2DCGglbn76m9N5CIKT2LPj2qHy Q8LV+om2gmrqgE1yqT6uGIIltWHDC3IfREHCUC/yJvL+y0XQTQeLqDwmt17WQ9m+dukiau 9Cz+g4prQIAlLsTNtrQwb3vvBmWFPr+/TYlxrhbufv6vmKwlFBaGvAOuU80cGTMe2gqxs/ zdXb05KUa7OgXexxx7a+opjKp6wuh2U9qzDA4DHs9uL7ZIDr5Evm08gBJHOzYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699577869; a=rsa-sha256; cv=none; b=RbSQvxQnfbDzT806ESN0CqIa+fkwb+yIRvahXjbggKCUSi+60U8oIDUTT8mVdJrNbVva6u czcHZLHvL93uIbzxvFyQ8vVsC0ow/JwLSmPoo74vb63l0WzAdxacu7gRkEgYGGVdqFtPTA zfR1yDw2K1rQZSGcJSkyQ7OQKg3zbRVc+Pl9lCyQiUz+B6CimGBUh10rJOqW7KyuO5xvas QuJonkrOo9NNVBG8AvuN1yg5eS1fXbypSBKGfFO+Y1KVozef4/YmUX0PsK+1cE1leXoYK3 jNzvUEJMdng4flf7lc+y7/WQJgEfTlGbzoIDovtcPXVXQTkTyHNLFeepe9PkLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRL5n2qyvzdPP; Fri, 10 Nov 2023 00:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA0vn3V099917; Fri, 10 Nov 2023 00:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA0vn2X099914; Fri, 10 Nov 2023 00:57:49 GMT (envelope-from git) Date: Fri, 10 Nov 2023 00:57:49 GMT Message-Id: <202311100057.3AA0vn2X099914@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 68c2e57d0043 - stable/14 - mpsutil: Add higher PCIe speeds. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 68c2e57d0043a7e3c50ae361e436926c857657bb Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=68c2e57d0043a7e3c50ae361e436926c857657bb commit 68c2e57d0043a7e3c50ae361e436926c857657bb Author: Alexander Motin AuthorDate: 2023-11-03 15:49:59 +0000 Commit: Alexander Motin CommitDate: 2023-11-10 00:57:44 +0000 mpsutil: Add higher PCIe speeds. There are already PCIe Gen4 HBAs, reported improperly. MFC after: 1 week (cherry picked from commit 7bca09e2bb7f812913249a1e5883742d6d6ac6b2) --- usr.sbin/mpsutil/mps_show.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index 7454bf15e06c..6efa9b76dd3d 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -57,7 +57,7 @@ MPS_TABLE(top, show); static int show_adapter(int ac, char **av) { - const char* pcie_speed[] = { "2.5", "5.0", "8.0" }; + const char* pcie_speed[] = { "2.5", "5.0", "8.0", "16.0", "32.0" }; const char* temp_units[] = { "", "F", "C" }; const char* ioc_speeds[] = { "", "Full", "Half", "Quarter", "Eighth" }; From nobody Fri Nov 10 00:58:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRL632lmsz50Cm5; Fri, 10 Nov 2023 00:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRL632LxYz3Cpf; Fri, 10 Nov 2023 00:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699577883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5G4FPmsWKITb4kQM1XjraWlY97mBVZInQd7JNWOJ1s=; b=tVCDREgQit7jVE3kbnbg8epJCULLY7Of15d5clo3hrgOrDgVdmvcBagoD2qEPLXU1DhSNt h2x3LfLdj/4TiAAox3Nzj2TT/afX2PCxvP5t+M3h9zX2u90cM8ijKVDaszLt8l121qXCav Cdgnl8ZvbcVaRmLOpQ6zv91wOS+3E0K6Xkp1c07SU9EKT+oj3RYy8wH45xmzHnwK++iHfu fLsSZ4v8fRd5x08hTu6b7nO+gyz7rQ2GsK5+AmbZyDmxwBs48JEKGqMdS+fv/5ox5kWyfS xqqS0lhVWJdUXWhCHCYRNsWvD8QUlaQCD2gjA2IUPV6zyILxpefsuQ9Fv1vbnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699577883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5G4FPmsWKITb4kQM1XjraWlY97mBVZInQd7JNWOJ1s=; b=xHIVu1Ja30H8HKzk3aE1nYJ3N+5mZ5n7cdetuuZFRccK5/hKlae3mK/jUHIm8hWGI6xiV7 4icMGWZyj4SxJ5wyxGwI24suxrd7PrtbwsfB9TyLvFgbJcSyQp4BtXw7GTsmoSwqOMSZCg NU06Ncp+r0QqGjVl+ZAAEwjlzajThhyj0FkXF+LpRkdYe2ecRHO7rDsXyn2pPVz34H88rr tYmklDvQlTKleX9FLU2cCugQ6UPOKzP1iY1p7U1E/uFqEnm7eilaQo22Ayta3Xq767XKa7 wE44RqjOCAXV5ol5azq1h6XEB6rpSDK/n5ALrd0cXQNRBwdB2MVYn7vqdV6/SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699577883; a=rsa-sha256; cv=none; b=yZq+eVPhaMmsSDA30FAWcp1fPQrOIEcIgFFX+4v4VsLQ2quZi2fNFRW7Ej3wumLmquf1X7 pfrpIJ8dbAcFZapmDkaK5tCSQCMp7qRgXpTKflz5tIoQJutbJwC9sl1zGLSvXQKJ4ptRFr EtVSQZ+DxXCs+9f88gs9vZ/7m2s9lpycT9O9yR+0P5Eex07ryhC7EdJsgmDjV4xLxpSB0B Ixn9f0sTLQAO9Bp4/q3bRXjOg0eNsRVS//bHfvJoJDm9Ik/+o5xFlnBE7fYkD46Pcr/2BU /SVMxfDFUByWxJfrpOeywypfWVyyTNgQZdczQFPGh3ZiCtLd2PIMrRFYpAlA3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRL631Q8TzdGn; Fri, 10 Nov 2023 00:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA0w3mc000094; Fri, 10 Nov 2023 00:58:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA0w3J8000091; Fri, 10 Nov 2023 00:58:03 GMT (envelope-from git) Date: Fri, 10 Nov 2023 00:58:03 GMT Message-Id: <202311100058.3AA0w3J8000091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 88770f0c6971 - stable/13 - mpsutil: Add higher PCIe speeds. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 88770f0c69717d706b83efddd6dd282f5ddf7612 Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=88770f0c69717d706b83efddd6dd282f5ddf7612 commit 88770f0c69717d706b83efddd6dd282f5ddf7612 Author: Alexander Motin AuthorDate: 2023-11-03 15:49:59 +0000 Commit: Alexander Motin CommitDate: 2023-11-10 00:57:58 +0000 mpsutil: Add higher PCIe speeds. There are already PCIe Gen4 HBAs, reported improperly. MFC after: 1 week (cherry picked from commit 7bca09e2bb7f812913249a1e5883742d6d6ac6b2) --- usr.sbin/mpsutil/mps_show.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index 7454bf15e06c..6efa9b76dd3d 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -57,7 +57,7 @@ MPS_TABLE(top, show); static int show_adapter(int ac, char **av) { - const char* pcie_speed[] = { "2.5", "5.0", "8.0" }; + const char* pcie_speed[] = { "2.5", "5.0", "8.0", "16.0", "32.0" }; const char* temp_units[] = { "", "F", "C" }; const char* ioc_speeds[] = { "", "Full", "Half", "Quarter", "Eighth" }; From nobody Fri Nov 10 02:22:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRMzK4sftz50YTC; Fri, 10 Nov 2023 02:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRMzK4JyYz3QG5; Fri, 10 Nov 2023 02:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699582941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofKtBhLEQCCo7AOAe8Jo7E4cAGjljoBb+rHibpRULq0=; b=xyTLmwRN5JRJgDPHVwsy3eRN23GeMl3liTwvhEXL3d+fHNsSAV1xAvIi0rbLQcZstWcEPC HeYSd2OSj+Fbp/7qPl3Kfy/HdP0HXT/1nGdm4z73ONYJFYrB2jioQg0AgF0RNfBHGf3yMQ pu352PcyLhvg/L+ovr4opXdvdRdH5YNFVti9lZ1QCnxIqUPEk0QYU6Zf7FAE5nfQjoRw81 vauDIhazoD0yMp9poADAIbgjhjgYtNLHw+dbq5Tcxk3BxVXhae9YYXeVWtaGvcaofsf6Cq hx3b9E/bS8jHY5ZWlN9jy9TJdiEozvPYgt2Uh0qmu4z7xzXZJPfYB6gL+l9X+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699582941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofKtBhLEQCCo7AOAe8Jo7E4cAGjljoBb+rHibpRULq0=; b=IoFV/7x7rSqkICKZERqYLH0vOTnaEtNCMFx0Tg/zxk+nQQO5OKYhh7HLiwAh3lPafU0LHy 2qwH+NRZRaZHrNi0rF1ZH3bSTrVMQg6wjmMIdkoMXZ5cukKIxMvBgNT3vVoYLQ8DTb0QM0 rcAsGE4IOFqfZUtsfk6HKOCRvXi5vImxp+t/nTE/p5bmh4d68SA/mS0fi+kqul18iLkoql Pn/9ls2LKDtE67eYAal/J7P9xYJiEqqghVuQFu4FMEZJ4ZzYoQeBq0kUVeI48IqA+b4i/y 8yjH6Qb3iJ+D3SneL0sDoD25I30G/n+M8dn0j10kf3R0+i3iO59B2fzUa1c3lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699582941; a=rsa-sha256; cv=none; b=T+3Aa/PywuHlKAPhMOyI5kx1bgHNsBePztec8UA1OVPrXIjH210E1y1v8/LEXXUffwNRmk crr2LvRPrdQ3JSBFcgkY8pwEnNdjVUiDPT3+y2EYEgIOmNyMXwWK6zhy+BBhhlcEm4Czjy aY6xmyt399LqvmyCaqqCv7heGVWwJRzh6yLfwaatAxNwwU8ahkPd6H0PsOS7Y0i3a63tns 8OIMf42DVSy7TmX0oMKztOIL6drL0mxSdmb/U9y7Ogfs2jupzNLnN03LqbLs0pBtBC9sGH d2TlmfjdOtVbnM5J5Vxiskv5CQXNIxBZ47CR+LuNS0lN1eOH8PscOrnxCMKyLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRMzK3MX3zgTf; Fri, 10 Nov 2023 02:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA2MLO8048879; Fri, 10 Nov 2023 02:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA2MLLN048876; Fri, 10 Nov 2023 02:22:21 GMT (envelope-from git) Date: Fri, 10 Nov 2023 02:22:21 GMT Message-Id: <202311100222.3AA2MLLN048876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: f0fa40867d1d - main - Fix build on powerpc after previous commit. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0fa40867d1d556ee0400ca6e1483b9ae1a068e2 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f0fa40867d1d556ee0400ca6e1483b9ae1a068e2 commit f0fa40867d1d556ee0400ca6e1483b9ae1a068e2 Author: Alexander Motin AuthorDate: 2023-11-10 02:21:47 +0000 Commit: Alexander Motin CommitDate: 2023-11-10 02:21:47 +0000 Fix build on powerpc after previous commit. --- sys/vm/uma_dbg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index c256e62875c0..2f6360699419 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -165,7 +165,11 @@ dopanic: off = (uintptr_t)p - (uintptr_t)mem; ksp = (struct malloc_type **)mem; ksp += size / sizeof(struct malloc_type *); - if (*ksp != NULL && INKERNEL((uintptr_t)*ksp)) { + if (*ksp != NULL +#ifdef INKERNEL + && INKERNEL((uintptr_t)*ksp) +#endif + ) { /* * If *ksp is corrupted we may be unable to panic clean, * so print what we have reliably while we still can. From nobody Fri Nov 10 04:34:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRQvY5Xlgz4yyy1; Fri, 10 Nov 2023 04:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRQvY54Tvz4D4V; Fri, 10 Nov 2023 04:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699590857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZOpSbNkFOMkwO3cLai/5p2uNhl9Eh3LBZcKs7ChZ0M=; b=CSCA8zdz8PJjn11SSeto4JIRYCXEXa15KvbB9WLP6MTAjPdVhF6rXZYad6z8oo3pA1Wn34 Gv66iBZdfXQnpI7Q9xBdOcCId6UhYuT/FmExxKxLPI4d5CsA60ml/Ip2xNN/9sY7L9d5dk AIKjouumAmx9KSgKTuD7UFRPBKOmXA8IxteXEW8G8wL9LonSELrJfnNTSuxj73Ts89b/9+ YKwY7iZuDd1wim7YfkHnzo/PMgtjQHiOMEh3SjmB1/xwMLXuKl3TkC02jbBlsT+7OeFwzr ODja5uqAEqRzdQKcAf+E9kAtfe/sRfHA6A6l4voXz3TCut14IFAtlhcAlEsV6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699590857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZOpSbNkFOMkwO3cLai/5p2uNhl9Eh3LBZcKs7ChZ0M=; b=DYkO8s/sz7sknWEYUikktGerCYSy1Ei1nHI2l+1caBwmIkQ/tjnDSw15TPrfBIcHzRg34W SJdtXPcZWWvE1HzvibHltIAvISznrp/8xhVmhg21UUmkTZW1Ro8LpH5fQ5aBMeRqxHvWud ZPjhl/6dDN+f38+OXouox4xfC/kaRy6oyX6LK3Q6X4+V4TuyHOzg/4oNsAO/omeG6k8CSB bULmIlbxdSfdp1lTUFuripaJp3aRzTGlIgahSWGW065hFnChN/a9XkjfV7NZ18Y/M0XQCV FZISFG7jxJ0W7l4tFvAAOKNwZyhYJjN/f+yjfd/NRMb9HUbE3qLLOd1/RYvujA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699590857; a=rsa-sha256; cv=none; b=aHHNr9SBG+TAIVG8Va3AywpHjBec0cArfkE6WelBhtq7bwCFccD7ODW9IiMesMgRVlqaGz 2Xq1FBZhyG/eb/j+HENy24seAiGGooS9JcxoZc1o9m4qWJop18rBiiwIxrmOt4Lpsewxul 4fr6ZjQkDR/LR7vyK5i1g80WrkuNFH+y75TlDO26pJhmuPUChg+WZbVDRAGSyowsNuvkw4 lAKiShtF5XmpXqmj/uUg+/ka72YHbOs9s/VInLUY0v8LsQbIkz43sDvfeK/faC40bfBG/I 9ao9JItWaWbXgKfkNLoJvBEoHbt+2ELtzQQPoX0lk5SLV/hQqUzvbvmaAZ/DuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRQvY49d6zkLM; Fri, 10 Nov 2023 04:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA4YHe3067263; Fri, 10 Nov 2023 04:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA4YHxC067260; Fri, 10 Nov 2023 04:34:17 GMT (envelope-from git) Date: Fri, 10 Nov 2023 04:34:17 GMT Message-Id: <202311100434.3AA4YHxC067260@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: 8f2848eafa68 - main - crunchgen: fix "keep" for an ELF world, break it out List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8f2848eafa682f1af629f8ee5e32fec607ab0ba1 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8f2848eafa682f1af629f8ee5e32fec607ab0ba1 commit 8f2848eafa682f1af629f8ee5e32fec607ab0ba1 Author: Kyle Evans AuthorDate: 2023-11-10 04:33:58 +0000 Commit: Kyle Evans CommitDate: 2023-11-10 04:33:58 +0000 crunchgen: fix "keep" for an ELF world, break it out "keep" currently adds a leading underscore, which hasn't been useful or accurate since a.out days. Preserve the symbol name as it's given rather than mangle it to match ELF-style symbol names. This was partially fixed back in 6cd35234a092d ("Assume ELF-style symbol names now.") for crunchgen, but the keeplist wasn't changed to match it. While we're here, break it out to bsd.crunchgen.mk for later use in bsdbox. Reviewed by: adrian, imp Differential Revision: https://reviews.freebsd.org/D42499 --- share/mk/bsd.crunchgen.mk | 4 ++++ usr.sbin/crunch/crunchgen/crunchgen.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk index 182ca387fe2b..bdbb6c5a22b0 100644 --- a/share/mk/bsd.crunchgen.mk +++ b/share/mk/bsd.crunchgen.mk @@ -18,6 +18,7 @@ # CRUNCH_SRCDIR_${P}: base source directory for program ${P} # CRUNCH_BUILDOPTS_${P}: additional build options for ${P} # CRUNCH_ALIAS_${P}: additional names to be used for ${P} +# CRUNCH_KEEP_${P}: additional symbols to keep for ${P} # # By default, any name appearing in CRUNCH_PROGS or CRUNCH_ALIAS_${P} # will be used to generate a hard link to the resulting binary. @@ -101,6 +102,9 @@ ${CONF}: Makefile .ifdef CRUNCH_LIBS_${P} echo special ${P} lib ${CRUNCH_LIBS_${P}} >>${.TARGET} .endif +.ifdef CRUNCH_KEEP_${P} + echo special ${P} keep ${CRUNCH_KEEP_${P}} >>${.TARGET} +.endif .for A in ${CRUNCH_ALIAS_${P}} echo ln ${P} ${A} >>${.TARGET} .endfor diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index dfde38ed0b70..7b5f892cffbe 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1128,7 +1128,7 @@ prog_makefile_rules(FILE *outmk, prog_t *p) fprintf(outmk, "\n"); fprintf(outmk, "\tcrunchide -k _crunched_%s_stub ", p->ident); for (lst = p->keeplist; lst != NULL; lst = lst->next) - fprintf(outmk, "-k _%s ", lst->str); + fprintf(outmk, "-k %s ", lst->str); fprintf(outmk, "%s.lo\n", p->name); } From nobody Fri Nov 10 07:41:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRW443gWGz50k5V; Fri, 10 Nov 2023 07:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRW443BJ5z4f1w; Fri, 10 Nov 2023 07:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699602116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=klhcs8QWDINgYcojbk9snYwu8EhqVU+lT4nlLaz1/1o=; b=fmNZbMHKNsFivuh5kI6eTkZSIwyxmRJLk7OX+wxCpPMqz9bV1HJbceXypp/H5Q+Fz3tfBe 7zW9f1uQZgLJBaXM08vB6eNZjA+yUK50OEW9v9MY5M7RoVZhiVcJ15qCJYLgYo8cpbzAgv 8fyLwMX4bgY91i/SBbjSR7dF6NhARoHw7KWfTty8qrBOZrsz3DCWC8UmDXvQe3WT9/EeEj ELsrWFTybePdrK25MFEWf86c4l4O5GOyXvWmr/ODfBHns8zly14dpAoG9KX5v9Jw+UNOBR Vpc9NIiMxuXedGrF4ypwniElmZvM/48kW38BEbRL2OncxDWMEN+47uCpXopliQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699602116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=klhcs8QWDINgYcojbk9snYwu8EhqVU+lT4nlLaz1/1o=; b=h4hQNP/k/j6w7BXVSO3bzIzkxLVuFcu/anhGxj4eSnkK6irJxSSbhil2NsiuXpSFK5nMTY NyUTEMUeobTH0LDbAwra/90Rnb929EuJJaXtuvw+Kx0iAeElCbkcF4PRLF7jWZdMsjuu0c B3jw7P6eA/Mn/0ojQ3eNbhoe1KqzkRnwhyXPhhaediEcenYp5vTWbAJhe5XNcdLOXFPI/G 24S7LtWJIRCyCrGpW3zIyknSWceyeBA1H0B/FS0Fh32aE0NJ+npX1tn+3fMAPV4o8+7xKD 1uea3dwhZRjxUT5HxoG1jldHd9rKWj9nvkD0FPRioLw9agRH/eWEdN0rfWtt3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699602116; a=rsa-sha256; cv=none; b=CiHmr/ndJSGwBtYdz2CNn2Hgagfo8Hbc60fKYDiMl3up1mM0ctyf+DGcpNWFUeCAQ7HIO5 VhEkHkal0pKq97coHrJVkzu/4BS/qdh83e6XJibartCy4U6EmcraqpGbxYweX9tydJMIDE oT/En/pwIPH09jDYDttVb1JdX3ydGEgtm/1703x7P5CPyYFx2DNvBUQo6nRBXy08e+q4Yp ed5zkV41oOHZNaWRCZ6G31r1PiamduuqcCSW5i/g2Yka/EbVKehwT3JwVlVhLbCkCSDHn2 FRfx0eqUURQrVgzd8cvO/TgimEiTZI2pSIOL6ZD4H4vJOxyzP/2wTXj40lpCsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRW442FKRzpdN; Fri, 10 Nov 2023 07:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA7fueA080837; Fri, 10 Nov 2023 07:41:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA7fuol080834; Fri, 10 Nov 2023 07:41:56 GMT (envelope-from git) Date: Fri, 10 Nov 2023 07:41:56 GMT Message-Id: <202311100741.3AA7fuol080834@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: bd7dceb27c08 - stable/14 - ping6(8): Add ping6(8) as MLINK to ping(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bd7dceb27c085c0014f5a09b5d92c6a060d16f23 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=bd7dceb27c085c0014f5a09b5d92c6a060d16f23 commit bd7dceb27c085c0014f5a09b5d92c6a060d16f23 Author: Antranig Vartanian AuthorDate: 2023-11-07 21:14:59 +0000 Commit: Li-Wen Hsu CommitDate: 2023-11-10 07:41:32 +0000 ping6(8): Add ping6(8) as MLINK to ping(8) Reviewed by: chuck MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42203 (cherry picked from commit d6e457328d0e57176b66ba5f5c614becca680fea) --- ObsoleteFiles.inc | 1 - sbin/ping/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 396f4822b02b..32a044706e51 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -6718,7 +6718,6 @@ OLD_FILES+=usr/share/man/man4/if_hme.4.gz OLD_FILES+=usr/include/net/radix_mpath.h # 20201124: ping6(8) was merged into ping(8) -OLD_FILES+=usr/share/man/man8/ping6.8.gz OLD_FILES+=usr/tests/sbin/ping6/Kyuafile OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out OLD_FILES+=usr/tests/sbin/ping6/ping6_test diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile index 4713b01cac90..1483a93ace37 100644 --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -20,6 +20,7 @@ CFLAGS+= -DINET6 -DKAME_SCOPEID SRCS+= ping6.c LIBADD+= md LINKS= ${BINDIR}/ping ${BINDIR}/ping6 +MLINKS= ping.8 ping6.8 .endif .if ${MK_DYNAMICROOT} == "no" From nobody Fri Nov 10 07:42:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRW4S2txKz50jv2; Fri, 10 Nov 2023 07:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRW4S2Rtnz4f3r; Fri, 10 Nov 2023 07:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699602136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9KV64Bv56lfoIYZEjuYeG+a/0DQJBx2RbKPQuCbkgw0=; b=QwKwKF7Mz1GW67diCgUCLhweXyWz4Tt788XkS5ciylt40WAOYzmcmq6IHNSwx98wUDWgW9 7x7sZOTEPzzEHdtPRLaoOMdV15KpjNLy55wkrE/MP/KqYroAen610G5KluJy3PjYi2EFe7 VZCjKgr5pfwPX/nBPHK5rqhdM4VDTwtr+4Mu8PkBEmrYZv0XMaSUKDN0wl6A6/seukSixm kjvpC32ZFdqD4S+ozxqSCJGw41SWJrykddrXnDo4ShRqa/4nEhbk+BmXC0klSNxK29kSeA YJHL/c693RJr8PP53KkSKdRVn0tOdCTYzvutdcYO9LtWAA2cT8i52ihsMX5g/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699602136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9KV64Bv56lfoIYZEjuYeG+a/0DQJBx2RbKPQuCbkgw0=; b=r3Y786GLyzI38yOo2a4bkMfRMloXQLE3Bz3oNB1SGcUBVP4T32IoWF77DatLwIJB5D4dpE nFENykO/lYeAfkbhY/FqfwyGku54de73QWPNln3uKWIaNlM7YqBIAlibwIyYY22jKGS/vW qpKtrlYk3YSx8jzwmnCAMN3bY2iIVbNU1cjIeNAZ+OW6NmY7ucnG+PtsecFUS5F+41wEdD SvLf0n6Ala5EW3nCJZAdj7euFeCXBBJ4zKTuK50zr4lW/nLbIgCisOc7uG3zmWakf6MOWx Ejqmyb8sOCtOHcYr+rcBWGQz5ouQ5g3jFsTmnBTRC0+otkLqKJVpTPY0LPGu7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699602136; a=rsa-sha256; cv=none; b=ALkozX4fHWHJkeKRZLtM/dzHS6VAJd0q5GHUQABlc6wJDEEXKgx6WKITo8fGbA9J00nfo0 zMkUn5VBvhV3U4veiL6sHhI/NFMU1d9jq28R0cfPKQc7cMyc7GeuCCia6+i3W5lHEuBW9C MEFcIaPzWJ5rYz+HOYEy84jvSaDf+u6KCn5YJhV8LEoNOW2pxSzSZ+MWRG59JL8v6RMU9s +ioTyhecjbWzw1jMa4/Ndjmc+giVYQy0RbH78QLJ9VeO/Lup3DTD/TmJPtSuvuLDMskOWQ Gd3foTKIJGSmPiMNGkS/UeaUniGSbZLLZfphJ3XpkNBdNHuQzn2Y8kELRzmTyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRW4S1VbBzqRH; Fri, 10 Nov 2023 07:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA7gGRo082247; Fri, 10 Nov 2023 07:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA7gGA4082244; Fri, 10 Nov 2023 07:42:16 GMT (envelope-from git) Date: Fri, 10 Nov 2023 07:42:16 GMT Message-Id: <202311100742.3AA7gGA4082244@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: cddce522f185 - stable/13 - ping6(8): Add ping6(8) as MLINK to ping(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cddce522f185c3a69977917b35efcf7bf96374bb Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=cddce522f185c3a69977917b35efcf7bf96374bb commit cddce522f185c3a69977917b35efcf7bf96374bb Author: Antranig Vartanian AuthorDate: 2023-11-07 21:14:59 +0000 Commit: Li-Wen Hsu CommitDate: 2023-11-10 07:42:07 +0000 ping6(8): Add ping6(8) as MLINK to ping(8) Reviewed by: chuck MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42203 (cherry picked from commit d6e457328d0e57176b66ba5f5c614becca680fea) --- ObsoleteFiles.inc | 1 - sbin/ping/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 9fa227b121a9..fd4e1d98e631 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -3156,7 +3156,6 @@ OLD_FILES+=usr/share/man/man4/hme.4.gz OLD_FILES+=usr/share/man/man4/if_hme.4.gz # 20201124: ping6(8) was merged into ping(8) -OLD_FILES+=usr/share/man/man8/ping6.8.gz OLD_FILES+=usr/tests/sbin/ping6/Kyuafile OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out OLD_FILES+=usr/tests/sbin/ping6/ping6_test diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile index 5d98e4ca518b..3ec7656f7bc1 100644 --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -20,6 +20,7 @@ CFLAGS+= -DINET6 -DKAME_SCOPEID SRCS+= ping6.c LIBADD+= md LINKS= ${BINDIR}/ping ${BINDIR}/ping6 +MLINKS= ping.8 ping6.8 .endif .if ${MK_DYNAMICROOT} == "no" From nobody Fri Nov 10 09:47:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRYsN2qVtz4ywMG; Fri, 10 Nov 2023 09:47:52 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRYsN2BRLz3Fsn; Fri, 10 Nov 2023 09:47:52 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699609672; 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=6IxVAfnxu46L1HEoPr98ipqDU57cLfZFtPJdxymC4OI=; b=J+Ku4cRCNy49eOm9Tmu7FUXZPc+vB8PnBYfiYLcDngoDjBhu0pMhrNJEvAHFf9WW66Z4Hp VJOvre1IcA9jTsSFuBmzRtKSzKdkD+LNP9Ud5VV+ErhQCki4Lm7bpEEfnapC5JALrP2YJ5 vJ5vo3NXPcZ5u+LviHGu6CeKmz70GD6spPQTY0uQjiv5e2/TWWNwN/bvHoLzRDKUOtWYdj z53jCVsupjOIjpqpgXR7SK6/nsQpvI0E5VdUjlUWf0yS1YUL5+Eo4LqUj99Fx2NegXWcuH op/r6FGgH0wXUqkA9qZeMMTpJzSwzK52xYqn3+93X1jl48qFjjHIjWzhqUPjXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699609672; 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=6IxVAfnxu46L1HEoPr98ipqDU57cLfZFtPJdxymC4OI=; b=u/JBlpJYWHz6o39mP/4O4g4IL5MmrbVBQBtYgDAJ2qP0KHVopHK0BjPTocjj4iLSnAc52v btdNjnsqsDrl6SAKhJsPYDT1elKAK95Gk98DrSiKPs0EQdBzzMUEQYSVOLAppOmW5ziKfL bGKJ27hPSYjgfyEnG9HxAUoNZzBAUETvk2ihhGlfJSpD5DOnpD711V4ZUXWF+Eu6yv1Z6M I6So43J+cqTVLdu0s9LJxF9hA5jR0Tjej6gfJBA+blJxKIZ1OJiOpa+Zg1sUsllX5ts9zD MJIz6fi6Uqj9hGOUOIgryS748kGCPlPSgt0VsqZsYxmqQ2hwvXyocjh5alYEpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699609672; a=rsa-sha256; cv=none; b=Uw8shn08hK5PN0zgkzpXndz4iE/mqtkJoYEZWMv1pjnbTz+aD7+kn96SnyG400As5PwfdX LI8qmSS98kAqizuZzEDL8dqZHSQhOQg9C4VO3N57IWsNSh0nuJWueHnLryXbM4GCB4Ytzy JqA9lv7rIpvL2NUmjq9xYaIeYc6lWFpYDgqmpiZ+/Rh70pqmm/H5sbzqWMoUbVRQ80xo1T GjyaI7gmfxv0xhmPBZ63xtPv1ollcH2aEoZcoY925qPX45TtbWmvvfhB3g0q9MQFghdcE+ KxImX6a/M74bfpj4YyCnNAimLimkanNKZcCkgwtd1VmZLlqycfTPgHXSHLhjjQ== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SRYsN0YNzz144p; Fri, 10 Nov 2023 09:47:52 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id A747FE22D; Fri, 10 Nov 2023 10:47:50 +0100 (CET) From: Kristof Provost To: Konstantin Belousov Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: af21145f33d7 - main - pf_purge_expired_states(): fix build without SDT probes Date: Fri, 10 Nov 2023 10:47:50 +0100 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <202311092022.3A9KM0N7049005@gitrepo.freebsd.org> References: <202311092022.3A9KM0N7049005@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 9 Nov 2023, at 21:22, Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Daf21145f33d75c8d754b2371= d03c181cd0c730e7 > > commit af21145f33d75c8d754b2371d03c181cd0c730e7 > Author: Konstantin Belousov > AuthorDate: 2023-11-09 20:17:53 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-11-09 20:17:53 +0000 > > pf_purge_expired_states(): fix build without SDT probes > > Sponsored by: The FreeBSD Foundation Thanks for the fix. I should have thought of that myself. Best regards, Kristof From nobody Fri Nov 10 10:06:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRZHK6plfz501DM; Fri, 10 Nov 2023 10:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHK6FxXz3JFk; Fri, 10 Nov 2023 10:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MlEGXPYkZc/DBjVATDYLAcVdHiJCaOuaabdw88EeTsw=; b=fbeFz0ySiSE/VQ+8CvIsaqpfOB65NAOw7Xlh6YSI3557NBQ6hm+6HsaznC4tCH1r0Q5BaG 4QO2qNMIzxIwZGzQRWjvFy8maBTUMiWcLgcJoGSlMtohB4C33S61J1v38K9bpk0mnyHzjl 74Mnuwy5alu9f33ABxf+FxHLNS58dJL9fOBn5j4uP48fi3lmZsdi1jA8c81fw+p9xMGngM inUEeTU4lPoqFDCYeRsMh42OOsFAVphzrf5GIJqsOKI3xhB0IhTRfMgh88685s1Sa8yzw/ GBrUM9KvzWI6BI5hWJVYilFMfLUr0bqWtUcC4zKe/EiIDLelV8XSuI53qMPy9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MlEGXPYkZc/DBjVATDYLAcVdHiJCaOuaabdw88EeTsw=; b=qW9RK0VL/V8f/uEphGfFJnhXD8iVXgyIJrulNnkqybx3RVk6PPj7dKaU6hGQK/p+AX+R9R jyq50eI9NqJ39tcisaVg9DERGYj6t3XntDUWTcIBYa7YzK6Cii/fk412PAVmfNCBvRyQxj DS/8XvJqBfXY6pu78SFdL7uRUZbTXyNpGuAZCWgr61pxHMjIv84xr94wPrbSIz3Y6iCHQ4 p1zsTMw5hqGAN9vWsVDjJ1XkV7VzINXFjP1JdSiCKU1qOdWQkWzvYW7a/Mc0SWwvu+rBTi vvGL6QcCvA/AAFrGRikssvlzdLb44URyQPJv70onmgksKpD1SFr0YgtA3xsJUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610813; a=rsa-sha256; cv=none; b=t0+ByFpgyPEN+VRl3mxSC75le43MuTFk5dXxBpSdC2yXK+2/17YOuxF4WVjaUfirHdgK9y EpFov73UwKGZfVRJofYRz/OqjjMGfvd+Bra79bK6umAuhS1G06LtHO9fTzgEgU01pIg2Yc clfyIbuUSJDt+aMpWboMlROx/9KHehHMhhfFVlVzCrIXdREXS0lwd6UE0zIuQMEiRmUbFd QcPcgH2/hI3Qslok7W4+OFJm2ORLW44ZSxvsaY4VnuTpM5eD0hH+Sg2PRucrnUoVmIaHP6 KD+sKkW7KE7cTP9yiLB1QJx0uOk3q2/jm4EiVVyf9iGCqIOSfXDUqGp9zsX7zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRZHK5BN5zsr6; Fri, 10 Nov 2023 10:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6rnM016531; Fri, 10 Nov 2023 10:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6rWx016528; Fri, 10 Nov 2023 10:06:53 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:53 GMT Message-Id: <202311101006.3AAA6rWx016528@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: 83771b1914e1 - main - llvm: Reduce overlinking with the minimal llvm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 83771b1914e182c6324839e05ff82ee6f4a87c98 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=83771b1914e182c6324839e05ff82ee6f4a87c98 commit 83771b1914e182c6324839e05ff82ee6f4a87c98 Author: Andrew Turner AuthorDate: 2023-11-09 13:00:51 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 09:57:44 +0000 llvm: Reduce overlinking with the minimal llvm We only need to link against libz and libzstd when linking against the fill libllvm, libllvmminimal doesn't use either library. Move adding libz and libzstd to the list of libraries to link against to where we decide to use the full libllvm. Reported by: Cristian Marussi Reported by: Colin S. Gordon Reviewed by: dim Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42528 --- usr.bin/clang/clang.prog.mk | 4 ++-- usr.bin/clang/llvm.prog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index c15b846c5aa8..cf48f02359e9 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -14,6 +14,8 @@ LIBDEPS+= llvmminimal .else LIBDEPS+= clang LIBDEPS+= llvm +LIBADD+= z +LIBADD+= zstd .endif .for lib in ${LIBDEPS} @@ -28,7 +30,5 @@ LIBADD+= execinfo LIBADD+= ncursesw .endif LIBADD+= pthread -LIBADD+= z -LIBADD+= zstd .include diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index 87f804063c86..0c102730999f 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -12,6 +12,8 @@ CFLAGS+= -I${OBJTOP}/lib/clang/libllvm LIBDEPS+= llvmminimal .else LIBDEPS+= llvm +LIBADD+= z +LIBADD+= zstd .endif .for lib in ${LIBDEPS} @@ -26,7 +28,5 @@ LIBADD+= execinfo LIBADD+= tinfow .endif LIBADD+= pthread -LIBADD+= z -LIBADD+= zstd .include From nobody Fri Nov 10 10:06:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRZHM09p3z501DP; Fri, 10 Nov 2023 10:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHL6j6Dz3JT9; Fri, 10 Nov 2023 10:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyDeq4pzNV24RcNdaU9JNE2K3h7lf2AfBpM/yiUj+oE=; b=nXKCD62VaQIA0UIOKR83r4lkld9wc5TQEDzJgVN3uwabxP/NNyC3zZJQ6WPmzwK2rs6Sk4 BX01wFJWsQeSpWQsLW6KUg9zWHuFSn1+KBlpXvbkW4SJ4l0swAq+mXZj1koWSiGlaeudOY l3VaOOxwpPWrDU3BqBTWjBK//HyF1zwGNGHhKHRtRfDTd2LwVJA/HjgBGQFhLoMwhSo+3r 9N8dpX7sBHS2XKlrbeQmFsP1yBVFxfAQdatMi8eR4HoYnW+NMUR5eNihxa9ehsCK4+mE7X pxHL8ijAGJ3K//XKPaRzkPee/jroHZMZUVkykkj81c56Q+M1giz/up90SmI0Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyDeq4pzNV24RcNdaU9JNE2K3h7lf2AfBpM/yiUj+oE=; b=oecfV6eY6YmeRI8257gbbvaPxIbEUs4NdC0kYZC3K32/YY/tRCa2nir+/0/JItmFuXCx05 mVeFb6e/N1QkOnIlD1ct8Igri69AcBZT2rqUcCOBpfgyq1gxW7EFi+eH0cRZIVDQ9AkTB9 AkumJR0Sv+RtSWbZkP+94ffrk7iV51Y50n1NEiPff+CTZxWkEmi6eVwWinRuKnKrZMVESG qZKggVECEvA47LYF220oRWnvJDeYxpa0pExPAMRB1ftp73XoyTR3yVBUxVQobI3b4qKMDV fnkdf3V5WsnwNtabiwVCw6c14mdy6zbtVdIxbx9EbY2V+DEuEFAEoNscf+Oayw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610814; a=rsa-sha256; cv=none; b=f8p8KOnYH2VZyMtsArmKWRFtAH09vS7vAFKrlcDJ8jwk7OMhAZg26FZlDaUTvXvRHt6H8E Sr6zg6ac8vArofZZyQP8LJS1JV/MjbefTKlZSavMfksbYZgB5EFl8XlIyWizgk2jtnece5 kspNKwoUvcHHDWYChKVsieKfgMnCl+Y2CgiPJELNOkTWTHKCgcYTTFItCDsonceT4P4Pnc 8S8umBg9YQ98MPiPXSlluTdDBmlwBP6RcLtzh1Bwp7EmxVUngkjQ30ZmtFeNsfAFKu0xQL c708LMhkq0p5rPSssmyR7bDPd6Ieq1fsayF7cUVBt0FyxB6A5tdCfB0i2Izgww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRZHL5lsqztfR; Fri, 10 Nov 2023 10:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6s97016578; Fri, 10 Nov 2023 10:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6sHU016575; Fri, 10 Nov 2023 10:06:54 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:54 GMT Message-Id: <202311101006.3AAA6sHU016575@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: 0b2001416752 - main - sys/conf: Move adding kernel.bin earlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0b2001416752f2dc7b910b38bd398ef84cb263c2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0b2001416752f2dc7b910b38bd398ef84cb263c2 commit 0b2001416752f2dc7b910b38bd398ef84cb263c2 Author: Andrew Turner AuthorDate: 2023-11-09 16:37:27 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 09:57:44 +0000 sys/conf: Move adding kernel.bin earlier When building with kernel.bin enabled we need to set KERNEL_EXTRA and KERNEL_EXTRA_INSTALL before they are used otherwise kernel.bin isn't built. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42531 --- sys/conf/kern.post.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 5258cea9441c..cb34ebc36295 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -141,6 +141,15 @@ ports-${__target}: .endfor .endif +# Generate the .bin (booti images) kernel as an extra build output. +# The targets and rules to generate these appear in Makefile.$MACHINE +# if the platform supports it. +.if ${MK_KERNEL_BIN} != "no" +KERNEL_EXTRA+= ${KERNEL_KO}.bin +KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin +CLEAN+= ${KERNEL_KO}.bin +.endif + .ORDER: kernel-install modules-install beforebuild: .PHONY @@ -466,13 +475,4 @@ embedfs_${MFS_IMAGE:T:R}.o: ${MFS_IMAGE} $S/dev/md/embedfs.S .endif .endif -# Generate the .bin (booti images) kernel as an extra build output. -# The targets and rules to generate these appear in Makefile.$MACHINE -# if the platform supports it. -.if ${MK_KERNEL_BIN} != "no" -KERNEL_EXTRA+= ${KERNEL_KO}.bin -KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin -CLEAN+= ${KERNEL_KO}.bin -.endif - .include "kern.mk" From nobody Fri Nov 10 10:06:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRZHN1CT0z5015w; Fri, 10 Nov 2023 10:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHN0jGMz3JTm; Fri, 10 Nov 2023 10:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJY04f4mRnC+umyzLjdGXI65geIFJLYa66j7msIX6GY=; b=I4QZ6pJdWRNS85SFcs9b/XZEegIxEbwalu495WGywauvNitefr41DccQkGN3j7BaanPhzl UV1octMhQRgJvVPT2PtTW2nW8PY5G/22nxXbxlAVTsY+UgEoohH5iWPr1vmZg6nd0a7aiH vYpdYqGD5yZVq0Wdm5Q6IEQP2VvNTAj0T/TXifIa0Eo3g/R4Dfy3JwRrVftnqobauf+zC9 kDRi1m/15YlgaytJPdR5oA7tnYre+nTaNaucZsXGe8CyD0qaBQk5a4Tmehw6OHxuubUnwP z0cdqd3s7bBrnIZHfKcgX+YJ/uM74QAKuzadUfQM8g4bVmdN11VxXMiz57I2Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJY04f4mRnC+umyzLjdGXI65geIFJLYa66j7msIX6GY=; b=L9UY5msLJmWpOMpkq5eLfLs1Sn3naxseqiHyZQx9StdDWI5SPclnAqY8GKSbNnqe3yyq7u QeiMkBRp3vSF6+I3Jfbf53wcVlvX1XGxZsb958WB/5VLynHzQZepDkqr3FFPJqJXRJYcF6 9rxpEi6HEFbA8sY9QQnA3qg+PyjWoUbNI3OYOgF/MnHyDlviw9PslcH8iOBSgrgmLu1Lgq V7QOvprbb309lRa9hflljdji6p3WugUfUMR5B6MOyRpoU5cjubPNAIVarUv4VwMT23Y8ru keepMQBbLFo/WLgYp74HOL25OJW76Yd93TxQiVE2zEncDa+5YHxPvNT89knHXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610816; a=rsa-sha256; cv=none; b=oVHtTyx0WN6DLKCJTPlzHoL7ih1P6E/9fMFe/F6n2IoufR80kvUVf2AdKnysJqvLXvtRre iF4R7y5qbIdIRyIlRO1qBw4nyVXfxuAOVY5clxGfCCrSer1an3AvrV4iq/vMFoMBP1oVQC 0SmyRpP/ZafjlLEWCboRQ+CV6O10yagq5mYIKLcL8nR4YCaVr4vo/8XV0zkCcq8qmCo+Og SPS870/MCrwNLBRnUi3TuYIpqg+g2jz+VbmIh7FDCJVJQSBGNNBCsmtz5VqarHuARBWf0C oGP5acp3zCKdSdJa3smjhVtw8DkJZXiYCwJoqxf23cNzu2aqoIjHUUGbf2KNGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRZHM6kN2ztfS; Fri, 10 Nov 2023 10:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6tRE016630; Fri, 10 Nov 2023 10:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6tLH016627; Fri, 10 Nov 2023 10:06:55 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:55 GMT Message-Id: <202311101006.3AAA6tLH016627@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: 960b4327f49c - main - bsd.compat.mk: Set MACHINE before including bsd.opts.mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 960b4327f49cb84f1555d147aa7e16a070e4e82b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=960b4327f49cb84f1555d147aa7e16a070e4e82b commit 960b4327f49cb84f1555d147aa7e16a070e4e82b Author: Andrew Turner AuthorDate: 2023-11-02 17:46:34 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 09:57:45 +0000 bsd.compat.mk: Set MACHINE before including bsd.opts.mk In bsd.opts.mk we check MACHINE_ARCH and may want to check MACHINE to decide which options to enable. Unfortunately this is included too early via bsd.compiler.mk. Move including bsd.compiler.mk until after we can set MACHINE and MACHINE_ARCH. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42448 --- share/mk/bsd.compat.mk | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 0c387bcb020c..c41cfda5f01c 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -20,8 +20,6 @@ COMPAT_ARCH= ${MACHINE_ARCH} .for _LIBCOMPAT in ${_ALL_LIBCOMPATS} LIB${_LIBCOMPAT}CPUTYPE= ${CPUTYPE} .endfor -.include -COMPAT_COMPILER_TYPE=${COMPILER_TYPE} .endif # ------------------------------------------------------------------- @@ -33,10 +31,7 @@ LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2 .else LIB32CPUFLAGS= -march=${LIB32CPUTYPE} .endif -.if ${COMPAT_COMPILER_TYPE} == gcc -.else -LIB32CPUFLAGS+= -target x86_64-unknown-freebsd${OS_REVISION} -.endif +LIB32CPUFLAGS.clang+= -target x86_64-unknown-freebsd${OS_REVISION} LIB32CPUFLAGS+= -m32 LIB32_MACHINE= i386 LIB32_MACHINE_ARCH= i386 @@ -52,11 +47,8 @@ LIB32CPUFLAGS= -mcpu=powerpc LIB32CPUFLAGS= -mcpu=${LIB32CPUTYPE} .endif -.if ${COMPAT_COMPILER_TYPE} == "gcc" -LIB32CPUFLAGS+= -m32 -.else -LIB32CPUFLAGS+= -target powerpc-unknown-freebsd${OS_REVISION} -.endif +LIB32CPUFLAGS.gcc+= -m32 +LIB32CPUFLAGS.clang+= -target powerpc-unknown-freebsd${OS_REVISION} LIB32_MACHINE= powerpc LIB32_MACHINE_ARCH= powerpc @@ -72,10 +64,7 @@ LIB32CPUFLAGS= -mcpu=${LIB32CPUTYPE} .endif LIB32CPUFLAGS+= -m32 -.if ${COMPAT_COMPILER_TYPE} == "gcc" -.else -LIB32CPUFLAGS+= -target armv7-unknown-freebsd${OS_REVISION}-gnueabihf -.endif +LIB32CPUFLAGS.clang+= -target armv7-unknown-freebsd${OS_REVISION}-gnueabihf LIB32_MACHINE= arm LIB32_MACHINE_ARCH= armv7 @@ -121,6 +110,25 @@ _LIBCOMPATS= ${USE_COMPAT} libcompats= ${_LIBCOMPATS:tl} +# Update MACHINE and MACHINE_ARCH so they can be used in bsd.opts.mk via +# bsd.compiler.mk +.if defined(USE_COMPAT) +_LIBCOMPAT_MAKEVARS= _MACHINE _MACHINE_ARCH +.for _var in ${_LIBCOMPAT_MAKEVARS} +.if !empty(LIB${USE_COMPAT}${_var}) +LIBCOMPAT${_var}?= ${LIB${USE_COMPAT}${_var}} +.endif +.endfor + +MACHINE= ${LIBCOMPAT_MACHINE} +MACHINE_ARCH= ${LIBCOMPAT_MACHINE_ARCH} +.endif + +.if !defined(COMPAT_COMPILER_TYPE) +.include +COMPAT_COMPILER_TYPE=${COMPILER_TYPE} +.endif + # ------------------------------------------------------------------- # Generic code for each type. # Set defaults based on type. @@ -131,6 +139,7 @@ WORLDTMP?= ${SYSROOT} LIB${_LIBCOMPAT}_OBJTOP?= ${OBJTOP}/obj-lib${_libcompat} LIB${_LIBCOMPAT}CFLAGS+= ${LIB${_LIBCOMPAT}CPUFLAGS} \ + ${LIB${_LIBCOMPAT}CPUFLAGS.${COMPAT_COMPILER_TYPE}} \ -DCOMPAT_LIBCOMPAT=\"${_LIBCOMPAT}\" \ -DCOMPAT_libcompat=\"${_libcompat}\" \ -DCOMPAT_LIB${_LIBCOMPAT} \ @@ -150,10 +159,12 @@ LIB${_LIBCOMPAT}CFLAGS+= -B${WORLDTMP}/usr/lib${_libcompat} .endfor .if defined(USE_COMPAT) +LIB${USE_COMPAT}CPUFLAGS+= ${LIB${USE_COMPAT}CPUFLAGS.${COMPAT_COMPILER_TYPE}} + libcompat= ${USE_COMPAT:tl} _LIBCOMPAT_MAKEVARS= _OBJTOP TMP CPUFLAGS CFLAGS CXXFLAGS LDFLAGS \ - _MACHINE _MACHINE_ARCH _MACHINE_ABI \ + _MACHINE_ABI \ WMAKEENV WMAKEFLAGS WMAKE WORLDTMP .for _var in ${_LIBCOMPAT_MAKEVARS} .if !empty(LIB${USE_COMPAT}${_var}) @@ -166,8 +177,6 @@ LIBDATADIR:= /usr/lib${libcompat} _LIB_OBJTOP= ${LIBCOMPAT_OBJTOP} CFLAGS+= ${LIBCOMPATCFLAGS} LDFLAGS+= ${CFLAGS} ${LIBCOMPATLDFLAGS} -MACHINE= ${LIBCOMPAT_MACHINE} -MACHINE_ARCH= ${LIBCOMPAT_MACHINE_ARCH} .endif .endif From nobody Fri Nov 10 10:06:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRZHP283zz5015y; Fri, 10 Nov 2023 10:06:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHP1YjYz3JSH; Fri, 10 Nov 2023 10:06:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bIU++slt86lO48BlmYB6buwZmY4/j+vfFP29bd1DUPs=; b=IfnPTVGc2fG7w1CTNgjwJjctr0G0XuR4UsJTAtuoC8QuC/8WGkOCRa/nKuqLIa/vHOjP8U BSXGMunW2Y1JFwCF+dGx9tcsQ3nkURf8Vy1QFMGpcBg3dk+MZjnxjQrVr5JA2TED5uH1fb 45yFLgLBvvOo1jHL/CoQqJaELKssTyghoXt3vfnEGMVqJxlLw6r6i81TDU0DyJde+TVJlF kwk4tRNgzziM7irmBjFAQ+Esl9qJEC3pkJw1HinY5lZAehuGDd+o6bliFxiqYtspyPdhea 0hxYekTUnikwVdS+5bKHQ3vMumAFvFUBmKbqAAqPDF0C+N76HQVOwxiHBk+9Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bIU++slt86lO48BlmYB6buwZmY4/j+vfFP29bd1DUPs=; b=AkJWAE5jq/znq2ZPpAI7r9jeL0Q8jp3iEjMxZRzDhjgxtTYM2R5K96Nx4jPY53ugiIUCz8 o+X3Vr0BlnVGQizsva6N8caImtVWHwaFkbADkQxXssVOLlO0whF+PY1xkczTaMwqoibcQs 3JcsK+TXavLGRrAHZcam5mm9EPuOoOFcz35AYBbMCJXS0R7J6pyS/lDVqd1CH2p8umFTpA 36ODjZAo+8HSTyxBNakKEVp+YH7dea/s9OgOvsyebAVLJmWfdvz3XkrhL6n1VbWYN3xY9U B7Ld/X5VoELxCLIC35NMwISGEjg5rmmncNAncUOoksVd0SK9OzWJQ2PVsxxaiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610817; a=rsa-sha256; cv=none; b=V1UczgJGVOnh33QWMxDmAlXWmjLue5/5l/B3nPlULmlaolAuXMqEk/y+fY5fw9caamoMWF dvjcF87B5xnpFc58bL0NHqNAtCLoPZNBmOYB4w33R/m39t/4AnRYOq95lZQbhSrs0Ztb+o kBq4XC4775TxOV0W7v+GTUdr0jfzaTtP2H6lX8B6dEroa4w5uXTy8BWnMIIUXps5aZ7paE dtCIGjDt2D9388wgcdcK4MGRAwAwnJfGFDMpgvfP2lMtMuthLxI5IPReI5rjZC5X1VMz9y WcFWI5RCZqyphkOZMGFxTX4oTAci/XzDDtOX73J93V90FzIaNhY8Y/9FNGdaCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRZHP0f3Nztmt; Fri, 10 Nov 2023 10:06:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6uBc016678; Fri, 10 Nov 2023 10:06:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6u2G016675; Fri, 10 Nov 2023 10:06:56 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:56 GMT Message-Id: <202311101006.3AAA6u2G016675@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: 9d2612fc2a7e - main - imgact_elf: Move GNU_ABI_VENDOR to a common 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9d2612fc2a7e54719058c68b62ea035b029c954f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9d2612fc2a7e54719058c68b62ea035b029c954f commit 9d2612fc2a7e54719058c68b62ea035b029c954f Author: Andrew Turner AuthorDate: 2023-11-01 15:05:58 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 09:57:45 +0000 imgact_elf: Move GNU_ABI_VENDOR to a common header Move the definition of GNU_ABI_VENDOR to a common location so it can be used in multiple files. Reviewed by: emaste, kib, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42442 --- sys/kern/imgact_elf.c | 1 - sys/sys/imgact_elf.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index dfa874e307e5..e03527f6a873 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -247,7 +247,6 @@ __elfN(freebsd_trans_osrel)(const Elf_Note *note, int32_t *osrel) return (true); } -static const char GNU_ABI_VENDOR[] = "GNU"; static int GNU_KFREEBSD_ABI_DESC = 3; Elf_Brandnote __elfN(kfreebsd_brandnote) = { diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index f3d9be027079..7210fc2187a9 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -100,6 +100,7 @@ __ElfType(Brandinfo); #define MAX_BRANDS 8 #define FREEBSD_ABI_VENDOR "FreeBSD" +#define GNU_ABI_VENDOR "GNU" typedef void (*outfunc_t)(void *, struct sbuf *, size_t *); From nobody Fri Nov 10 10:06:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRZHQ3FX1z501M6; Fri, 10 Nov 2023 10:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHQ2KNDz3Jpp; Fri, 10 Nov 2023 10:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aehq8A3QmxzETB7FrTfto6mHd0aMZzX16yUKPVchuyo=; b=oUizgEw6DHjhH1EZQr2EfMkphtM/Lcn9T1WaTBJBk67QHt5omUKLN0zsIsWhluIk+r6D6b V2B/a1K/E5ZqPNp+PL1GNGMwKzPfTwxjPnXurabxSkKT0JcK6a4xRrWVBCIwEmg8EeuBUs 3gZtoibFdUsY3yskSC+UxpSCh/bIkFcgVWN0jahrFYrTaM/AgIl/AjrhezuyP0tA59BO4D kVOuBuFsHEbtxz8njxPdp0aqJlqEtb8VUGh5/cq1MOYUQDupoGVnmuHJs+Zkja1rxUbevE 0dFKcwrnmoppM7NccDXhYrruYlqEmWJFSoe6Xzl8TJETI1PZUuvh9egZpkLXtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aehq8A3QmxzETB7FrTfto6mHd0aMZzX16yUKPVchuyo=; b=PhTftSjCkF7ihDAPxt8wA1SlW1acq5XhxHYHr/raT5KQk7wXU0EWtKyAVyBde690MVtigd YAceqQAHTipueZ2DKS7OaZCCwV6SY7ab8wxZV/JMP6mNIYOrCFdy5Vx5VSnAzMDKcbVNj/ HGYY4wtcNfjJeY9DrJAu/aJBYm8cgyFs4Q8r+MBGXOxHvJtZivYP668GBnzNBtRFMdr1KX /I8+7Vv3RhALRti9FiXsdkfUwirU/RTKkNj/71aICWYsvWWdrAKWZClw6Sd3aqt4d4l9n+ SzLeUMmf1a+ouP3XItAev1WXu/7YkP1Fovvjycszx9f3YaoGTvkraqBp0avW4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610818; a=rsa-sha256; cv=none; b=ElgiTXtzzYAVWLOuqW6vltq/0TMokUF/UrHgDFCt0oxFHClYHHWvx83vYNnGPr2Mk9YQWF aNW1YVQZagTf+xf1pJkRgXFFTYj5BdLZFcfSEoIEn+inN+d8c6Tiho1w4LrimCwYd+QTOe PKhEk6tMzdZ3nqr3iscRWQC9v9Z/bAhkV/8VDpXi8oX9RRiEzW4FcqbAH4aMrlA/FpycFK 8LW8Mw8GuQofT+VT9AfMXovJIhJOgZaaYC6+yU6mta2XRcP+wGvpxrM7Q1KOp/Y7gMy3c0 w9BEe+ztLgAB6RIMMfXk12rYid0yar9B8VuoBycTSezU9zbziXkvnbjvBub10g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRZHQ1NPlztkv; Fri, 10 Nov 2023 10:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6w3R016714; Fri, 10 Nov 2023 10:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6wcE016711; Fri, 10 Nov 2023 10:06:58 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:58 GMT Message-Id: <202311101006.3AAA6wcE016711@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: a04633cef81e - main - imgact_elf: Export __elfN(parse_notes) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a04633cef81e3b29da4eb214331bd472fc2e9238 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a04633cef81e3b29da4eb214331bd472fc2e9238 commit a04633cef81e3b29da4eb214331bd472fc2e9238 Author: Andrew Turner AuthorDate: 2023-11-01 15:18:12 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 09:57:45 +0000 imgact_elf: Export __elfN(parse_notes) This is useful to check if a note is present and contains an expected value, e.g. to read NT_GNU_PROPERTY_TYPE_0 on arm64 to see if we should enable BTI. Reviewed by: kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42439 --- sys/kern/imgact_elf.c | 2 +- sys/sys/imgact_elf.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index e03527f6a873..f361920e16d5 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2704,7 +2704,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) } } -static bool +bool __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, const char *note_vendor, const Elf_Phdr *pnote, bool (*cb)(const Elf_Note *, void *, bool *), void *cb_arg) diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index 7210fc2187a9..51e149476a28 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -123,6 +123,9 @@ void __elfN(prepare_notes)(struct thread *, struct note_info_list *, void __elfN(size_segments)(struct thread *, struct sseg_closure *, int); size_t __elfN(register_note)(struct thread *, struct note_info_list *, int, outfunc_t, void *); +bool __elfN(parse_notes)(struct image_params *, Elf_Note *, const char *, + const Elf_Phdr *, bool (*)(const Elf_Note *, void *, bool *), + void *); /* Machine specific function to dump per-thread information. */ void __elfN(dump_thread)(struct thread *, void *, size_t *); From nobody Fri Nov 10 10:06:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRZHR5H8Mz501ZM; Fri, 10 Nov 2023 10:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHR3WVfz3Jf1; Fri, 10 Nov 2023 10:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IHiwvdBb6KIdRRuOudGbsFCCAsPt/FLbDJGWiYNoM6k=; b=UMrKMYVH5harV2EA5+NtFehcEvcip/s1s2K47TQOd6eMsi+GO8pp/b22CWF2c8i4L0mmo2 TRPC7gLzeTuTUilUnVoQK/z2cY12eZpDgHHDwmyQCT0B5qkv6EcDrHt6ZKJx+v2ctjhX5u jue2SQr5s1+lgcp6P3A8sp2sVzB8uL/5f4oUwVLbVXbfB+GE5cPFS+9Z12R4oL9X50S0cf Pvr/fn01iJi7cKCFO/V1P+siVCxteX2VqftJLabHCUrvnjz3mWyXQfMNusGXuDT8vO6ZVI y4VPTXzUcffilp3VgZIeWUS3SUSqQ8f2/a6dJ2DgW57cCVvBdh10VJsCLlEGBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IHiwvdBb6KIdRRuOudGbsFCCAsPt/FLbDJGWiYNoM6k=; b=Exn+3GTmnEl+QwsliMQUmcteL3H/EgEPES3ACSByiag1VT3oX0poZcWgjG+2B5/mIvMT7d 2Wurt84LYw2ad470IASMBpUQTjJyTeXFusUPDDSJ1qIQFil7TCNmmRlhjPtnNK/K/PDuMR NDATpw1VXB8T+bdT8sfyiP9UHBOWbBAqyUVrQBHTvX3zBFq3RHbvOZVCrQZPdgDUlG1Aw4 WrSNUHqgfTqDvwXkejZ1pr/8uW7DYJOn6DM8VZtanOersc3hc+erUXeAl2a36XuD+n+peb pHBjh61beRcf14V1gJGTSM+cBGLNZiQswxEIGzlcYOh9wMLT4ae1ArMk+IPuXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610819; a=rsa-sha256; cv=none; b=tafmK7k/ST7NqSLX5K++E6teHjEOmIkTb1AQKxTv8ZP7S1aeDq5O+r9Hdh7e+5vQZ3oqCf +ybcWYiPxMgiT6ZEQbVQZEpBElKdkWs4hlMT2TaiRm48y64oXVVYfZcbzKMpqd4hHsp9sr YDut7v2eAPJxZgedozUu7cX5n4MEwJ1UccV01tpZ/a8POPToImdiwHbszyS4rk4mWkk6R6 VTuEqcjpwgI3gMai4DLj2lf1cS7lqRtg3FisfTxpvC3qoBvUl84z8XG1+9DV4ijArfK6zS fBottyQbTyzopfX4PeKXZPoBaNJxb0ivkwsuLrWwDu/8RzlLYfOJO55ha9hrQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRZHR2bVBztkw; Fri, 10 Nov 2023 10:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6x7O016751; Fri, 10 Nov 2023 10:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6xxF016748; Fri, 10 Nov 2023 10:06:59 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:59 GMT Message-Id: <202311101006.3AAA6xxF016748@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: eb32c1c75ab0 - main - sysent: Add sv_protect List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: eb32c1c75ab0d8518a04ab18d46e82804b31d055 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=eb32c1c75ab0d8518a04ab18d46e82804b31d055 commit eb32c1c75ab0d8518a04ab18d46e82804b31d055 Author: Andrew Turner AuthorDate: 2023-11-02 09:49:27 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 09:57:45 +0000 sysent: Add sv_protect To allow for architecture specific protections add sv_protect to struct sysent. This can be used to apply these after the executable is loaded into the new address space. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42440 --- sys/kern/imgact_elf.c | 6 ++++++ sys/sys/sysent.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index f361920e16d5..047bde3c250b 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -862,6 +862,9 @@ __elfN(load_file)(struct proc *p, const char *file, u_long *addr, if (error != 0) goto fail; + if (p->p_sysent->sv_protect != NULL) + p->p_sysent->sv_protect(imgp, SVP_INTERP); + *addr = base_addr; *entry = (unsigned long)hdr->e_entry + rbase; @@ -1369,6 +1372,9 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) entry = (u_long)hdr->e_entry + imgp->et_dyn_addr; imgp->entry_addr = entry; + if (sv->sv_protect != NULL) + sv->sv_protect(imgp, SVP_IMAGE); + if (interp != NULL) { VOP_UNLOCK(imgp->vp); if ((map->flags & MAP_ASLR) != 0) { diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index a23c338f9ce2..c582ed494be9 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -149,6 +149,7 @@ struct sysentvec { vm_offset_t sv_fxrng_gen_offset; void (*sv_onexec_old)(struct thread *td); int (*sv_onexec)(struct proc *, struct image_params *); + void (*sv_protect)(struct image_params *, int); void (*sv_onexit)(struct proc *); void (*sv_ontdexit)(struct thread *td); int (*sv_setid_allowed)(struct thread *td, @@ -187,6 +188,10 @@ struct sysentvec { #define SVC_NOCOMPRESS 0x00000002 /* disable compression. */ #define SVC_ALL 0x00000004 /* dump everything */ +/* sv_protect flags */ +#define SVP_IMAGE 0x00000001 +#define SVP_INTERP 0x00000002 + #ifdef _KERNEL extern struct sysentvec aout_sysvec; extern struct sysent sysent[]; From nobody Fri Nov 10 11:53:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRcdw1r19z50Qw2; Fri, 10 Nov 2023 11:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRcdw1Nq6z3drK; Fri, 10 Nov 2023 11:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699617188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5G4WJ+9OgYdafxRYwv4R/r+TwMKATd2jWwK+TJfli38=; b=mObp+Jak4O/ERUedQ2lnohZVNT/O5sCJdgYED4O1m5Dq5YFHVfj6Lwr4oKLRZ+FNIfRLsL svfoJKWPIqhBio0EQYYNmskZ8PZfErmcc8nL+Se/cRMd4o1zcu8mtKdi4aFMAH0DFEDhjN /+HesQPAxsgo0y7tAF/F5UmA9+YHo7e8B7ai9T02q0JIiexCShyVM9mGSUWUxMUVV7+I81 IpPewPWyKjFhc7n3xQy6unqh5pWsDoOakwcee0iLrmN+coLlH0S/GLRxygvnJXpJD1C0aA 2PO4M73H1ouNaEoQge7RaLHKANDZzOu+83YyOoaq8eFVmDVZI7qDvhI8kqXGbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699617188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5G4WJ+9OgYdafxRYwv4R/r+TwMKATd2jWwK+TJfli38=; b=KmsT9NY0jgapKXo+Wnv0FQvapEm4nZNZSH7Z4V1xqM6J3uyOdwrfW4W0dm4AVC5xfTbpog gVPAaa+0ZpwsyXd3EbrmUMn2f7DjDpvDVrDwTVJzZeF7K8AO7MTMOk9gt4C6ENSGvzJCbX chgXYPPF5a2f7AZNsK2LfhTdXSN5xImqnUW33jQJD0c6IQsTbOoiaemNr2UPFicqtyQE08 gTJZL+XO5Vzi2WHUF1wrYqVTyKmLbwT8CqXGFeD7VZUYvQI4ia2c5tEQbykbNO5qN2OKZe PK8/3pX4mHY6fIwNbJfL67DAMN1y1XHHkM4aF+uTte35zahP4NobUZdWNHYGNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699617188; a=rsa-sha256; cv=none; b=DxLkqdOy45M3yrcAURS4r8S0D8u69Ud8ZD+EqGGi8JXkzAulqUiFZdOpG2bJ4ggzjkvWvz Dz5LchzLPegKVaZxp88gANQa30OYXo26HgoVrmK54G93h6S3BRUloEw8cQSMqHl4B7B1EX 6TJAr1eDXO1HvQfiVsYC2qUDXoWu2o9DcNV2om+gO5RZrS038d7VrhqK5DBP5JTRTxemjS 7zRS1eoVIz/WVni0mV0zFRBhML1V/2Whv1nSIYRJHTL2F/RgS6pGL1KUsFVr9yqNlEJYg7 Q8CALXyuZinqCJTK4jS6LDbYtiw5F4g5WZWhDqTKdLQg6Op3q6DA2E0GKtpgPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRcdw0SMVzxSq; Fri, 10 Nov 2023 11:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AABr7no099244; Fri, 10 Nov 2023 11:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AABr7Ju099241; Fri, 10 Nov 2023 11:53:07 GMT (envelope-from git) Date: Fri, 10 Nov 2023 11:53:07 GMT Message-Id: <202311101153.3AABr7Ju099241@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: 83dbbe8295ff - stable/13 - libpfctl: fix label setting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 83dbbe8295ff0bb06a8f6b621c25d8224b026b77 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=83dbbe8295ff0bb06a8f6b621c25d8224b026b77 commit 83dbbe8295ff0bb06a8f6b621c25d8224b026b77 Author: Franco Fichtner AuthorDate: 2023-11-10 11:42:17 +0000 Commit: Kristof Provost CommitDate: 2023-11-10 11:47:44 +0000 libpfctl: fix label setting A mismerge caused the labels list to be added to the wrong nvlist, breaking label configuration. If you compare the change from from main and stable/13 you can see that main uses "nvl" and stable/13 has "nlvr" for nvlist_append_string_array() but the backport changes it to "nlv". This code was supposed to apply to pfctl_add_eth_rule() but instead applied to pfctl_add_rule() for otherwise interesting reasons. Since pfctl_add_eth_rule() uses "nvl" and pfctl_add_rule() uses "nvlr" but also has "nvl" this compiled fine but still broke the label set. Direct commit to stable/13. PR: 275006 --- lib/libpfctl/libpfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index bf25a45b792f..4dec539e250b 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -643,7 +643,7 @@ pfctl_add_rule(int dev, const struct pfctl_rule *r, const char *anchor, labelcount = 0; while (labelcount < PF_RULE_MAX_LABEL_COUNT && r->label[labelcount][0] != 0) { - nvlist_append_string_array(nvl, "labels", + nvlist_append_string_array(nvlr, "labels", r->label[labelcount]); labelcount++; } From nobody Fri Nov 10 16:06:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRkFp32LVz4ywf7; Fri, 10 Nov 2023 16:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRkFp2bfhz3N7W; Fri, 10 Nov 2023 16:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xruBsDHG/untGN25mL3fAkm/jUPT2tOIC4yi2RGwRW0=; b=DtOKPocG4xY/s3toqOUYWC8/Sdm4x09jv5S7imhVvrEVDCsWTGvGBwEKBNtRR3y6Ie1jCV miemlFYAEj8l2ZMlxrln23dzy5K7miPzlBYZ85lz9Wj6Qv4uYOvbDqsohtoDT1TJnWOcHj yaS/H2/FA/nN2Evmsn17gm1vCWcizl2yD37naxxfVsN2PKNQEgPx1aDckuQbZi9qyuuKgf uDgAdpPdPYdiDwQuSTwiGc4m+cvmud6nhshxNbiQMSOSXBkwCjN3xkxzp/BCjk65y+7BFe 31wZDCBg0gzR8u2P9jsnq5WBKacZ/2TUCFE3D+YMh8m+fiT86fWb2q3hU7k6hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xruBsDHG/untGN25mL3fAkm/jUPT2tOIC4yi2RGwRW0=; b=ZCvHPTR5vbyPuAuEc2pD59Htk3McA4KldVHB5BRDhBJqTAJy06CvUX4P5zmMcJkIrKDZh5 dc4fPftabpvQWQN30FRGEqHHIpMrI4TuuKvyWOqAr/XfSNNcxrpuPRFeBDbcA41IuiOmEu 0wZtvuqt2+DwYKAebtIeWb6Zbc+sx1mzUt58sgD8tB3OhKXwWY5ekUHlxN1gakMSvgBF44 dMqBoSutKrkSJEb6v700q8TTz3ycUibmYmcz18cVbp2pya+/2DgyK75KA9nwdJHTTCFRlN 4C6qJONCQxdzPO43gGjGMavvNla8kLDw7V4HXzs6Wu3Lb5U3b5qQ7/eRgyWR9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699632366; a=rsa-sha256; cv=none; b=aBNx6w7eZbQi+Yk3ojvQ1ai0Etc/fGrRHGhQZfj4PNN2AxtDgKLCo4LYbQ3LaFCoPbf60U iz/zz0Iarllk794TFYfZhqt11V/u0EyVyVH2umS0Mt4KaO58STWcoSU0wR63WoPylmDjNX GJYH4JQPOw5VcPpot+32AEozoGOpfSLOp7S65QYdeVnnvj8hJby5vq2wLyr+NYyOZ0Thn5 VDGSqjRILNF6XikQKtn1tUumb45h9hKTZ8LPaEbl1AFkFZav1X6dj+P6J6+yTqHi1L3ZjT fQASSOFpZT/DpwyBTgCFa1APujHfNjpUHeQD3FYq9iBXqA2l6bUhEY6iOZZiNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRkFp1fkWz14Vj; Fri, 10 Nov 2023 16:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAG66w4018089; Fri, 10 Nov 2023 16:06:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAG66rL018086; Fri, 10 Nov 2023 16:06:06 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:06:06 GMT Message-Id: <202311101606.3AAG66rL018086@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: c2dc043c9757 - main - arm64: Add an is64bit flag to user readable 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c2dc043c9757aad77bb1745e3b14dfa6b27e3fa4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c2dc043c9757aad77bb1745e3b14dfa6b27e3fa4 commit c2dc043c9757aad77bb1745e3b14dfa6b27e3fa4 Author: Andrew Turner AuthorDate: 2023-10-25 10:47:30 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 16:01:13 +0000 arm64: Add an is64bit flag to user readable ID regs To tell if a register is for 32 or 64 bit userspace add a flag to the user reg struct. This will be used later to rework how the hwcaps are generated. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42370 --- sys/arm64/arm64/identcpu.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 0dc23286ec9d..994dc4602b9c 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1827,50 +1827,52 @@ struct mrs_user_reg { u_int reg; u_int CRm; u_int Op2; + bool is64bit; size_t offset; const struct mrs_field *fields; }; -#define USER_REG(name, field_name) \ +#define USER_REG(name, field_name, _is64bit) \ { \ .reg = name, \ .CRm = name##_CRm, \ .Op2 = name##_op2, \ .offset = __offsetof(struct cpu_desc, field_name), \ .fields = field_name##_fields, \ + .is64bit = _is64bit, \ } static const struct mrs_user_reg user_regs[] = { - USER_REG(ID_AA64AFR0_EL1, id_aa64afr0), - USER_REG(ID_AA64AFR1_EL1, id_aa64afr1), + USER_REG(ID_AA64AFR0_EL1, id_aa64afr0, true), + USER_REG(ID_AA64AFR1_EL1, id_aa64afr1, true), - USER_REG(ID_AA64DFR0_EL1, id_aa64dfr0), - USER_REG(ID_AA64DFR1_EL1, id_aa64dfr1), + USER_REG(ID_AA64DFR0_EL1, id_aa64dfr0, true), + USER_REG(ID_AA64DFR1_EL1, id_aa64dfr1, true), - USER_REG(ID_AA64ISAR0_EL1, id_aa64isar0), - USER_REG(ID_AA64ISAR1_EL1, id_aa64isar1), - USER_REG(ID_AA64ISAR2_EL1, id_aa64isar2), + USER_REG(ID_AA64ISAR0_EL1, id_aa64isar0, true), + USER_REG(ID_AA64ISAR1_EL1, id_aa64isar1, true), + USER_REG(ID_AA64ISAR2_EL1, id_aa64isar2, true), - USER_REG(ID_AA64MMFR0_EL1, id_aa64mmfr0), - USER_REG(ID_AA64MMFR1_EL1, id_aa64mmfr1), - USER_REG(ID_AA64MMFR2_EL1, id_aa64mmfr2), + USER_REG(ID_AA64MMFR0_EL1, id_aa64mmfr0, true), + USER_REG(ID_AA64MMFR1_EL1, id_aa64mmfr1, true), + USER_REG(ID_AA64MMFR2_EL1, id_aa64mmfr2, true), #ifdef NOTYET - USER_REG(ID_AA64MMFR3_EL1, id_aa64mmfr3), - USER_REG(ID_AA64MMFR4_EL1, id_aa64mmfr4), + USER_REG(ID_AA64MMFR3_EL1, id_aa64mmfr3, true), + USER_REG(ID_AA64MMFR4_EL1, id_aa64mmfr4, true), #endif - USER_REG(ID_AA64PFR0_EL1, id_aa64pfr0), - USER_REG(ID_AA64PFR1_EL1, id_aa64pfr1), + USER_REG(ID_AA64PFR0_EL1, id_aa64pfr0, true), + USER_REG(ID_AA64PFR1_EL1, id_aa64pfr1, true), #ifdef NOTYET - USER_REG(ID_AA64PFR2_EL1, id_aa64pfr2), + USER_REG(ID_AA64PFR2_EL1, id_aa64pfr2, true), #endif - USER_REG(ID_AA64ZFR0_EL1, id_aa64zfr0), + USER_REG(ID_AA64ZFR0_EL1, id_aa64zfr0, true), #ifdef COMPAT_FREEBSD32 - USER_REG(ID_ISAR5_EL1, id_isar5), + USER_REG(ID_ISAR5_EL1, id_isar5, false), - USER_REG(MVFR0_EL1, mvfr0), - USER_REG(MVFR1_EL1, mvfr1), + USER_REG(MVFR0_EL1, mvfr0, false), + USER_REG(MVFR1_EL1, mvfr1, false), #endif /* COMPAT_FREEBSD32 */ }; From nobody Fri Nov 10 16:06:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRkFq3y2Lz4ywfC; Fri, 10 Nov 2023 16:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRkFq3dWdz3NK8; Fri, 10 Nov 2023 16:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OpHlu6XHfVhdAYIDNQTC/bUbabDh/fK3RsooX1CUBzE=; b=yMOSM4rneWEmEs51g8oouUu5e7PmVWfMFI4IUKbWydfC3/NpHo0ZSIALJDEwo2vjLQT6b0 EIjem+Umxpfct/RrBEeFUpiNdm0LV/hZoaqv9nfOckou4UxqoPuMlaFflo5s0ntfQIWL9O eSpDqWpzXjPs9ivNJxEDyRh3BqyqSmtBxO8qQajzQDt37s3bUc+cFHDq7RT2oafvgUNomp 2yn+V6MpmsT86WD+IyvBTLtiUojO/IRTPDDKKP5fYnc1pax3ggYqj4CpKreXInztgY7sP5 jxQNRhWLVbmKJ4CT6xkI1TNctlJfTw/ZK+G3R8u4yPxwS+gJdBBRibRuNdKtAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OpHlu6XHfVhdAYIDNQTC/bUbabDh/fK3RsooX1CUBzE=; b=NtppDaIZltnmMZcBCUxcQc7pl/K1jeTqBqxh6spp6pgJkMpz53IUq+TL4P3xWe8JXTO+a6 0AZ6DIwpQValgfFgrLANqiAPJZkiTTv2n3BrGGJbOuhFHRB3rH/i2rcCDEkYMR4wRmK++8 5RdUKmhOCP/OhK0wUeBvIlk6KpJ3y72wqy+Zg7WJTWYf+7X9GUXMtARyhCwqg3pvF+wp/Z JsvXe/kiD0rHqfPAzzZGdwyJqPypIEoc2B9W/aMzViu8QiWzMd+pXVjIaQGnjXdH4p9eV9 Fgv5FQa5/jTqNut1i4t9iQj0bx3eiEDVyYZocBEyt2Axt1i8fQoCpzUDeQkq1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699632367; a=rsa-sha256; cv=none; b=GASdw+Cj1JxEY5gsgn4FsFTJtyrq0HmYxnQVXrZcQ+G2OF6cle3mqeTpVzuWCtpyP36KAo vQtiL48dKHuoJm8FAmLf5E+SVyHTJf8F2TWy3ih+GbGgb3vvovQjU3DMVTNmI2Ez2awN3X W88udIwglw1zt2jVUbO0f0yYcNSuBYQrWv2MSf4yvgHqc75/v9HNODSyD+q3tVyIsGMcML uNzTRzugbIc0sW+0A54vKFfn/zOpfkL7zsGIa28FK5XZgFZyHvZHQIa9yXSrDdVGSEJpB8 V2dMX3arXPzbhg+ghkEStc61VaDroG3BAbeC0Tr1iSskjN1OheROeBdx4ZgtFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRkFq2Mfpz14Vk; Fri, 10 Nov 2023 16:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAG67wT018147; Fri, 10 Nov 2023 16:06:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAG67Bg018144; Fri, 10 Nov 2023 16:06:07 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:06:07 GMT Message-Id: <202311101606.3AAG67Bg018144@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: c9e8b4b27966 - main - arm64: Use a hwcap ID rather than pointer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c9e8b4b27966acf710f86d8c9f867f857f05f2c3 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c9e8b4b27966acf710f86d8c9f867f857f05f2c3 commit c9e8b4b27966acf710f86d8c9f867f857f05f2c3 Author: Andrew Turner AuthorDate: 2023-10-26 10:21:57 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 16:01:13 +0000 arm64: Use a hwcap ID rather than pointer To allow for a different Linux hwcap value store the hwcap ID rather than a pointer to elf{32,}_hwcap{2,}. This will be needed when creating a different view of the ID registers for FreeBSD and Linux. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42371 --- sys/arm64/arm64/identcpu.c | 133 +++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 59 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 994dc4602b9c..d699e409bc8a 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -317,19 +317,19 @@ struct mrs_field_value { #define MRS_FIELD_VALUE_END { .desc = NULL } struct mrs_field_hwcap { - u_long *hwcap; uint64_t min; u_long hwcap_val; + u_int hwcap_id; }; -#define MRS_HWCAP(_hwcap, _val, _min) \ +#define MRS_HWCAP(_hwcap_id, _val, _min) \ { \ - .hwcap = (_hwcap), \ + .hwcap_id = (_hwcap_id), \ .hwcap_val = (_val), \ .min = (_min), \ } -#define MRS_HWCAP_END { .hwcap = NULL } +#define MRS_HWCAP_END { .hwcap_id = 0 } struct mrs_field { const char *name; @@ -493,7 +493,7 @@ static const struct mrs_field_value id_aa64isar0_rndr[] = { }; static const struct mrs_field_hwcap id_aa64isar0_rndr_caps[] = { - MRS_HWCAP(&elf_hwcap2, HWCAP2_RNG, ID_AA64ISAR0_RNDR_IMPL), + MRS_HWCAP(2, HWCAP2_RNG, ID_AA64ISAR0_RNDR_IMPL), MRS_HWCAP_END }; @@ -512,8 +512,8 @@ static const struct mrs_field_value id_aa64isar0_ts[] = { }; static const struct mrs_field_hwcap id_aa64isar0_ts_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_FLAGM, ID_AA64ISAR0_TS_CondM_8_4), - MRS_HWCAP(&elf_hwcap2, HWCAP2_FLAGM2, ID_AA64ISAR0_TS_CondM_8_5), + MRS_HWCAP(1, HWCAP_FLAGM, ID_AA64ISAR0_TS_CondM_8_4), + MRS_HWCAP(2, HWCAP2_FLAGM2, ID_AA64ISAR0_TS_CondM_8_5), MRS_HWCAP_END }; @@ -523,7 +523,7 @@ static const struct mrs_field_value id_aa64isar0_fhm[] = { }; static const struct mrs_field_hwcap id_aa64isar0_fhm_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_ASIMDFHM, ID_AA64ISAR0_FHM_IMPL), + MRS_HWCAP(1, HWCAP_ASIMDFHM, ID_AA64ISAR0_FHM_IMPL), MRS_HWCAP_END }; @@ -533,7 +533,7 @@ static const struct mrs_field_value id_aa64isar0_dp[] = { }; static const struct mrs_field_hwcap id_aa64isar0_dp_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_ASIMDDP, ID_AA64ISAR0_DP_IMPL), + MRS_HWCAP(1, HWCAP_ASIMDDP, ID_AA64ISAR0_DP_IMPL), MRS_HWCAP_END }; @@ -543,7 +543,7 @@ static const struct mrs_field_value id_aa64isar0_sm4[] = { }; static const struct mrs_field_hwcap id_aa64isar0_sm4_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SM4, ID_AA64ISAR0_SM4_IMPL), + MRS_HWCAP(1, HWCAP_SM4, ID_AA64ISAR0_SM4_IMPL), MRS_HWCAP_END }; @@ -553,7 +553,7 @@ static const struct mrs_field_value id_aa64isar0_sm3[] = { }; static const struct mrs_field_hwcap id_aa64isar0_sm3_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SM3, ID_AA64ISAR0_SM3_IMPL), + MRS_HWCAP(1, HWCAP_SM3, ID_AA64ISAR0_SM3_IMPL), MRS_HWCAP_END }; @@ -563,7 +563,7 @@ static const struct mrs_field_value id_aa64isar0_sha3[] = { }; static const struct mrs_field_hwcap id_aa64isar0_sha3_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SHA3, ID_AA64ISAR0_SHA3_IMPL), + MRS_HWCAP(1, HWCAP_SHA3, ID_AA64ISAR0_SHA3_IMPL), MRS_HWCAP_END }; @@ -573,7 +573,7 @@ static const struct mrs_field_value id_aa64isar0_rdm[] = { }; static const struct mrs_field_hwcap id_aa64isar0_rdm_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_ASIMDRDM, ID_AA64ISAR0_RDM_IMPL), + MRS_HWCAP(1, HWCAP_ASIMDRDM, ID_AA64ISAR0_RDM_IMPL), MRS_HWCAP_END }; @@ -588,7 +588,7 @@ static const struct mrs_field_value id_aa64isar0_atomic[] = { }; static const struct mrs_field_hwcap id_aa64isar0_atomic_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_ATOMICS, ID_AA64ISAR0_Atomic_IMPL), + MRS_HWCAP(1, HWCAP_ATOMICS, ID_AA64ISAR0_Atomic_IMPL), MRS_HWCAP_END }; @@ -598,7 +598,7 @@ static const struct mrs_field_value id_aa64isar0_crc32[] = { }; static const struct mrs_field_hwcap id_aa64isar0_crc32_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_CRC32, ID_AA64ISAR0_CRC32_BASE), + MRS_HWCAP(1, HWCAP_CRC32, ID_AA64ISAR0_CRC32_BASE), MRS_HWCAP_END }; @@ -609,8 +609,8 @@ static const struct mrs_field_value id_aa64isar0_sha2[] = { }; static const struct mrs_field_hwcap id_aa64isar0_sha2_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SHA2, ID_AA64ISAR0_SHA2_BASE), - MRS_HWCAP(&elf_hwcap, HWCAP_SHA512, ID_AA64ISAR0_SHA2_512), + MRS_HWCAP(1, HWCAP_SHA2, ID_AA64ISAR0_SHA2_BASE), + MRS_HWCAP(1, HWCAP_SHA512, ID_AA64ISAR0_SHA2_512), MRS_HWCAP_END }; @@ -620,7 +620,7 @@ static const struct mrs_field_value id_aa64isar0_sha1[] = { }; static const struct mrs_field_hwcap id_aa64isar0_sha1_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SHA1, ID_AA64ISAR0_SHA1_BASE), + MRS_HWCAP(1, HWCAP_SHA1, ID_AA64ISAR0_SHA1_BASE), MRS_HWCAP_END }; @@ -631,8 +631,8 @@ static const struct mrs_field_value id_aa64isar0_aes[] = { }; static const struct mrs_field_hwcap id_aa64isar0_aes_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_AES, ID_AA64ISAR0_AES_BASE), - MRS_HWCAP(&elf_hwcap, HWCAP_PMULL, ID_AA64ISAR0_AES_PMULL), + MRS_HWCAP(1, HWCAP_AES, ID_AA64ISAR0_AES_BASE), + MRS_HWCAP(1, HWCAP_PMULL, ID_AA64ISAR0_AES_PMULL), MRS_HWCAP_END }; @@ -688,7 +688,7 @@ static const struct mrs_field_value id_aa64isar1_i8mm[] = { }; static const struct mrs_field_hwcap id_aa64isar1_i8mm_caps[] = { - MRS_HWCAP(&elf_hwcap2, HWCAP2_I8MM, ID_AA64ISAR1_I8MM_IMPL), + MRS_HWCAP(2, HWCAP2_I8MM, ID_AA64ISAR1_I8MM_IMPL), MRS_HWCAP_END }; @@ -698,7 +698,7 @@ static const struct mrs_field_value id_aa64isar1_dgh[] = { }; static const struct mrs_field_hwcap id_aa64isar1_dgh_caps[] = { - MRS_HWCAP(&elf_hwcap2, HWCAP2_DGH, ID_AA64ISAR1_DGH_IMPL), + MRS_HWCAP(2, HWCAP2_DGH, ID_AA64ISAR1_DGH_IMPL), MRS_HWCAP_END }; @@ -709,7 +709,7 @@ static const struct mrs_field_value id_aa64isar1_bf16[] = { }; static const struct mrs_field_hwcap id_aa64isar1_bf16_caps[] = { - MRS_HWCAP(&elf_hwcap2, HWCAP2_BF16, ID_AA64ISAR1_BF16_IMPL), + MRS_HWCAP(2, HWCAP2_BF16, ID_AA64ISAR1_BF16_IMPL), MRS_HWCAP_END }; @@ -725,7 +725,7 @@ static const struct mrs_field_value id_aa64isar1_sb[] = { }; static const struct mrs_field_hwcap id_aa64isar1_sb_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SB, ID_AA64ISAR1_SB_IMPL), + MRS_HWCAP(1, HWCAP_SB, ID_AA64ISAR1_SB_IMPL), MRS_HWCAP_END }; @@ -735,7 +735,7 @@ static const struct mrs_field_value id_aa64isar1_frintts[] = { }; static const struct mrs_field_hwcap id_aa64isar1_frintts_caps[] = { - MRS_HWCAP(&elf_hwcap2, HWCAP2_FRINT, ID_AA64ISAR1_FRINTTS_IMPL), + MRS_HWCAP(2, HWCAP2_FRINT, ID_AA64ISAR1_FRINTTS_IMPL), MRS_HWCAP_END }; @@ -745,7 +745,7 @@ static const struct mrs_field_value id_aa64isar1_gpi[] = { }; static const struct mrs_field_hwcap id_aa64isar1_gpi_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_PACG, ID_AA64ISAR1_GPI_IMPL), + MRS_HWCAP(1, HWCAP_PACG, ID_AA64ISAR1_GPI_IMPL), MRS_HWCAP_END }; @@ -755,7 +755,7 @@ static const struct mrs_field_value id_aa64isar1_gpa[] = { }; static const struct mrs_field_hwcap id_aa64isar1_gpa_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_PACG, ID_AA64ISAR1_GPA_IMPL), + MRS_HWCAP(1, HWCAP_PACG, ID_AA64ISAR1_GPA_IMPL), MRS_HWCAP_END }; @@ -767,8 +767,8 @@ static const struct mrs_field_value id_aa64isar1_lrcpc[] = { }; static const struct mrs_field_hwcap id_aa64isar1_lrcpc_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_LRCPC, ID_AA64ISAR1_LRCPC_RCPC_8_3), - MRS_HWCAP(&elf_hwcap, HWCAP_ILRCPC, ID_AA64ISAR1_LRCPC_RCPC_8_4), + MRS_HWCAP(1, HWCAP_LRCPC, ID_AA64ISAR1_LRCPC_RCPC_8_3), + MRS_HWCAP(1, HWCAP_ILRCPC, ID_AA64ISAR1_LRCPC_RCPC_8_4), MRS_HWCAP_END }; @@ -778,7 +778,7 @@ static const struct mrs_field_value id_aa64isar1_fcma[] = { }; static const struct mrs_field_hwcap id_aa64isar1_fcma_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_FCMA, ID_AA64ISAR1_FCMA_IMPL), + MRS_HWCAP(1, HWCAP_FCMA, ID_AA64ISAR1_FCMA_IMPL), MRS_HWCAP_END }; @@ -788,7 +788,7 @@ static const struct mrs_field_value id_aa64isar1_jscvt[] = { }; static const struct mrs_field_hwcap id_aa64isar1_jscvt_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_JSCVT, ID_AA64ISAR1_JSCVT_IMPL), + MRS_HWCAP(1, HWCAP_JSCVT, ID_AA64ISAR1_JSCVT_IMPL), MRS_HWCAP_END }; @@ -804,7 +804,7 @@ static const struct mrs_field_value id_aa64isar1_api[] = { }; static const struct mrs_field_hwcap id_aa64isar1_api_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_PACA, ID_AA64ISAR1_API_PAC), + MRS_HWCAP(1, HWCAP_PACA, ID_AA64ISAR1_API_PAC), MRS_HWCAP_END }; @@ -820,7 +820,7 @@ static const struct mrs_field_value id_aa64isar1_apa[] = { }; static const struct mrs_field_hwcap id_aa64isar1_apa_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_PACA, ID_AA64ISAR1_APA_PAC), + MRS_HWCAP(1, HWCAP_PACA, ID_AA64ISAR1_APA_PAC), MRS_HWCAP_END }; @@ -832,8 +832,8 @@ static const struct mrs_field_value id_aa64isar1_dpb[] = { }; static const struct mrs_field_hwcap id_aa64isar1_dpb_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_DCPOP, ID_AA64ISAR1_DPB_DCCVAP), - MRS_HWCAP(&elf_hwcap2, HWCAP2_DCPODP, ID_AA64ISAR1_DPB_DCCVADP), + MRS_HWCAP(1, HWCAP_DCPOP, ID_AA64ISAR1_DPB_DCCVAP), + MRS_HWCAP(2, HWCAP2_DCPODP, ID_AA64ISAR1_DPB_DCCVADP), MRS_HWCAP_END }; @@ -900,7 +900,7 @@ static const struct mrs_field_value id_aa64isar2_apa3[] = { }; static const struct mrs_field_hwcap id_aa64isar2_apa3_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_PACA, ID_AA64ISAR2_APA3_PAC), + MRS_HWCAP(1, HWCAP_PACA, ID_AA64ISAR2_APA3_PAC), MRS_HWCAP_END }; @@ -910,7 +910,7 @@ static const struct mrs_field_value id_aa64isar2_gpa3[] = { }; static const struct mrs_field_hwcap id_aa64isar2_gpa3_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_PACG, ID_AA64ISAR2_GPA3_IMPL), + MRS_HWCAP(1, HWCAP_PACG, ID_AA64ISAR2_GPA3_IMPL), MRS_HWCAP_END }; @@ -1201,7 +1201,7 @@ static const struct mrs_field_value id_aa64mmfr2_at[] = { }; static const struct mrs_field_hwcap id_aa64mmfr2_at_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_USCAT, ID_AA64MMFR2_AT_IMPL), + MRS_HWCAP(1, HWCAP_USCAT, ID_AA64MMFR2_AT_IMPL), MRS_HWCAP_END }; @@ -1336,7 +1336,7 @@ static const struct mrs_field_value id_aa64pfr0_dit[] = { }; static const struct mrs_field_hwcap id_aa64pfr0_dit_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_DIT, ID_AA64PFR0_DIT_PSTATE), + MRS_HWCAP(1, HWCAP_DIT, ID_AA64PFR0_DIT_PSTATE), MRS_HWCAP_END }; @@ -1365,7 +1365,7 @@ static const struct mrs_field_value id_aa64pfr0_sve[] = { #if 0 /* Enable when we add SVE support */ static const struct mrs_field_hwcap id_aa64pfr0_sve_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SVE, ID_AA64PFR0_SVE_IMPL), + MRS_HWCAP(1, HWCAP_SVE, ID_AA64PFR0_SVE_IMPL), MRS_HWCAP_END }; #endif @@ -1392,8 +1392,8 @@ static const struct mrs_field_value id_aa64pfr0_advsimd[] = { }; static const struct mrs_field_hwcap id_aa64pfr0_advsimd_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_ASIMD, ID_AA64PFR0_AdvSIMD_IMPL), - MRS_HWCAP(&elf_hwcap, HWCAP_ASIMDHP, ID_AA64PFR0_AdvSIMD_HP), + MRS_HWCAP(1, HWCAP_ASIMD, ID_AA64PFR0_AdvSIMD_IMPL), + MRS_HWCAP(1, HWCAP_ASIMDHP, ID_AA64PFR0_AdvSIMD_HP), MRS_HWCAP_END }; @@ -1404,8 +1404,8 @@ static const struct mrs_field_value id_aa64pfr0_fp[] = { }; static const struct mrs_field_hwcap id_aa64pfr0_fp_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_FP, ID_AA64PFR0_FP_IMPL), - MRS_HWCAP(&elf_hwcap, HWCAP_FPHP, ID_AA64PFR0_FP_HP), + MRS_HWCAP(1, HWCAP_FP, ID_AA64PFR0_FP_IMPL), + MRS_HWCAP(1, HWCAP_FPHP, ID_AA64PFR0_FP_HP), MRS_HWCAP_END }; @@ -1510,7 +1510,7 @@ static const struct mrs_field_value id_aa64pfr1_ssbs[] = { }; static const struct mrs_field_hwcap id_aa64pfr1_ssbs_caps[] = { - MRS_HWCAP(&elf_hwcap, HWCAP_SSBS, ID_AA64PFR1_SSBS_PSTATE), + MRS_HWCAP(1, HWCAP_SSBS, ID_AA64PFR1_SSBS_PSTATE), MRS_HWCAP_END }; @@ -1523,7 +1523,7 @@ static const struct mrs_field_value id_aa64pfr1_bt[] = { #if 0 /* Enable when we add BTI support */ static const struct mrs_field_hwcap id_aa64pfr1_bt_caps[] = { - MRS_HWCAP(&elf_hwcap2, HWCAP2_BTI, ID_AA64PFR1_BT_IMPL), + MRS_HWCAP(2, HWCAP2_BTI, ID_AA64PFR1_BT_IMPL), MRS_HWCAP_END }; #endif @@ -1636,7 +1636,7 @@ static const struct mrs_field_value id_isar5_crc32[] = { }; static const struct mrs_field_hwcap id_isar5_crc32_caps[] = { - MRS_HWCAP(&elf32_hwcap2, HWCAP32_2_CRC32, ID_ISAR5_CRC32_IMPL), + MRS_HWCAP(2, HWCAP32_2_CRC32, ID_ISAR5_CRC32_IMPL), MRS_HWCAP_END }; @@ -1646,7 +1646,7 @@ static const struct mrs_field_value id_isar5_sha2[] = { }; static const struct mrs_field_hwcap id_isar5_sha2_caps[] = { - MRS_HWCAP(&elf32_hwcap2, HWCAP32_2_SHA2, ID_ISAR5_SHA2_IMPL), + MRS_HWCAP(2, HWCAP32_2_SHA2, ID_ISAR5_SHA2_IMPL), MRS_HWCAP_END }; @@ -1656,7 +1656,7 @@ static const struct mrs_field_value id_isar5_sha1[] = { }; static const struct mrs_field_hwcap id_isar5_sha1_caps[] = { - MRS_HWCAP(&elf32_hwcap2, HWCAP32_2_SHA1, ID_ISAR5_SHA1_IMPL), + MRS_HWCAP(2, HWCAP32_2_SHA1, ID_ISAR5_SHA1_IMPL), MRS_HWCAP_END }; @@ -1667,8 +1667,8 @@ static const struct mrs_field_value id_isar5_aes[] = { }; static const struct mrs_field_hwcap id_isar5_aes_caps[] = { - MRS_HWCAP(&elf32_hwcap2, HWCAP32_2_AES, ID_ISAR5_AES_BASE), - MRS_HWCAP(&elf32_hwcap2, HWCAP32_2_PMULL, ID_ISAR5_AES_VMULL), + MRS_HWCAP(2, HWCAP32_2_AES, ID_ISAR5_AES_BASE), + MRS_HWCAP(2, HWCAP32_2_PMULL, ID_ISAR5_AES_VMULL), MRS_HWCAP_END }; @@ -1721,8 +1721,8 @@ static const struct mrs_field_value mvfr0_fpdp[] = { }; static const struct mrs_field_hwcap mvfr0_fpdp_caps[] = { - MRS_HWCAP(&elf32_hwcap, HWCAP32_VFP, MVFR0_FPDP_VFP_v2), - MRS_HWCAP(&elf32_hwcap, HWCAP32_VFPv3, MVFR0_FPDP_VFP_v3_v4), + MRS_HWCAP(1, HWCAP32_VFP, MVFR0_FPDP_VFP_v2), + MRS_HWCAP(1, HWCAP32_VFPv3, MVFR0_FPDP_VFP_v3_v4), MRS_HWCAP_END }; @@ -1759,7 +1759,7 @@ static const struct mrs_field_value mvfr1_simdfmac[] = { }; static const struct mrs_field_hwcap mvfr1_simdfmac_caps[] = { - MRS_HWCAP(&elf32_hwcap, HWCAP32_VFPv4, MVFR1_SIMDFMAC_IMPL), + MRS_HWCAP(1, HWCAP32_VFPv4, MVFR1_SIMDFMAC_IMPL), MRS_HWCAP_END }; @@ -1794,7 +1794,7 @@ static const struct mrs_field_value mvfr1_simdls[] = { }; static const struct mrs_field_hwcap mvfr1_simdls_caps[] = { - MRS_HWCAP(&elf32_hwcap, HWCAP32_VFPv4, MVFR1_SIMDFMAC_IMPL), + MRS_HWCAP(1, HWCAP32_VFPv4, MVFR1_SIMDFMAC_IMPL), MRS_HWCAP_END }; @@ -2148,14 +2148,18 @@ int64_t idcache_line_size; /* The minimum cache line size */ * Find the values to export to userspace as AT_HWCAP and AT_HWCAP2. */ static void -parse_cpu_features(void) +parse_cpu_features(bool is64bit, u_long *hwcap, u_long *hwcap2) { const struct mrs_field_hwcap *hwcaps; const struct mrs_field *fields; uint64_t min, reg; + u_long *cur_hwcap; int i, j, k; for (i = 0; i < nitems(user_regs); i++) { + if (user_regs[i].is64bit != is64bit) + continue; + reg = CPU_DESC_FIELD(user_cpu_desc, i); fields = user_regs[i].fields; for (j = 0; fields[j].type != 0; j++) { @@ -2163,7 +2167,14 @@ parse_cpu_features(void) if (hwcaps == NULL) continue; - for (k = 0; hwcaps[k].hwcap != NULL; k++) { + for (k = 0; hwcaps[k].hwcap_id != 0; k++) { + KASSERT(hwcaps[k].hwcap_id == 1 || + hwcaps[k].hwcap_id == 2, + ("%s: Invalid HWCAP ID %d", __func__, + hwcaps[k].hwcap_id)); + + cur_hwcap = hwcaps[k].hwcap_id == 1 ? + hwcap : hwcap2; min = hwcaps[k].min; /* @@ -2172,7 +2183,7 @@ parse_cpu_features(void) */ if (mrs_field_cmp(reg, min, fields[j].shift, 4, fields[j].sign) >= 0) { - *hwcaps[k].hwcap |= hwcaps[k].hwcap_val; + *cur_hwcap |= hwcaps[k].hwcap_val; } } } @@ -2205,7 +2216,11 @@ identify_cpu_sysinit(void *dummy __unused) } /* Find the values to export to userspace as AT_HWCAP and AT_HWCAP2 */ - parse_cpu_features(); + parse_cpu_features(true, &elf_hwcap, &elf_hwcap2); +#ifdef COMPAT_FREEBSD32 + parse_cpu_features(false, &elf32_hwcap, &elf32_hwcap2); +#endif + /* We export the CPUID registers */ elf_hwcap |= HWCAP_CPUID; From nobody Fri Nov 10 16:06:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRkFr5Ndhz4ywlF; Fri, 10 Nov 2023 16:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRkFr4Smnz3NMb; Fri, 10 Nov 2023 16:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fY5r7L2DOQ4iKlYbwGwRBSZ0wja6ksozcL4xWq8w5VU=; b=j51UPVvkbaxElErsf5DybjrzklcEK8GBeMgKhC9JIdhsvCOag9EqfG39y97Rb7LPvME4TG znkYkkg40mXYg74wwNJkbobYFcEQiMPwltUBYaSI+sGEaMU2DmXMghGg7/22ZwwwxOu/B6 UOZYeL9ce2SYaZ8rH/Q1SNRDqVGHEcrHOdP95EFpJSRlRObD2tMD8bEayGP1gIy1P5Xwjv apUPM7v10So2HB4SDxYtQk75bTLkAtPf7JVOjGYu1brl5p3HAxtCIx6nxQYx2+ghvIOEVC KytdGgqfqkG+JbQg7M4ErOUmPCib4bicBJHBdYg87Bi99qdFtnL3S9mULC06Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fY5r7L2DOQ4iKlYbwGwRBSZ0wja6ksozcL4xWq8w5VU=; b=pMdG2XsAjdUwfq5/GT2wZR+8cuJUt1uowBJk0r7YmNWa9nG3ok8drxB4lekORq3+wh43/m 4clp4luysFL3yeuf25XNupNAzp73UakVii+zYgpmP6ZL/uNKC2jZgXrDeUBeO/Kl3uLxzD wFyaJiclYj4Ry2hpMst5/GiSfS/5nmzM1J213aE7HJsJZaa/r9/cXZMClzhdVZmohOG0KD MnZmf5h72xez6OaeKNDac2DAeSPJ6Qgu1PYXWS/UyPr3bpD2McTcbqGFLih53AcDrIC4Bq lxu4Tnuk1qQAyaqI8ijBMLDp6lMcpvDM0APTa2zjC3JaXaH+EWxVo/vt+fP9LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699632368; a=rsa-sha256; cv=none; b=tmhQd8v0RzakwmDg7ztf3LFHgkaf1HTmlP3h5xISN+yzScbKXuvFdkmoXq53fRXL3gHpVZ lKblamt2Dfhjjgr44YMdwqdlQx8/Rbo4wRMwr9FV6MPjJymUWF/BXP3eLx7oFjL/RUfgnq wms7t948DTbcDZwHo664ZkvSEkUYzKT2VbGfcm5ffsArIXNTPTv60N4vgoOgeCJ8vh6GKZ 6nGyA0MQE4mPhr2fIWwKVUAhCtODkqjFJFtOvbQx+1+crCV8hETJAiS0aaLgfHt4vy0N2U SmGU7uDsJ3nfyEruYk+KXhtcpc+lZTy1LO7bqu8gdxn8DUnoV4c2GGHgw0ntsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRkFr3RHCz14Xh; Fri, 10 Nov 2023 16:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAG68LS018201; Fri, 10 Nov 2023 16:06:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAG68d5018198; Fri, 10 Nov 2023 16:06:08 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:06:08 GMT Message-Id: <202311101606.3AAG68d5018198@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: e6dbc99d47dd - main - arm64: Create a Linux view of the ID registers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6dbc99d47ddb254d75822817592bb82b5ce4d97 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e6dbc99d47ddb254d75822817592bb82b5ce4d97 commit e6dbc99d47ddb254d75822817592bb82b5ce4d97 Author: Andrew Turner AuthorDate: 2023-10-25 12:34:38 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 16:01:13 +0000 arm64: Create a Linux view of the ID registers When adding support for new hardware extensions we may not want to enable support for the FreeBSD and Linux ABIs at the same time. To support this split the Linux ID register and hwcaps so they can be configured separately. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42372 --- sys/arm64/arm64/elf_machdep.c | 3 ++ sys/arm64/arm64/identcpu.c | 86 +++++++++++++++++++++++++++++++----------- sys/arm64/include/md_var.h | 2 + sys/arm64/linux/linux_sysvec.c | 4 +- 4 files changed, 70 insertions(+), 25 deletions(-) diff --git a/sys/arm64/arm64/elf_machdep.c b/sys/arm64/arm64/elf_machdep.c index dd053d4d7847..66377464111f 100644 --- a/sys/arm64/arm64/elf_machdep.c +++ b/sys/arm64/arm64/elf_machdep.c @@ -56,6 +56,9 @@ u_long __read_frequently elf_hwcap; u_long __read_frequently elf_hwcap2; +/* TODO: Move to a better location */ +u_long __read_frequently linux_elf_hwcap; +u_long __read_frequently linux_elf_hwcap2; struct arm64_addr_mask elf64_addr_mask; diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index d699e409bc8a..ac44b87ffcbd 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -33,10 +33,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include @@ -162,6 +164,7 @@ static struct cpu_desc cpu_desc0; static struct cpu_desc *cpu_desc; static struct cpu_desc kern_cpu_desc; static struct cpu_desc user_cpu_desc; +static struct cpu_desc l_user_cpu_desc; static struct cpu_desc * get_cpu_desc(u_int cpu) @@ -275,10 +278,12 @@ 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_EXACT_VAL(x) (MRS_EXACT | ((x) << 4)) -#define MRS_EXACT_FIELD(x) ((x) >> 4) +#define MRS_EXACT_FIELD(x) (((x) >> 4) & 0xf) #define MRS_LOWER 2 struct mrs_field_value { @@ -341,17 +346,23 @@ struct mrs_field { u_int shift; }; -#define MRS_FIELD_HWCAP(_register, _name, _sign, _type, _values, _hwcap) \ +#define MRS_FIELD_HWCAP_SPLIT(_register, _name, _sign, _fbsd_type, \ + _lnx_type, _values, _hwcap) \ { \ .name = #_name, \ .sign = (_sign), \ - .type = (_type), \ + .type = ((_fbsd_type) << MRS_TYPE_FBSD_SHIFT) | \ + ((_lnx_type) << MRS_TYPE_LNX_SHIFT), \ .shift = _register ## _ ## _name ## _SHIFT, \ .mask = _register ## _ ## _name ## _MASK, \ .values = (_values), \ .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) @@ -1911,7 +1922,10 @@ user_mrs_handler(vm_offset_t va, uint32_t insn, struct trapframe *frame, for (i = 0; i < nitems(user_regs); i++) { if (user_regs[i].CRm == CRm && user_regs[i].Op2 == Op2) { - value = CPU_DESC_FIELD(user_cpu_desc, i); + if (SV_CURPROC_ABI() == SV_ABI_FREEBSD) + value = CPU_DESC_FIELD(user_cpu_desc, i); + else + value = CPU_DESC_FIELD(l_user_cpu_desc, i); break; } } @@ -2064,12 +2078,32 @@ get_kernel_reg_masked(u_int reg, uint64_t *valp, uint64_t mask) return (false); } +static uint64_t +update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, + u_int shift, bool sign) +{ + switch (type & MRS_TYPE_MASK) { + case MRS_EXACT: + user_reg &= ~(0xful << shift); + user_reg |= (uint64_t)MRS_EXACT_FIELD(type) << shift; + break; + case MRS_LOWER: + user_reg = update_lower_register(user_reg, value, shift, 4, + sign); + break; + default: + panic("Invalid field type: %d", type); + } + + return (user_reg); +} + void update_special_regs(u_int cpu) { struct cpu_desc *desc; const struct mrs_field *fields; - uint64_t user_reg, kern_reg, value; + uint64_t l_user_reg, user_reg, kern_reg, value; int i, j; if (cpu == 0) { @@ -2080,6 +2114,8 @@ update_special_regs(u_int cpu) ID_AA64PFR0_FP_NONE | ID_AA64PFR0_EL1_64 | ID_AA64PFR0_EL0_64; user_cpu_desc.id_aa64dfr0 = ID_AA64DFR0_DebugVer_8; + /* Create the Linux user visible cpu description */ + memcpy(&l_user_cpu_desc, &user_cpu_desc, sizeof(user_cpu_desc)); } desc = get_cpu_desc(cpu); @@ -2088,33 +2124,33 @@ update_special_regs(u_int cpu) if (cpu == 0) { kern_reg = value; user_reg = value; + l_user_reg = value; } else { kern_reg = CPU_DESC_FIELD(kern_cpu_desc, i); user_reg = CPU_DESC_FIELD(user_cpu_desc, i); + l_user_reg = CPU_DESC_FIELD(l_user_cpu_desc, i); } fields = user_regs[i].fields; for (j = 0; fields[j].type != 0; j++) { - switch (fields[j].type & MRS_TYPE_MASK) { - case MRS_EXACT: - user_reg &= ~(0xful << fields[j].shift); - user_reg |= - (uint64_t)MRS_EXACT_FIELD(fields[j].type) << - fields[j].shift; - break; - case MRS_LOWER: - user_reg = update_lower_register(user_reg, - value, fields[j].shift, 4, fields[j].sign); - break; - default: - panic("Invalid field type: %d", fields[j].type); - } + /* 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); + + /* 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); + + /* Update the kernel ID register view */ kern_reg = update_lower_register(kern_reg, value, fields[j].shift, 4, fields[j].sign); } CPU_DESC_FIELD(kern_cpu_desc, i) = kern_reg; CPU_DESC_FIELD(user_cpu_desc, i) = user_reg; + CPU_DESC_FIELD(l_user_cpu_desc, i) = l_user_reg; } } @@ -2148,7 +2184,8 @@ int64_t idcache_line_size; /* The minimum cache line size */ * Find the values to export to userspace as AT_HWCAP and AT_HWCAP2. */ static void -parse_cpu_features(bool is64bit, u_long *hwcap, u_long *hwcap2) +parse_cpu_features(bool is64bit, struct cpu_desc *cpu_desc, u_long *hwcap, + u_long *hwcap2) { const struct mrs_field_hwcap *hwcaps; const struct mrs_field *fields; @@ -2160,7 +2197,7 @@ parse_cpu_features(bool is64bit, u_long *hwcap, u_long *hwcap2) if (user_regs[i].is64bit != is64bit) continue; - reg = CPU_DESC_FIELD(user_cpu_desc, i); + reg = CPU_DESC_FIELD(*cpu_desc, i); fields = user_regs[i].fields; for (j = 0; fields[j].type != 0; j++) { hwcaps = fields[j].hwcaps; @@ -2216,13 +2253,16 @@ identify_cpu_sysinit(void *dummy __unused) } /* Find the values to export to userspace as AT_HWCAP and AT_HWCAP2 */ - parse_cpu_features(true, &elf_hwcap, &elf_hwcap2); + parse_cpu_features(true, &user_cpu_desc, &elf_hwcap, &elf_hwcap2); + parse_cpu_features(true, &l_user_cpu_desc, &linux_elf_hwcap, + &linux_elf_hwcap2); #ifdef COMPAT_FREEBSD32 - parse_cpu_features(false, &elf32_hwcap, &elf32_hwcap2); + parse_cpu_features(false, &user_cpu_desc, &elf32_hwcap, &elf32_hwcap2); #endif /* We export the CPUID registers */ elf_hwcap |= HWCAP_CPUID; + linux_elf_hwcap |= HWCAP_CPUID; #ifdef COMPAT_FREEBSD32 /* Set the default caps and any that need to check multiple fields */ diff --git a/sys/arm64/include/md_var.h b/sys/arm64/include/md_var.h index e0f707f3d881..f9aaaeba7306 100644 --- a/sys/arm64/include/md_var.h +++ b/sys/arm64/include/md_var.h @@ -37,6 +37,8 @@ extern char sigcode[]; extern int szsigcode; extern u_long elf_hwcap; extern u_long elf_hwcap2; +extern u_long linux_elf_hwcap; +extern u_long linux_elf_hwcap2; #ifdef COMPAT_FREEBSD32 extern u_long elf32_hwcap; extern u_long elf32_hwcap2; diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 4b5544841313..185c4f3044b1 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -456,8 +456,8 @@ struct sysentvec elf_linux_sysvec = { .sv_schedtail = linux_schedtail, .sv_thread_detach = linux_thread_detach, .sv_trap = NULL, - .sv_hwcap = &elf_hwcap, - .sv_hwcap2 = &elf_hwcap2, + .sv_hwcap = &linux_elf_hwcap, + .sv_hwcap2 = &linux_elf_hwcap2, .sv_onexec = linux_on_exec_vmspace, .sv_onexit = linux_on_exit, .sv_ontdexit = linux_thread_dtor, From nobody Fri Nov 10 16:06:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRkFt03gJz4ywt2; Fri, 10 Nov 2023 16:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRkFs5Ccqz3NSM; Fri, 10 Nov 2023 16:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DrHPjIc4YjtZYicjx6FOdfV4rXebSIBtr3RCEMUJR0=; b=SKU5bt/VHeVq7qh3qodLrKdYX+DoSLSCieriJb0AqHx0t3zHf1EFKHN7UrPnsOpMST7FMU apzmLNpUP9F7D2c60RUaSY0XaawsxNl1McTtcMZgdqYWBLkcPGfECrRm/vV3O7/ha7KOb5 ggnBqpMm7lhZJVId/DwX7QQl+0Ml24vYKQLVifqjl8XY4ew5X0bcam3xzEkg9ksz5ypd7c IFil1ArHgHDWwB9nCf/2zDmqR3Uo4DobyRcmcrZ7H+dyaZEqd3ZQQ1t0o/2+PHx/yxGNw8 k+YfNa+Te3wflq7aGwUXdhrlRrb4+RM+K8B9tC5BVj+xB/rtCa9hOhXRh5b+tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DrHPjIc4YjtZYicjx6FOdfV4rXebSIBtr3RCEMUJR0=; b=UPKj64eHAO8tL0Ldma1aECOP/4a0n+PjZR1shvppttxMT5J3rKxipMt87aDNUvYzcSCJOa +Tqtpe+zSu/Gxk3GjB3cCSleUgdrFJk2Hju5V4BAm3ZDPDNmbwkEmkQuSYYxfzOHnvY27S VGWU7hDCqkRJqj9AhUNNz2U6C5eG6wgp1wZ5mxp5J14awbW/FkhSKapx9oAyI7MPlftsnM CvYjbZ/7I7sKpt5dRUxJXjl25twMK9dLfl5V+96QBumWB+ReQhMTWDCQAeU1ZJE7+EONW5 3fAh1NTlLh9oRWVwPUFiP8IZlYTKXogB/lyQDY6p3cHmpgr4IOW71kFmohmfYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699632369; a=rsa-sha256; cv=none; b=gFiOEl3DVaTNUvkXJd6vpK6nfZvbF1Il2/RDXCGlA80fleSO/WIwqSPTRK29rwVcTHkASH pn02vXmRt/ojsZlrbVfxWAT4kpTPYI8b5fxBohmRP6oOEnRRViVZr8Gb3OvHMNYG+vpEET Hh+reClRKRgTy1XHKPilpCwsthgaVTEDtCeJ8GjD8bf/oUdaimV9sdLVQ8FPyCrOeDXw/Y pZ7i2WWoZDc/MaqnNi8vz6rXssIfIIupF4/Frd3cGwlBwT/Gz+KO3wx5dscsqMT1rauFTM S7y+8xqkoC6kq+cbZ0dnZ0KH4fgO2Wqn5sGM5GCSwGs6hxm+6EsVCaDEZh4zfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRkFs48lGz13hN; Fri, 10 Nov 2023 16:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAG69qQ018249; Fri, 10 Nov 2023 16:06:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAG69qe018246; Fri, 10 Nov 2023 16:06:09 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:06:09 GMT Message-Id: <202311101606.3AAG69qe018246@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: 0f0938800989 - main - arm64: Expand HWCAP2 to be 64 bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f0938800989dbf84a56c370db0b9379ee730a39 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0f0938800989dbf84a56c370db0b9379ee730a39 commit 0f0938800989dbf84a56c370db0b9379ee730a39 Author: Andrew Turner AuthorDate: 2023-10-27 10:24:55 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 16:01:13 +0000 arm64: Expand HWCAP2 to be 64 bit There are more than 32 arm64 HWCAP2 values. Expand the macros to include leading zeros and mark them as unsigned long. Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42378 --- sys/arm64/include/elf.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h index 5a7698f0324d..04449b20a194 100644 --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -133,24 +133,24 @@ __ElfType(Auxinfo); #define HWCAP_PACG 0x80000000 /* HWCAP2 */ -#define HWCAP2_DCPODP 0x00000001 -#define HWCAP2_SVE2 0x00000002 -#define HWCAP2_SVEAES 0x00000004 -#define HWCAP2_SVEPMULL 0x00000008 -#define HWCAP2_SVEBITPERM 0x00000010 -#define HWCAP2_SVESHA3 0x00000020 -#define HWCAP2_SVESM4 0x00000040 -#define HWCAP2_FLAGM2 0x00000080 -#define HWCAP2_FRINT 0x00000100 -#define HWCAP2_SVEI8MM 0x00000200 -#define HWCAP2_SVEF32MM 0x00000400 -#define HWCAP2_SVEF64MM 0x00000800 -#define HWCAP2_SVEBF16 0x00001000 -#define HWCAP2_I8MM 0x00002000 -#define HWCAP2_BF16 0x00004000 -#define HWCAP2_DGH 0x00008000 -#define HWCAP2_RNG 0x00010000 -#define HWCAP2_BTI 0x00020000 +#define HWCAP2_DCPODP 0x0000000000000001ul +#define HWCAP2_SVE2 0x0000000000000002ul +#define HWCAP2_SVEAES 0x0000000000000004ul +#define HWCAP2_SVEPMULL 0x0000000000000008ul +#define HWCAP2_SVEBITPERM 0x0000000000000010ul +#define HWCAP2_SVESHA3 0x0000000000000020ul +#define HWCAP2_SVESM4 0x0000000000000040ul +#define HWCAP2_FLAGM2 0x0000000000000080ul +#define HWCAP2_FRINT 0x0000000000000100ul +#define HWCAP2_SVEI8MM 0x0000000000000200ul +#define HWCAP2_SVEF32MM 0x0000000000000400ul +#define HWCAP2_SVEF64MM 0x0000000000000800ul +#define HWCAP2_SVEBF16 0x0000000000001000ul +#define HWCAP2_I8MM 0x0000000000002000ul +#define HWCAP2_BF16 0x0000000000004000ul +#define HWCAP2_DGH 0x0000000000008000ul +#define HWCAP2_RNG 0x0000000000010000ul +#define HWCAP2_BTI 0x0000000000020000ul #ifdef COMPAT_FREEBSD32 /* ARM HWCAP */ From nobody Fri Nov 10 16:06:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRkFt6cSLz4ywcW; Fri, 10 Nov 2023 16:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRkFt5tkYz3NQY; Fri, 10 Nov 2023 16:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RY4UkEWqRg6dbuddPqhjffm1janvlliLnIsn2hxupv8=; b=Dam2L60t26bLYMkjlKUb+Oqats6BBOIoglBE9kT78gdkTQX+9nWl7u0QEEgMIyXMdFRyS7 GClHngEdZO19mTt8ecQ7gUso5PaIaabH1tsLB9SI3neXLgfl3/IprGMWbAktK3HRweDXEt P8HrFR8iF4w2LA/a3gGOLa8K2JQ8wL4mwWV2WHxJs5y4Ue6tw3sds98i76dwnPAE0xkHyA SKvHpR5UHYIxOpimkKcs0BEq9Nfo3vFkmC2vTcDebql3m75OgT4aDSfvTwcjo0foiuyVB3 2Tg/IyYwZilZTXjRvlmycza8Rw+X23npqp22ik0SpOIPMePGg1Mkp2GIBichFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RY4UkEWqRg6dbuddPqhjffm1janvlliLnIsn2hxupv8=; b=e4HxojioR0hXsfgoA0xT7dseRbJRwko5TUA8J7iaCIn+zuEHgE1263VQNoJIoTsqQNe04u IW+vSi5+JWgPGCYo7IrD9qXK2WgmYgqIfiymcdgct4ct7hKGcp3PKpfY/Re+O9AytogICH M7UhU6g1xf4cwAQdFlOuCe/kQpj8WyW1KCveJVnBho5D1xnlVirX48qi/EkGfJhgUCS4WL +oeETblLALdlhXmGhr61qmF4VGKzNMNIEE6XaUhhDya2CfMGsML1K6K2NI+9IUQOrfh27D m1y6ujlUOwnruRETo8pQ2+1coDJP4sd8sAYGWW2oc2eW5NACMhmXCs6H4Vn8CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699632370; a=rsa-sha256; cv=none; b=rjrwGo+zrncp0ELwIPojdTGr29/ScbV4HlZJSf+W/EOnXKYkh6Qc1eSNCY7P27K8+WNi45 9XRAyR86EpMVQq2p2GlO+sY3eOYINY4qBSO4DeII4j+GWPcGuinb43gyh1/YQ8WDqxrSgL cykSSDNTQYbIG2GUtvn4OdZ/DlBuo+InjbWS3jzzFxvjleCjm0vhLbFusa+bDTd/OCNXL9 tIKBctINiN4tjDqD+cysLSJOpkWRYNUcwdgrQTuIm62A6pRtKkbj/gNAdRH7xVucjHyLbj yRwVuy+DeTRrWlnVp2YWMQD0rx/OwVFJgxneXdjCat9LpqJxAp75dtsOgRqPJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRkFt4nY3z13hP; Fri, 10 Nov 2023 16:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAG6A3R018291; Fri, 10 Nov 2023 16:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAG6Awk018288; Fri, 10 Nov 2023 16:06:10 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:06:10 GMT Message-Id: <202311101606.3AAG6Awk018288@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: 2ee649c1dd5c - main - arm64: Add more HWCAP2 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2ee649c1dd5c41e93f02fdca8bba9279371e4efd Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee649c1dd5c41e93f02fdca8bba9279371e4efd commit 2ee649c1dd5c41e93f02fdca8bba9279371e4efd Author: Andrew Turner AuthorDate: 2023-10-27 10:42:08 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 16:01:13 +0000 arm64: Add more HWCAP2 values Update the HWCAP2 values to align with Linux v6.6-rc7 Reviewed by: manu, imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42379 --- sys/arm64/include/elf.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h index 04449b20a194..9f9cd44ac9f7 100644 --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -151,6 +151,33 @@ __ElfType(Auxinfo); #define HWCAP2_DGH 0x0000000000008000ul #define HWCAP2_RNG 0x0000000000010000ul #define HWCAP2_BTI 0x0000000000020000ul +#define HWCAP2_MTE 0x0000000000040000ul +#define HWCAP2_ECV 0x0000000000080000ul +#define HWCAP2_AFP 0x0000000000100000ul +#define HWCAP2_RPRES 0x0000000000200000ul +#define HWCAP2_MTE3 0x0000000000400000ul +#define HWCAP2_SME 0x0000000000800000ul +#define HWCAP2_SME_I16I64 0x0000000001000000ul +#define HWCAP2_SME_F64F64 0x0000000002000000ul +#define HWCAP2_SME_I8I32 0x0000000004000000ul +#define HWCAP2_SME_F16F32 0x0000000008000000ul +#define HWCAP2_SME_B16F32 0x0000000010000000ul +#define HWCAP2_SME_F32F32 0x0000000020000000ul +#define HWCAP2_SME_FA64 0x0000000040000000ul +#define HWCAP2_WFXT 0x0000000080000000ul +#define HWCAP2_EBF16 0x0000000100000000ul +#define HWCAP2_SVE_EBF16 0x0000000200000000ul +#define HWCAP2_CSSC 0x0000000400000000ul +#define HWCAP2_RPRFM 0x0000000800000000ul +#define HWCAP2_SVE2P1 0x0000001000000000ul +#define HWCAP2_SME2 0x0000002000000000ul +#define HWCAP2_SME2P1 0x0000004000000000ul +#define HWCAP2_SME_I16I32 0x0000008000000000ul +#define HWCAP2_SME_BI32I32 0x0000010000000000ul +#define HWCAP2_SME_B16B16 0x0000020000000000ul +#define HWCAP2_SME_F16F16 0x0000040000000000ul +#define HWCAP2_MOPS 0x0000080000000000ul +#define HWCAP2_HBC 0x0000100000000000ul #ifdef COMPAT_FREEBSD32 /* ARM HWCAP */ From nobody Fri Nov 10 16:06:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRkFw0vDFz4ywfM; Fri, 10 Nov 2023 16:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRkFw0LMvz3NCS; Fri, 10 Nov 2023 16:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XW5Rs8a+QS3i3gwyTjTO+9dRdhNsR5rmaDA1PFilwjk=; b=EXcfUbBcfZSPtXP0f2XnPdNmE7q+bJNp8I3ceNC8D3cKuYgr6cOrOss94REusbjAOMtWGq tDcj/iDDIxFaNZt5/yDSryCclJmVXfVThrkW2fTesxiVJPYyAwEF4BIpkgTyEQ5LZlQWws 2ittBAUdtrsC9KWnURuyIxhP22B5BQwzmbcnP2NG+HwDAa28M2mwjRDdGxrNnyH7HPxSyq vDuXuKjgCP+3aJDbKcN4eP3nI4WLY5KbXz79TZe1yHFkK21+ZDWaMlaURKid/MIxQrfp3i KA1M95wTugqUfm4xBwgj9Xb9Sf/ug79AufW6KeCe5ZNy3RRNBea/HXTh4lX3lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699632372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XW5Rs8a+QS3i3gwyTjTO+9dRdhNsR5rmaDA1PFilwjk=; b=lRVVKNue1P6LyHn8KlISiDSZx9DKv+UfZucnBIl+gLJ05FzEl0TuNjeXKHC4By8fxwje/a 69X5IcH2ZVwf3Sz+6kj6yWWep1039VjfBm6yzWBFtQ6Cdfz60dBqshlSTZunD40UKZ3oOh N/mPQKBRuRibOeUEloqklKo78+LnxsN8/Iu5dI4SamY15KnYE+HeRaHuIaxgMDODQ3uDax xrSUIEN/7A6qwFyqM9oGh943HEp1DuXe3BMUFA92hoFibJ6kAccBctEWItFvAkesVc2F6m ue8JMbJk2qXsLzUKvIZVD7+ruogySt5fLE+MFnhoroQZl6p8bjNBB6KSUpC1cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699632372; a=rsa-sha256; cv=none; b=IRikqDQqDDbGbQdGLOT7ZJVJlz+2AKUDQEAucTVWxnJOX5CJxYMBqcn3IQpYiiUGFuTlO7 lkgFiqlnF4U1U/4f/Jsuf3Y43B2JhZZszmkA7U7ohvtVZTdVsFsclpWazb2WQsO3L8zTaw ELi2wURrhpvRLLDaBbUDI0Ah+ERYaFnTPAFw6kmheGLfkft1lZ49euBX/ZJdLoJqlkvgiS WZlnjUu1e3IUfQI4WAGoawlQBpa1r460yciHK/YrKCHySUQNBN/4BIggOz7q0+Q4eBthH6 1uCKq2aWog5l1xwC3gVsLzVvGVU7ju3CuARU2Iq3nR6qHnLjs8eKRbdnaXyvJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRkFv62R1z14Ft; Fri, 10 Nov 2023 16:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAG6BCs018348; Fri, 10 Nov 2023 16:06:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAG6BNL018345; Fri, 10 Nov 2023 16:06:11 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:06:11 GMT Message-Id: <202311101606.3AAG6BNL018345@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: 5a8417c78f9d - main - arm64: Check if PSCI before 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5a8417c78f9d51bf1103353bee348eaac83e86e5 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5a8417c78f9d51bf1103353bee348eaac83e86e5 commit 5a8417c78f9d51bf1103353bee348eaac83e86e5 Author: Andrew Turner AuthorDate: 2023-10-30 14:33:08 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 16:01:13 +0000 arm64: Check if PSCI before calling SMCCC As SMCCC depends on PSCI check if the latter is present before calling the former. This fixes an issue where we may call into SMCCC when there is no PSCI in the system causing a smccc_version assert to fail. Reported by: stevek Reviewed by: emaste, imp, stevek Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42404 --- sys/arm64/arm64/cpu_errata.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/arm64/arm64/cpu_errata.c b/sys/arm64/arm64/cpu_errata.c index fee22240bb0e..a03303d83044 100644 --- a/sys/arm64/arm64/cpu_errata.c +++ b/sys/arm64/arm64/cpu_errata.c @@ -40,6 +40,7 @@ #include +#include #include typedef void (cpu_quirk_install)(void); @@ -117,6 +118,9 @@ static struct cpu_quirks cpu_quirks[] = { static void install_psci_bp_hardening(void) { + /* SMCCC depends on PSCI. If PSCI is missing so is SMCCC */ + if (!psci_present) + return; if (smccc_arch_features(SMCCC_ARCH_WORKAROUND_1) != SMCCC_RET_SUCCESS) return; @@ -140,6 +144,10 @@ install_ssbd_workaround(void) } } + /* SMCCC depends on PSCI. If PSCI is missing so is SMCCC */ + if (!psci_present) + return; + /* Enable the workaround on this CPU if it's enabled in the firmware */ if (smccc_arch_features(SMCCC_ARCH_WORKAROUND_2) != SMCCC_RET_SUCCESS) return; From nobody Fri Nov 10 16:42:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRl3j69sCz505cl; Fri, 10 Nov 2023 16:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRl3j5YQ8z3XW2; Fri, 10 Nov 2023 16:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699634545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NgAxQy409+FWkhELYQKZDxjQkTdbMjGlo51sWipBe4g=; b=gG21B6dnsTOwVNrxEh4dGNFekxldaIZNSNin5xX6vzJFatQduv0QKoZXkpjXhe6aScNWgd 4YOv397/VBzLFE7cATW3OO+fczGESWu0HVtE5oC7p7YSlzPJxXnODhaQfyofQbXrhHHfFk qHl28Q9Z2Hcs1D00J/V0FY+UFBC2jPAhRpiJhGdvD0LBCqsHeI2lBdvx+YyrGYcYebpWPZ 7blfGCN7NeABU0TWn1x8BVoEilA7Jmhfbe1Q5hjNto8Mb2kFRGbzmaM8iYoDEE+vbfhMZu BZArjJ33aFeu5+tMXDWVS2Jadz27Em310V+pK5iaFBcvq3X39a0vRWIvbhFxEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699634545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NgAxQy409+FWkhELYQKZDxjQkTdbMjGlo51sWipBe4g=; b=HlhJ6K5yl/6UBBY2tmUyceawracL380IvdH5gp4nbhjj+OBpBEzdWVyYYZXXu0zHfyZ/rv 63AGNK/WnDChLryVPA0AdJ3Qrc8cLef3kDrfanSx9og0wjISMMJMDjQD40K0oVPmHsBVVz ET19w6CLH66EO8S/8cR/mpDMnDID8/hkRFWCq0Lnrb37KTozaz8k+O8CGtaXN5D+eyaMrP IJdb0ZdEFSYDjEhpe6gWc7V6imaS7nxBsoh0OpwWbJDRRtwqdB6XKwroUkLrcVAZVM5kIb OY3ORxS31y5EtH0zyTRB/dAqJxnLvjwYJ3usWmwkqkYg8ZoKyf9xR4M81dNVZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699634545; a=rsa-sha256; cv=none; b=kzlA1eLNFC8EiQLNLO/IyjMBRYrK7Xhi6ES0P2eeWCsXvs44aRpujoy72U+xA2ggxJvTqW Oe8dVfxH1J23i64BWoROmDPt+x5i5xXAiL6GJnxeQU4YgcOlRQeF5eujHJJiSwlD79BcHL RuNj4ukJrlIKWUeCHLvEYvU1fw7xKTNZu6oqIj1nU96TTd7gBki3SDzOTtIFIjBJu4Akxw c4RcMqGwz7N91u6Ue1zmJa9OLFr/Xj/CKsafU0idx2K+b0M4FLyi01imDaHsL3VpEJ4yWo 1WJP9kn08gXX1J3o9PmiRCHYQK8Lj0tZv/zWDvFU0E6jtsbF58WtmQJtzaCsSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRl3j4dJKz154w; Fri, 10 Nov 2023 16:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAGgPig083733; Fri, 10 Nov 2023 16:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAGgP89083730; Fri, 10 Nov 2023 16:42:25 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:42:25 GMT Message-Id: <202311101642.3AAGgP89083730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 81d4c786209b - main - pfsync: Document the transport over IPv6 feature List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81d4c786209bfa3752c25b2564eb363027f5d914 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=81d4c786209bfa3752c25b2564eb363027f5d914 commit 81d4c786209bfa3752c25b2564eb363027f5d914 Author: Luiz Amaral AuthorDate: 2023-11-10 15:40:02 +0000 Commit: Kristof Provost CommitDate: 2023-11-10 15:40:02 +0000 pfsync: Document the transport over IPv6 feature On D40102 we implemented support for transport over IPv6 but the documentation was not updated to reflect the new feature. Clarify what is available and how it can be used. MFC after: 1 week Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42505 --- sbin/ifconfig/ifconfig.8 | 24 ++++++++++++++++++------ share/man/man4/pfsync.4 | 21 ++++++++++++++++++++- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index bd6cbd05210e..3b1774606b21 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" -.Dd October 17, 2023 +.Dd November 08, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2870,12 +2870,24 @@ to send and receive pfsync state synchronisation messages. .It Fl syncdev Stop sending pfsync state synchronisation messages over the network. .It Cm syncpeer Ar peer_address -Make the pfsync link point-to-point rather than using -multicast to broadcast the state synchronisation messages. -The peer_address is the IP address of the other host taking part in -the pfsync cluster. +Set the destination address for the state synchronization messages sent. +The +.Ar peer_address +is normally the IPv4 or IPv6 address of the other host taking +part in the pfsync cluster. +.Pp +When the +.Ar peer_address +is set to a unicast IP address, the pfsync link will behave +as point-to-point rather than using multicast to broadcast the messages. +.Pp +When the +.Ar peer_address +is set to ff12::f0, the state synchronization +messages will be broadcast using multicast over IPv6. .It Fl syncpeer -Broadcast the packets using multicast. +Unset the syncpeer. +Packets will then be broadcast using multicast over IPv4. .It Cm maxupd Ar n Set the maximum number of updates for a single state which can be collapsed into one. diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4 index 4decb50feb7b..b3603c48316e 100644 --- a/share/man/man4/pfsync.4 +++ b/share/man/man4/pfsync.4 @@ -24,7 +24,7 @@ .\" (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 17, 2023 +.Dd November 08, 2023 .Dt PFSYNC 4 .Os .Sh NAME @@ -113,6 +113,25 @@ dedicated to pfsync messages such as a crossover cable between two firewalls, or specify a peer address and protect the traffic with .Xr ipsec 4 . .Pp +Support for +.Nm +transport over IPv6 was introduced in +.Fx 14.0 . +To set up +.Nm +using multicast with IPv6 link-local addresses, the +.Ic syncpeer +must be set to the +.Nm +multicast address and the +.Ic syncdev +to the interface where +.Nm +traffic is expected. +.Bd -literal -offset indent +# ifconfig pfsync0 syncpeer ff12::f0 syncdev vtnet0 +.Ed +.Pp When new features are introduced to .Xr pf 4 the format of messages used by From nobody Fri Nov 10 23:40:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRwLZ2vZmz511nw; Fri, 10 Nov 2023 23:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRwLZ2TWyz3cxZ; Fri, 10 Nov 2023 23:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699659654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vKOEYT/Gs35pesdglGm+twXJ7IeQ2mNuZk5VWQFlo4=; b=s3YtOm4F4rpnKI6ppF1JfLnex/+SnbRqLnA+nhCgrUXGAg9niCsrsRyyiUBTrndtiUInBq kA1HMaaH+XT/TWRu3qjkE93FVqtRQykr6Ujo7FopritEoegwozXN1quimSXwkd47g+aKKR 5EScTpu7qUp8y+0x5k+/qXbeICTzBHdDAwQt/hlXSIp6GSWnEadtBn7PyoQaRODCrCtx+d TyWnu2qZTZcBWf1Dv3oPz5gHFBiaOGXVdDHgzbD1cbkwNE1AMzJcy/eghEsWBRDtofw3C4 y0ia4L5QVSg0+fzuAqVRvxWtRroDmJ34wZ8CmXK3qS+hXw46JwquVAS/fpUnxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699659654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vKOEYT/Gs35pesdglGm+twXJ7IeQ2mNuZk5VWQFlo4=; b=FILbUZdsqQ1JP2n2qjWJ4YvvzpnaJcya3QbhFH2SUBXh25E47TeByifIX7JozOFIgBx5Ka CgmQqne8RxZ+XGewMy2pvNS6vNIKBnSjQJc4TUE5o2XWBZ8/Oy4LnsVqL9qnv9SdIIIUNH alKFkHiNF75nxVN7ZHbklOGLLYv5E/thLe3yZKfbxHmV4b5jJO62mr+bhDwRk6VOlPtefE 1wT589u9IjpmDCjAE39te1FeCF1m4A6WgLPmMZAspQtxaRdg/+9u6n8OYaqf7nPAVgqluO iHAi2u1GsHK9Ra5qbXNSNgW0jciZJ94FWdKvHNkzTOtq56Q0x9CtV13CLbO3aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699659654; a=rsa-sha256; cv=none; b=kvUuPKc77/bxfnZ8w6zNqxfjk/wGkj5pRxFdnjJhu+ysNG+N5wq9+73IZHRknZGCLalnfJ oMhYYMl+R4dEP4aXhLEEjGHDpKc4kqN6fidVGdFtwRVhdWezT6gCd/GzAqiUw1NV+T1uks 8EkIWhU6zA2mSwriRDVbv0h3+OA8xFg0WEqovWiX0RxKohOSX0z9BaVL34iRinC1EmXf/E iQ3vEA3ltHvvF469ThCR74aGDl6U1rIFt5Vca6yMGzaQAchDaVfdqupFUGeZnbtLL+tqKL bnMQPK2JKJRoj3Rne3WA5I86Rt7YoxcD/kFoB3fQcNz60A2TQ5V4YEMn20Samw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRwLZ1Xqmz343; Fri, 10 Nov 2023 23:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AANesKj080279; Fri, 10 Nov 2023 23:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AANesFH080274; Fri, 10 Nov 2023 23:40:54 GMT (envelope-from git) Date: Fri, 10 Nov 2023 23:40:54 GMT Message-Id: <202311102340.3AANesFH080274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 105c7c4b8dce - main - iostat: Tune formatting for higher disk speeds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 105c7c4b8dcec22567a5f137b9406a95fbd9f4f2 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=105c7c4b8dcec22567a5f137b9406a95fbd9f4f2 commit 105c7c4b8dcec22567a5f137b9406a95fbd9f4f2 Author: Alexander Motin AuthorDate: 2023-11-10 23:35:38 +0000 Commit: Alexander Motin CommitDate: 2023-11-10 23:35:38 +0000 iostat: Tune formatting for higher disk speeds MFC after: 2 weeks --- usr.sbin/iostat/iostat.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index d4f7a2519a1b..c6ba6aa8a7a2 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -765,9 +765,9 @@ phdr(void) (void)printf(" blk xfr msps "); } else { if (Iflag == 0) - printf(" KB/t tps MB/s "); + printf("KB/t tps MB/s "); else - printf(" KB/t xfrs MB "); + printf("KB/t xfrs MB "); } printed++; } @@ -934,26 +934,30 @@ devstats(int perf_select, long double etime, int havelast) msdig, ms_per_transaction); else - printf("%4.1" PRIu64 "%4.1" PRIu64 "%5.*Lf ", + printf("%4" PRIu64 "%4" PRIu64 "%5.*Lf ", total_blocks, total_transfers, msdig, ms_per_transaction); } else { if (Iflag == 0) - printf(" %4.*Lf %4.0Lf %5.*Lf ", + printf("%4.*Lf %5.0Lf %5.*Lf ", kb_per_transfer >= 100 ? 0 : 1, kb_per_transfer, transfers_per_second, - mb_per_second >= 1000 ? 0 : 1, + mb_per_second >= 1000 ? 0 : + (total_mb >= 100 ? 1 : 2), mb_per_second); else { total_mb = total_bytes; total_mb /= 1024 * 1024; - printf(" %4.1Lf %4.1" PRIu64 " %5.2Lf ", + printf("%4.*Lf %5" PRIu64 " %5.*Lf ", + kb_per_transfer >= 100 ? 0 : 1, kb_per_transfer, total_transfers, + total_mb >= 1000 ? 0 : + (total_mb >= 100 ? 1 : 2), total_mb); } } From nobody Sat Nov 11 00:40:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRxg46JT0z501RW; Sat, 11 Nov 2023 00:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRxg45sQDz4Gf2; Sat, 11 Nov 2023 00:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXqPTET/dZ7HEpjJW4M1Ke7tZVcwCMLRPJ6b+eu//Z0=; b=UnJ9sWDeSaHKBkT/BZ3ZJjcvN/jsZBB5XaE3aNVK4XF3YAI+3+NFZn58OeQ9nvGopdOJNA bWkxbrlPGleIzsXvJ7BUR0VXwVRjV/fYs+YoT3M0QfBQCS4PI43t8sjqVBfZ7zfQwz5cYy 6zZfo24XVYuHdKePEmw9cca4YZNTigCDPR6SkgyECDmt4fQ88IxN0hMCoSZvQ4qvTayaG6 xYACKIgBkj0SDvoz6scaiNpqKvXvqZ0J0YqK6l+nwtvgSvTb5GU/F2oPB/3q2my8gmdFFD heGqHYzak/RaPdTu/F4LxUJzSuBYe5SAWTEeay+aQMMGD35YYW4h9DFGA6ZSdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXqPTET/dZ7HEpjJW4M1Ke7tZVcwCMLRPJ6b+eu//Z0=; b=aCERZCYfQ+hKb5GC7bl+s13LY4ZdkVqGeWMTvmrCftv0FHL4H3gyIbYNO9uIKOYfrAGHxq UZMVqhQWDaMUADDdgobRcPOYXMaS4+OrLTY+N/XTIiGr0BstWmt3z3kwdUwMlmEyaFjCzb SxEbs3/Yx2XcypFCxYd62/2GmBBmz9OPRluP5pbHiYcMHPFPdiHh02Fu02ldEURgdOb5bQ cwezvQq7iA1dogelk88n+6gLPdB42spYTP4/SXizDkqlAiFCM4QcZ56r1z7SocZBUaQbjq kaxNRUfp4E/U+FL/ghHm01lJ9oLOGs1PTTY5g8N+JHbCkcd+OyS5HcxMluEiKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699663216; a=rsa-sha256; cv=none; b=TCdKvJiMbuPefRKR76Gpt/xkQ7sUqyLP23dZt4KXdkPZ3PpOxSPNxzFurAJDMdFdrptvAS ODLkfYJU4gIIhbO4FFXUmRtb7AzMoKolwCQhPy/qeClt+yiPeMIrxHSo+EhKhn2IuW/h1m kehC6jAdty820j+vf9NWqiq/rhT2UK3t508zVwggWZLZd20T14q8PylGRu8O6dX013pNPw QbFSiQQMhHwtzQf4ADP3EEj0SoGV4Y1kU5O0KU//87nb9GIwVaftJeFTqN242VOKYV3cAM Kai79Wf9lgau+4VV/W+x1ZxSzZp9frct8DnjbYkcab21DZCUJfMs/pTU6K4W0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRxg44p7Nz4Tx; Sat, 11 Nov 2023 00:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AB0eG40076865; Sat, 11 Nov 2023 00:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AB0eGQo076857; Sat, 11 Nov 2023 00:40:16 GMT (envelope-from git) Date: Sat, 11 Nov 2023 00:40:16 GMT Message-Id: <202311110040.3AB0eGQo076857@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: 0dc8af9dae2c - stable/14 - arm64: improve UVA layout for 32bit processes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0dc8af9dae2ca5419a0d3313d0dcb42c6b5d6d38 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0dc8af9dae2ca5419a0d3313d0dcb42c6b5d6d38 commit 0dc8af9dae2ca5419a0d3313d0dcb42c6b5d6d38 Author: Konstantin Belousov AuthorDate: 2023-10-25 01:03:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-10 12:15:46 +0000 arm64: improve UVA layout for 32bit processes PR: 274705 (cherry picked from commit 967022aa5aa60a18764a668ae0fb78e39e16fa8e) --- sys/arm64/arm64/elf32_machdep.c | 54 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 4161f9d44ae7..733aaf40541a 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -61,6 +62,9 @@ #define FREEBSD32_MAXUSER ((1ul << 32) - PAGE_SIZE) #define FREEBSD32_SHAREDPAGE (FREEBSD32_MAXUSER - PAGE_SIZE) #define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE +#define AARCH32_MAXDSIZ (512 * 1024 *n1024) +#define AARCH32_MAXSSIZ (64 * 1024 * 1024) +#define AARCH32_MAXVMEM 0 extern const char *freebsd32_syscallnames[]; @@ -74,12 +78,26 @@ static void freebsd32_set_syscall_retval(struct thread *, int); static bool elf32_arm_abi_supported(struct image_params *, int32_t *, uint32_t *); +static void elf32_fixlimit(struct rlimit *rl, int which); extern void freebsd32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); u_long __read_frequently elf32_hwcap; u_long __read_frequently elf32_hwcap2; +static SYSCTL_NODE(_compat, OID_AUTO, aarch32, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "aarch32 mode"); + +static u_long aarch32_maxdsiz = AARCH32_MAXDSIZ; +SYSCTL_ULONG(_compat_aarch32, OID_AUTO, maxdsiz, CTLFLAG_RWTUN, + &aarch32_maxdsiz, 0, ""); +u_long aarch32_maxssiz = AARCH32_MAXSSIZ; +SYSCTL_ULONG(_compat_aarch32, OID_AUTO, maxssiz, CTLFLAG_RWTUN, + &aarch32_maxssiz, 0, ""); +static u_long aarch32_maxvmem = AARCH32_MAXVMEM; +SYSCTL_ULONG(_compat_aarch32, OID_AUTO, maxvmem, CTLFLAG_RWTUN, + &aarch32_maxvmem, 0, ""); + static struct sysentvec elf32_freebsd_sysvec = { .sv_size = SYS_MAXSYSCALL, .sv_table = freebsd32_sysent, @@ -102,8 +120,8 @@ static struct sysentvec elf32_freebsd_sysvec = { .sv_copyout_auxargs = elf32_freebsd_copyout_auxargs, .sv_copyout_strings = freebsd32_copyout_strings, .sv_setregs = freebsd32_setregs, - .sv_fixlimit = NULL, // XXX - .sv_maxssiz = NULL, + .sv_fixlimit = elf32_fixlimit, + .sv_maxssiz = &aarch32_maxssiz, .sv_flags = SV_ABI_FREEBSD | SV_ILP32 | SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER | SV_SIGSYS, .sv_set_syscall_retval = freebsd32_set_syscall_retval, @@ -284,3 +302,35 @@ void elf32_dump_thread(struct thread *td, void *dst, size_t *off) { } + +static void +elf32_fixlimit(struct rlimit *rl, int which) +{ + + switch (which) { + case RLIMIT_DATA: + if (aarch32_maxdsiz != 0) { + if (rl->rlim_cur > aarch32_maxdsiz) + rl->rlim_cur = aarch32_maxdsiz; + if (rl->rlim_max > aarch32_maxdsiz) + rl->rlim_max = aarch32_maxdsiz; + } + break; + case RLIMIT_STACK: + if (aarch32_maxssiz != 0) { + if (rl->rlim_cur > aarch32_maxssiz) + rl->rlim_cur = aarch32_maxssiz; + if (rl->rlim_max > aarch32_maxssiz) + rl->rlim_max = aarch32_maxssiz; + } + break; + case RLIMIT_VMEM: + if (aarch32_maxvmem != 0) { + if (rl->rlim_cur > aarch32_maxvmem) + rl->rlim_cur = aarch32_maxvmem; + if (rl->rlim_max > aarch32_maxvmem) + rl->rlim_max = aarch32_maxvmem; + } + break; + } +} From nobody Sat Nov 11 00:40:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRxg56nG5z501Cb; Sat, 11 Nov 2023 00:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRxg55wVnz4GfR; Sat, 11 Nov 2023 00:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uPoKxW03AvomjDgVEpGsuTUehaxJHLBL8aT96+tP5ow=; b=SsR5bNcVDukcFoh6KvFscdmD229sF2BL+BErNaqFu0e6XiAJw4d6ScUfzozytNHKdgrLDF B3KopMmhS9sbI9AZLJQ9LyI6F6HNsg62b1LD5LtEg8eWOKu3XGjyR/6kNv5handBNhazUR 726mnQ0pPggAiq+OFBNSXOGc2G0v4E0Mirr6Gu7sxsr/BEg6GPGWQsGieczPZDAoaKqXV3 WHXGRDgSUhzkEsjOSzY+8U1GHS6fqRyW+uGhbhIkVyazY/WInkKSvqaIP22BAgV8+IB36Y OFEhpV+0SsCDpXcAaAalNnhFK1JR+GEjSQcYj1E/c3GifOJfAoXmGnxvUKWHWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uPoKxW03AvomjDgVEpGsuTUehaxJHLBL8aT96+tP5ow=; b=LxplFyYncUHN7nniVkNSVwvQ5Qqn+sGlkiPLyvFUv7Ti+rMP6yiMCbs9pBV9tXviaT/yPl ZW6NmyNkq3MGRZ2dLuZIgP/nfYz1SxsRfbLovXxqShr90iUlr+8J5hib7rvDvqvf7vhs60 hDxvTk/dGisxikV/geD2PYoiIBAC7e+cekwTMxFqIi65Ehrk6k1wGtV9sOEap5TLLREMiN JRoBGMTkkoG3albSjcmkKu6Ck05OF6AA5NbEiwIZGLU9rnSrKNA8g7RjUW1hPHmauMtRIq Nh8FJPwyugndTnK8BvtKZz9/b4UA+vzPaYGNR2nwvJZI7LnXEIE1QEKqImdyXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699663217; a=rsa-sha256; cv=none; b=TVGD10S0X3TmmKZIUnKueh/ATfNuwttu0wR3sX7ONg9wg4cM9XmZxhAoLePq/NSjhADw0/ 9bQMnhSQwRTdqgC0Fwg6uw+5zYpXODbANFDxZwFfEcB+IkxDjp580ETl5STV9Q0S1o9xBo KNZvrF0zqejx/8EZwwF1v6JDHTZN58WDc4JBAqncsEUVHb56SbENqN6WeotNyzqXWhT6Ae uSQqxSNY6yWZP1uY44/DR/dAkJssUM5NgHSD46ehMt7s/d0y/S3UL+18PrqxZ1lawXbs06 SwnIHW7CCTtUVFRhVP2NkMhYVgo+JrHyZi+Wm9EI2dNjoRMjot7hHJPvse4aew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRxg5528bz4Jg; Sat, 11 Nov 2023 00:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AB0eHED077445; Sat, 11 Nov 2023 00:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AB0eHnC077434; Sat, 11 Nov 2023 00:40:17 GMT (envelope-from git) Date: Sat, 11 Nov 2023 00:40:17 GMT Message-Id: <202311110040.3AB0eHnC077434@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: e4fb49e867ae - stable/14 - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e4fb49e867ae70412205d1aade0b76fae158b551 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e4fb49e867ae70412205d1aade0b76fae158b551 commit e4fb49e867ae70412205d1aade0b76fae158b551 Author: Konstantin Belousov AuthorDate: 2023-11-04 16:48:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-10 12:15:46 +0000 Fix typo (cherry picked from commit d093fe94e10f88fb5f46108f28555584f2f90d08) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 733aaf40541a..26aa2cddfdb2 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -62,7 +62,7 @@ #define FREEBSD32_MAXUSER ((1ul << 32) - PAGE_SIZE) #define FREEBSD32_SHAREDPAGE (FREEBSD32_MAXUSER - PAGE_SIZE) #define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE -#define AARCH32_MAXDSIZ (512 * 1024 *n1024) +#define AARCH32_MAXDSIZ (512 * 1024 * 1024) #define AARCH32_MAXSSIZ (64 * 1024 * 1024) #define AARCH32_MAXVMEM 0 From nobody Sat Nov 11 00:40:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRxgh66Jwz501XW; Sat, 11 Nov 2023 00:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRxgh5XGyz4H1J; Sat, 11 Nov 2023 00:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XjZfYK9cC6Mqrj/oGt+W8ESb366hVXzj1jpo2DV87lo=; b=cGxm3F8ZV9QIA8GSQNPsY9bkohyAFTPt9Frox7248NrP0MSRtj5Pz2lmsWBziQqFzf+T4D HQSpLa1RKK75nZ3Rqllrq5CvtysFxXGVQvi0i13nbScg0Yd0QiIqv04z37xFLqUB/leOYc KfZkrcbmHjlMT9IkJoWFhnLgVrUU+c5zRIyj1KJhAmGHFCuHe4bFywG8ac3OrRX0/ch45p 6ac+cJQs+ASGsbluYDapCPrd+OqNbajYo5OcuAvBmvRfgvF33i9OeZ2KH8xFlFksyv+yUU /kV7uLvRdRnsjzs/wwmQxmJK+/PNx1ps+eLF9s2py3C5RvLkXiX3oq9sQsHkxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XjZfYK9cC6Mqrj/oGt+W8ESb366hVXzj1jpo2DV87lo=; b=GM4zl4zQQYjNn10Sgzl0ysqXjx/GqeOY2q67fGwmKs9xNgdhd+Vue4B1pAT9+LpGiE9vnp qjzav2BAkNQRSsFGoSeXSlPH+Lg3w1Hh8X93MsJWvzUFKfBcPyOVzbH2E5iWCA03q2VAxw GhjaOzz36V32AejAZBe71dGzlEBtASCZMymv4u0iIliiBp9XE68h9zdziEt4knCF5d0Yic dncSGf6Njc6rUlai9AteAV+Lw1Pylf8lCG7KLU7MAd4FJkWIyL62Cnx3M610ayrJ9o3YsW RLRpGjPtlSHkwmNK5u89eewyVEpGXRhsn8PZ0yy/qnOGMTTE71xy5AGBvLWBnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699663248; a=rsa-sha256; cv=none; b=rCtNYKPy1b+l/WnNUyJ3N0yJNPpYuV2nLJcG7AxaiCXgmbItU2dyylVu0kFMhXM9E7RlgB zDOE7noV9B9xEpQsJmBjRcXcziBhOGy6s3R5bKtlmef9bN2pBXk/eBKSWxbFXzjd+bON5E sKDn/yL/Mf4wwuLq36Y5wIikeoJiiuUtHNFDbe1HPxTDytrQF+VoQxNJm0Yj1HdTZeQbz/ LjSxHFXSrqlRIfQ/yPy1IPts8TfqYwX6SSydks0FtWl08qbdFG0fSU0BDbejSmqrhZpLlF sNlFT9huHdzvx8Cfca5grJJhXsMbYFq6IiPVR2J9kOPw3hZ9QF8xg7kVjAKcNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRxgh4ZvZz564; Sat, 11 Nov 2023 00:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AB0emUa078828; Sat, 11 Nov 2023 00:40:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AB0emjk078825; Sat, 11 Nov 2023 00:40:48 GMT (envelope-from git) Date: Sat, 11 Nov 2023 00:40:48 GMT Message-Id: <202311110040.3AB0emjk078825@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: 9e1efa0f8835 - stable/13 - arm64: improve UVA layout for 32bit processes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9e1efa0f88356747d88e310209e57ba8f689fa4e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9e1efa0f88356747d88e310209e57ba8f689fa4e commit 9e1efa0f88356747d88e310209e57ba8f689fa4e Author: Konstantin Belousov AuthorDate: 2023-10-25 01:03:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-11 00:40:25 +0000 arm64: improve UVA layout for 32bit processes PR: 274705 (cherry picked from commit 967022aa5aa60a18764a668ae0fb78e39e16fa8e) --- sys/arm64/arm64/elf32_machdep.c | 54 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index c59571808cd3..3668d2a3c444 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,9 @@ #define FREEBSD32_MAXUSER ((1ul << 32) - PAGE_SIZE) #define FREEBSD32_SHAREDPAGE (FREEBSD32_MAXUSER - PAGE_SIZE) #define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE +#define AARCH32_MAXDSIZ (512 * 1024 *n1024) +#define AARCH32_MAXSSIZ (64 * 1024 * 1024) +#define AARCH32_MAXVMEM 0 extern const char *freebsd32_syscallnames[]; @@ -73,12 +77,26 @@ static void freebsd32_set_syscall_retval(struct thread *, int); static boolean_t elf32_arm_abi_supported(struct image_params *, int32_t *, uint32_t *); +static void elf32_fixlimit(struct rlimit *rl, int which); extern void freebsd32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); u_long __read_frequently elf32_hwcap; u_long __read_frequently elf32_hwcap2; +static SYSCTL_NODE(_compat, OID_AUTO, aarch32, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "aarch32 mode"); + +static u_long aarch32_maxdsiz = AARCH32_MAXDSIZ; +SYSCTL_ULONG(_compat_aarch32, OID_AUTO, maxdsiz, CTLFLAG_RWTUN, + &aarch32_maxdsiz, 0, ""); +u_long aarch32_maxssiz = AARCH32_MAXSSIZ; +SYSCTL_ULONG(_compat_aarch32, OID_AUTO, maxssiz, CTLFLAG_RWTUN, + &aarch32_maxssiz, 0, ""); +static u_long aarch32_maxvmem = AARCH32_MAXVMEM; +SYSCTL_ULONG(_compat_aarch32, OID_AUTO, maxvmem, CTLFLAG_RWTUN, + &aarch32_maxvmem, 0, ""); + static struct sysentvec elf32_freebsd_sysvec = { .sv_size = SYS_MAXSYSCALL, .sv_table = freebsd32_sysent, @@ -102,8 +120,8 @@ static struct sysentvec elf32_freebsd_sysvec = { .sv_copyout_auxargs = elf32_freebsd_copyout_auxargs, .sv_copyout_strings = freebsd32_copyout_strings, .sv_setregs = freebsd32_setregs, - .sv_fixlimit = NULL, // XXX - .sv_maxssiz = NULL, + .sv_fixlimit = elf32_fixlimit, + .sv_maxssiz = &aarch32_maxssiz, .sv_flags = SV_ABI_FREEBSD | SV_ILP32 | SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER | SV_SIGSYS, .sv_set_syscall_retval = freebsd32_set_syscall_retval, @@ -283,3 +301,35 @@ void elf32_dump_thread(struct thread *td, void *dst, size_t *off) { } + +static void +elf32_fixlimit(struct rlimit *rl, int which) +{ + + switch (which) { + case RLIMIT_DATA: + if (aarch32_maxdsiz != 0) { + if (rl->rlim_cur > aarch32_maxdsiz) + rl->rlim_cur = aarch32_maxdsiz; + if (rl->rlim_max > aarch32_maxdsiz) + rl->rlim_max = aarch32_maxdsiz; + } + break; + case RLIMIT_STACK: + if (aarch32_maxssiz != 0) { + if (rl->rlim_cur > aarch32_maxssiz) + rl->rlim_cur = aarch32_maxssiz; + if (rl->rlim_max > aarch32_maxssiz) + rl->rlim_max = aarch32_maxssiz; + } + break; + case RLIMIT_VMEM: + if (aarch32_maxvmem != 0) { + if (rl->rlim_cur > aarch32_maxvmem) + rl->rlim_cur = aarch32_maxvmem; + if (rl->rlim_max > aarch32_maxvmem) + rl->rlim_max = aarch32_maxvmem; + } + break; + } +} From nobody Sat Nov 11 00:40:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRxgk2TwJz501Xj; Sat, 11 Nov 2023 00:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRxgj6d7Mz4HCC; Sat, 11 Nov 2023 00:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L/JVhdHMBtdDd5Kqm+IabrRcm4um5LK3W+Kf1axaNZI=; b=MFR/dGpodjPvUVz79Kl30tuH8F8VkZGCyhUzcCfs3KArUWcQQZguhPFX/3Xd9DclMW2/OS e+yMLqeN96gOA4FWcJ35y07GiGEwTX9PkV4gayOxlNc3/Kck2RYOreSlHmUPob5i4pMLTI /6hvleGnQj4JwuvhiPKTxnlENfsOHpmrC4Y/RCdZ+Yceo4jxTjKvuMyihV4F5fG72nrUGm VmsaseYQ7owBNum6TbtT16IeTflMwA/CDEV8WpElYeu6/3uMNgytzFvNaMotBkG8UOFlhb kz0NwfbxtmJyYDv2bC1vsLu4K5dG2AyVnHvu62MB1KF6U+00P2d8usTIGSQA2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699663249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L/JVhdHMBtdDd5Kqm+IabrRcm4um5LK3W+Kf1axaNZI=; b=HrkwqrnbyAWJiPJ0AiWrLlTk34AFi/r++gfE7D1ZSZMhFhBtQQYskIrl/pIgEnK0GXsQR/ mhxp+RAr7W4YbVueLaHGrqD40Lkr/R90F06sEdj2GpKQIMlmrfyTDpZGIqOKHMeCqQMCFh a3hUWS/7jtzzwdaj1tJz3dkwRvI06YLNKyoDOMvR7HQxm2OQWlJYqZJAxZYI/62L1x/JkE CknNx35LkyJ8VJOEBOg8CoOrRw0OoaKJvEa+tMbTESkrbO2V8C6MA7rIHQiZXa+4OJTg1N IFpsBXt62w68ViS2/P1JVJvi9Ife+LjYM1F6kZykR1/riLaXQVqLNxcCzEfSUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699663249; a=rsa-sha256; cv=none; b=fLwkIMe2pMBVr3mfzF6HxpCyfjZQj3VciraSjxQ1FSsENK1i7M1j2i+/Lhn2YK232B8BP2 QYI5fOphj0szb1vak1vZ+7yLqiQA7PIFmXe1Or5rMxyXxREq3XPSYdEGgmasC0t0bpZwTY JedfzI/UX9L96X72lm7uuQ3WdyeBZO482TDSuJRiFrzewIBMcFJ4DAcgjn/vGtslyRz9Ps Rid0eW3yfCc04qNetl+wzyjNkBjzPJlXSIK1tl3wUdBt/3UCX+uUpq7NUnBLm6Xd07W69B UVNPEJhVQEyETadccXNB5eoz+wlPKmBuSH/GMbYNRNc5DIcZO4aKyuJsxK4gFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRxgj5XjRz53d; Sat, 11 Nov 2023 00:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AB0enB2078863; Sat, 11 Nov 2023 00:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AB0enTH078860; Sat, 11 Nov 2023 00:40:49 GMT (envelope-from git) Date: Sat, 11 Nov 2023 00:40:49 GMT Message-Id: <202311110040.3AB0enTH078860@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: a6d08183731b - stable/13 - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6d08183731b28d1e9c898a0bc8708136776b250 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6d08183731b28d1e9c898a0bc8708136776b250 commit a6d08183731b28d1e9c898a0bc8708136776b250 Author: Konstantin Belousov AuthorDate: 2023-11-04 16:48:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-11 00:40:26 +0000 Fix typo (cherry picked from commit d093fe94e10f88fb5f46108f28555584f2f90d08) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 3668d2a3c444..1c580e2b0de3 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -61,7 +61,7 @@ #define FREEBSD32_MAXUSER ((1ul << 32) - PAGE_SIZE) #define FREEBSD32_SHAREDPAGE (FREEBSD32_MAXUSER - PAGE_SIZE) #define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE -#define AARCH32_MAXDSIZ (512 * 1024 *n1024) +#define AARCH32_MAXDSIZ (512 * 1024 * 1024) #define AARCH32_MAXSSIZ (64 * 1024 * 1024) #define AARCH32_MAXVMEM 0 From nobody Sat Nov 11 10:12:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SSBM557QPz5010V; Sat, 11 Nov 2023 10:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSBM54XpRz4YT8; Sat, 11 Nov 2023 10:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699697537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUaPQMuJ03aLr1v3UKhwRAM1fQ2oX5d+rf4rnB3hrgg=; b=wFxh7VDfv3VCwmPTaKKweQCNC6z5tvwjwe7aZG5cghzejQFgAZ1gqH58h/IMtnY1pNuLDG lqI8o/VdDxQjpDNU0TQOf0+tolPn3xwWYDPOtvByn0TZBzhGl9+ELzlQ0/Oh+R48KmwiyZ c8BEXt/61OBaV3ccL3vf47Y6zti2uZd3wT0ixMdpBCbJLbweYaTkoOAqyLBf4Nv5gw8DVn Sqg7tmI5kix3njddz7NRbip0+A01fORTgM97SZjPTvgR3N7SF2G3yeEk5ItFL5mjbsF2wZ mHe1XDXXVl50Nc1Nz5kwD3a4bKbpgGKXrwsdTx2+OuLDzILoccuSVp6Ji+CW0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699697537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUaPQMuJ03aLr1v3UKhwRAM1fQ2oX5d+rf4rnB3hrgg=; b=ylCCTiKMSVnf8By5y3pbZmftWF9lvZ+3p4hKD1/oGNG5FI6gqocq/n/zsI72UbhAnpoo+2 nOuRxsYpgWXGSDrf9JnxVxTCk3W5o+Kbat+mKKd1fE60WqX4jFrSG+FAPfCTT7oM99NTIp YmSR5f31WEJXrgBJ76xkLH3gFHA20axS24G8vp8XuGpoepx3IH3+b7cC5GgLRbX3gqF16P PZpOb389hKeSByTWy9xYhZ38eVIBRpDulAqNAlvhlVSAjPGhcjpBD5GpzUurQV2Lsau7X3 G7nORWEghtRE21IBpmbAU88pWy8n8/i8cKdpwiBC8h59CngKpKZnaiFhW2m82A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699697537; a=rsa-sha256; cv=none; b=Vz8eUd/Rc1mPRhCPBqL2q+0cg1tEl2JZQYLIvbDI+HQRjXFZJQYZ30hsQ7fTPTFeWhSdsJ pT8NUINN7oTHQlX5X2GY9dd69QbBzZrr1lDjmUMtqJb/Wb1kTlSopl2wuKYTUoccgskHb8 5xtqkrUAoiI9q2057W5epKTFBlnUNT2EBvonaVtm+aJHhonSBhdRXfduJ4SvoKAmrYgjrQ PJLztlZD+qnWxY2YOi7rYzD8DP0/IHnx5bhMBsineQcdx3HcIHNDVohUTqbdOsEcODdaze jW3WDRmfCWdrpMmb9IxZUF2z9S9qopzxGAkXLmZnYu6WvBRm0RIoAWuD1/9qBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SSBM53bY8zcYw; Sat, 11 Nov 2023 10:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ABACHkl034972; Sat, 11 Nov 2023 10:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABACHrX034959; Sat, 11 Nov 2023 10:12:17 GMT (envelope-from git) Date: Sat, 11 Nov 2023 10:12:17 GMT Message-Id: <202311111012.3ABACHrX034959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4b2d944b406e - main - pfsync.4: 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b2d944b406e89d9d07e4142c66f635a25b245bb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b2d944b406e89d9d07e4142c66f635a25b245bb commit 4b2d944b406e89d9d07e4142c66f635a25b245bb Author: Trond Endrestøl AuthorDate: 2023-11-11 10:10:41 +0000 Commit: Kristof Provost CommitDate: 2023-11-11 10:10:41 +0000 pfsync.4: fix typo PR: 275025 Reviewed by: kp --- share/man/man4/pfsync.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4 index b3603c48316e..96f498c7a7cb 100644 --- a/share/man/man4/pfsync.4 +++ b/share/man/man4/pfsync.4 @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm pfsync -.Nd packet filter state table sychronisation interface +.Nd packet filter state table synchronisation interface .Sh SYNOPSIS .Cd "device pfsync" .Sh DESCRIPTION From nobody Sat Nov 11 14:44:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SSJP50xPpz513JH; Sat, 11 Nov 2023 14:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSJP50NJzz3bZc; Sat, 11 Nov 2023 14:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699713865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vqk6E/iQ/ypJF8BODm/SiVoG247cLFr3qhmGzV6Taso=; b=YQX7i9JL1r4SXc7HMwxP8RVgdwtl3rvCmQID+GvosuIARKURpnKXQ9RkTOkhMWr0YaVcro pGM7pWM86SpF1ZA7hrQjPCUCr2Mrpi/sK9qbFfbXjpyeZBo6675r1JVC4hyA8qEpfXiv6L kr+1cR3t36LFxWo0JLBxnUQX/XY8TdRh6MAComr7b3/EkH5gpIv41wJIvmTNdpKCxjSPaT XokfECQ47LLj9IUAjES/gIe0V5RxN8zv1ZOJQMJEJM6cYpjS3HOGf2VmtEGHZRTSWhHL3y 6YP1858jRpIeCEdeCQaiBVOZtNAztvAlGzYRNoB1Kd0RcanUpzgiYIkk/c5YFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699713865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vqk6E/iQ/ypJF8BODm/SiVoG247cLFr3qhmGzV6Taso=; b=q3bMxnOUEJJmtcot4bFwpDj7gr10YOCozRYv+c/+0ammaOR7sBPmHS8PAjEvGNgK+ygcnC d/NlRqSSzCumlh9uqGbX5/5NXkPAV/JPWplFjFppCcWMPwd4Ei0VND+ev84tBvYWvKAeyC GKKCfYhr0RCeFfFcZ22KTxQbTuTs5T/W10T8hclj1B6yGj6Bb1A6zRtds4Kmw3Fq6Cq2iv eQMq2yTaDVes421ajACD4zF3H6W+wRVmiOxI76i00qW0tsldjh9h648sI18WprVLxjVbWZ Plsisja4H5Hs6ZO+f35covQ+UUSTfVF72gZHACeHvjPLxbr40imaWVuIGCvQPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699713865; a=rsa-sha256; cv=none; b=E/uxuaCu5d70k4sq8w8eHRI4GAH0fogs2BWDyHFRizL1KWZ1cVXl86+b8VwPRu+El70MSY Mz0ckHGJS2yDps5A32V8j5bqbIuwB677YaW+mc+vYBR2OL+x+4TSgjHsXtgQWU30KChelQ ObR2l2+wI5ULqMtBCmndjdIDYt0a2M+9ekpXCMwPL+KAGuLJX6eVgGGwqG78GT+U1TJcU3 rZNhxfW/rq0SWrRz+Kah70jOoqXc0tFXG4euAyDZs4V/4cVjm+b4xttsmmAvGSww/uCZAd Fz7YXMtCEK24+3A4kqRd2P/DCWKyPgfm9T7Be7RtoB4dOLkNjzsWaK9xA8Ehbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SSJP46Yg5zl4Q; Sat, 11 Nov 2023 14:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ABEiOcK086440; Sat, 11 Nov 2023 14:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABEiOIc086437; Sat, 11 Nov 2023 14:44:24 GMT (envelope-from git) Date: Sat, 11 Nov 2023 14:44:24 GMT Message-Id: <202311111444.3ABEiOIc086437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: dcc4d2939f78 - main - if_wg: Missing radix unlock can cause deadlock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcc4d2939f789a6d1f272ffeab2068ba2b7525ea Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dcc4d2939f789a6d1f272ffeab2068ba2b7525ea commit dcc4d2939f789a6d1f272ffeab2068ba2b7525ea Author: Aaron LI AuthorDate: 2023-11-11 13:13:08 +0000 Commit: Kristof Provost CommitDate: 2023-11-11 13:13:08 +0000 if_wg: Missing radix unlock can cause deadlock In function 'wg_aip_add()', the error path of returning ENOMEM when (node == NULL) is forgetting to unlock the radix tree, and thus may lead to a deadlock. PR: 275001 Reviewed by: kp MFC after: 1 week --- sys/dev/wg/if_wg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 4a21afe82eb5..0ea40b763416 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -562,7 +562,7 @@ wg_aip_add(struct wg_softc *sc, struct wg_peer *peer, sa_family_t af, const void node = root->rnh_lookup(&aip->a_addr, &aip->a_mask, &root->rh); if (!node) { free(aip, M_WG); - return (ENOMEM); + ret = ENOMEM; } else if (node != aip->a_nodes) { free(aip, M_WG); aip = (struct wg_aip *)node; From nobody Sat Nov 11 17:15:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SSMlv1fRZz50Qtv; Sat, 11 Nov 2023 17:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSMlv00YCz4SG1; Sat, 11 Nov 2023 17:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699722955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0g3STzSJiHenFwFiRX5RQub1WPEi1hzH2PePotB+U8M=; b=xrYj1qRACllwK/T/JrU7acUhCdmMZ1wbNqWthyeTTHBeQGJeJLvfeWwAJ6/j172MhlXE7d p5Fbz3J1K6ZCT4hIdoFbk7MJkeahd7bDMTj2fhpH6gDTVbW0xTX8jwCFpVd2vRILhsHxGQ JxZwqJgN4eQMZ4liMs85qwe4rQ8vGqXJWVLjoVN1jpiPR2yNemTb0ZG6R3f2zZQBsZnHvE +NPUrCYRzLVIRp5mH7VoeOcwwR+KlqxtJ7pqxmX/gSp8SFm08yUP1wvYkgwtnYAEeTlb40 5lbMjMaoPaeuwEISmOhgGEvfx9s90cHoDzCaCdUJZwrjy094xbuBNSw81o79hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699722955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0g3STzSJiHenFwFiRX5RQub1WPEi1hzH2PePotB+U8M=; b=aOrjMOVKINX0hrfiEn7qWfBaXpmw6KyyWYNrAw1dQO0mbHmZ0C7peXWM4PqVXf5GzpxL4U J7Dr03LirW4eR9aUZqs1/eE+ex5S3sXkFND9URojrzfyqAC+yrTunuA6sQ5whj15aOWvd1 4GwszVeYNN/QAk0seU8Y4pQyIh4HY8ZAogJz+fHkUi++5ZC+Zl+u1BJmQcXRFAGIKuQ9N8 Gv5Bb0iwYX/ot1wxJSrswxDPQMwIrozRhum0kR6QSx5g08XrGl1opocHvqyuMisIzqV177 uGc5eAwCIJyAs1dw7dOjEtmKfwcsYSvHSe6oEbkCK8DlIhdlPMX/QJptQj59Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699722955; a=rsa-sha256; cv=none; b=ZQmDdSSs6Hc66KVaAOkXuKqKPTyb9CXayhMhEswNxObfgNbUgRL1QOU/i3+HhWoqXeqBxc ze7zub6OvRwUfb+R/8JXW1c7CCV6bUI/UhDUaaPPZKXYm7goIthVUxb6v6httgf/5eaCbg kCrKTJHVQjVveWEJn3OZg4PGu29k8lG6n7jcRQ4Jp0fzlIGWdRdm3VAhaXvJ4hSjUR3xUT ygzAZ66sHeg92sR6kG7qS/0B+y647/x2OCnjX67+ohxkHP1PBiJ9+HHvju/gYFXPIEQlW7 A/CyJTTDB2asszgkoXy38ASP1kKobgbf3oAmgx3o2pdnz0559EFYfDRENS2/Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SSMlt69pBzpcD; Sat, 11 Nov 2023 17:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ABHFsr4037714; Sat, 11 Nov 2023 17:15:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABHFs56037712; Sat, 11 Nov 2023 17:15:54 GMT (envelope-from git) Date: Sat, 11 Nov 2023 17:15:54 GMT Message-Id: <202311111715.3ABHFs56037712@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: 4e288572b858 - main - bhyve: Fix the GDB_LOG build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e288572b85815bcefb929fcc4f20c01a459e9db Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4e288572b85815bcefb929fcc4f20c01a459e9db commit 4e288572b85815bcefb929fcc4f20c01a459e9db Author: Mark Johnston AuthorDate: 2023-11-11 17:14:49 +0000 Commit: Mark Johnston CommitDate: 2023-11-11 17:15:30 +0000 bhyve: Fix the GDB_LOG build MFC after: 1 week Fixes: 7d9ef309bd09 ("libvmmapi: Add a struct vcpu and use it in most APIs.") --- usr.sbin/bhyve/gdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 55178677f837..a6c0700308e7 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -764,7 +764,7 @@ gdb_cpu_add(struct vcpu *vcpu) CPU_SET(vcpuid, &vcpus_active); if (!TAILQ_EMPTY(&breakpoints)) { vm_set_capability(vcpu, VM_CAP_BPT_EXIT, 1); - debug("$vCPU %d enabled breakpoint exits\n", vcpu); + debug("$vCPU %d enabled breakpoint exits\n", vcpuid); } /* From nobody Sat Nov 11 17:30:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SSN530gnBz50Tn2; Sat, 11 Nov 2023 17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSN530GGDz4VVN; Sat, 11 Nov 2023 17: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=1699723847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qcSG5WxDRHjZnMdEj+Qgc5HU0ao1QIgsqz1cSn1iHU=; b=J5JCGwwdyf7PxH747VPL7LeYNVQdIL/+6fGZ/HC482+B4Z8sGmhsXoGym+PKQ+/24Dk2MH hkw2wBYUCA6Rp4WdC58PJkn/bSWss7mUmS2As1bVOqLqGpe4ZfzARkfYnxeyEtxTBiWXlL KxcgokkfNv76hFbSvbOmsMR6alRCueRlIcB/6MdsUMhtdWOowbngx26QGnjoVbs7viEzOs jnjl2oUurLqDrn+3uEtBytslMKBx2gRuhXRIA66pK3b7/LnWqzLAJeC7GVt82xi2fPu1/v Q7QkNz4psdVeFYww+zRr9rgLwr+roPrskPJPmUJIoEIIu8DhQHJoR1x5g0H9vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699723847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qcSG5WxDRHjZnMdEj+Qgc5HU0ao1QIgsqz1cSn1iHU=; b=kd7ytKL/b/MHLfSgkr/IjF8awHgFwJd1TV01m/rhzQowE/etFLN+DLOoW/pE4W3WZxhAP8 B+Ja9fXs4R/wRvjFPA8KXBnoLzRtkide9tTGTokZC0lVYFoRTMD0iBzYHPjBsiomkZqwP8 ZICLv1ConNu7Qo3lj8QLi0SoB0z+8Ih4nkW9RX463Vw2lDpoOtMF9F/MvupDIxWjn4L0dr 1F5PTOAwtURV+BuEhAHSIt8MAcvIigbdV20+7OGi7giZcbi0M3t6/Feg3pEqWpugOaRQLA Lyqu9HBIt12BbXmBjwvbtn+9JiTT7qDstVNnO+7Iqj6dIxgwC6h7bPaqVZnf/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699723847; a=rsa-sha256; cv=none; b=jqjCXHpwOehEFgL0drZtjl0vMm0XZVqPu1+avf/FP5g80nLuL5RUQccS9Xrj/vq4vPcqSJ r2mpk0F3J5viDDsxT5j/k92V+EaJ31/J1PnoaZ7eabIIZsQh5jTM2jd3Cpr2CbTdnf9QJI vJtOfrYM2SbWNN9gYemNXV/pIHBWxiF8kN+vFqG5IX86+V9F4ZbbmM8xyz5P2tPpYEWtr8 xGXLFPyK2qqyUz+Qut3qHBXWqGbzr3jWNv5IT0zoIyU6iUtzhtObcDLrS5fUwN02tTgLfg 7UvxlU8hbhBzaNXdgS/nfANC58sMCWwZd0ejoacKGkB3tPEKoddWg8BTy6VaOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SSN526RHhzpZy; Sat, 11 Nov 2023 17:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ABHUkga065337; Sat, 11 Nov 2023 17:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABHUk8D065334; Sat, 11 Nov 2023 17:30:46 GMT (envelope-from git) Date: Sat, 11 Nov 2023 17:30:46 GMT Message-Id: <202311111730.3ABHUk8D065334@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: 5d15f0d5406b - stable/14 - kmsan: Correct the origin address in kmsan_shadow_check() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5d15f0d5406b6d27ecc8fa21a6d93754bf6c85f4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5d15f0d5406b6d27ecc8fa21a6d93754bf6c85f4 commit 5d15f0d5406b6d27ecc8fa21a6d93754bf6c85f4 Author: Mark Johnston AuthorDate: 2023-11-03 19:37:09 +0000 Commit: Mark Johnston CommitDate: 2023-11-11 17:30:37 +0000 kmsan: Correct the origin address in kmsan_shadow_check() Otherwise a KMSAN report (which panics the system by default) could trigger a recursive panic. MFC after: 1 week Fixes: ca6cd604c8fc ("kmsan: Use the correct origin bytes in kmsan_check_arg()") (cherry picked from commit 346134f19aa9ba38a0384244609e2bcd4f7838f4) --- sys/kern/subr_msan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index f8fdcf478b79..abac71da6d64 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -375,7 +375,7 @@ kmsan_shadow_check(uintptr_t addr, size_t size, const char *hook) for (i = 0; i < size; i++) { if (__predict_true(shad[i] == 0)) continue; - orig = (msan_orig_t *)kmsan_md_addr_to_orig((vm_offset_t)&shad[i]); + orig = (msan_orig_t *)kmsan_md_addr_to_orig(addr + i); orig = (msan_orig_t *)((uintptr_t)orig & MSAN_ORIG_MASK); kmsan_report_hook((const char *)addr + i, orig, size, i, hook); break; From nobody Sat Nov 11 18:00:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SSNl329stz50bKn; Sat, 11 Nov 2023 18:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSNl31kkHz4Z60; Sat, 11 Nov 2023 18:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699725615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IdyjaVcVmstrcN0oBg5G+lCqB+1af8qpY+CxEs174Ac=; b=Cv9m8OspJXQm5ikXSvKqy1+QWHRme8W/GUku8P+QgD0/4NvDyOj13eaP4PU4jZfFl/5l6g dhqpUgZyh1ZUnCDlTip82y8gf0oQmAQM7V1pztIFjgeEyjzdbHFs8Z0Da/9X50U4oli665 qNGcNpwrNtg4wBXQAiC0jqM8d6f4GcBY+PmTc2NAGJdjSj1VkvZwwX9duAci08Eei/vieD agf6llvoH3J9pSOE1zuJQIldtEC3c+FoDODr+5qdUmRTqS1rlFIZs4BBkcFN2m6UBXMXnB 0s9m354EgWpxfQmjoilOhXDvPIVVAFaejp6townRQVsJljK1vOEwXRzHhXjaTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699725615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IdyjaVcVmstrcN0oBg5G+lCqB+1af8qpY+CxEs174Ac=; b=rfYpx3pRw0mFZHnxrOv6fGB5FnqXVlC3Us/6zq2M8fZlDz01O4WOPSHP/D2bvxEadrLrJ5 KLrQK1LtJn1aCDfZU3gQAOQBRgki+UY0HYBTVsWZpVFKISqEyJKQGN9NlADzTKl+HVU/lY olCZSf5wun613NmhzjeYU+GAGsU9TMoTLxPh2GtI0aVyXAVTd2dZQzJGx8oucE85o16lME joXo7pNQSOe3WLUVNZ0pUnZMy/nvVkplmJqFzWUwtoppV0UkUybeGcDoG212euL7rp3XI8 /jPWjQQOfdnGTxNSDz0KT/XSYdgGIl992OfpOawWJB5GuNRKsqogVIsVhwpbUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699725615; a=rsa-sha256; cv=none; b=texb98yGYAqPOiBv5Kq+Fa/kvw4vrLfyGhfQJWaGIPOlB9eEkml3GGRdQvBuvy/+8EVGZq rtZD492ijzy7ItpHx+ns/Z0B5xXCqIiGkeR9kJITAutpb32wsN0xl/M+ZQos8mGbCySz/G EMLBXCS1NlFMLfUPnSWdPiUa70ZA2bgyA1Ti7ygrljW971mquxCDhLjSboQHhehvl4b+zS 09hCovTt0MQ3auGTmXXuVgfg1EWdFHMnhVeUJNUzHWdmThLgkpPHyKm/854s2Ll2uZdO6T 0pbRliAGm5qjiAWsYNXNhOrlXjpT9Kzj3guKkFjWJRvNvIpfyv+4VQu/D5TwuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SSNl30nGYzpqr; Sat, 11 Nov 2023 18:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ABI0FPR013746; Sat, 11 Nov 2023 18:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABI0FVu013737; Sat, 11 Nov 2023 18:00:15 GMT (envelope-from git) Date: Sat, 11 Nov 2023 18:00:15 GMT Message-Id: <202311111800.3ABI0FVu013737@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: b2921fdc2330 - main - arm64: Implement bus_get_resource and bus_delete_resource. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: b2921fdc2330a5750f557fa321b94f972d5a7702 Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=b2921fdc2330a5750f557fa321b94f972d5a7702 commit b2921fdc2330a5750f557fa321b94f972d5a7702 Author: Andrew Gallatin AuthorDate: 2023-11-11 17:54:19 +0000 Commit: Andrew Gallatin CommitDate: 2023-11-11 17:57:39 +0000 arm64: Implement bus_get_resource and bus_delete_resource. These devmethods were not defined, leading to the surprising result of using bus_set_resource(), and then immediately turning around and getting zeros back from bus_get_resource(). These are now simply passed through to the generic definitions, since there is no need for them to be arm64 specific. Note that jhb plans to replace most of the devmethods with the generic versions. Suggested by: jhb Sponsored by: Netflix --- sys/arm64/arm64/nexus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index b9871f0e9b3a..6ba73cd456ef 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -136,6 +136,8 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_adjust_resource, nexus_adjust_resource), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), + DEVMETHOD(bus_delete_resource, bus_generic_rl_delete_resource), + DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_get_resource_list, nexus_get_reslist), DEVMETHOD(bus_map_resource, nexus_map_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), From nobody Sat Nov 11 19:23:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SSQZj1W4Yz50tpF; Sat, 11 Nov 2023 19:23:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSQZj13fhz3Gmq; Sat, 11 Nov 2023 19:23:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699730589; h=from:from:reply-to:subject: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=7KrUI+2BnTyiFSb3F7zYbOJgCG59UKLE7VMa782P+B0=; b=iBlX1qgkpjgq1tqvCQvsfZTOknooBsfPITiVhNFxSGrvFhTsKzF9U9jmRAuzeimB2pwxD6 zQukFoQDwsdx1cUMNdH9jiG8pqZy5tP78U+6flHweEJR2bplFY1O4MW3aCm9nP4Ipb+lfa yfrga4ZLquFXDIGywtpEs0BHwmIW7TtatZXpKyWPhLK+ALm5JxrsdgvR7h+FyrnA/ieSZl gs7CWJpOsEdJ91nehzg8C7EJu1+0kV9SXhAdUq4e14QBgVaicv+qOKEmz7io3ERV9cxjWQ UdgE1rAihEQ1ct5l91tqp9UQA3wfdEAAscooFP0VXCNVED51pj5aCHS1s4XT9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699730589; h=from:from:reply-to:subject: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=7KrUI+2BnTyiFSb3F7zYbOJgCG59UKLE7VMa782P+B0=; b=dFXHzRzwzo5AGI2SkzklgnYa3xc6kyVPC0V1q4VZwGV355YR7Tu/1qowlPc/T8RhtVi23a J15iUQSfrTKsNXGzotDBxVfDxSRLPWR0CcrKU/o+b+qXp5dOZoqXecHjZBJxVvak1NmlCK iUWvZMyi9bIXu9tvjiAW0Y0XnM05pjcuDoBzhbJZjcC50A/CQuaph3N5/pydUPDODaUqvn PXX3DP8xD8J48stW9ywwyyZsCrHDmw5JEwMjg1KQJ4AfSrHGF8tztIc+7J2aiokoFYk140 oMQCmMw4VPVXid22njqE1Dr45EB78t04PPytzChhPp3uTVr+iwTUf+ir6q4Qmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699730589; a=rsa-sha256; cv=none; b=mpGImnf12EtcGE4ycETZ5SbRcXnNfq2h2cwuSdFFZmiCAAyoWtIlOyulNgGEenwuVEw7PR ef3nxFrQDppqAkVc4piRfrEJ2PbDt4raUIeBXS7FYF4N4zH1O/S130ZysplQYo17gGxsgn fYTG+wQpylueMzfLzE9rW3GROpboHcNctbJuY48YlX2n4TeKPJJV6em1ZWO75lppqgDhAY KdIG6uWQMTxunrhNqSSXZlYFC5oQNlBboQlRyadrqT4RMJfmal3ZIHZpeV/nMTlDyJHg1o uGZEqvrHmUctgxMJg2JTuf/mwww2QMfEA859uWUQmrKGMuJbiIm1uwak68P9Mw== Received: from [IPV6:2601:648:8384:fd00:8dc8:68:d931:e24b] (unknown [IPv6:2601:648:8384:fd00:8dc8:68:d931:e24b]) (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 4SSQZh4W3WzkJ5; Sat, 11 Nov 2023 19:23:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Sat, 11 Nov 2023 11:23:06 -0800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 7c566d6cfc7b - main - uma: Micro-optimize memory trashing Content-Language: en-US To: Alexander Motin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202311091821.3A9ILlAJ044944@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202311091821.3A9ILlAJ044944@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/9/23 10:21 AM, Alexander Motin wrote: > The branch main has been updated by mav: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7c566d6cfc7bfb913bad89d87386fa21dce8c2e6 > > commit 7c566d6cfc7bfb913bad89d87386fa21dce8c2e6 > Author: Alexander Motin > AuthorDate: 2023-11-09 18:07:46 +0000 > Commit: Alexander Motin > CommitDate: 2023-11-09 18:07:46 +0000 > > uma: Micro-optimize memory trashing > > Use u_long for memory accesses instead of uint32_t. On my tests on > amd64 this by ~30% reduces time spent in those functions thanks to > bigger 64bit accesses. i386 still uses 32bit accesses. > > MFC after: 1 month > --- > sys/vm/uma_dbg.c | 62 ++++++++++++++++++++++++-------------------------------- > 1 file changed, 26 insertions(+), 36 deletions(-) > > diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c > index 36567f3b3968..76dd2bfde2fe 100644 > --- a/sys/vm/uma_dbg.c > +++ b/sys/vm/uma_dbg.c > @@ -64,27 +64,20 @@ static const uint32_t uma_junk = 0xdeadc0de; > int > trash_ctor(void *mem, int size, void *arg, int flags) > { > - int cnt; > - uint32_t *p; > + u_long *p = mem, *e; > > #ifdef DEBUG_MEMGUARD > if (is_memguard_addr(mem)) > return (0); > #endif > > - cnt = size / sizeof(uma_junk); > - > - for (p = mem; cnt > 0; cnt--, p++) > - if (*p != uma_junk) { > -#ifdef INVARIANTS > - panic("Memory modified after free %p(%d) val=%x @ %p\n", > - mem, size, *p, p); > -#else > - printf("Memory modified after free %p(%d) val=%x @ %p\n", > - mem, size, *p, p); > -#endif > - return (0); > - } > + e = p + size / sizeof(*p); > + for (; p < e; p++) { > + if (__predict_true(*p == uma_junk)) > + continue; > + panic("Memory modified after free %p(%d) val=%lx @ %p\n", > + mem, size, *p, p); > + } > return (0); For future reference, switching from printf to panic here for the !INVARIANTS case is a good change I think, but it was probably worth calling out in the commit log (or possibly doing as a separate commit before/after this one). -- John Baldwin From nobody Sat Nov 11 19:55:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SSRHf44mqz5115l; Sat, 11 Nov 2023 19:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SSRHf3GlWz3LKP; Sat, 11 Nov 2023 19:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699732510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6tlCdkhj5qiVhwpLqljdwa7h9cTlgbjax1m+2OWXFwk=; b=FLYKGxcSNN1455bHqpZZpqXyFdgQpbKTB4T5H/tbGMj7sRfNQOTab3gWfYZuPFersnsQnF 7GKa6SWykQNxhWC6GB4mPhN0iFvnNEWfSsqTllQ2evGVwUNTBM/gU9/ILEz1ZJY2YzgyGB xRnWzPBdaQf2eXAHv5A4soWnCM0u+j+5yFMRe7kQ1Dzt9DNEbWGKG+3Aa3FAl6dKJ+bh7r VPY7UvsgCw13f176utSbS1J1CTTvYnhsQSUNoxVxJN9dUDIcOwT7ZwYu6N/76TSmYKtVIK 6sxTqT76qTY413Nr8oNoRUWNtj/SwuAj1sLM+6SZ6FavLpExa5hAxd70WCtenA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699732510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6tlCdkhj5qiVhwpLqljdwa7h9cTlgbjax1m+2OWXFwk=; b=s1LWah4cPmKyUdIo7kE6TjD+YHjUN8g8eLQTMfMflwExkl9zlutT+L5jg+pxaNknrnf3oI Kdc+DfWKZ/OO3P1KuidVfJWHojbxuDbaWAIEk7OrSjizxy0tVakLTu96IibLfezO4ZthEY IdywaGmh9HGN4z1ln1LasIyVjQLRBNA9priWnAwKumT17HncdjyH2VHv/ndL3fVUcWTn+Z Inj9l2dvoVVz3eRiKUb59n9sol8tt1O1cpo0GBWgULm3HtDdblc77ux8c5oVTE2H8O3L0M iDO9MmnXFvvzwyGMCM7Nhi4CyTeHQbX61p6P7gsvBQAGGhNzp1wQjZ/N9M3oVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699732510; a=rsa-sha256; cv=none; b=aF0P2fjpjjZoy5L/qybTi+/T8fOf1DefIFMeNP8h+pgSMVuSxrMmGo1Pra7KpZPuBb2n7X b6wKpEpm8MZlsvaWDcckuFnJ3Ws4VRkTKytukdWQUqvOal6IPNgVwQh9JGz3s0piRbDa8j c1A6LikADFNsW/fYbtigRI7T0P6SVL64xSrweeGd9tqKTgBwMHyebEyE4qNT4wl0cFH8NW bVx/6gcYa4hjdZaLD1ow+Xtez7MlBSjjE363NWGtjiGFXCRkIKE0GQ77zvO6R5yUsRdFq4 MVIzPw4zllsunFU/2NZmZk2Wkjh8H3K2f2ieUW51V34Hl6j29XzRH2c7/oO8fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SSRHf2BFlztBT; Sat, 11 Nov 2023 19:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ABJtAlh004863; Sat, 11 Nov 2023 19:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABJtAO0004860; Sat, 11 Nov 2023 19:55:10 GMT (envelope-from git) Date: Sat, 11 Nov 2023 19:55:10 GMT Message-Id: <202311111955.3ABJtAO0004860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: ba44650a0b1e - main - ps.1: update regarding -D option and -p x/d interaction List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba44650a0b1e3b0f52554380937a3ffc16d396f3 Auto-Submitted: auto-generated The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=ba44650a0b1e3b0f52554380937a3ffc16d396f3 commit ba44650a0b1e3b0f52554380937a3ffc16d396f3 Author: Benedict Reuschling AuthorDate: 2023-11-11 19:49:24 +0000 Commit: Benedict Reuschling CommitDate: 2023-11-11 19:49:24 +0000 ps.1: update regarding -D option and -p x/d interaction The -p option does not imply -x, it is merely a different mode that ps uses. Remove that statement from the -p option, effectively rolling back d6ae056e9dc96c2db45982ac358ba9ed716a9202. pstef@ introduced the -D option in 5c0a1c15ff8cb66128f4826ace8ba91e0a31486d which also turns ps into a similar mode. List the -D option along with the others in the first sentence of the second paragraph of the DESCRIPTION section for completeness and correctness sake. Pointed out by: pstef@ Differential Revision: https://reviews.freebsd.org/D42552 --- bin/ps/ps.1 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index c393b2e49c28..0afd53523854 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -28,7 +28,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd October 6, 2023 +.Dd November 11, 2023 .Dt PS 1 .Os .Sh NAME @@ -65,7 +65,7 @@ will also display processes that do not have controlling terminals. .Pp A different set of processes can be selected for display by using any combination of the -.Fl a , G , J , p , T , t , +.Fl a , D , G , J , p , T , t , and .Fl U options. @@ -238,11 +238,6 @@ So the header texts for multiple keywords can be changed. If all keywords have empty header texts, no header line is written. .It Fl p Display information about processes which match the specified process IDs. -It implies the use of -.Fl x . -When combined with -.Fl d , -all descendent processes are included. .It Fl r Sort by current CPU usage, instead of the combination of controlling terminal and process ID.