From nobody Sun Oct 29 00: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 4SHyRL1Z8Kz4yFyh; Sun, 29 Oct 2023 00: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 4SHyRL11ZYz3Qvh; Sun, 29 Oct 2023 00:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698540446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vq1NULzJubPT6rGChbTreqNpPXu3NO3hs4iUnXKKEpc=; b=HjnJe/FmZURERYGJl6rHR84DYUfPWg9fWXnrYh1Mtd+9b+TwrlpYiWS8WiTpH3GCeoRcoV TRjIo8UhFynivwyb9bI/UmVAQPJEcINdtseblh2d0QHCommbkCHGp56KCUgyzdX0xJX4pX BTt0nyI/QoULVoge94ufvJARJpimbfFUZKlKsyoTcLTO+KRLJesXaeiUQzvelxYWDWTdoR yy5yREi88Vm+G/rrgX6Eu3RRrN3EY2kQhi2PFXEVsLAxwIeWjf/RkYy4QCH99r45QaQ50s Sg48RonSYQErTbLSu9JQd++ED6JPxTsv4rqwCSHnIJzk1ADjbJQg742ZifcbFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698540446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vq1NULzJubPT6rGChbTreqNpPXu3NO3hs4iUnXKKEpc=; b=nWB4yxiXQznJ05+rTRr0CLsclSlfRaXcFVvYGF0/cO1lhBAMtwcbc5KsBYg1bjxPYkS3VC DReJuduSAycCZHo8C0Ikd2cjoODBe4Crx/TclQPtAAPj7/j+jQrfb/8IPbwhgoxlu9zA8B ulV0AYOp4ctI/LDL+O504Gq1C0RoDrZ3COwTXfpv4MRVO0nZL4byT/HcflliPq3ytlEFoj ZejIkmJYuvawSIcWNKvM26YgxhNjFWqpt0M9w3OdZgOVqfgUB8+XhkUYN0TNZ3XjRWlQes U3PZ/UJVA55qQRiPc2ypUOsAtHBCXoh6uZlAZSZJoq+QOe6lPCXVzr1GJT/edg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698540446; a=rsa-sha256; cv=none; b=DJhE2GcGjP6cP3JS5w11q7bZ2lOMa69kiFRKG+YoVL+dZ+6vUYWU69wVp+4qdqgDbTDzFM Hh52Pej5OmmA4zz+os9AXFTab+7ndYMHfStMaZ09lQZDCBLuOmkPIRLzRRC6iS1LaDLs6L +TjokpwjqBD9JAJIRDmnMHJsmapnoG1qsDOO0DHteq14UWhQ3+Ke1MoWJILm+k7Vl163jC PslS7gnFeECRHIunht+5HG32/ybJyaTxAEHDcfh8QamjdLh75hAx0iJF8Z2VjFqXytRDt/ RyPrwPf56ryjFk6L6kJCJap/6eDpHNHBwpZiQdvD9vLdku4mvDLHO0v4qHe9fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHyRL045Vz3Fv; Sun, 29 Oct 2023 00: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 39T0lP86011657; Sun, 29 Oct 2023 00: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 39T0lPch011654; Sun, 29 Oct 2023 00:47:25 GMT (envelope-from git) Date: Sun, 29 Oct 2023 00:47:25 GMT Message-Id: <202310290047.39T0lPch011654@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: 578e91188081 - stable/14 - pthread_mutexattr_init(3): describe pthread_mutexattr_{set,get}pshared List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 578e91188081525fe45abd00cd751600190b4688 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=578e91188081525fe45abd00cd751600190b4688 commit 578e91188081525fe45abd00cd751600190b4688 Author: Konstantin Belousov AuthorDate: 2023-10-23 22:54:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-29 00:47:05 +0000 pthread_mutexattr_init(3): describe pthread_mutexattr_{set,get}pshared PR: 274678 (cherry picked from commit 2152c4e2db88b9264c6400f2510440465d39c7b8) --- share/man/man3/pthread_mutexattr.3 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3 index 8e457b87dc8f..30537b9a9f86 100644 --- a/share/man/man3/pthread_mutexattr.3 +++ b/share/man/man3/pthread_mutexattr.3 @@ -132,6 +132,26 @@ all threads waiting on any mutex owned by this thread. .El .Pp The +.Fn pthread_mutexattr_setpshared +function sets the process-shared attribute of +.Fa attr +to the value specified in +.Fa pshared . +The argument +.Fa pshared +may have one of the following values: +.Bl -tag -width ".Dv PTHREAD_PROCESS_PRIVATE" +.It Dv PTHREAD_PROCESS_PRIVATE +The mutex may only be used by threads in the same process as the one +that created the object. +.It Dv PTHREAD_PROCESS_SHARED +The mutex may be used by +threads in processes other than the one that created the object, +assuming other processes share access to the memory where the mutex +was allocated. +.El +.Pp +The .Fn pthread_mutexattr_setrobust function specifies robustness attribute of the mutex. Possible values for the From nobody Sun Oct 29 00:47: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 4SHyRM2zFWz4yGJ8; Sun, 29 Oct 2023 00: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 4SHyRM2Y8Pz3R1d; Sun, 29 Oct 2023 00: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=1698540447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDDBS2UAs5YsuoGC4FbcpQR+CVtQi+bb9MUOkfifxCs=; b=jc4Newu5pXoeyHhes20M/AgnVA98o/rxIN3EqW2w8/cCq3SIc++JmLORtZXvvsQAlh+40t NJWIdOqmQSDxRAn9xBA71Vm7zakgw/2XZRaf9JYIoxKGYfGTAEMWNOONtywwomciJp+tYE ryYnlDqj/3FK5/1dbHrA5Uj46w5O2arClswEL73W+yi2lAY30zELCXFYFq7SXH7ecOG49s NIIlCoWIEGCytEYBMWyWQeFSGVixDMRaxFaPbpD61peLb5AFcIqQ19KlyrHmRSmpquA00E 17aam7K5q1di94caLd3TC/dsj6ZYQJiTbfyDqxETNsxokb70uOOgUVEwA7SFUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698540447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDDBS2UAs5YsuoGC4FbcpQR+CVtQi+bb9MUOkfifxCs=; b=bPq7MpkMEw1GCAeffsrh4t51+l1hsSXVGo8pt5oqSHZ+jukQqigwKnUillAkngiwbzoobU XKCv3zsLpNINuMrnfKteFs5PSH8y8yqF8dfj+fR5yebEkQCsaGGyPE7sIVA3n5no9KMHgu u0ec+xaztmJYnCDfpIWr1r6+on51jRBw9hsXIgumJXVvzvEK/A05ZQWlzsB4VSOnPUdlKP wKg2Lb1AfIueGQG1ufdTjEgmuesfquOQCv9Wfpn+za2fR58byRaFzR1L7YOCGOQTSipo7T G0gkqoMDaGW5oq12oihGIS3nxVI46gd3x30ATYrXOnZMnODwbVwPNFzQzJPW8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698540447; a=rsa-sha256; cv=none; b=twlLlhe7JkWR9OU/+Juxdd2VcyTTraDo4bTTuSyk3ZLdo+eCtTdgl2/EshMdzrMCoAIQnw dsZUt1ne+0rjwEI6gwiDdTH5Y7+YbRTpWVHb4M8JYXeqsDCBO2U5x0zRpqaFiQvZuP4VTr 14gx1jpRWkuwOoLPednqhMy9k4Qe+GPEs36bJrYBF8VXsNQlSJUrpeKx9djbzSxvGrjP14 O211HtOMl5VwlAtlamUZB8QPRRTERpUKwDs5AZUnw1wz3WkcmP8r516usgzOuJWV87wwqV z4CbJ6gl6ETsidqKRKJhjMqXlSzNzTxhbDGAizJtjeU5HulD7pcohbvWtW2rNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHyRM12ZSz3gZ; Sun, 29 Oct 2023 00:47: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 39T0lRsS011698; Sun, 29 Oct 2023 00:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39T0lRPe011695; Sun, 29 Oct 2023 00:47:27 GMT (envelope-from git) Date: Sun, 29 Oct 2023 00:47:27 GMT Message-Id: <202310290047.39T0lRPe011695@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: b23756cc7892 - stable/14 - pthread_mutexattr(3), _condattr(3): reference libthr(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b23756cc789213c24c68fdc43a60fc837daec21d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b23756cc789213c24c68fdc43a60fc837daec21d commit b23756cc789213c24c68fdc43a60fc837daec21d Author: Konstantin Belousov AuthorDate: 2023-10-23 23:03:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-29 00:47:05 +0000 pthread_mutexattr(3), _condattr(3): reference libthr(3) (cherry picked from commit 4f03a2cae8ae96446064da4e8a533ab24172bdcb) --- share/man/man3/pthread_condattr.3 | 7 ++++++- share/man/man3/pthread_mutexattr.3 | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3 index f11b50070d3d..f3b1d3639827 100644 --- a/share/man/man3/pthread_condattr.3 +++ b/share/man/man3/pthread_condattr.3 @@ -24,7 +24,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.Dd May 31, 2016 +.Dd October 27, 2023 .Dt PTHREAD_CONDATTR 3 .Os .Sh NAME @@ -112,6 +112,10 @@ threads in the same process as the one that created the object. The condition variable it is attached to may be accessed by threads in processes other than the one that created the object. .El +See +.Xr libthr 3 +for details of the implementation of shared condition variables, +and their limitations. .Sh RETURN VALUES If successful, these functions return 0. Otherwise, an error number is returned to indicate the error. @@ -153,6 +157,7 @@ The value specified in is not one of the allowed values. .El .Sh SEE ALSO +.Xr libthr 3 , .Xr pthread_cond_init 3 , .Xr pthread_cond_timedwait 3 .Sh STANDARDS diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3 index 30537b9a9f86..8f4d0d9a06a4 100644 --- a/share/man/man3/pthread_mutexattr.3 +++ b/share/man/man3/pthread_mutexattr.3 @@ -29,7 +29,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.Dd October 1, 2021 +.Dd October 27, 2023 .Dt PTHREAD_MUTEXATTR 3 .Os .Sh NAME @@ -150,6 +150,10 @@ threads in processes other than the one that created the object, assuming other processes share access to the memory where the mutex was allocated. .El +See +.Xr libthr 3 +for details of the implementation of the shared mutexes, +and their limitations. .Pp The .Fn pthread_mutexattr_setrobust @@ -334,6 +338,7 @@ Invalid value for .Fa attr . .El .Sh SEE ALSO +.Xr libthr 3 , .Xr pthread_mutex_init 3 .Sh STANDARDS The From nobody Sun Oct 29 00:48: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 4SHyS02DJ6z4yGG8; Sun, 29 Oct 2023 00:48: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 4SHyS01jxXz3RHp; Sun, 29 Oct 2023 00:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698540480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8eCcCQ09BFc8ez30sjfA2oPzxuCIwYD+TdlcRk0kTe8=; b=Rrf9xGr7lp/ytp5QBcpPd4/KolAIqIia6mAI+nSplVWkG70MuDQcVXH6il635NzxtifDUB rota+8aLCTyyOqzR1MRAuDzIS7sBrcFHNjbKQCE01/IL562rQlP3lesFrYrXYGq/kKBRmg Vo7SBe2hfVV4ht/8oPpQVHvz35uoLp8FkPlLqdEPdMQnd6DVAdfz0+79MIGLkGjswbbghj HOLnZ9kw0Hka/SG999ZWIt+M0haZL/1A96JQIYrslm7PhjLKjYHh/f+gEMKChR8BSLWbjw MxHR1qLRwyKdF5cZAKM6GsPEwmcbgTRBKM4IvXsnaOpLgvaasRzFHyor56W7iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698540480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8eCcCQ09BFc8ez30sjfA2oPzxuCIwYD+TdlcRk0kTe8=; b=Lte4aO6rRnD4KXEuiZBYQ0k8WYQGtXaouWEusPQv/rBgjkWpHjFGttyvXoIydqO8hjXPIr TmHrDa4DVvfLMKeeNv6Rn88GiM1d/+T3rDecGZtyAugGuQla3CqMoBTMSDKQKEIVhMC3Mw GIUxvbTzffpCDu7x2ybmbUQHynW8kASV/GscSb12m7lsPtMEC/RlHQfMZbBRPp1e4zx8AQ XbEW002Zj/4Hr/uqnm7NdMYNYOPOHYOR4BsC2CXQog5KdknsAJaHa6JIEsvFAfuUymm3wn AIq8lzH3qw2iH5m1PPyiZn2n1ePDc0CdiBt5AV5SwHabF8XukbTQ8P5vD6gKiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698540480; a=rsa-sha256; cv=none; b=VsYm/fa0EJJowzqFFJv8xPbGVfiwxWhyi4ENMvQ/NZ2F/yUzlcW8yAIA8bEUrqR2dZt/xD Bsz3Rz3RWYxE51XSxM3WTN0zNs2RMZXVvajcVMAvTfo2BG78I1GUmpPUl6dNaJIXczhBHB I3myCMonKiGIbMvyU7PlpGoSI8MknWumkyNW5MXxqJomsipAbncBuX0yDti8gfTbqPW3lj QxLZca6ubpH7KNhsy8+4J6ntL/g7mS9CbSbJJc2NOsxpsN8uurNHXwP5v2iYw3K6yXTOHg /e6Sr9nJT6db4CWPPT3FEB09S6oI5XxgjlxfE7mS4pumw6upumTbrDZlO1gDAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHyS00mscz3P2; Sun, 29 Oct 2023 00:48: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 39T0m0MO011915; Sun, 29 Oct 2023 00:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39T0m0Dh011912; Sun, 29 Oct 2023 00:48:00 GMT (envelope-from git) Date: Sun, 29 Oct 2023 00:48:00 GMT Message-Id: <202310290048.39T0m0Dh011912@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: 9fe1192bd9f2 - stable/13 - pthread_mutexattr_init(3): describe pthread_mutexattr_{set,get}pshared List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9fe1192bd9f25e21a7c2cac9a5acd5091ec78de8 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe1192bd9f25e21a7c2cac9a5acd5091ec78de8 commit 9fe1192bd9f25e21a7c2cac9a5acd5091ec78de8 Author: Konstantin Belousov AuthorDate: 2023-10-23 22:54:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-29 00:47:44 +0000 pthread_mutexattr_init(3): describe pthread_mutexattr_{set,get}pshared PR: 274678 (cherry picked from commit 2152c4e2db88b9264c6400f2510440465d39c7b8) --- share/man/man3/pthread_mutexattr.3 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3 index 8e457b87dc8f..30537b9a9f86 100644 --- a/share/man/man3/pthread_mutexattr.3 +++ b/share/man/man3/pthread_mutexattr.3 @@ -132,6 +132,26 @@ all threads waiting on any mutex owned by this thread. .El .Pp The +.Fn pthread_mutexattr_setpshared +function sets the process-shared attribute of +.Fa attr +to the value specified in +.Fa pshared . +The argument +.Fa pshared +may have one of the following values: +.Bl -tag -width ".Dv PTHREAD_PROCESS_PRIVATE" +.It Dv PTHREAD_PROCESS_PRIVATE +The mutex may only be used by threads in the same process as the one +that created the object. +.It Dv PTHREAD_PROCESS_SHARED +The mutex may be used by +threads in processes other than the one that created the object, +assuming other processes share access to the memory where the mutex +was allocated. +.El +.Pp +The .Fn pthread_mutexattr_setrobust function specifies robustness attribute of the mutex. Possible values for the From nobody Sun Oct 29 00:48: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 4SHyS13g6vz4yFyr; Sun, 29 Oct 2023 00:48: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 4SHyS12pwZz3RFf; Sun, 29 Oct 2023 00:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698540481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhaNL7Z5lbAswzuiqvrWJv0YnfG2AT5H/F1UKowgV0w=; b=di7uxLjSfoQr4HcSm6AmoBEyDkRJ4DSa8pacn58um+6Qx+jBS875YFU1HJA4ReOZsKvj+F KV6aE2vAauFRTdRGPP6EXwqd2caDvIDSZPqfsVHV+O6VJ8YkBaP35fjLouz4SuuJbH+Z5Y T+EufAPXGFFIFFr6ADh/ylqjyzV8juuu1QtkCq1dmQ8owk/BkgE+UBsjDX/KFYS4ucI892 XycvVwPGVLIfwfqm9XMu/fL+xy3C3L137+s0vb56IfZz76RelSRQv8O+/q2Bb2pvE/UwP+ j7PSkvbQWxrwmnvPdP8HpuCT6nM46CEun/8tfKHv2Lme+LkPGhDjGa5LX1CQEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698540481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhaNL7Z5lbAswzuiqvrWJv0YnfG2AT5H/F1UKowgV0w=; b=KRrAjKD/xLsxfVEBD5T2gug+xrq+EnfW0MV68bh/QwgE3a1KTKY1NXWRAsPdvfjOsYVTpg oCQGGByv4UJabWNCj3bmIno47CL6obedqowXL/sbMxUd+koBBupTq8dscj/FINNf0rYocC 5Gqn8/d3YwDXF3CxhAzsgdtKN9ZeBnRsdinj5XW4O/haQLvfxWsqWcuGGxpIpy3+95fDtg oTQ+f3+3EwhvIXiiffUf+AzMxSXaPSLC5rN/wd+AzBFwZ0f+tPBZMTHlKAffN40A8xLWiJ x7WpQXH3wlDC0N8j6bDcONUcIrPDEbpdnPN4PY+z0NQdZyA13mEgB2p83l6tWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698540481; a=rsa-sha256; cv=none; b=c4D2+IsbJMFV8qJJ3CRops7VzhOebFGx9n7ORnnNVkaqFPXvhErUn+VmjM8YkYSRiRYG9b kULEJM7BfJc1/l07Kr3hhcZHU6XI0ic7y2e31pZ03+kWajCWmXqtEiTuMtRcSSKJlceIPI herHv/TC3zgTLLoPe1WB3vU7zyTgU8Ni0aVPHwyFc+EHrMlr1BINtesxSUvwWaC5pzMXuq RBpNEdoW3rdXy+BMudjvHl2C95aUhu8iWiS1LExMVqdv/lb9XVk+RMS1cOS2tP7XONWZJZ 7ryv9cqoNrxqciZZb/PVqB7rz/KLp+9SE82ovZOBf5jgYsne2iv2Pyvv+uGvEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHyS11d6Pz3G0; Sun, 29 Oct 2023 00:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39T0m1b9011954; Sun, 29 Oct 2023 00:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39T0m1w3011951; Sun, 29 Oct 2023 00:48:01 GMT (envelope-from git) Date: Sun, 29 Oct 2023 00:48:01 GMT Message-Id: <202310290048.39T0m1w3011951@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: c1429f5f9b42 - stable/13 - pthread_mutexattr(3), _condattr(3): reference libthr(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c1429f5f9b426aa1358d17e5349013da9075fd33 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c1429f5f9b426aa1358d17e5349013da9075fd33 commit c1429f5f9b426aa1358d17e5349013da9075fd33 Author: Konstantin Belousov AuthorDate: 2023-10-23 23:03:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-29 00:47:44 +0000 pthread_mutexattr(3), _condattr(3): reference libthr(3) (cherry picked from commit 4f03a2cae8ae96446064da4e8a533ab24172bdcb) --- share/man/man3/pthread_condattr.3 | 7 ++++++- share/man/man3/pthread_mutexattr.3 | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3 index f11b50070d3d..f3b1d3639827 100644 --- a/share/man/man3/pthread_condattr.3 +++ b/share/man/man3/pthread_condattr.3 @@ -24,7 +24,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.Dd May 31, 2016 +.Dd October 27, 2023 .Dt PTHREAD_CONDATTR 3 .Os .Sh NAME @@ -112,6 +112,10 @@ threads in the same process as the one that created the object. The condition variable it is attached to may be accessed by threads in processes other than the one that created the object. .El +See +.Xr libthr 3 +for details of the implementation of shared condition variables, +and their limitations. .Sh RETURN VALUES If successful, these functions return 0. Otherwise, an error number is returned to indicate the error. @@ -153,6 +157,7 @@ The value specified in is not one of the allowed values. .El .Sh SEE ALSO +.Xr libthr 3 , .Xr pthread_cond_init 3 , .Xr pthread_cond_timedwait 3 .Sh STANDARDS diff --git a/share/man/man3/pthread_mutexattr.3 b/share/man/man3/pthread_mutexattr.3 index 30537b9a9f86..8f4d0d9a06a4 100644 --- a/share/man/man3/pthread_mutexattr.3 +++ b/share/man/man3/pthread_mutexattr.3 @@ -29,7 +29,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.Dd October 1, 2021 +.Dd October 27, 2023 .Dt PTHREAD_MUTEXATTR 3 .Os .Sh NAME @@ -150,6 +150,10 @@ threads in processes other than the one that created the object, assuming other processes share access to the memory where the mutex was allocated. .El +See +.Xr libthr 3 +for details of the implementation of the shared mutexes, +and their limitations. .Pp The .Fn pthread_mutexattr_setrobust @@ -334,6 +338,7 @@ Invalid value for .Fa attr . .El .Sh SEE ALSO +.Xr libthr 3 , .Xr pthread_mutex_init 3 .Sh STANDARDS The From nobody Sun Oct 29 18:40:42 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 4SJQFk291yz4y3G2; Sun, 29 Oct 2023 18:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SJQFk1fjfz4Lm0; Sun, 29 Oct 2023 18:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698604842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dsGFfGGn/dCahZFch0Zfq626Y3SNqX/rXwGXnxKhLV0=; b=qGbA5M2K/tsOfi2M9XNitj8qx1YT2TITBNaWfz+/qB5Ibs1RWeuvP+kwZK3Zqj3MzwwSmZ 0/pzvuXaRHiYhrlipvcTzU+3PD5fujYptI0BUslR+VQ5Df26ZTyWk4sdkMP2KXeSTBO3V7 pfCEcrlwyb0TLeETTRDR97JSdDburiC0iB0e2AazAQpFUXKGhhFh1kSMNNZAu1gMH/MPnw xwzTcVR0H4XvL7iyIt4a2/TEzAddFVAKqLtabqkMG1fuU8YqqzyY7BoFN5xKd8oWynK3Bm CicJByUoFqRVgH5rFzZ+6jXiAc00s/0LeIYmxMVe3Dlf54OOP9+mimrzC1oS8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698604842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dsGFfGGn/dCahZFch0Zfq626Y3SNqX/rXwGXnxKhLV0=; b=pUADwh5w9nBtvxuZ2u6oZyASEdwHfj1zQBXRuyqFb3FZmwwFFtzWCVzN3pkm5JOZfsGvny 4zN0N5l0bAlfGqdiG+sXiC13Ww/neyZrP45Ua/Rvbhpw9VSsQmMtH+rIbalZVzaR0AFwlw nX0aHy0HUObesMtWdCxXv5sOfsyeqdK+hgnTHBln7FXz7t7qp48RP0RpSQ6+IQ8LH1NI5z dclaX/VRV2UNQHFTCqFCCukqEsQKFbD1LEsOUrlD6LVGnrxzHUEFQIzWqm3qnW5BuVmd9g ci0e0z27LzY0iLVW+xtVFVbWNYCuyc8vuflng8MRADceaamem6HG7TemtVFsRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698604842; a=rsa-sha256; cv=none; b=D6cF1U4a/DPUqGlyeUPyDOEmh4IGtnwCb0++cUUHZoSA88+aR0+BGmtfJ2KotO1nwA40vi JddeZgmJXrlQRXvg9LE33PJTWiHi3EsclaV02g8BL9w3RhDqrX/aYwVj0fuCJ8OeFKdddM IXeoU3KqNlJ7GOMZRMzQKIpHaxcEUv05SAWhNpoX9Z6qvBD+10quoa9AFltfkAiyvFNLqf jbjq5jrXNGdNcm9+YNMMsfr5qyAI2vNqMqStxzGUc+CO/OH0Rh+00hOY3I+Ni8o+0HA4pG 5TtgBrgWTKvZ5VHcWNylCPHqoUq01qWLbq0jbZ4V71kUCVw9Hw3DoKXRtCWIEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJQFk0k0FzpLb; Sun, 29 Oct 2023 18:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39TIegkM003993; Sun, 29 Oct 2023 18:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39TIeg8I003990; Sun, 29 Oct 2023 18:40:42 GMT (envelope-from git) Date: Sun, 29 Oct 2023 18:40:42 GMT Message-Id: <202310291840.39TIeg8I003990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 5f98380c3ef1 - main - Stop adding $FreeBSD$ to Makefile.depend List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f98380c3ef18cdb60cd31cfb1c0858d1b0f5ad4 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5f98380c3ef18cdb60cd31cfb1c0858d1b0f5ad4 commit 5f98380c3ef18cdb60cd31cfb1c0858d1b0f5ad4 Author: Simon J. Gerraty AuthorDate: 2023-10-29 18:40:03 +0000 Commit: Simon J. Gerraty CommitDate: 2023-10-29 18:40:03 +0000 Stop adding $FreeBSD$ to Makefile.depend Reviewed by: stevek --- share/mk/local.gendirdeps.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/share/mk/local.gendirdeps.mk b/share/mk/local.gendirdeps.mk index 5c417c0acd31..fcfbb24f7311 100644 --- a/share/mk/local.gendirdeps.mk +++ b/share/mk/local.gendirdeps.mk @@ -1,7 +1,4 @@ -# we need a keyword, this noise is to prevent it being expanded -GENDIRDEPS_HEADER= echo '\# ${FreeBSD:L:@v@$$$v$$ @:M*F*}'; - # suppress optional/auto dependencies # local.dirdeps.mk will put them in if necessary GENDIRDEPS_FILTER+= \ From nobody Sun Oct 29 21:02:39 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 4SJTPW3Yrdz4yD1b; Sun, 29 Oct 2023 21:02: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 4SJTPW1T97z4dsH; Sun, 29 Oct 2023 21:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698613359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2D/YPilhDDfWNaGx8NodympBGsHsOOMSEFlYlgWpUM8=; b=kLRGJUH2gVkWQTAviUVBJkKnA+fD7UMwyvvckASTkR4GG4Vo/YBfhHk3ITmdTptqFsz5F5 FkZQnXpSGjf0uX7wzfyof9pK17GE/TAIUeyIVSHtnZgmtfx/k8hPjFlevn1sAnXo0A2HqQ R2275QhFobL6M4FmNgCH4nnPPI/do5U36Ll/A4TreJr9dCqENI7qOxXPckb8YdZtWVKSX6 JqrHtTNEiS2unjpQOui80ougurgV4MpgLAIUIPUZY7TtkhZ88DyeCEMBN7dC4uGg2FTBX0 4lLLbIGUolpFlAMUWqYEWtZRI9eyny6c5nhvNGpFxYWn4D6PhSuoCzQN1Y9zBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698613359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2D/YPilhDDfWNaGx8NodympBGsHsOOMSEFlYlgWpUM8=; b=wN8Y4crByD43inQiXLcA5M+Mwm952vbcPfjwimE/LzSFOaR/HMWXrKbfIKKwunlIMJKwUe EQHhAfbeDQiYHVEXlzutmlutHkoZ/BMqUAmOZToogKWU5olO/OdIz2VpoVzRBYPiKRrgbi cn656jdrIXKmIP+8cPUDZq1d+4vAnX3WuKSvYAaCOOnYwv4mfwzvueC2UMe2eNfaMmzccm b/CZ2NVwDq6qdhmpTmGaziNYbnhAHDDRcwna+WNIj2fJrV539DHdqcW894A7n7Woj2ghce LfUC/p3wXcGVIWcEF5fd/bMElH+9f0bTooXizat3LqztPUn9Guvyy6c70nV2qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698613359; a=rsa-sha256; cv=none; b=GqqO7BVisRYOuk1/T83S36rvud1377wxyO4BHzaRs7tz6P6/W5OLgaZ/2gmigFfyjNCbsL +lKvOOAhvNgj+E3XPSJ17Sg7lYXJm1uVjkayV03dY2br1Q4qZxKVHWRFa+C0EXE51z9/6A eeYLZBGvmUh0F4ViRlmyLEYPCiCpNDHt5BFAwdZ+j7J1xCXEFQYsm2zn7K4c0D8VbJ/3fJ K9b7xhF6EqznsTtR1sSle+8Q8C51wvkqYk80k5Tv65LzUSfLTBr8MFJkBV1cRCvlYurTPz KOnagkKdViZ1d8N4IXPgx7/oS3z9/XsXIj33hTix4LTCYH1kZ+7AJFkbRZItcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJTPW0X1Pztmy; Sun, 29 Oct 2023 21:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39TL2dtT044943; Sun, 29 Oct 2023 21:02:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39TL2dfM044940; Sun, 29 Oct 2023 21:02:39 GMT (envelope-from git) Date: Sun, 29 Oct 2023 21:02:39 GMT Message-Id: <202310292102.39TL2dfM044940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 5e3190f70063 - main - dirdeps: Update Makefile.depend* files with empty contents List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e3190f700637fcfc1a52daeaa4a031fdd2557c7 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=5e3190f700637fcfc1a52daeaa4a031fdd2557c7 commit 5e3190f700637fcfc1a52daeaa4a031fdd2557c7 Author: Stephen J. Kiernan AuthorDate: 2023-10-29 21:01:04 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-10-29 21:01:04 +0000 dirdeps: Update Makefile.depend* files with empty contents Some Makefile.depend* files were committed with no contents or empty DIRDEPS list, but they should have DIRDEPS with some contents. --- cddl/lib/libicp/Makefile.depend | 15 +++++++++++++++ cddl/lib/libicp_rescue/Makefile.depend | 15 +++++++++++++++ cddl/lib/libspl/Makefile.depend | 15 +++++++++++++++ cddl/lib/libtpool/Makefile.depend | 16 ++++++++++++++++ cddl/lib/libzfsbootenv/Makefile.depend | 17 +++++++++++++++++ cddl/lib/libzutil/Makefile.depend | 19 +++++++++++++++++++ lib/lib9p/Makefile.depend | 19 +++++++++++++++++++ lib/libbsddialog/Makefile.depend | 18 ++++++++++++++++++ lib/libcasper/services/cap_dns/tests/Makefile.depend | 10 ++++++++++ lib/libcasper/services/cap_grp/tests/Makefile.depend | 8 ++++++++ lib/libcasper/services/cap_net/Makefile.depend | 17 +++++++++++++++++ lib/libcasper/services/cap_netdb/Makefile.depend | 17 +++++++++++++++++ lib/libcasper/services/cap_pwd/tests/Makefile.depend | 8 ++++++++ .../services/cap_sysctl/tests/Makefile.depend | 9 +++++++++ lib/libiscsiutil/Makefile.depend | 14 ++++++++++++++ lib/libmixer/Makefile.depend | 16 ++++++++++++++++ lib/libpfctl/Makefile.depend | 12 ++++++++++++ lib/libregex/Makefile.depend | 16 ++++++++++++++++ lib/libssp/Makefile.depend | 15 +++++++++++++++ lib/libstats/Makefile.depend | 15 +++++++++++++++ lib/libxo/encoder/csv/Makefile.depend | 15 +++++++++++++++ lib/libxo/libxo/Makefile.depend | 16 ++++++++++++++++ sbin/pfctl/tests/Makefile.depend | 7 +++++++ tests/sys/acl/Makefile.depend | 6 ++++++ tests/sys/netpfil/pf/Makefile.depend | 1 + tests/sys/opencrypto/Makefile.depend | 6 ++++++ usr.sbin/bluetooth/iwmbtfw/Makefile.depend | 16 ++++++++++++++++ usr.sbin/mlx5tool/Makefile.depend | 15 +++++++++++++++ usr.sbin/wpa/src/ap/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/common/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/crypto/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/drivers/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/eap_common/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/eap_peer/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/eap_server/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/eapol_auth/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/eapol_supp/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/l2_packet/Makefile.depend | 14 ++++++++++++++ usr.sbin/wpa/src/radius/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/rsn_supp/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/tls/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/utils/Makefile.depend | 13 +++++++++++++ usr.sbin/wpa/src/wps/Makefile.depend | 13 +++++++++++++ 43 files changed, 569 insertions(+) diff --git a/cddl/lib/libicp/Makefile.depend b/cddl/lib/libicp/Makefile.depend index e69de29bb2d1..6ef78fac5cbf 100644 --- a/cddl/lib/libicp/Makefile.depend +++ b/cddl/lib/libicp/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/cddl/lib/libicp_rescue/Makefile.depend b/cddl/lib/libicp_rescue/Makefile.depend index e69de29bb2d1..6ef78fac5cbf 100644 --- a/cddl/lib/libicp_rescue/Makefile.depend +++ b/cddl/lib/libicp_rescue/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/cddl/lib/libspl/Makefile.depend b/cddl/lib/libspl/Makefile.depend index e69de29bb2d1..6ef78fac5cbf 100644 --- a/cddl/lib/libspl/Makefile.depend +++ b/cddl/lib/libspl/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/cddl/lib/libtpool/Makefile.depend b/cddl/lib/libtpool/Makefile.depend index e69de29bb2d1..409c3c86cc20 100644 --- a/cddl/lib/libtpool/Makefile.depend +++ b/cddl/lib/libtpool/Makefile.depend @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libspl \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/cddl/lib/libzfsbootenv/Makefile.depend b/cddl/lib/libzfsbootenv/Makefile.depend index e69de29bb2d1..7209d9b784ef 100644 --- a/cddl/lib/libzfsbootenv/Makefile.depend +++ b/cddl/lib/libzfsbootenv/Makefile.depend @@ -0,0 +1,17 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libnvpair \ + cddl/lib/libzfs \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/cddl/lib/libzutil/Makefile.depend b/cddl/lib/libzutil/Makefile.depend index e69de29bb2d1..ddad58a70480 100644 --- a/cddl/lib/libzutil/Makefile.depend +++ b/cddl/lib/libzutil/Makefile.depend @@ -0,0 +1,19 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libavl \ + cddl/lib/libtpool \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libgeom \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/lib9p/Makefile.depend b/lib/lib9p/Makefile.depend index e69de29bb2d1..b4b434e22ff9 100644 --- a/lib/lib9p/Makefile.depend +++ b/lib/lib9p/Makefile.depend @@ -0,0 +1,19 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_grp \ + lib/libcasper/services/cap_pwd \ + lib/libcompiler_rt \ + lib/libsbuf \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libbsddialog/Makefile.depend b/lib/libbsddialog/Makefile.depend index e69de29bb2d1..e61d93449db1 100644 --- a/lib/libbsddialog/Makefile.depend +++ b/lib/libbsddialog/Makefile.depend @@ -0,0 +1,18 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/ncurses/form \ + lib/ncurses/ncurses \ + lib/ncurses/tinfo \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libcasper/services/cap_dns/tests/Makefile.depend b/lib/libcasper/services/cap_dns/tests/Makefile.depend index 11aba52f82cf..560f3166bc47 100644 --- a/lib/libcasper/services/cap_dns/tests/Makefile.depend +++ b/lib/libcasper/services/cap_dns/tests/Makefile.depend @@ -1,6 +1,16 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_dns \ + lib/libcompiler_rt \ + lib/libnv \ .include diff --git a/lib/libcasper/services/cap_grp/tests/Makefile.depend b/lib/libcasper/services/cap_grp/tests/Makefile.depend index 11aba52f82cf..fd331b1176a3 100644 --- a/lib/libcasper/services/cap_grp/tests/Makefile.depend +++ b/lib/libcasper/services/cap_grp/tests/Makefile.depend @@ -1,6 +1,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_grp \ + lib/libcompiler_rt \ + lib/libnv \ .include diff --git a/lib/libcasper/services/cap_net/Makefile.depend b/lib/libcasper/services/cap_net/Makefile.depend index e69de29bb2d1..02bae00eb04d 100644 --- a/lib/libcasper/services/cap_net/Makefile.depend +++ b/lib/libcasper/services/cap_net/Makefile.depend @@ -0,0 +1,17 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libcasper/services/cap_netdb/Makefile.depend b/lib/libcasper/services/cap_netdb/Makefile.depend index e69de29bb2d1..02bae00eb04d 100644 --- a/lib/libcasper/services/cap_netdb/Makefile.depend +++ b/lib/libcasper/services/cap_netdb/Makefile.depend @@ -0,0 +1,17 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libcasper/services/cap_pwd/tests/Makefile.depend b/lib/libcasper/services/cap_pwd/tests/Makefile.depend index 11aba52f82cf..e03864c8ad46 100644 --- a/lib/libcasper/services/cap_pwd/tests/Makefile.depend +++ b/lib/libcasper/services/cap_pwd/tests/Makefile.depend @@ -1,6 +1,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_pwd \ + lib/libcompiler_rt \ + lib/libnv \ .include diff --git a/lib/libcasper/services/cap_sysctl/tests/Makefile.depend b/lib/libcasper/services/cap_sysctl/tests/Makefile.depend index 11aba52f82cf..1938a0318d2c 100644 --- a/lib/libcasper/services/cap_sysctl/tests/Makefile.depend +++ b/lib/libcasper/services/cap_sysctl/tests/Makefile.depend @@ -1,6 +1,15 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_sysctl \ + lib/libcompiler_rt \ + lib/libnv \ .include diff --git a/lib/libiscsiutil/Makefile.depend b/lib/libiscsiutil/Makefile.depend index e69de29bb2d1..e1cc198eab19 100644 --- a/lib/libiscsiutil/Makefile.depend +++ b/lib/libiscsiutil/Makefile.depend @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/libmd \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libmixer/Makefile.depend b/lib/libmixer/Makefile.depend index e69de29bb2d1..40575a605e97 100644 --- a/lib/libmixer/Makefile.depend +++ b/lib/libmixer/Makefile.depend @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + usr.bin/awk.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libpfctl/Makefile.depend b/lib/libpfctl/Makefile.depend index e69de29bb2d1..15a1f9c07f7c 100644 --- a/lib/libpfctl/Makefile.depend +++ b/lib/libpfctl/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libregex/Makefile.depend b/lib/libregex/Makefile.depend index e69de29bb2d1..40575a605e97 100644 --- a/lib/libregex/Makefile.depend +++ b/lib/libregex/Makefile.depend @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + usr.bin/awk.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libssp/Makefile.depend b/lib/libssp/Makefile.depend index e69de29bb2d1..6ef78fac5cbf 100644 --- a/lib/libssp/Makefile.depend +++ b/lib/libssp/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libstats/Makefile.depend b/lib/libstats/Makefile.depend index e69de29bb2d1..6ef78fac5cbf 100644 --- a/lib/libstats/Makefile.depend +++ b/lib/libstats/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libxo/encoder/csv/Makefile.depend b/lib/libxo/encoder/csv/Makefile.depend index e69de29bb2d1..6ef78fac5cbf 100644 --- a/lib/libxo/encoder/csv/Makefile.depend +++ b/lib/libxo/encoder/csv/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libxo/libxo/Makefile.depend b/lib/libxo/libxo/Makefile.depend index e69de29bb2d1..678747db6f2c 100644 --- a/lib/libxo/libxo/Makefile.depend +++ b/lib/libxo/libxo/Makefile.depend @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libutil \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/sbin/pfctl/tests/Makefile.depend b/sbin/pfctl/tests/Makefile.depend index 11aba52f82cf..74196cedd525 100644 --- a/sbin/pfctl/tests/Makefile.depend +++ b/sbin/pfctl/tests/Makefile.depend @@ -1,6 +1,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ + lib/libsbuf \ .include diff --git a/tests/sys/acl/Makefile.depend b/tests/sys/acl/Makefile.depend index 11aba52f82cf..462a1562f495 100644 --- a/tests/sys/acl/Makefile.depend +++ b/tests/sys/acl/Makefile.depend @@ -1,6 +1,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ .include diff --git a/tests/sys/netpfil/pf/Makefile.depend b/tests/sys/netpfil/pf/Makefile.depend index 11aba52f82cf..993ab0638f4a 100644 --- a/tests/sys/netpfil/pf/Makefile.depend +++ b/tests/sys/netpfil/pf/Makefile.depend @@ -1,6 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ .include diff --git a/tests/sys/opencrypto/Makefile.depend b/tests/sys/opencrypto/Makefile.depend index 11aba52f82cf..462a1562f495 100644 --- a/tests/sys/opencrypto/Makefile.depend +++ b/tests/sys/opencrypto/Makefile.depend @@ -1,6 +1,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/atf/libatf-c \ + lib/libc \ + lib/libcompiler_rt \ .include diff --git a/usr.sbin/bluetooth/iwmbtfw/Makefile.depend b/usr.sbin/bluetooth/iwmbtfw/Makefile.depend index e69de29bb2d1..34fbfadfcfb6 100644 --- a/usr.sbin/bluetooth/iwmbtfw/Makefile.depend +++ b/usr.sbin/bluetooth/iwmbtfw/Makefile.depend @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libusb \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/mlx5tool/Makefile.depend b/usr.sbin/mlx5tool/Makefile.depend index e69de29bb2d1..6ef78fac5cbf 100644 --- a/usr.sbin/mlx5tool/Makefile.depend +++ b/usr.sbin/mlx5tool/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/ap/Makefile.depend b/usr.sbin/wpa/src/ap/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/ap/Makefile.depend +++ b/usr.sbin/wpa/src/ap/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/common/Makefile.depend b/usr.sbin/wpa/src/common/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/common/Makefile.depend +++ b/usr.sbin/wpa/src/common/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/crypto/Makefile.depend b/usr.sbin/wpa/src/crypto/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/crypto/Makefile.depend +++ b/usr.sbin/wpa/src/crypto/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/drivers/Makefile.depend b/usr.sbin/wpa/src/drivers/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/drivers/Makefile.depend +++ b/usr.sbin/wpa/src/drivers/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/eap_common/Makefile.depend b/usr.sbin/wpa/src/eap_common/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/eap_common/Makefile.depend +++ b/usr.sbin/wpa/src/eap_common/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/eap_peer/Makefile.depend b/usr.sbin/wpa/src/eap_peer/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/eap_peer/Makefile.depend +++ b/usr.sbin/wpa/src/eap_peer/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/eap_server/Makefile.depend b/usr.sbin/wpa/src/eap_server/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/eap_server/Makefile.depend +++ b/usr.sbin/wpa/src/eap_server/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/eapol_auth/Makefile.depend b/usr.sbin/wpa/src/eapol_auth/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/eapol_auth/Makefile.depend +++ b/usr.sbin/wpa/src/eapol_auth/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/eapol_supp/Makefile.depend b/usr.sbin/wpa/src/eapol_supp/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/eapol_supp/Makefile.depend +++ b/usr.sbin/wpa/src/eapol_supp/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/l2_packet/Makefile.depend b/usr.sbin/wpa/src/l2_packet/Makefile.depend index e69de29bb2d1..31ec0d76c4b0 100644 --- a/usr.sbin/wpa/src/l2_packet/Makefile.depend +++ b/usr.sbin/wpa/src/l2_packet/Makefile.depend @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/libpcap \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/radius/Makefile.depend b/usr.sbin/wpa/src/radius/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/radius/Makefile.depend +++ b/usr.sbin/wpa/src/radius/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/rsn_supp/Makefile.depend b/usr.sbin/wpa/src/rsn_supp/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/rsn_supp/Makefile.depend +++ b/usr.sbin/wpa/src/rsn_supp/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/tls/Makefile.depend b/usr.sbin/wpa/src/tls/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/tls/Makefile.depend +++ b/usr.sbin/wpa/src/tls/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/utils/Makefile.depend b/usr.sbin/wpa/src/utils/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/utils/Makefile.depend +++ b/usr.sbin/wpa/src/utils/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/wpa/src/wps/Makefile.depend b/usr.sbin/wpa/src/wps/Makefile.depend index e69de29bb2d1..f2b0559818dd 100644 --- a/usr.sbin/wpa/src/wps/Makefile.depend +++ b/usr.sbin/wpa/src/wps/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From nobody Sun Oct 29 21:10: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 4SJTZ14w1Yz4yCcL; Sun, 29 Oct 2023 21:10: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 4SJTZ14Shjz4fX2; Sun, 29 Oct 2023 21:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698613801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKPz6My19INw8wjf7MKzdcOtPnLhFtQl7cwtQ9lPuio=; b=J1v85KK7QkrzqfMAW/zH8bWavVkxetgZb0eJflplfLtoWNPtVxG8GDZp+qZf1n0KO3xwbW ukv4DtmO8N0uyIKfjGhSOsjFKCwwyz8ocl84CXqBjPNyL6ITu9Sh8tSiI1oT31TnSN+t9u 3bVyEi2eSZGBJFmn9OorFFYmHU1x6wh7Jhwx1C3tCC31FBODnj5EKNozca1qLmM/+HWdee qHb5bqHt61ozdxIvsMzMgcXiGLooVMCsiZacJq5lPvOfmTtkkXJcnSOaHd0SHJIDdPvUBp cUe4xE2FfoTfRNR9bKAaGwUEA6KuqWZhr5hD8G+a6sbQWErTndkkgoWjCnYarA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698613801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKPz6My19INw8wjf7MKzdcOtPnLhFtQl7cwtQ9lPuio=; b=dXKuwwOGzMJPN3Hh1G1D+w6b4sGXn+iQzRTMs1nXSbg1Dx7dgvLL1QyyK/nVBxi3XWikKv sUkqyNlOL9IaLSGjEOxVKpTwFa2H4eDEi6bshLtoPhfFkWmSJmwl0QMRFRv+/dukKA29Z2 wu000dAICbWo72qynCNrLzUnAplXsT863rv/3tJxT5fOOb/pvjggjCT0IraA3lohOWZ55F 4S3fAcWWMBlcvGhhqMAl2SX5rzlzVpJELOmv8C4HNjaT5zAx0JvL//SNJUao+7vMvTIxO4 XEYFBX6n2mZWMYcBANi850BICKOgMF7EjM2KXZnxZ3vee4PO0FPJ7C/BNhOwvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698613801; a=rsa-sha256; cv=none; b=RMgkM9Oik1sWSNtYPAhtlLxIdLDRZhQCktte6+6XsRjZRYFtve6vUmCc4W5bgzZxnbj109 GKjpLnRZ04FSLZkvoZkfnw2KaUvLUVGq2/4u48zAninSEXFpQVllahuRvi0tHqQ2UPGDPo XUPpQBu5M/pEzLHOHCHP8UiBj8wPBRSTAQfbQk70dobXMBsNGTefz4Qpdkys6a7eOfJt6l XKkiu3w87vTkIUGgSw0n1+YpmLVhkxW5JV+JacvrGwHKXrXkd6wAbGiZQxnmMuZogXtD7A etfr3ONxyp9ej32vT81f5T9WQKALnmF13Z+zOjn31NoKyfu/1ZlJ0DwOv2MvLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJTZ13DFNzt5b; Sun, 29 Oct 2023 21:10: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 39TLA138047856; Sun, 29 Oct 2023 21:10:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39TLA1Y4047851; Sun, 29 Oct 2023 21:10:01 GMT (envelope-from git) Date: Sun, 29 Oct 2023 21:10:01 GMT Message-Id: <202310292110.39TLA1Y4047851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: e5b786625f7f - main - dirdeps: Add missing dependency 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5b786625f7f82a1fa91e41823332459ea5550f9 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=e5b786625f7f82a1fa91e41823332459ea5550f9 commit e5b786625f7f82a1fa91e41823332459ea5550f9 Author: Stephen J. Kiernan AuthorDate: 2023-10-29 21:08:29 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-10-29 21:08:29 +0000 dirdeps: Add missing dependency files Some leaf directories were missing Makefile.depend files or needed architecture-specific Makefile.depend.* files. --- lib/csu/aarch64/Makefile.depend | 11 +++++++++++ lib/csu/riscv/Makefile.depend | 11 +++++++++++ lib/liblua/Makefile.depend | 14 ++++++++++++++ lib/libpmc/pmu-events/Makefile.depend | 10 ++++++++++ share/man/man4/man4.aarch64/Makefile.depend | 11 +++++++++++ stand/efi/loader/Makefile.depend.arm | 17 +++++++++++++++++ stand/efi/loader/Makefile.depend.arm64 | 17 +++++++++++++++++ stand/liblua/Makefile.depend | 11 +++++++++++ stand/uboot/Makefile.depend | 12 ++++++++++++ usr.bin/clang/lldb-tblgen/Makefile.depend | 11 +++++++++++ 10 files changed, 125 insertions(+) diff --git a/lib/csu/aarch64/Makefile.depend b/lib/csu/aarch64/Makefile.depend new file mode 100644 index 000000000000..993ab0638f4a --- /dev/null +++ b/lib/csu/aarch64/Makefile.depend @@ -0,0 +1,11 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/csu/riscv/Makefile.depend b/lib/csu/riscv/Makefile.depend new file mode 100644 index 000000000000..993ab0638f4a --- /dev/null +++ b/lib/csu/riscv/Makefile.depend @@ -0,0 +1,11 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/liblua/Makefile.depend b/lib/liblua/Makefile.depend new file mode 100644 index 000000000000..c210061155d2 --- /dev/null +++ b/lib/liblua/Makefile.depend @@ -0,0 +1,14 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/lib/libpmc/pmu-events/Makefile.depend b/lib/libpmc/pmu-events/Makefile.depend new file mode 100644 index 000000000000..11aba52f82cf --- /dev/null +++ b/lib/libpmc/pmu-events/Makefile.depend @@ -0,0 +1,10 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/share/man/man4/man4.aarch64/Makefile.depend b/share/man/man4/man4.aarch64/Makefile.depend new file mode 100644 index 000000000000..f80275d86ab1 --- /dev/null +++ b/share/man/man4/man4.aarch64/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/efi/loader/Makefile.depend.arm b/stand/efi/loader/Makefile.depend.arm new file mode 100644 index 000000000000..8eb92e94c6e0 --- /dev/null +++ b/stand/efi/loader/Makefile.depend.arm @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + bin/sh.host \ + stand/efi/fdt \ + stand/efi/libefi \ + stand/fdt \ + stand/libsa \ + usr.bin/awk.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/efi/loader/Makefile.depend.arm64 b/stand/efi/loader/Makefile.depend.arm64 new file mode 100644 index 000000000000..8eb92e94c6e0 --- /dev/null +++ b/stand/efi/loader/Makefile.depend.arm64 @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + bin/sh.host \ + stand/efi/fdt \ + stand/efi/libefi \ + stand/fdt \ + stand/libsa \ + usr.bin/awk.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/liblua/Makefile.depend b/stand/liblua/Makefile.depend new file mode 100644 index 000000000000..18537add9fe3 --- /dev/null +++ b/stand/liblua/Makefile.depend @@ -0,0 +1,11 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + stand/libsa \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/uboot/Makefile.depend b/stand/uboot/Makefile.depend new file mode 100644 index 000000000000..ce51494084aa --- /dev/null +++ b/stand/uboot/Makefile.depend @@ -0,0 +1,12 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + stand/fdt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.bin/clang/lldb-tblgen/Makefile.depend b/usr.bin/clang/lldb-tblgen/Makefile.depend new file mode 100644 index 000000000000..e41a35dcde12 --- /dev/null +++ b/usr.bin/clang/lldb-tblgen/Makefile.depend @@ -0,0 +1,11 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + lib/clang/libllvmminimal \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From nobody Sun Oct 29 23:02: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 4SJX443Hdgz4yKx2; Sun, 29 Oct 2023 23:02: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 4SJX442VMNz4sdr; Sun, 29 Oct 2023 23:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698620564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VLPfYXqhu9R5acRf+tQkdvzJZSXwb4OffauFpaHGApw=; b=Lz61rbCEnpwQetqtx0p3G/HxGueFEN0PUu2021kHTx45OjKmXv3hq0M1lfN7zItBuxP+/C daE7uI12Rk+5GAmz2sagIjqZZhX4H+fPPfZ8Onyztvip30i+cXWa0q5mg7rsPieFuxF6fI esI7EZfbDEjB/eZUqTwhunNiAYRL0MWs+fsiGS179QtJZl93gpZtpliwmexeqNE3hOzZ7P pgtDDQblfZTbqYU5kU+hJ6H6PIYLQLY80xTZqqlgooBAT7eduXZ91MxQ0vEZU49eDRfQuR 5Q7+2zNpEVWgOIXie6AipufLksGgLxpKYl1dOKy8r1AzU7cGgqEw4H0X6/dH5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698620564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VLPfYXqhu9R5acRf+tQkdvzJZSXwb4OffauFpaHGApw=; b=SpS1h6IoEdY6ntmddyJVirr7+mliNc3DCjwwrl4RM/+XMM5MF5m6ed5Ht1NKAnypHiaWWZ 8ie9WRRYnix0exSlUvmuxC6dVUcWHlLcGSm/V4aNBUMimGD+fVigeMWT2W0py0cdC/YMXI eRTaysOf+nnWgS8Yp5dCLa6uxs91/hdYMulHISNnQEamEzyzlHJYZmDhqg/CM6SjwApVd8 EjcP87YaIZOV2Ha2YW++zF1DSvLCDNyY2bo/eShkQL1xfS/03B7RJ6nFJ4dT8WP1SnIN2w t1foLFqxjc0q6xmr6tGQitXaITfQQyI4wJfMqV25Rtbnt1NcnvnY/KuyYs4jHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698620564; a=rsa-sha256; cv=none; b=lC4Nl5Bf36rgVl4yhpfA3VRo/D0zqQsAR8C62IG3qwLRvi9iNzE3zUXZxAZDSJoGOEFvN/ Sl9GNa9k88gRpmRUC4OyGCOJjwcFMhBE/7hbyS7fqLCqUACNkii+UllQnZcXqc4Pu4thy6 7fddLbTTPUpldQojvCxiQ+1bxcT2VB7Z3p1xcf73BzvrFUIjaXJNr8OvC9PAU8BWm67dhc UGTOWq5DRd2T2rF3uddacHHV946jpLqMPLC1yXUWip0cUBRSIIxYCwj5+b7d1fumzBzUuQ QChSt2dUKx7w9YjtF9dg3Txy3Iu0mSZjBKr6K3ccAmkj7Pi4VcMaCIDrvdbXrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJX441Xw3zxdk; Sun, 29 Oct 2023 23:02: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 39TN2iD1047827; Sun, 29 Oct 2023 23:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39TN2igv047824; Sun, 29 Oct 2023 23:02:44 GMT (envelope-from git) Date: Sun, 29 Oct 2023 23:02:44 GMT Message-Id: <202310292302.39TN2igv047824@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: ce37de8e05b2 - main - src.conf.5: regen after addition of KERNEL_BIN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ce37de8e05b233bc50de2c7678ee841573e6a7e2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ce37de8e05b233bc50de2c7678ee841573e6a7e2 commit ce37de8e05b233bc50de2c7678ee841573e6a7e2 Author: Ed Maste AuthorDate: 2023-10-29 22:55:56 +0000 Commit: Ed Maste CommitDate: 2023-10-29 23:02:39 +0000 src.conf.5: regen after addition of KERNEL_BIN Fixes: 34632ed1a495 ("arm: Introduce MK_KERNEL_BIN to control gener...") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index bc94d5c62234..67a906e964b2 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd October 10, 2023 +.Dd October 29, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -818,6 +818,15 @@ Build some programs without Kerberos support, like .Xr telnet 1 , and .Xr sshd 8 . +.It Va WITH_KERNEL_BIN +Generate and install kernel.bin from kernel as part of the normal build and +install processes for the kernel. Available only on arm and arm64. + +Usually this will be added to the kernel config file with: + +makeoptions WITH_KERNEL_BIN=1 + +though it can also be used on the command line. .It Va WITH_KERNEL_RETPOLINE Enable the "retpoline" mitigation for CVE-2017-5715 in the kernel build. From nobody Mon Oct 30 00:55: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 4SJZZf3tHcz4yRSl; Mon, 30 Oct 2023 00:55: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 4SJZZf3Cwpz3H2K; Mon, 30 Oct 2023 00:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698627354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGIPwbbNGwtwe5MjNGu3+wR/5s++iC2SFxyuUCZtLwg=; b=s+GHE2wcSDdOBo674HJLrgMpwYTPq9Eqt8DSr6oMno0YjPE44pMrLeSrsI7IzTHPlwHGNY PIEEn7ecSlVQL3fFJcPso5K48NjrYBRbwHB9Uynth3Ov/3CZc6bGtvZRfGhqfIJhWuxdAB jk7Ov6Iu9an8wZN2o6fKg9pLBa6oLylO7BJ+B3VvRtWcrATxgp0LjgqTEKp/84vEA22Lr9 DjoWPwJyUX9odkCCRRxp6HAQuaq0/sZa9OS77VRzJzM5+9THEArKSjT5NjCcRmjfCc2NrA z+xxSaIZcFajesUN2uBB26atGdho4fRgQsHnDht+pLzpfHXQxm/IHHHY4VQdXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698627354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGIPwbbNGwtwe5MjNGu3+wR/5s++iC2SFxyuUCZtLwg=; b=Py5gfgiXrWHH5puTqUr0OUDXjTXsx3YB0Tpve4RhwCVOO8O3lRmZAabwoILf8m+tIZ8gfk RWpbzR9JS1mb6kPDOsqR3ekB9dQvStbdwfX7M6vBehD9ZiNXdrqHdnKPHpw+LKayM+xEL9 b32C6CFxFDtWAA2hrWMMgSwgOhws9hxPNGzeOXuU1gXA8auSByhbcnARudJQyRiel/DX36 TUVaGR5X2d+0JH+wvORLY7/+z4WrSO3rDDBjuP1mNkM8QIhh9uyOzyBnCGI8H+3mEqMUvn o2/ndvVKnIhnYp7Ry5lcGMSBltJQMs8/VeZWeAu4FLTAyc0N7/aIWmOqp1v2Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698627354; a=rsa-sha256; cv=none; b=sgQ+a4xMQueu/8P6BcYEbSJsUf+vo0b+0d3W70gt0HhJaMP4nc+7yLO+YDkuRqfxSN8mY+ bhgSR5F179oc0JcSswGzGeQh1SRSGnpAUUac9g9iQl0huo4e5klbxNLicJ50dVFBFTBPIQ culXuTdj9j2DSyETGeiy6Fr4jMRVnvIpCu+nb4D5MQ25bNXQZDaCnaZ0DWlz27wqSEuuRT pjjGswqvfEFmk/2NYuJbQ9ZEiKB8qc0NXu2Zg3GkRE2o2QmYHjxD/8hNuZMPBHLSBX/x6+ G/kYkdY9yuJZ1TdS+3QZYhsGLgEDCHgT9cPMOzNEI/7aSYjGoqVy0uHhv5461w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJZZf29Cxz1121; Mon, 30 Oct 2023 00:55: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 39U0tsmr029191; Mon, 30 Oct 2023 00:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39U0tsJc029188; Mon, 30 Oct 2023 00:55:54 GMT (envelope-from git) Date: Mon, 30 Oct 2023 00:55:54 GMT Message-Id: <202310300055.39U0tsJc029188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 699526792d2f - stable/14 - isa: Postpone removal of the non-PNP driver until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 699526792d2fac156d72654dba89a4b94c8a4c67 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=699526792d2fac156d72654dba89a4b94c8a4c67 commit 699526792d2fac156d72654dba89a4b94c8a4c67 Author: Zhenlei Huang AuthorDate: 2023-10-28 20:31:11 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-30 00:55:08 +0000 isa: Postpone removal of the non-PNP driver until 15 Reviewed by: imp MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42387 (cherry picked from commit 98a670cdd6720da4988f902192177fa368b9f9e9) --- sys/isa/isa_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 3abbff68ea02..b6f99a0922e5 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -570,7 +570,7 @@ isa_probe_children(device_t dev) strcmp(kern_ident, "GENERIC") == 0 && device_is_attached(child)) device_printf(child, - "non-PNP ISA device will be removed from GENERIC in FreeBSD 14.\n"); + "non-PNP ISA device will be removed from GENERIC in FreeBSD 15.\n"); } /* From nobody Mon Oct 30 00:57: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 4SJZcQ0v32z4yRSs; Mon, 30 Oct 2023 00:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SJZcQ0Mn2z3HDK; Mon, 30 Oct 2023 00:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698627446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7A2b7TaywyoNrl3QCYsZpxrUoEqIJVztQLBeHaVzC2s=; b=LUpnfJJARCKlxI5jXCbNbfF9Rp30doKoD05EH43+1OPAnQbfo2v8M7ULavRojctovGVttt ixmpt5DQRsopT/v4ezMqa0xsnl3Ol9r65HrGcjLlwR+c1UOrymJpv4rvTdtZT2KYN2N8qo dHCSE2t3pNSjxxp37lzbf/TAn144kZUssMO/9zPJgj/Obplu5lsSDefAKDyQegVut7hSe5 qPDTOVWXVC0PolCBjDQ2SHfAejQ/da3uvpc48tjxnQBEmEKcqC62b77nKHg5fb7sbUnw40 noRh6uiuLpIkpqpYKhAoANbFixQb+UCHNMrKRpdvmAWocw8GmfYT0+POv2xgeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698627446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7A2b7TaywyoNrl3QCYsZpxrUoEqIJVztQLBeHaVzC2s=; b=PJ7tNBORna8LeKjuRmjc9aAxRR1nkz/xuQIEyXf+kLVOzwCJIBtvypPu1n0Rsl4LHBJPNL DIC0MhKmrftE7p9JLW6tfAxivhJ/kOywST2CeVQm1zML/nDjxMU1gF6szrN/0qpZFWk3Qo bd16OIQmh8P0y4HPiwJ47hmu96e3Rb/JbY6yTN5jmB7qS+nFt6aB6ZOL1SlegppcHt5jHL kHdbkhYDD/GP3m4m7Zma2r7DYvvyKKnQsonaYelCxlo0Z8wGL27hX8QJvKjexLd7qu9BU3 y8Ozk7k0kt3RrTb2yXtltE3HwSbnwm1p4rIRk3FR5LL8AkIFr0u58h+mNaCcsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698627446; a=rsa-sha256; cv=none; b=N1I44dgWdVbZqxCF35HaVKqoEOQdpTTDxPmqBEkgfL31lwZcKEQkXGmUETKZIC/ASq1wqe O4s2bHklLwZVZZwbGlndv+Fw+fUqvbgY3CnB5PxwYkpOzSYVKMejzju8dvuGlDx8xNhd38 QemgFZ+MhATksVJE6FxE7cVJOcsRM3BBLbkoi1qDyK4AAke+PFMHRlcqwZHi7Z/feMJFTe B+qIY+FCQV0+oA1EmfNvyxp8CilMpTQrhVY4gCLoCrAcpEFu7UiR1idMuby4V/CIBfDujS BOmNeYMKSnfb5V3pckdGvP+n1CIQ23HsGmzKofv4jHKbsr2WNi1Mikgv2rtIoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJZcP6Xzcz10mX; Mon, 30 Oct 2023 00:57: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 39U0vPWQ029527; Mon, 30 Oct 2023 00:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39U0vPXb029524; Mon, 30 Oct 2023 00:57:25 GMT (envelope-from git) Date: Mon, 30 Oct 2023 00:57:25 GMT Message-Id: <202310300057.39U0vPXb029524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ac34d3cd6840 - stable/13 - isa: Postpone removal of the non-PNP driver until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ac34d3cd6840e2c7626d113e9ee7b8a873e11300 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ac34d3cd6840e2c7626d113e9ee7b8a873e11300 commit ac34d3cd6840e2c7626d113e9ee7b8a873e11300 Author: Zhenlei Huang AuthorDate: 2023-10-28 20:31:11 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-30 00:56:50 +0000 isa: Postpone removal of the non-PNP driver until 15 Reviewed by: imp MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42387 (cherry picked from commit 98a670cdd6720da4988f902192177fa368b9f9e9) (cherry picked from commit 699526792d2fac156d72654dba89a4b94c8a4c67) --- sys/isa/isa_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 2a3920373c1d..856551a7abba 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -574,7 +574,7 @@ isa_probe_children(device_t dev) strcmp(kern_ident, "GENERIC") == 0 && device_is_attached(child)) device_printf(child, - "non-PNP ISA device will be removed from GENERIC in FreeBSD 14.\n"); + "non-PNP ISA device will be removed from GENERIC in FreeBSD 15.\n"); } /* From nobody Mon Oct 30 09:22: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 4SJnq45HcRz4ytn6 for ; Mon, 30 Oct 2023 09:22: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 4SJnq44sC4z4LKR; Mon, 30 Oct 2023 09:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698657744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Ka2xMwRtPmeVlmX5VJrK1eKoaY2PYDu7jL2DxbGs6o=; b=kb9CylgwxOrb4ulBuMYExjmpBZxskDv8uHE3k2SZjuTlfwLrbLs6K6pDfka+LlZwQB5S4X AN/+2BOqk3x52CHu7iaBi6gcwU2TaKqDSBRfArPBRjzrf2ecp+RMf+vGBmnlti2G4cV5XO fEBnZXyqZHS6VSh//a8yh3oezE3i/2FiH+Crc3AdSEuz+oEfKZXBTjbabl8gJ+TUIqWjCn wCFWjvjbJxt1TKhJJ5aKy07megivF82uHq2mDpRl5vAbX7MeZEE1ynU3eKVDer0mjOLCFp OFBIwt/ofwd8MczzSjiymW3t90NxKYDZG1OsLOaTDxgn7YwNkhyJf7emUcPlEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698657744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Ka2xMwRtPmeVlmX5VJrK1eKoaY2PYDu7jL2DxbGs6o=; b=qR2iWCUNQpGTXRp/Sj0ToVXTsCja0gEdEVUJ/ihzmNBTGIvtPap7RhLY8XYcr29B15lP9S 9lozi7pOQqSXEnwLGdxWQLjKRAXwF5MhwMjnp6QQY+NV9uLEDX3M1XmuSAyEYCA4gelAc9 CacqYoFTYFrd2G52mKO4a9Sb1KFy5ht7K9FLrS3nB2QcvfnlK0JvvA/L4vbLlLhMOyA2eG qykC+r09YD04XkHia1jSlCVrlxWr1dUjvsO105FOgXnUzicIMxEilSd7aSBO6Zln+Fur9O 0bvs7OPDupD+9m+3lPz3qlMWdjv2eJ7ijtx/XvPOaRLyo/etP++BJQtdd9I/fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698657744; a=rsa-sha256; cv=none; b=XNBhOT+H0ycIEa1RO9GmOCA1//gWtkskntJ2lthBPJONKGkznOvqmujYOQ09+hiFne0uSo Tsv763zh2kosJQzttvgiAYj9K0gA9jnJUQjdLND85AgsY7IHmj74hQxl3t7D6W+eLAMPEs TX3r4fIyBQL1XH0phyhdoOOVbVCsu1f7+rYl6rj0sVTxE+3A4cl9c0XTC0bNpM5q3sHB1E ZfjbABCsgWYopskaEsNVwPZOx4o10dMEvNUh3dyzds3YxFaiJg28L/WuAzveTzXQ/G33fg Q4+30E1KhIKqNtUy9XPc7iUubAUcOq/R54BAjBLvE29kAsGPx4/xJl73bTMMkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJnq43dmsz17q; Mon, 30 Oct 2023 09:22: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 39U9MOON079386; Mon, 30 Oct 2023 09:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39U9MOSh079385; Mon, 30 Oct 2023 09:22:24 GMT (envelope-from git) Date: Mon, 30 Oct 2023 09:22:24 GMT Message-Id: <202310300922.39U9MOSh079385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 8b83ef067441..0b4a06ab29a0 - vendor/bc - 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: se X-Git-Repository: src X-Git-Refname: refs/heads/vendor/bc X-Git-Reftype: branch X-Git-Commit: 0b4a06ab29a0da80f6cb5c99189054cb8e2f756c X-Git-Oldrev: 8b83ef067441f6d3a4a55e92d1738724954a057c X-Git-Newrev: 0b4a06ab29a0da80f6cb5c99189054cb8e2f756c Auto-Submitted: auto-generated The branch vendor/bc has been updated by se: URL: https://cgit.FreeBSD.org/src/log/?id=8b83ef067441..0b4a06ab29a0 0b4a06ab29a0 vendor/bc: upgrade to version 6.7.2 From nobody Mon Oct 30 10:12: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 4SJpwt6Y6Kz4xjQl; Mon, 30 Oct 2023 10:12: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 4SJpwt66pdz4QtB; Mon, 30 Oct 2023 10:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698660750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/nA07o7uphfBldVFhT+4511tCMffnn7gTGLZr+Zsnhg=; b=ZU6wPChraBYrWlDA4jLb7H8KGZusB/Z4rRIlX0uQHc/YLfWAxLJSeyxHY91wwjIdrMFXZS RnOFv2LD8gmtIVksTj7XuVcflGjWm4SDRnD7N/8G2qrWPIPXhf6zGgo+A8I3x7NcxfS/Aq YodxdbdBi6wLeBhWIfqcy3Mk1s8NLzcoXSpynJw7q4CrK0FVbeyXNGTHeXRM04U3TWJyLz VdqaN7PpGYofFDCNRaM3qWd1FTQDmjsUdB/OpC//o5mMGu+25Rwyta/gL5VuZk4ytO6A3k 4mEyUuWyTcafyRZyTQ4WCtH/YhVzWLIzCyWjDs+RNH02DhGyPLQCtYo0ixNzwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698660750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/nA07o7uphfBldVFhT+4511tCMffnn7gTGLZr+Zsnhg=; b=vggOufLLrzgZnK7H/hRe3J5rKyGsJfRTx9yh243wotU2V00g9eduAcOyBlPYDJa8CCcwFZ fkBJLog/rMYDTepNuVoqJXZzjePj5SZAIppEho0QSrQuc/iOR9X0zyhfkruy2TPOHNdYie s4dLXwhN0ndsT4+diCasRDIgYKbZJmocGC/jxsHNsMKSI2Rh9R676IMk++JAAXmHoJ3i9f e3h6owKCjlLQ21Pc/wvioZd0DZX+Zl/Hv1A0ShIer8/kip3OZAlYYRE9ITyRxV47MQbcPF Q+WXILGQfNZ4OV/A/kUbZDnZEW8wos47eHUfWqJIUSi6HJ9reO53jLB2Y6WpMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698660750; a=rsa-sha256; cv=none; b=XN/xen4WdmiECfbQDDKp1IMZm9l61iXBWiUoAujRH4ZaK1nadJ3uoVR/D1mJMotfdjcdbh X1XsK0kDbk2XrAOqCF4bb5exTg9Ieh3rjltBm63Fub4vv3hP0DH54T3r1PerEgTvPdghkN O4ELKZDTPJV/mrOsVtXqbXloT4r3j6yO2etZXwuiTXc8PLUdpgG4EFOBVKlOrYCn9DU4YR g4fvq4xfGiJoApTMW4W2a66O8P4C8Rj1QaECibUu2LxsMCktGLUbzWJiowlilgLg5IS8Uc +HVPp7GzgcQfJLYwH7cN7LCtHKLFp+t0qMYsLdA5hIKxq2ep9OKaj5C9Ib4lhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJpwt59mPz2hf; Mon, 30 Oct 2023 10:12: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 39UACUXi062375; Mon, 30 Oct 2023 10:12:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UACUkb062372; Mon, 30 Oct 2023 10:12:30 GMT (envelope-from git) Date: Mon, 30 Oct 2023 10:12:30 GMT Message-Id: <202310301012.39UACUkb062372@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: 586fae3cd286 - main - Revert "pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 586fae3cd28661cfb45bb12306c8e6d048bb9f2e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=586fae3cd28661cfb45bb12306c8e6d048bb9f2e commit 586fae3cd28661cfb45bb12306c8e6d048bb9f2e Author: Kristof Provost AuthorDate: 2023-10-30 08:09:56 +0000 Commit: Kristof Provost CommitDate: 2023-10-30 08:17:56 +0000 Revert "pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h" This reverts commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4. The libpfctl port has been fixed (to avoid using DIOCGETSTATESV2), so we can now safely revert this. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 6a5f8761755d..27992864c899 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1952,7 +1952,9 @@ struct pfioc_iface { #define DIOCCLRSTATUS _IO ('D', 22) #define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook) #define DIOCSETDEBUG _IOWR('D', 24, u_int32_t) +#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) +#endif #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule) /* XXX cut 26 - 28 */ #define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm) @@ -2013,7 +2015,9 @@ struct pfioc_iface { #define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill) #define DIOCGIFSPEEDV0 _IOWR('D', 92, struct pf_ifspeed_v0) #define DIOCGIFSPEEDV1 _IOWR('D', 92, struct pf_ifspeed_v1) +#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATESV2 _IOWR('D', 93, struct pfioc_states_v2) +#endif #define DIOCGETSYNCOOKIES _IOWR('D', 94, struct pfioc_nv) #define DIOCSETSYNCOOKIES _IOWR('D', 95, struct pfioc_nv) #define DIOCKEEPCOUNTERS _IOWR('D', 96, struct pfioc_nv) From nobody Mon Oct 30 13:58: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 4SJvxj6JdTz4xy0p; Mon, 30 Oct 2023 13:58: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 4SJvxj5X7cz3DB5; Mon, 30 Oct 2023 13:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698674313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=463S+8Ztvt+0Tdpb5V7o0yyxDUh1CaRAPp2H0hLziwk=; b=MJmMx5eM7sM2F0MYsrecYE54kRQLxQAVJA/Mqy/MnIOLdlOjFcsL+WGVW8VgZI4Hzx09vH W/mUb5RVwajenPhSZzzx8k7eHE+tzRqZf7o6vdS3J7s4QE5KLLRj2HKNMEfv605UkGQvUC GeRXVZTYrOgExYWHyZmJ13rP3qc7qedcZvlz1SJikHxwYJSiUT/5JL+VsSoukSDDSpJzIN KeoaAmZ2lYslRU3BS1/66YybSYZ3Y/gLVOxckX7An4u0ZdqktJr6DFzGxfdAnfVc3yItWG ZPZmRuiIBYdL2H9txEsSoZV2VWInLFPvpxvQYcbfMMfR0j/jCiFofDumtErWKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698674313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=463S+8Ztvt+0Tdpb5V7o0yyxDUh1CaRAPp2H0hLziwk=; b=AjzQzBrQWc/0xueztNLeA/OKBsp/OdBcHxdLpQvR+vdYWi+8qYDpi68UsvmzcqHfFcRzfR ogl7o/T7iJzQTIDx+lLi2y9XidcD4Ng9ep3u2rbF7bi+0Ecvtghtr8hwbcuA87O3qJaZya Ma0oyyc2lN1WqKpnCeJqeA3IEUTozeC1vPE4zEjyqgsSLIwP6TdTgBWjaRUuAuzI9Nu3xe DS0JXCgbZ79QcMS9QQ5Hf0M9YMUkvltkNMDKzShGMI5Ru8uCecJ6dvxLeAISVpjJ9X+vVU Uj4p8tKCMdszJx5nmOVbphIApIUYKeC2hchwwUmye9GcufW7A554PcL6Iq1XhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698674313; a=rsa-sha256; cv=none; b=XdMutNeuR+izW1rl5E84ElMbvlIOkubcKBmc0AGek37ostgtvid1be3QUfJzM/gFzJV97r zVa/Ljj0/7brbP094Za3ZiZwriZ9SAEh6dbXuK/HRxQjXNGikiWI6d5lLgf1LXXxB2V3fC zQRtqBfEONUq5VlLN6UU11sErIcCkKOLZstccHfj7/9zS3sPu2nlymMCVGtOdsAk38cdCu qNvTJwkD/rCITDd937QkTDWKX767//z3BmlJK+s1HDpwbJan+ACsrLKD8+MsYs5WsZdJdd u0GgJ21CMTIb+RLSpGgmV4CMus3THvUXGEx87kelrcx0DMgod/XkbZO5IiS2yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJvxj4RNvz87p; Mon, 30 Oct 2023 13:58: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 39UDwXAF028481; Mon, 30 Oct 2023 13:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UDwXbA028478; Mon, 30 Oct 2023 13:58:33 GMT (envelope-from git) Date: Mon, 30 Oct 2023 13:58:33 GMT Message-Id: <202310301358.39UDwXbA028478@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: 05d1c205383b - main - Add IDs for Intel BayTrail SATA. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 05d1c205383bfcde073465f10113d1d8d1cc82c7 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=05d1c205383bfcde073465f10113d1d8d1cc82c7 commit 05d1c205383bfcde073465f10113d1d8d1cc82c7 Author: Dmitry Luhtionov AuthorDate: 2023-10-30 13:57:19 +0000 Commit: Alexander Motin CommitDate: 2023-10-30 13:57:19 +0000 Add IDs for Intel BayTrail SATA. --- sys/dev/ahci/ahci_pci.c | 2 ++ sys/dev/ata/ata-pci.h | 3 +++ sys/dev/ata/chipsets/ata-intel.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 93a72875b502..8c74488d1da3 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -99,6 +99,8 @@ static const struct { {0x11651b21, 0x00, "ASMedia ASM116x", 0}, {0x11661b21, 0x00, "ASMedia ASM116x", 0}, {0x79011d94, 0x00, "Hygon KERNCZ", 0}, + {0x0f228086, 0x00, "Intel BayTrail", 0}, + {0x0f238086, 0x00, "Intel BayTrail", 0}, {0x26528086, 0x00, "Intel ICH6", AHCI_Q_NOFORCE}, {0x26538086, 0x00, "Intel ICH6M", AHCI_Q_NOFORCE}, {0x26818086, 0x00, "Intel ESB2", 0}, diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h index 1978d8c1bc04..95e7dd113fec 100644 --- a/sys/dev/ata/ata-pci.h +++ b/sys/dev/ata/ata-pci.h @@ -244,6 +244,9 @@ struct ata_pci_controller { #define ATA_COLETOCRK_S1 0x23a18086 #define ATA_COLETOCRK_S2 0x23a68086 +#define ATA_IBT_S1 0x0f208086 +#define ATA_IBT_S2 0x0f218086 + #define ATA_ITE_ID 0x1283 #define ATA_IT8211F 0x82111283 #define ATA_IT8212F 0x82121283 diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c index 14542afba5b7..d3eb1965c740 100644 --- a/sys/dev/ata/chipsets/ata-intel.c +++ b/sys/dev/ata/chipsets/ata-intel.c @@ -189,6 +189,8 @@ ata_intel_probe(device_t dev) { ATA_ISCH, 0, 0, 1, ATA_UDMA5, "SCH" }, { ATA_COLETOCRK_S1, 0, INTEL_6CH2, 0, ATA_SA300, "COLETOCRK" }, { ATA_COLETOCRK_S2, 0, INTEL_6CH2, 0, ATA_SA300, "COLETOCRK" }, + { ATA_IBT_S1, 0, 0, 0, ATA_SA300, "BayTrail" }, + { ATA_IBT_S2, 0, 0, 0, ATA_SA300, "BayTrail" }, { 0, 0, 0, 0, 0, 0}}; if (pci_get_vendor(dev) != ATA_INTEL_ID) From nobody Mon Oct 30 14:38: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 4SJwrD2Dk2z4y1Mg; Mon, 30 Oct 2023 14:38: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 4SJwrD1lHYz3JZ0; Mon, 30 Oct 2023 14:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698676732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0aMLSz4mY3omeuup/bJ8BQpsDIkH2XX7aYIBcmcic4k=; b=E4yeI7jyKoV6p1NlArB5+MfUHJHMxNVX2mNl9rrjbwR3hFR3Q4/5aUxrpl8RrD/CyR0tdO /mksU7x7rLOK1VIC3qGVz9P98m5ZSY+7pjk0NqUKA8P6sfMumCDg7+y+sdck9ZmrJ1rRQs 5y3ZqtVezhho8TBmsYd4Qu2PLOudx0+MjMyOCXTuWvSeizUhSE2XT+j7hrm9hdpQY4+YMK VDvW54Cvpx5cY/vNB2NAh+opLsZM3jV1jszx79cnzbh9v79UTeVFFeNmW4LuCjN6cCgrqs /sQz6DPIXnn0X4aBRP6wSATA9SMq3LKc5xrLuCnPKBZlbye5an5emHb/3jRrqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698676732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0aMLSz4mY3omeuup/bJ8BQpsDIkH2XX7aYIBcmcic4k=; b=RhiuES9W0T+IsPyIZtkx0+sXm7v2ZyrfoHUiZPE+DewYJcpoW9ymy0IT1BATboXNjZNrIf kmmICBdrblUYbyt4ILW0+f7xUw9kioZKVp+CqtLLTAycf5044o3ypWNHanvjViHd13wPfX uSeOLGs6dLE5j78umVYMpTv7mMedvLAm1mdL18iKZy48rEiEmHv4Yyq/oTLwpq9GTyi6pk b+GD1c0e76qByzb3S1C6LUklFZGLIupgddvs4nzEfYVmN9TFAuLj2O/7kExxurLtuqVGCn VhZFljA+luEldfhG8qEX1xKsbJeRqc0zOMH618n3FVO/7K/68xaG0g877rWH2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698676732; a=rsa-sha256; cv=none; b=SWlLamDOxWsSuJ37D1bijXs+YE96wv1I9VVC2ASnATsfjEyj9XweJq4uP9kgJrVWSxwArj X327agdDq4fJyz0cN79pP53oEvZ6XzL+VS1unTHvxNuVaHvHJhHJSTzgGtjlTNQ3bAp2ba oSemHPkXD9OX4QbYtDFLwmGj4OU1cRWROQHgXbCw3WK2XCPVw4HVd8qCgQarhKbFXUGM0O IxFm9XIzPekkqv+jdJCzHfo/4eYAwCw3hB0JwGJ+ePGKsZ7E9iqaVSwUNM9tkA4+xQSMUp F01ZqBSdIWs6khZ95PeROtNcfikylJQga34QHeURXEqxvvwxU151R3JqEOLVcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJwrD0W33z8gq; Mon, 30 Oct 2023 14:38: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 39UEcqNO095839; Mon, 30 Oct 2023 14:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UEcq6r095836; Mon, 30 Oct 2023 14:38:52 GMT (envelope-from git) Date: Mon, 30 Oct 2023 14:38:52 GMT Message-Id: <202310301438.39UEcq6r095836@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: f969fb53d873 - main - Add some Intel ICH10 PCI IDs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f969fb53d873046548557e137d9497647981ab3a Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f969fb53d873046548557e137d9497647981ab3a commit f969fb53d873046548557e137d9497647981ab3a Author: Dmitry Luhtionov AuthorDate: 2023-10-30 14:37:36 +0000 Commit: Alexander Motin CommitDate: 2023-10-30 14:37:36 +0000 Add some Intel ICH10 PCI IDs. --- sys/dev/ahci/ahci_pci.c | 1 + sys/dev/usb/controller/ehci_pci.c | 4 ++++ sys/dev/usb/controller/uhci_pci.c | 12 ++++++++++++ 3 files changed, 17 insertions(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 8c74488d1da3..2be92ce79e18 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -127,6 +127,7 @@ static const struct { {0x292f8086, 0x00, "Intel ICH9M", 0}, {0x294d8086, 0x00, "Intel ICH9", 0}, {0x294e8086, 0x00, "Intel ICH9M", 0}, + {0x3a028086, 0x00, "Intel ICH10", 0}, {0x3a058086, 0x00, "Intel ICH10 (RAID)", 0}, {0x3a228086, 0x00, "Intel ICH10", 0}, {0x3a258086, 0x00, "Intel ICH10 (RAID)", 0}, diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 916e11fe16fa..2aa0cd2fbcd8 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -167,6 +167,10 @@ ehci_pci_match(device_t self) return "Intel 82801JI (ICH10) USB 2.0 controller USB-A"; case 0x3a3c8086: return "Intel 82801JI (ICH10) USB 2.0 controller USB-B"; + case 0x3a6c8086: + return "Intel 82801JD (ICH10) USB 2.0 controller USB-A"; + case 0x3a6a8086: + return "Intel 82801JD (ICH10) USB 2.0 controller USB-B"; case 0x3b348086: return ("Intel PCH USB 2.0 controller USB-A"); case 0x3b3c8086: diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index a851af86d9ef..250e2a7b31c6 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -224,6 +224,18 @@ uhci_pci_match(device_t self) return ("Intel 82801JI (ICH10) USB controller USB-E"); case 0x3a398086: return ("Intel 82801JI (ICH10) USB controller USB-F"); + case 0x3a678086: + return ("Intel 82801JD (ICH10) USB controller USB-A"); + case 0x3a688086: + return ("Intel 82801JD (ICH10) USB controller USB-B"); + case 0x3a698086: + return ("Intel 82801JD (ICH10) USB controller USB-C"); + case 0x3a648086: + return ("Intel 82801JD (ICH10) USB controller USB-D"); + case 0x3a658086: + return ("Intel 82801JD (ICH10) USB controller USB-E"); + case 0x3a668086: + return ("Intel 82801JD (ICH10) USB controller USB-F"); case 0x719a8086: return ("Intel 82443MX USB controller"); From nobody Mon Oct 30 17:13: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 4SK0GZ6p1sz4yBVQ; Mon, 30 Oct 2023 17:13: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 4SK0GZ6GYqz3VTl; Mon, 30 Oct 2023 17:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698686006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R5CNR/hDiInhlNVNNbQmARDkGE9VkaXnp1M/j+sDoGk=; b=PXe9wxENvTQ5xJIWQY9WaEWoqa0/bTS9sx8mbymHDAKvkRSR4wCAOJChZLugep48Xi/lMy 5aCKsENFjM91miZv1x1r9Z1PDixj9x78aTlXcWQfY5bOMEpv0fviPx0mJrIJV0lL5+wMFJ IP0KdZHD+vwGXzhl54epeoLGuRuCTmd6f5KXOBypnn1vabc2ihPloGrxFJQMkPGfWfWrK5 t+pMuCbeCQsZEidIE9cKnarLTKRgnCCB2JMsCamOqKfzLUZP/E09tDcHOsTs78jshfvHJn DPLwJv3GQsxNz7SYW3L1Myj9xBxofMuINcx/fTeq4szHL7UOQ99KUgCJVgeCqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698686006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R5CNR/hDiInhlNVNNbQmARDkGE9VkaXnp1M/j+sDoGk=; b=XCTpfkqxT82HDzGICVX0a/3fro4a6mIQpawgBatMcU8w9cqlIKl7eQMVtLf7FXaL7ZnbzJ E9rnUVPENs0LmvTPbSpO2o0GUeVO8tS8TXtt7kx6ZiSqCIoQbKeR1SG8fF1LE7OZXPpD3d n2ALQ9yMElBSMzECMtiUUyyFkOCEW8fSrqOvQ3gDS6FLt0HB2j/p9lJ98WKmE5+biphLWA Iqf4Rs0yD9f93XwMppubNZkb71cLo6sHoVTGcloXuuJ9oPIF3wx0oTD/aksJsVPQwwMFFU FeuDEEeyPkNpc8jhqCnPByXIxoDY8LfRf7PXQBudmSJUQdu7DmF6YR8EbwpHCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698686006; a=rsa-sha256; cv=none; b=f/mwz+RIlaGV1ENEq+hKxznl4kHJ1u5dPZWC/SinCqwQlTZlf3QwVDvalNZKK+a24v6JJt v+dvmvmVfqlkbziUKngQaazZt3TjvGcfrLWd0+5Q4NJ3ac3kBK3+DSOlGhF73jAxpQlIpv BRsmtIYUIaJfWuRKHUbJOK2vqQ8qEEIQ/M+rhSS5p0MRfrAhFQoe5l1IaX40KbmD33z1Z4 C4v/9c3FupJ44vSvLNMSjHCEOwYHS4v69DfkBF4dkUwjONmUp3Iisylf7eGSpvEzJJoeln CO/NCt6565F28z35G8Y6Xxcx+O0fjjjjtmAlwToWvF+WsvUx+hTT+uh1R7TpXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK0GZ5KRJzVFh; Mon, 30 Oct 2023 17:13: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 39UHDQL5062198; Mon, 30 Oct 2023 17:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UHDQ4L062195; Mon, 30 Oct 2023 17:13:26 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:13:26 GMT Message-Id: <202310301713.39UHDQ4L062195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 9be802c04b7c - stable/14 - Avoid IPv6 source address selection on accepting TCP connections List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9be802c04b7cd98fcf7a1dd2f41d9ebac0e32996 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=9be802c04b7cd98fcf7a1dd2f41d9ebac0e32996 commit 9be802c04b7cd98fcf7a1dd2f41d9ebac0e32996 Author: Andrey V. Elsukov AuthorDate: 2023-09-14 08:39:06 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-10-30 17:12:50 +0000 Avoid IPv6 source address selection on accepting TCP connections When an application listens IPv6 TCP socket, due to ipfw forwarding tag it may handle connections for addresses that do not belongs to the jail or even current host (transparent proxy). Syncache code can successfully handle TCP handshake for such connections. When syncache finally accepts connection it uses in6_pcbconnect() to properly initlize new connection info. For IPv4 this scenario just works, but for IPv6 it fails when local address doesn't belongs to the jail. This check occurs when in6_pcbladdr() applies IPv6 SAS algorithm. We need IPv6 SAS when we are connection initiator, but in the above case connection is already established and both source and destination addresses are known. Use unused argument to notify in6_pcbconnect() when we don't need source address selection. This will fix `ipfw fwd` to jailed IPv6 address. When we are connection initiator, we stil use IPv6 SAS algorithm and apply all related restrictions. MFC after: 1 month Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D41685 (cherry picked from commit 0bf5377b6b9642acc85355062b921a07604b7c04) --- sys/netinet6/in6_pcb.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index bf81de78f992..5c4ef7570ddc 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -335,7 +335,7 @@ in6_pcbbind(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred) */ static int in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, - struct in6_addr *plocal_addr6) + struct in6_addr *plocal_addr6, bool sas_required) { int error = 0; int scope_ambiguous = 0; @@ -364,13 +364,25 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, if ((error = prison_remote_ip6(inp->inp_cred, &sin6->sin6_addr)) != 0) return (error); - error = in6_selectsrc_socket(sin6, inp->in6p_outputopts, - inp, inp->inp_cred, scope_ambiguous, &in6a, NULL); - if (error) - return (error); + if (sas_required) { + error = in6_selectsrc_socket(sin6, inp->in6p_outputopts, + inp, inp->inp_cred, scope_ambiguous, &in6a, NULL); + if (error) + return (error); + } else { + /* + * Source address selection isn't required when syncache + * has already established connection and both source and + * destination addresses was chosen. + * + * This also includes the case when fwd_tag was used to + * select source address in tcp_input(). + */ + in6a = inp->in6p_laddr; + } + if (IN6_IS_ADDR_UNSPECIFIED(&in6a)) return (EHOSTUNREACH); - /* * Do not update this earlier, in case we return with an error. * @@ -398,7 +410,7 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, */ int in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, - bool rehash __unused) + bool sas_required) { struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; struct sockaddr_in6 laddr6; @@ -432,7 +444,8 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred, * Call inner routine, to assign local interface address. * in6_pcbladdr() may automatically fill in sin6_scope_id. */ - if ((error = in6_pcbladdr(inp, sin6, &laddr6.sin6_addr)) != 0) + if ((error = in6_pcbladdr(inp, sin6, &laddr6.sin6_addr, + sas_required)) != 0) return (error); if (in6_pcblookup_hash_locked(pcbinfo, &sin6->sin6_addr, From nobody Mon Oct 30 17:42: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 4SK0w44yrZz4yD9v; Mon, 30 Oct 2023 17:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SK0w44WsZz3XNr; Mon, 30 Oct 2023 17:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698687748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fH6l9J2ak2d+bsH8MH8O9JwKIF3ZzqTV3GHaPuos08E=; b=xL7s/hIFzQufR6VjNlEWo4vfHTs+7No2Qt55UNKVo3alL7IK8/bWBFQRhVZiA+wDL8cWGT HQqfnU1P4Ln+KeFF8eVvRnWMNz7UgVsYIE35vECaQrwiVALeMTrh//r1uBwk7MiOTPSjwO MiOV4uP11U+GYe1HnFvCPj27n5GGzyX+vZcLjtQr++VISYHSiiUHkQ0/9+sTGEzBFZ2pNp eKtgo9sIqmd0Wi0sW5p5INYw1lYzpoblDFFjF99n6EvzbyhBbLV3+vpO/OfVjMT6SlMQI9 VLAIIV7oN51Z3EH1Ro+scwNiPbH2+YTDcT546/ngyTktqGay3NXuRQ9RxI0QVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698687748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fH6l9J2ak2d+bsH8MH8O9JwKIF3ZzqTV3GHaPuos08E=; b=Wf2BGOn5R2JjcTd0IEWySNEyWVNHgnizN4eOEPnM3b1afSiIH3DUqVSc9uRdjUTAaLyoag R0ApjEvUkR+VgQEVas0hznDr9ARG6xTJDCOiFi+BnKAzjNyoR+rQjPy9IaATMxuRIV4ij0 YO677hhxxAbR6DdLnWjzxB+QheaWx2H4GgSikPjtMtgkw3gpSyOw/kCshPR7Bsf8SnYKcv Ej28Wda18DOUxkV9uDr7lRmCLAYucEsx7C8iEK8OTJ+03nR7KP8aXQz9cBBX6pTJQuPxuO 3M924rw0oiI2dJOHJRbiWl6yZGsyxr1uYvXr6tcHDg/1a2H/HkrB8nQJe1oH+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698687748; a=rsa-sha256; cv=none; b=UN3pZqRszw1Ze227YfYKZBscgKRqrgY5bnBsThRaYAZp9P/Uek/goz6m422HgcNggqvY8p u5UYyAd0YYC31Vs+Jd2FQRPj5npjFmxRjdUTD9KbQrBj4gNkWnYZWlBH9w6GSW3g2yc+40 uUBPex5RRqsrHQWJS6F4wBGXbb3kS45iwPQA2rVMWmZVEPMAbYY3stk8R0b7ckUPyHHIz/ 0fmdsgsQfqtzaZrGlgxkaZEfAE3Vg7YzRUFLYBATa+AkNHxLnc55lb5LBaYxH3TcvRseHG G9uyXKk3U4qvDGTxjDb6Hqu5lwf9lKXh7cvi7W5GNcqoW6kFDVhnKm7lByfO5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK0w43ZjVzVdj; Mon, 30 Oct 2023 17:42: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 39UHgSIX011583; Mon, 30 Oct 2023 17:42:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UHgSPp011580; Mon, 30 Oct 2023 17:42:28 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:42:28 GMT Message-Id: <202310301742.39UHgSPp011580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 95335dd3c19e - main - rtld: introduce STATIC_TLS_EXTRA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95335dd3c19e0ade161bb4dc8462fc3d045ce4f8 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=95335dd3c19e0ade161bb4dc8462fc3d045ce4f8 commit 95335dd3c19e0ade161bb4dc8462fc3d045ce4f8 Author: Stephen J. Kiernan AuthorDate: 2023-10-29 21:13:10 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-10-30 17:42:05 +0000 rtld: introduce STATIC_TLS_EXTRA The new STATIC_TLS_EXTRA variable provides a means for applications to increases the size of the extra static TLS space allocated by rtld beyond the default of '128'. This extra static TLS space is used for objects loaded with dlopen. The value specified in the variable must be no less than the default value and no greater than the maximum allowed value for size_t type. If an invalid value is specified, rtld will ignore it and just use the default value. The rtld(1) man page is updated to document this new option. Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D42025 --- libexec/rtld-elf/aarch64/reloc.c | 2 +- libexec/rtld-elf/amd64/reloc.c | 2 +- libexec/rtld-elf/arm/reloc.c | 3 ++- libexec/rtld-elf/i386/reloc.c | 2 +- libexec/rtld-elf/powerpc/reloc.c | 3 ++- libexec/rtld-elf/powerpc64/reloc.c | 3 ++- libexec/rtld-elf/riscv/reloc.c | 2 +- libexec/rtld-elf/rtld.1 | 8 +++++++- libexec/rtld-elf/rtld.c | 21 +++++++++++++++++---- libexec/rtld-elf/rtld.h | 1 + 10 files changed, 35 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index c8f09d797215..907377f2619a 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -521,7 +521,7 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ tls_static_space = tls_last_offset + tls_last_size + - RTLD_STATIC_TLS_EXTRA; + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index ce74c54cc5c3..9c5887def356 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -527,7 +527,7 @@ allocate_initial_tls(Obj_Entry *objs) * offset allocated so far and adding a bit for dynamic * modules to use. */ - tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + ld_static_tls_extra; addr = allocate_tls(objs, 0, TLS_TCB_SIZE, TLS_TCB_ALIGN); diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index b2fb3fdad2c7..c3e95940be74 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -454,7 +454,8 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index 8e8966926839..04a8354343bc 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -510,7 +510,7 @@ allocate_initial_tls(Obj_Entry *objs) * offset allocated so far and adding a bit for dynamic modules to * use. */ - tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + ld_static_tls_extra; tls = allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); _tcb_set(tls); } diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index 8254f21a3ce6..73a1c89991e2 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -817,7 +817,8 @@ allocate_initial_tls(Obj_Entry *list) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(list, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index 5bfb05116315..70928829aeda 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -714,7 +714,8 @@ allocate_initial_tls(Obj_Entry *list) * use. */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; + tls_static_space = tls_last_offset + tls_last_size + + ld_static_tls_extra; _tcb_set(allocate_tls(list, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index 5ed516bc4337..d806e1ec3d63 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -392,7 +392,7 @@ allocate_initial_tls(Obj_Entry *objs) * use. */ tls_static_space = tls_last_offset + tls_last_size + - RTLD_STATIC_TLS_EXTRA; + ld_static_tls_extra; _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); } diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 807ecb31ad7c..4d97159b0aaf 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -26,7 +26,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 November 10, 2022 +.Dd October 29, 2023 .Dt RTLD 1 .Os .Sh NAME @@ -320,6 +320,12 @@ If set, causes .Nm to dump content of the aux vector to standard output, before passing control to any user code. +.It Ev LD_STATIC_TLS_EXTRA +If the variable is specified and has a numeric value, +.Nm +will set the size of the static TLS extra space to the specified number +of bytes. The static TLS extra space is used when loading objects with +dlopen. The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index f8c4c18b5d5e..831a854cffb8 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -225,6 +225,8 @@ static Obj_Entry *obj_main; /* The main program shared object */ static Obj_Entry obj_rtld; /* The dynamic linker shared object */ static unsigned int obj_count; /* Number of objects in obj_list */ static unsigned int obj_loads; /* Number of loads of objects (gen count) */ +size_t ld_static_tls_extra = /* Static TLS extra space (bytes) */ + RTLD_STATIC_TLS_EXTRA; static Objlist list_global = /* Objects dlopened with RTLD_GLOBAL */ STAILQ_HEAD_INITIALIZER(list_global); @@ -365,6 +367,7 @@ enum { LD_TRACE_LOADED_OBJECTS_FMT2, LD_TRACE_LOADED_OBJECTS_ALL, LD_SHOW_AUXV, + LD_STATIC_TLS_EXTRA, }; struct ld_env_var_desc { @@ -398,6 +401,7 @@ static struct ld_env_var_desc ld_env_vars[] = { LD_ENV_DESC(TRACE_LOADED_OBJECTS_FMT2, false), LD_ENV_DESC(TRACE_LOADED_OBJECTS_ALL, false), LD_ENV_DESC(SHOW_AUXV, false), + LD_ENV_DESC(STATIC_TLS_EXTRA, false), }; static const char * @@ -515,7 +519,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) struct stat st; Elf_Addr *argcp; char **argv, **env, **envp, *kexecpath; - const char *argv0, *binpath, *library_path_rpath; + const char *argv0, *binpath, *library_path_rpath, *static_tls_extra; struct ld_env_var_desc *lvd; caddr_t imgentry; char buf[MAXPATHLEN]; @@ -738,9 +742,16 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) else ld_library_path_rpath = false; } + static_tls_extra = ld_get_env_var(LD_STATIC_TLS_EXTRA); + if (static_tls_extra != NULL && static_tls_extra[0] != '\0') { + sz = parse_integer(static_tls_extra); + if (sz >= RTLD_STATIC_TLS_EXTRA && sz <= SIZE_T_MAX) + ld_static_tls_extra = sz; + } dangerous_ld_env = libmap_disable || libmap_override != NULL || ld_library_path != NULL || ld_preload != NULL || - ld_elf_hints_path != NULL || ld_loadfltr || !ld_dynamic_weak; + ld_elf_hints_path != NULL || ld_loadfltr || !ld_dynamic_weak || + static_tls_extra != NULL; ld_tracing = ld_get_env_var(LD_TRACE_LOADED_OBJECTS); ld_utrace = ld_get_env_var(LD_UTRACE); @@ -6105,13 +6116,15 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, "Env prefix %s\n" "Default hint file %s\n" "Hint file %s\n" - "libmap file %s\n", + "libmap file %s\n" + "Optional static TLS size %zd bytes\n", machine, __FreeBSD_version, ld_standard_library_path, gethints(false), ld_env_prefix, ld_elf_hints_default, ld_elf_hints_path, - ld_path_libmap_conf); + ld_path_libmap_conf, + ld_static_tls_extra); _exit(0); } else { _rtld_error("Invalid argument: '%s'", arg); diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 7fe9d837d6f1..c7c17426b38a 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -50,6 +50,7 @@ extern size_t tls_last_size; extern size_t tls_static_space; extern Elf_Addr tls_dtv_generation; extern int tls_max_index; +extern size_t ld_static_tls_extra; extern int npagesizes; extern size_t *pagesizes; From nobody Mon Oct 30 17:56: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 4SK1D152Bfz4yDgp; Mon, 30 Oct 2023 17:56: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 4SK1D14MTgz3Y35; Mon, 30 Oct 2023 17:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hr3Lv/agYZ834tB/y1jL+Zl9IRqIHAdYE4rlTWWVtnc=; b=rIdRViuYWdA/5fp0f/2DArl0BcuQ5cMYqpCQ+mQRzteolKf3Kcjn/tw5kE2a1Mj9aDQ3Vw 5QAOD9KOPluJ3sbm0y/73sTibK5TfcaLML7b7R5awoLdvh6jRmEC4qFcIcfjcF7be1BVQg 1uH7JWdPk0BdiZBm2tcnBmloTtN46lALNYlWh+kCFiD8cvhzSIh1ycT5bBjfkeu+WASOH+ 6FX9IjT+iNYuv6sM1lAOKrN4ZurJI9yeJvBHf8t8GUjt47iP0+Jn7d6kWWHgMB5Pbiq3D7 r3zqz1JXE1ZahTO8HOhA7WYHu5PL7qlk46FiPEArhjSPagoB+UD7TqSsn8BvxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hr3Lv/agYZ834tB/y1jL+Zl9IRqIHAdYE4rlTWWVtnc=; b=f3Pnt1v2U/+1egQG73Rlqxy//2xf4FZJmyTgND6P9SomS42ZZbAl4sWCd6nVIkREgVjO/x nRAQOeAMMmu1EC2OgFhVEov4s2vMvav/1x1ID4A32tOYpOtPEKIYKvadp6+c4uWxLd8uAg Hxymsoa3cwvBEwaUYq9TJle4715U1w/TyFVB+r2Dh26O5PoykjfIickUliE0WYahM0wLgU 7dm01xYspK8Nlx9JzLbF5R4JivPFzROmGN3H2j0wRuzGeeH9Md7jNdM1/2f68FZNFkWdfh 2idHpfr1tSijkY678i+Pk+2sW8JlDyvc/HyRzYvvE12BK7sGXOdwP63WKu32mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698688577; a=rsa-sha256; cv=none; b=p8wX4PyUoRgR/Z0kN1k0QEt/N7rGV9L64y5zgaoXgpCeHDV75+EWxOt8FgJgHvXYZo7t+2 fPhpdxO11E/yuykqsnUga5Jsg3NqwuEdG1yTeyrbbAewuyl3SdrjCuvnciahnMEctpE2Ch ADQorwrdeKR2X0r+Y54BZ/1xqqTrWhN7nK8ffnxToomuYC8QIDIKw6Jq0iIaxfwHQpahbQ 44M5KLQcQA3b92AVnvszikIQTRHKlxBhaPmVglG4y/xPtsdtiY+t5jcy8u3YkIqpdB8JOd +PSqbqiT25BBy1ku7i/RLRq9lhYxc5LkoQof2FemUzp6mTcF56T1+4c+j7Decw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK1D135yWzWkL; Mon, 30 Oct 2023 17:56: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 39UHuH4m028530; Mon, 30 Oct 2023 17:56:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UHuHcA028527; Mon, 30 Oct 2023 17:56:17 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:56:17 GMT Message-Id: <202310301756.39UHuHcA028527@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: 522126fea724 - main - csu: Teach csu about PAC and BTI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 522126fea72419fae344fbcb897b41588909308a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=522126fea72419fae344fbcb897b41588909308a commit 522126fea72419fae344fbcb897b41588909308a Author: Andrew Turner AuthorDate: 2023-10-12 10:03:37 +0000 Commit: Andrew Turner CommitDate: 2023-10-30 17:55:44 +0000 csu: Teach csu about PAC and BTI Add the Branch Target Identification (BTI) note to libc assembly sources and Pointer Authentication Code (PAC) instructions to _init and _fini. _init and _fini may be called indirectly so need a BTI landing pad. As they are non-leaf functions use the appropriate PAC instruction that also guards against changing the link register. As all object files need the note for any binary using these object files we need to insert it in all asm files. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42227 --- lib/csu/aarch64/crt1_s.S | 4 ++++ lib/csu/aarch64/crti.S | 5 +++++ lib/csu/aarch64/crtn.S | 6 ++++++ lib/csu/common/crtbrand.S | 5 +++++ lib/csu/common/feature_note.S | 5 +++++ lib/csu/common/ignore_init_note.S | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/lib/csu/aarch64/crt1_s.S b/lib/csu/aarch64/crt1_s.S index 97b4bff35a0b..981cf4653efd 100644 --- a/lib/csu/aarch64/crt1_s.S +++ b/lib/csu/aarch64/crt1_s.S @@ -30,6 +30,8 @@ */ #include +#include + /* * The program entry point * void _start(char **ap, void (*cleanup)(void)) __dead2 @@ -62,3 +64,5 @@ eprol: END(_start) .section .note.GNU-stack,"",@progbits + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/lib/csu/aarch64/crti.S b/lib/csu/aarch64/crti.S index 0a20f4c5e314..8bd2dfac1494 100644 --- a/lib/csu/aarch64/crti.S +++ b/lib/csu/aarch64/crti.S @@ -28,11 +28,14 @@ */ #include +#include + .section .init,"ax",@progbits .align 4 .globl _init .type _init,@function _init: + PAC_LR_SIGN stp x29, x30, [sp, #-16]! mov x29, sp @@ -41,6 +44,8 @@ _init: .globl _fini .type _fini,@function _fini: + PAC_LR_SIGN stp x29, x30, [sp, #-16]! mov x29, sp +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/lib/csu/aarch64/crtn.S b/lib/csu/aarch64/crtn.S index 924aa36aa045..441411f0ab83 100644 --- a/lib/csu/aarch64/crtn.S +++ b/lib/csu/aarch64/crtn.S @@ -28,13 +28,19 @@ */ #include +#include + .section .init,"ax",@progbits ldp x29, x30, [sp], #16 + PAC_LR_AUTH ret .section .fini,"ax",@progbits ldp x29, x30, [sp], #16 + PAC_LR_AUTH ret .section .note.GNU-stack,"",%progbits + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index 0ed86bfba2b2..b59e2fd8056b 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -47,3 +47,8 @@ 4: .section .note.GNU-stack,"",%progbits + +#ifdef __aarch64__ +/* This is needed in all objects for BTI to be used in the linked elf file */ +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) +#endif diff --git a/lib/csu/common/feature_note.S b/lib/csu/common/feature_note.S index 343d2a9262e2..5c1d56d4cde1 100644 --- a/lib/csu/common/feature_note.S +++ b/lib/csu/common/feature_note.S @@ -40,3 +40,8 @@ 4: .section .note.GNU-stack,"",%progbits + +#ifdef __aarch64__ +/* This is needed in all objects for BTI to be used in the linked elf file */ +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) +#endif diff --git a/lib/csu/common/ignore_init_note.S b/lib/csu/common/ignore_init_note.S index fa37a8990538..57fb4e8f4d51 100644 --- a/lib/csu/common/ignore_init_note.S +++ b/lib/csu/common/ignore_init_note.S @@ -41,3 +41,8 @@ 4: .section .note.GNU-stack,"",%progbits + +#ifdef __aarch64__ +/* This is needed in all objects for BTI to be used in the linked elf file */ +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) +#endif From nobody Mon Oct 30 17:56: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 4SK1D265DQz4yDkH; Mon, 30 Oct 2023 17:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SK1D25Ft5z3YBw; Mon, 30 Oct 2023 17:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tlhXwM04eA4BoUV8N2fd9LhhjCjXjlSg6SlCo/E+gyI=; b=n+0ymktyifB9inoGQZkNvzl9poQHGptTyGPXZ+807TOdyKSfZhdlESACrsbttHPQP13B9f HQQylzeMf0XmdenE6X6xmcRtUIuJgtw42KyA1BQFKYTjB/cHi5a1Eq2RvqXJ7NuEEwyQMB LImvYarSYeb1gu2CBeE9nr6VnX4aRRQjPEWCUAMrSMPlJ0LMjN352cO9wDDMJU9iLNj9S/ 4NrQj8vgGRzMwUkXQKv8BTzaqK0btqRYlp9Ei8V3BFq+7vDoYw6fH6Gh8GbIin5oL/guE0 efTamVQ8IxGYnHx/mnoQO8mnIcSSAZN2+g5SyiLfV7AtRL3QbTMK050w3prO/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tlhXwM04eA4BoUV8N2fd9LhhjCjXjlSg6SlCo/E+gyI=; b=rJjHR27sC4sns69JOZE+vKwCy3ixJYct/fMha94nfYRjks/fKOAmU+sntWCDAxGaWBcUjC pdBlYddWlzGdjlrxvx33pG483bpxJugARpD4yCrY6bidKNoDS1VexiPghtLfuwIkLQNMH3 NNASeLA474nTvg+hzPb9+LtAaaJXuPgx3OWfakoHCxdRjhKYWreZSqHyQ+lOPeWssE5IVw /DSuHmVb2QzFulnD9BuYibLDEOm1F18S1xQLP1g12ummNDp8HAwXzgFQde5BmdOyBaapFH hxAoPKFQixvsJv6uJrcgI3ofrWpS93WP4BrZTp+Ws2mwe5VmnCsyep0mL4qoyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698688578; a=rsa-sha256; cv=none; b=oyGtdBwCc4JEA9qRRAQQoUdyYuDb3c+RVblj9r8CTmtDM9gf9a2evKLqPh8T00N+DRg6NG NwYV22nbADcdIG0O6uSxtjYDSHwIrFhjAAuI4Gzf5g1iaK75GVyzz3FbihPSNeuMvnewn8 5OWKktGcAP4Rk/nTXOaCb3xtK/kIXQqm1R1+hFnXwgtJh3UquaJVbWMj0+2H2DZOsw6FMj 90Ax409/gEZTfO7mDUNHt8r8aCIwoazO+fNSNnjL2Zn8sMUiDzApArsOmeKegyhxELask6 87veY2q/dVaZXVFWQqSKy8VEu+fnXDQBr4jjCp0F6y1WnjnMRCP0X+jRX+RIDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK1D243rczWwb; Mon, 30 Oct 2023 17:56: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 39UHuISY028581; Mon, 30 Oct 2023 17:56:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UHuI0M028578; Mon, 30 Oct 2023 17:56:18 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:56:18 GMT Message-Id: <202310301756.39UHuI0M028578@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: 5270cc9757fb - main - rtld: Teach rtld about the BTI elf note List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5270cc9757fb4e0c1303ec44c2602b75acf3806d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5270cc9757fb4e0c1303ec44c2602b75acf3806d commit 5270cc9757fb4e0c1303ec44c2602b75acf3806d Author: Andrew Turner AuthorDate: 2023-10-12 16:29:46 +0000 Commit: Andrew Turner CommitDate: 2023-10-30 17:55:44 +0000 rtld: Teach rtld about the BTI elf note Add the Branch Target Identification (BTI) note to libc assembly sources. As all obect files need the note for rtld to have it we need to insert it in all asm files. Reviewed by: markj, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42228 --- libexec/rtld-elf/aarch64/rtld_start.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rtld-elf/aarch64/rtld_start.S b/libexec/rtld-elf/aarch64/rtld_start.S index 7dc87213b5fb..8de3e021d567 100644 --- a/libexec/rtld-elf/aarch64/rtld_start.S +++ b/libexec/rtld-elf/aarch64/rtld_start.S @@ -28,6 +28,8 @@ */ #include +#include + ENTRY(.rtld_start) .cfi_undefined x30 mov x19, x0 /* Put ps_strings in a callee-saved register */ @@ -249,3 +251,5 @@ ENTRY(_rtld_tlsdesc_dynamic) .cfi_adjust_cfa_offset -2 * 16 ret END(_rtld_tlsdesc_dynamic) + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) From nobody Mon Oct 30 17:56: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 4SK1D36gL4z4yDlt; Mon, 30 Oct 2023 17:56: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 4SK1D35cjpz3Y3k; Mon, 30 Oct 2023 17:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qCOdiWSLJ07Y8x25JZtX6Yru1cTBtygO8XK4SC88in0=; b=ahrK0LgZGDwOl3I0YqxioZi+pmurSN1/WBrL3GT0biObwBbR6I/N3THWN/UABiyiAFHHRn dsHgE4n+5tz4cC8M6SyF0R7iK1gJNLrc1v7Y30Cuc2mTD5c50GNU6azb/V1HQwChYzff5T tS5RPNUkwUyQ8usF6jrnhy/715vqZSxdgK9J/Rks+dbhtqX/jJt0c20gdLzTWSKcbdYME0 fnw1I4ZjqE2Au6pvXqGtQoNqNKEQpA7AU8gMX6QltG/sefNbXXc56olCRF/XY5XZiw2W7J 9VHMVow+dObISU4ZUNtNTkJw9xRpaWaQZ5I24m+rgMbqt2GtxbYyBS94AQckWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qCOdiWSLJ07Y8x25JZtX6Yru1cTBtygO8XK4SC88in0=; b=W6nfnLhw7BQIQVFp1EmNNW94OTVAHpajD6o4f5qOXZAKIbuA12DWmh3PQH2ooAbQDsqj29 dqTtgzpYUcw92EcYSskOr4inAmxqvJ14LuS/LSuvLdm6kqh6yll/LgH9SNqtS5Y0wMSSYV k2q3ia54j1tsJH/Fz6EQ+e1gkiliIjDUqgFLl+F18NzrCiNz9d8twHB7As+LCImscPSKpa L6dGl64ymyDesjvKItdmM+Dpy4qY3nnrJAbl9UdZkzQr5xNYGYVwifzI6xclFP3biU3wvC VCyJcBGNvKlb8yvSxsj0IcVR32sU1dmassA6J5kd0DOWPWAni69KqsBU844p/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698688579; a=rsa-sha256; cv=none; b=uDIrG0d3p3W0UvnRZzHr0biOjyU1P9gTEuRDgHzYwF94x0QgtVA63WjuxHEED9s7eBrJTM hUuqiPFEG30eMNvq12Brt0FaaozbMRWAIc/KTXv5n5QBijj9zA4e/ZGbIQ18m49wyqMPK3 Tnq/NtZpcn1SgVBZ8mEBFEAXMrg8KNNQ7jbZImWbq8WRpNcl5MxfMtS0bLeesxODwbrF0o foyJAyn9oX1IKmHNyl1gQMkF+Ns8KV6qQSSMqYtHZOH2GHfPwsWlh4ETAIy4r31Mjewpth ZcQDW/uWQR/UxiT2O/fZy+GUMlNI9jOvUv9m5jv3Q091H5agzH4h6jDK4F73xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK1D34kG0zWwc; Mon, 30 Oct 2023 17:56: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 39UHuJhQ028636; Mon, 30 Oct 2023 17:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UHuJCh028634; Mon, 30 Oct 2023 17:56:19 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:56:19 GMT Message-Id: <202310301756.39UHuJCh028634@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: 0590ed0967e0 - main - arm64: Add a BTI landing pad to .mcount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0590ed0967e025e1d155da9e06509f3fe9686feb Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0590ed0967e025e1d155da9e06509f3fe9686feb commit 0590ed0967e025e1d155da9e06509f3fe9686feb Author: Andrew Turner AuthorDate: 2023-10-16 14:34:19 +0000 Commit: Andrew Turner CommitDate: 2023-10-30 17:55:45 +0000 arm64: Add a BTI landing pad to .mcount The .mcount function needs a BTI branch target. As we can't rely on asm.h being included use the hint version of a "bti c" instruction. This is a nop when BTI is not supported or not used. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42230 --- sys/arm64/include/profile.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h index 3e4a34669360..8a61ff995d83 100644 --- a/sys/arm64/include/profile.h +++ b/sys/arm64/include/profile.h @@ -68,6 +68,8 @@ static void _mcount " .globl .mcount \n" \ " .mcount: \n" \ " .cfi_startproc \n" \ + /* Allow this to work with BTI, see BTI_C in asm.h */ \ +" hint #34 \n" \ /* Load the caller return address as frompc */ \ " ldr x0, [x29, #8] \n" \ /* Use our return address as selfpc */ \ From nobody Mon Oct 30 17:56: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 4SK1Dx6BrLz4yDkV; Mon, 30 Oct 2023 17:57:05 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-vs1-xe2e.google.com (mail-vs1-xe2e.google.com [IPv6:2607:f8b0:4864:20::e2e]) (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 4SK1Dx4YF8z3ZG3; Mon, 30 Oct 2023 17:57:05 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vs1-xe2e.google.com with SMTP id ada2fe7eead31-457c4e4a392so1324487137.0; Mon, 30 Oct 2023 10:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698688624; x=1699293424; 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=vHKO8upAXUtqtPYOuBW0WsUIDBw/XgSsq4J7wxIRHHg=; b=WOflVQ6ZNtaH1odxlFVonb4RZXSm6pkBRspTbxlu/5AQkYcni/KI6XxhzScyLf6rEq Sc462T4mLPVSdsuWL3ofgqGS2IBEOPjCYIG5J4D5ONprQQTVizi02I81EuSsfRRA+l9r nDSTBtUzrptI5lWAxQo8pKkk2YY92GmhY3Z48Tq2ZL9vvxGtT9p0WeHG++Fkmpv9+mVY h+vRdvCEnxp+YudrkIarNckChqWirzTXVozB5ClpSF3+m7aOd75E4+Ix/XeLOmsk679U 7LWxGOi6jZTndXQ26XuMIRNqORbfq+qB+EJ4JKUH/wJItkWUPZQMhzAlT8N1sVKVOW45 iw+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698688624; x=1699293424; 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=vHKO8upAXUtqtPYOuBW0WsUIDBw/XgSsq4J7wxIRHHg=; b=E3WIJzFkxfHRiBZuZxRohjFZQ1Uu7ZQh67onhc6sEL2gOEoZYh30jACXjZuOcQjAku ustTOJw7Sv+KdBN3JtflCas8tWqpBV5haDtqwlUx8YLYXmtuEMdhFkvZQvYiR4c4B7on p5mZRcpk56nepYssGoSd+lKirRDjGmaRksfsqt7MJ9OIIyJeSoMvwvNR6op25gDLEkQS I35t5dOEcRazZYeIFkKDpXHRsAlFJMMWPYHP+K3Xm7+rIhjRCpob37xhkMxaoQflTj2O G0/IcZnrw57GcUW/4BNhiUlD8LSh+TK5w0eUTdbrFPrJLzhM1paD9Be/F01OxgrHxUMk Zqpg== X-Gm-Message-State: AOJu0YwxorjS71YOBX83SlY/LltDiLF26Go3KT5vHFkIQ8JfgY7g72QX 1p613VHp4QCkT42v6O09UTEKCjP4bkf/Y3RGAS4uwY/1 X-Google-Smtp-Source: AGHT+IEwUDOxkRgu1Oa6zZS6KYHFKmRoHoUYukw99oL7bzwLKwgIcP1GFot2lfyJk6Sc9aQjP1+f4Ox4Bac6MGskcgI= X-Received: by 2002:a67:c00b:0:b0:457:e3bb:867 with SMTP id v11-20020a67c00b000000b00457e3bb0867mr6835190vsi.6.1698688623729; Mon, 30 Oct 2023 10:57:03 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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: <202310301742.39UHgSPp011580@gitrepo.freebsd.org> In-Reply-To: <202310301742.39UHgSPp011580@gitrepo.freebsd.org> From: Benjamin Kaduk Date: Mon, 30 Oct 2023 10:56:52 -0700 Message-ID: Subject: Re: git: 95335dd3c19e - main - rtld: introduce STATIC_TLS_EXTRA To: "Stephen J. Kiernan" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000000065c70608f2c495" 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:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4SK1Dx4YF8z3ZG3 --0000000000000065c70608f2c495 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 30, 2023 at 10:42=E2=80=AFAM Stephen J. Kiernan wrote: > The branch main has been updated by stevek: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D95335dd3c19e0ade161bb4dc8462fc3= d045ce4f8 > > commit 95335dd3c19e0ade161bb4dc8462fc3d045ce4f8 > Author: Stephen J. Kiernan > AuthorDate: 2023-10-29 21:13:10 +0000 > Commit: Stephen J. Kiernan > CommitDate: 2023-10-30 17:42:05 +0000 > > rtld: introduce STATIC_TLS_EXTRA > > The new STATIC_TLS_EXTRA variable provides a means for applications > to increases the size of the extra static TLS space allocated by > rtld beyond the default of '128'. This extra static TLS space is used > for objects loaded with dlopen. > > The value specified in the variable must be no less than the default > value and no greater than the maximum allowed value for size_t type. > > I think that we want to have a maximum allowed value that is smaller than SIZE_T_MAX, both to prevent chance of this being used in attacks and to prevent integer overflow. Perhaps something large but not incredibly large, like 1M? > If an invalid value is specified, rtld will ignore it and just use > the default value. > > The rtld(1) man page is updated to document this new option. > > Obtained from: Juniper Networks, Inc. > Differential Revision: https://reviews.freebsd.org/D42025 > --- > libexec/rtld-elf/aarch64/reloc.c | 2 +- > libexec/rtld-elf/amd64/reloc.c | 2 +- > libexec/rtld-elf/arm/reloc.c | 3 ++- > libexec/rtld-elf/i386/reloc.c | 2 +- > libexec/rtld-elf/powerpc/reloc.c | 3 ++- > libexec/rtld-elf/powerpc64/reloc.c | 3 ++- > libexec/rtld-elf/riscv/reloc.c | 2 +- > libexec/rtld-elf/rtld.1 | 8 +++++++- > libexec/rtld-elf/rtld.c | 21 +++++++++++++++++---- > libexec/rtld-elf/rtld.h | 1 + > 10 files changed, 35 insertions(+), 12 deletions(-) > > diff --git a/libexec/rtld-elf/aarch64/reloc.c > b/libexec/rtld-elf/aarch64/reloc.c > index c8f09d797215..907377f2619a 100644 > --- a/libexec/rtld-elf/aarch64/reloc.c > +++ b/libexec/rtld-elf/aarch64/reloc.c > @@ -521,7 +521,7 @@ allocate_initial_tls(Obj_Entry *objs) > * use. > */ > tls_static_space =3D tls_last_offset + tls_last_size + > - RTLD_STATIC_TLS_EXTRA; > + ld_static_tls_extra; > > _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); > } > diff --git a/libexec/rtld-elf/amd64/reloc.c > b/libexec/rtld-elf/amd64/reloc.c > index ce74c54cc5c3..9c5887def356 100644 > --- a/libexec/rtld-elf/amd64/reloc.c > +++ b/libexec/rtld-elf/amd64/reloc.c > @@ -527,7 +527,7 @@ allocate_initial_tls(Obj_Entry *objs) > * offset allocated so far and adding a bit for dynamic > * modules to use. > */ > - tls_static_space =3D tls_last_offset + RTLD_STATIC_TLS_EXTRA; > + tls_static_space =3D tls_last_offset + ld_static_tls_extra; > > This calculation could overflow, as I see it (likewise for the other archs)= . -Ben --0000000000000065c70608f2c495 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Mon, Oct 30, 2023 at 10:42=E2=80=AFAM = Stephen J. Kiernan <stevek@freebsd= .org> wrote:
The branch main has been updated by stevek= :

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D95335dd3c19e0ade161bb4dc8462fc3d045ce4f8
commit 95335dd3c19e0ade161bb4dc8462fc3d045ce4f8
Author:=C2=A0 =C2=A0 =C2=A0Stephen J. Kiernan <stevek@FreeBSD.org> AuthorDate: 2023-10-29 21:13:10 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Stephen J. Kiernan <stevek@FreeBSD.org> CommitDate: 2023-10-30 17:42:05 +0000

=C2=A0 =C2=A0 rtld: introduce STATIC_TLS_EXTRA

=C2=A0 =C2=A0 The new STATIC_TLS_EXTRA variable provides a means for applic= ations
=C2=A0 =C2=A0 to increases the size of the extra static TLS space allocated= by
=C2=A0 =C2=A0 rtld beyond the default of '128'. This extra static T= LS space is used
=C2=A0 =C2=A0 for objects loaded with dlopen.

=C2=A0 =C2=A0 The value specified in the variable must be no less than the = default
=C2=A0 =C2=A0 value and no greater than the maximum allowed value for size_= t type.



I think that we want to= have a maximum allowed value that is smaller than SIZE_T_MAX, both to prev= ent chance of this being used in attacks and to prevent integer overflow.

Perhaps something large but not incredibly large, l= ike 1M?
=C2=A0
=C2=A0 =C2=A0 If an invalid value is specified, rtld will ignore it and jus= t use
=C2=A0 =C2=A0 the default value.

=C2=A0 =C2=A0 The rtld(1) man page is updated to document this new option.<= br>
=C2=A0 =C2=A0 Obtained from:=C2=A0 Juniper Networks, Inc.
=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd= .org/D42025
---
=C2=A0libexec/rtld-elf/aarch64/reloc.c=C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0libexec/rtld-elf/amd64/reloc.c=C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0libexec/rtld-elf/arm/reloc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 3 ++-<= br> =C2=A0libexec/rtld-elf/i386/reloc.c=C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
=C2=A0libexec/rtld-elf/powerpc/reloc.c=C2=A0 =C2=A0|=C2=A0 3 ++-
=C2=A0libexec/rtld-elf/powerpc64/reloc.c |=C2=A0 3 ++-
=C2=A0libexec/rtld-elf/riscv/reloc.c=C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0libexec/rtld-elf/rtld.1=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2= =A0 8 +++++++-
=C2=A0libexec/rtld-elf/rtld.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 21= +++++++++++++++++----
=C2=A0libexec/rtld-elf/rtld.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2= =A0 1 +
=C2=A010 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/re= loc.c
index c8f09d797215..907377f2619a 100644
--- a/libexec/rtld-elf/aarch64/reloc.c
+++ b/libexec/rtld-elf/aarch64/reloc.c
@@ -521,7 +521,7 @@ allocate_initial_tls(Obj_Entry *objs)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 * use.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 tls_static_space =3D tls_last_offset + tls_last= _size +
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTLD_STATIC_TLS_EXTRA;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ld_static_tls_extra;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE,= TLS_TCB_ALIGN));
=C2=A0}
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.= c
index ce74c54cc5c3..9c5887def356 100644
--- a/libexec/rtld-elf/amd64/reloc.c
+++ b/libexec/rtld-elf/amd64/reloc.c
@@ -527,7 +527,7 @@ allocate_initial_tls(Obj_Entry *objs)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* offset allocated so far and adding a bi= t for dynamic
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* modules to use.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/
-=C2=A0 =C2=A0 =C2=A0 =C2=A0tls_static_space =3D tls_last_offset + RTLD_STA= TIC_TLS_EXTRA;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0tls_static_space =3D tls_last_offset + ld_stati= c_tls_extra;


This calculation could overflow, as I = see it (likewise for the other archs).

-Ben
<= div>
=C2=A0
--0000000000000065c70608f2c495-- From nobody Mon Oct 30 20:00: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 4SK3zZ0wF8z4yM54; Mon, 30 Oct 2023 20:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SK3zZ0PFlz4DNj; Mon, 30 Oct 2023 20:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698696042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mv9CNe/2wTOHlsTq7MfzZEF/6P+RdK4C6EwoKDcB+eE=; b=QbTjWirKDLXHKYSohNBamBUN1PF2tr7ICCZGJuSzn7qy/Wgrt70Vg/VCIeUL9thgHZNo4m 22zWWoeU3BNjtnxZmQ24NLL5MTGej5tOPh3SIUkBL8BxPc3qBqDnIAm3ybIJ9Il8D2lEYk xLkDw1FiNWHbP9wY5BUL6kt5NDnnqHfx7LiyyUGolrXNQyX3c45iPAUoWcwEkRuR4EVb51 v7jhtGBkL73gAspy3npZusoql5JDQ8RyfW+KzxMxT1eNOzmDvHsZO/q1zY8wAMaDVJJDve COqjEmodo2mjh3Yh+Fhdhue1/TlG1rfGS3tCVtudUjrzqQEdiX21+B4tNtplcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698696042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mv9CNe/2wTOHlsTq7MfzZEF/6P+RdK4C6EwoKDcB+eE=; b=eO91s4tIEWixULp11g9ltZ7oB5/nUPKYYzB0qFUbfbFj75hBa1+SBBs41uP5r8NiWmqaaf CYf3kOeBoDQwQ+8aPQtygIHy+jL7WCyIFyXiH+io1brncwBqiL8GYt35PNhaJSKiWepIwP ZY7+EWIQRnszyyhXRtJgnKxQgLzED1eQqhMbD+R5y8owBVE2pBoEA6BsUmT+BumpoTykKC 6fHIG+/HX8g0VImndb18kj2VtlnK8XtGp/EDjTrR1GALbYiqmh7AC6RZY/qHc5bKkm94Hz s0CvOu6ZQ2qWfB44pWb7oyuLc4Y8hQdq7NXcDDzmRUqpv/lvD/5cK5PT0NF7EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698696042; a=rsa-sha256; cv=none; b=iTmPdOAE8IwgWMl4ilP4hbRdgVvrrNdaiXoRqdfJkgj71LknwDMboGum5cQd4OJe4t9844 9IJf6SVCSRMsqyrDTbE0kQZNA7BZyM4Vixh9zpqZONIs/iTEoD6okHMtcRAeyoBm6P3uoZ KdumqmPx5L4JmAcCwijkXVOQYsEtluWnaKczNIGKvyA5z8j9T6bQz7FIvuBDsMmk30ga0t EFy0UZbjNGbCHFk1MexT3Qqw29q0j85uA99BAtQOJ75UB2H+UauzPiTfnK/6BXRfV0pJv5 Xz5toFDle8uo4DV5zzpGXW7uh9+gIjVsLYRz1cXbUSuXcbe5kOJxgLnbiAzsUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK3zY6YfpzZmX; Mon, 30 Oct 2023 20:00: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 39UK0f40038514; Mon, 30 Oct 2023 20:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UK0fYA038511; Mon, 30 Oct 2023 20:00:41 GMT (envelope-from git) Date: Mon, 30 Oct 2023 20:00:41 GMT Message-Id: <202310302000.39UK0fYA038511@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: 1c824f430a39 - main - libpfctl: add missing pfctl_status_lcounter() function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1c824f430a395cdc66e22406e72f20ebd300e47e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c824f430a395cdc66e22406e72f20ebd300e47e commit 1c824f430a395cdc66e22406e72f20ebd300e47e Author: Kristof Provost AuthorDate: 2023-10-30 18:02:29 +0000 Commit: Kristof Provost CommitDate: 2023-10-30 18:05:03 +0000 libpfctl: add missing pfctl_status_lcounter() function We already had accessors for the other types of counters, but not this one. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 6 ++++++ lib/libpfctl/libpfctl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 335aeb8e2c8c..1c8873dd6429 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -309,6 +309,12 @@ pfctl_status_counter(struct pfctl_status *status, int id) return (_pfctl_status_counter(&status->counters, id)); } +uint64_t +pfctl_status_lcounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->lcounters, id)); +} + uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 0b50cc054060..5e304ac56dd8 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -388,6 +388,7 @@ struct pfctl_syncookies { int pfctl_startstop(int start); struct pfctl_status* pfctl_get_status(int dev); uint64_t pfctl_status_counter(struct pfctl_status *status, int id); +uint64_t pfctl_status_lcounter(struct pfctl_status *status, int id); uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id); uint64_t pfctl_status_scounter(struct pfctl_status *status, int id); void pfctl_free_status(struct pfctl_status *status); From nobody Mon Oct 30 20:00:42 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 4SK3zb1tVtz4yLPq; Mon, 30 Oct 2023 20:00: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 4SK3zb1CNcz4DZV; Mon, 30 Oct 2023 20:00:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698696043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ks6nGcoy8wHm1x+SqB8Bhzglu1raEFAUSWA9TY4YCKI=; b=fKwjwBnJZpUhawTEn5QkM+zvGfi77B4G7RoheRPYk1Wa1MHDUfF7ngPBGYni/1nAZRQdV/ YtC0GIZ9LG2NrV8GossAGzTECYYFxWpUgm8G/msjZnZ6wzZ0785Vw8o8HcnkTDE5LpfPRT ITMCkRrWX4lut1TF3Q04uQtiepBLUTevmzZfRj2lybI7ypjkFOVv0HA77wlvjHcIWfzavk p7eidlVIMDwyySp1z1Ci7djKLFWhEo3POVAeOifvrEHYuPeq/bjnJg1YJM8RGLKRUfGSkQ +GSEs9OPd1AnHGXAykY3i4xrzyZB2rf7M+2NF/J3HyZPjaOsh0IKoceBnblQcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698696043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ks6nGcoy8wHm1x+SqB8Bhzglu1raEFAUSWA9TY4YCKI=; b=mRvK9wF8lQ6GcgsCWPmCqUTTAOeo0b9q2rDLzbOUDsANFumNlVmT57g9fNRie+B3Oq2t05 2cIZ0ipf+nbzHvsPOKKuiv9/CY/bxCcLJMPU2nt4lXvebQMstrlX1sYP7OQfr5Fh1PFAsd WQ46ssU6wrLv0x6dp3ur77g4gGcFAIL0u1da3n06Bg/W/vrxiJjHtifA2Uviz5sJsbjMZj eJrQXgM01jIChBhTfHW68PpCML2bOXdYVsAkGcY/mfXS3HJSdj1wBm80nnTgKgNoTC4x4M /2qb8bGbFqtKMvUkGhjKsjdKmxnqr45QgOObOPsOZDUHKXT3ELpjFCsX7DusrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698696043; a=rsa-sha256; cv=none; b=IXAYXS3Opww52cXNpOBtOT86a9PqBoVq4gaiejp0tr7TYziP9fziZjhzXm7Vg3KVPBt95I rQCKAqEPUuKQLKzG0viYneibTl3RhFAOnEmTFhKkniebxkFpQdIgKj/5DgimSJlEDjWR7I dSuMeWIdlgrCRqJE9ZI/K9n1bGpMcGClzloynJqhNceacdIpGzdX2gkrAW6xtL1GMLeAAN Wyf8nJDNlTcNebzg6U2OQOT0QAsL9qb8OQBD99sskJnu/l5xuXQAv8gn+h6ofcUghOTixK FafCbHtsUjTz47rkmr5hcjIJpwynaEdK2W/zKkvIALMNTWLGssLbCJowUvkP8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK3zb0JSPzZQY; Mon, 30 Oct 2023 20:00: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 39UK0gM1038568; Mon, 30 Oct 2023 20:00:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UK0gA0038565; Mon, 30 Oct 2023 20:00:42 GMT (envelope-from git) Date: Mon, 30 Oct 2023 20:00:42 GMT Message-Id: <202310302000.39UK0gA0038565@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: 87c503235310 - main - libpfctl: remove unused field from struct pfctl_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/main X-Git-Reftype: branch X-Git-Commit: 87c5032353106764f324e82541662f448e68f38a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=87c5032353106764f324e82541662f448e68f38a commit 87c5032353106764f324e82541662f448e68f38a Author: Kristof Provost AuthorDate: 2023-10-30 18:04:12 +0000 Commit: Kristof Provost CommitDate: 2023-10-30 18:05:03 +0000 libpfctl: remove unused field from struct pfctl_states We never populate this, or use it, so remove it. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 5e304ac56dd8..31b4b444ba64 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -369,7 +369,6 @@ struct pfctl_state { TAILQ_HEAD(pfctl_statelist, pfctl_state); struct pfctl_states { struct pfctl_statelist states; - size_t count; }; enum pfctl_syncookies_mode { From nobody Mon Oct 30 20:26: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 4SK4YS1ThTz4yNfH for ; Mon, 30 Oct 2023 20:26: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 4SK4YS0w5Mz4G7L; Mon, 30 Oct 2023 20:26:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698697596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4K+19gfgZk4LLp1qnFuCleIbZn+r/dF7dbk8IUb/rg4=; b=B1k/P6zRa+dDV8xO3tm9RvQJ2xJPtrx3sP7B707UBQ5XXva+eVHXZPGn5gp/xN+x1cyBKG 1Zdq+lcQeTnC0wOS5D72AnZEFN1eA3h8+e0m9IgYHvGkdtv5epXtQnOrbqOXFiWpZP8BOo SZTPc5Op4gTO1CDDhrNvj/aQ30bqAuwi88JJknz7dwFrZwNTzHb4lrhEPwhcHCbfEmpZze R1lOCRVjRxKY4fqYMe6Aq+idm8XfXZd4DBwvJwMMb8R3/ChNoOeaj5CGSoVIEqhKniNZBP crJRfFY4EpeQVOV2hci5QU8Y3rDy8LYRGBhA4C9H5WHUVP5WNXPutbXhiFcseQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698697596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4K+19gfgZk4LLp1qnFuCleIbZn+r/dF7dbk8IUb/rg4=; b=fQElKpkrbyPqFuLBTnC1vxpmInv2Z6ldoLdteX594FmnDKtiSlUkDnoDTjYKmNxEYBwBHn tQYJk7n5gBqdBFsZKGR9Zq6Yy05BDjV0K57y47fTcyp5NYQ1tfrgTIz8dyCvnRRH0qwKWj PN0vcbc3tOWGIoU9zC7VRdi25ibyCQzlrQkGLKmTMMk8AzM5rzGuuBrRbYfRgWr9YsA32D ZyheEsOL+uLQrEcRq//bwRIPWreauwCg2QcOkello/YwPQHpvY00wJ4t4unEvLqziLtrK3 HubtrT700V40kq2WUEY4g5MGPTOn+aPVrT0D7y2wrSg0N3omMBY93UvBRuSvTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698697596; a=rsa-sha256; cv=none; b=WICbO01jcDMJ7yarETAPsNO/FBlxLdrmFoWAhGOXQf8KboogTM1lCzSDC51v2aZia2y5K4 fYeNCfmxKykizzfGE1sbYysN+dYUBN+RB7Xn+B6pE2zss599At/Ar5mP1SdUtJC9EPHU2V tdNDLosyRVfrZxc7XcUEjBRmmYH4MC1i3iCAycyVNkeaVULnNvaF6Ou9cQfIXPFa+iYUjw iwBnz46cS4un01j5RuDvAaZGF5IvbhEfoEhIci763336ufa+z8a3i5cGocoWtVRE/nF3ag C9OKwXuSj+XjTksUq0lzUNnY2LE9pe5Z1HldIzqtRjJrJ5hVOptyZwKJWItbMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK4YR6rgBzZsW; Mon, 30 Oct 2023 20:26: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 39UKQZGq079087; Mon, 30 Oct 2023 20:26:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UKQZfm079086; Mon, 30 Oct 2023 20:26:35 GMT (envelope-from git) Date: Mon, 30 Oct 2023 20:26:35 GMT Message-Id: <202310302026.39UKQZfm079086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 797f55ef12d7..043c6ee3b6bf - 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: 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8 X-Git-Oldrev: 797f55ef12d752d2a7fb04fae5d24e019adf2a1d X-Git-Newrev: 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=797f55ef12d7..043c6ee3b6bf b5e6091885c3 spa: document spa_thread() and SDC feature gates e9725abd8316 Revert "Do not persist user/group/project quota zap objects when unneeded" e57909265b43 "ARC prefetch metadata accesses:" appears twice in the output. 07345ac25247 Add prefetch property e007908a1644 ABD: Be more assertive in iterators 252f46be7d8f ZIL: Detect single-threaded workloads 7c9b6fed16ed zvol: Remove broken blk-mq optimization 05c4710e8958 Revert "zvol: Temporally disable blk-mq" 3afdc97d91c2 ZIO: Remove READY pipeline stage from root ZIOs 6a629f323444 arc_default_max on Linux should match FreeBSD 97a0b5be5096 Add mutex_enter_interruptible() for interruptible sleeping IOCTLs 043c6ee3b6bf Read prefetched buffers from L2ARC From nobody Mon Oct 30 21:10: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 4SK5XC6GWjz4yQxZ; Mon, 30 Oct 2023 21:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SK5XC5zmCz4JRq; Mon, 30 Oct 2023 21:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698700235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ucS6OQNlh2RnF3iEoQ6x4YWeQNAJp3iZe5KfS/bGd0=; b=eyxnIAYCNKE2P5w8DNj3+89/cPjCRyn1hSajambljgmDp0iVHJVZm3HRQJaA0w626Hndso kMQKS7zAC+X7wfvUld/rBBhx/F/SZ0dOMZi4xzZKzPPs4vbK11DuZI/T2KJuEkcb5tqe56 eRkWkAIOMHMo0wU736KryavMlM/ZEvz7EljuwGsfwN4ewRRMlsDFIl57sy7m6AsWMK6mWc ILgXTwEJh2ZmNErIdhYIfo1Pa+IjKm1MU5+xGDkeT82XMc/8aIWyFWe/WFGsLWbWBJwW8R p01eUuL8gyhh5+Z+9ijyQGSFaEh4Ai5zOWLQYlNBxdhG3LHl5+tvRWHD4CKfyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698700235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ucS6OQNlh2RnF3iEoQ6x4YWeQNAJp3iZe5KfS/bGd0=; b=Gk2MntGah3ppixnfSpddE1xbKVznP809wjARAq60l9FrPokTFWTw2jo7YWOQklwaPkNedY 9d3mNR2CwhyAqKVPGi8VksqGLkAQUbl07f5WPv/QI530Aq3RYLjsmHq+UQHse0q/lB7LSt i64zLYOmWUfwKaPRfksY8hGJPFsJizG7X8nbidgENZdzgJN1/mcd4KcFmOv+/pn9KSCZ71 oWbyXqWCRA6AL2qUZu9+ldu6vt1+RazUEKfyz7KDGPFhPj3Ku+qxQlQmcj+yFTtf6JC0au jZ5LtgEuKcDF6SsPVARpbYpmcSQOJKPovMDd30mP/JgiEtTQiwzkZV9DXqU/LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698700235; a=rsa-sha256; cv=none; b=YReMhTFim4zfLv67/10T3dxh4NGvFTwjE9AOIQWlzX/beI35kRb6awofMjmgfnHcrizTNz 0LTzuqt5ApUGv7ZIYrLKKAWplXWltvuPZ7Xh6O4jZrzNALTRQLaq9QOmqa6Tzs5T9nHKuN zKAFp5kx7CWo6STID9cZAfI+S/dftH9Y1Gt11rU0+tMwpPtJL6hTz7w57t+XnVOdIumF7R S6M3un3dRAO8zNdypyYbI/KyvwY+yaig1HxoTSQqbZjVNQ6ni+u6JleqK/A/SqFjVOgo7w 2X/CAYWqTnNHZLnaCBnWTAe0IKN6vwTf5ZnQb7eBPmmtE0AuXIGdQeK/OrPi1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK5XC4sPCzc6Q; Mon, 30 Oct 2023 21:10: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 39ULAZY3055159; Mon, 30 Oct 2023 21:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ULAZvV055153; Mon, 30 Oct 2023 21:10:35 GMT (envelope-from git) Date: Mon, 30 Oct 2023 21:10:35 GMT Message-Id: <202310302110.39ULAZvV055153@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: 6c1e79df8c65 - main - zfs: merge openzfs/zfs@043c6ee3b List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 6c1e79df8c651b31ca4f656336e6c5ac29a66482 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6c1e79df8c651b31ca4f656336e6c5ac29a66482 commit 6c1e79df8c651b31ca4f656336e6c5ac29a66482 Merge: 87c503235310 043c6ee3b6bf Author: Martin Matuska AuthorDate: 2023-10-30 20:28:03 +0000 Commit: Martin Matuska CommitDate: 2023-10-30 20:42:11 +0000 zfs: merge openzfs/zfs@043c6ee3b Notable upstream pull request merges: #15360 97a0b5be Add mutex_enter_interruptible() for interruptible sleeping IOCTLs #15381 252f46be ZIL: Detect single-threaded workloads #15398 3afdc97d ZIO: Remove READY pipeline stage from root ZIOs #15428 e007908a ABD: Be more assertive in iterators #15436 07345ac2 Add prefetch property #15438 e9725abd Revert "Do not persist user/group/project quota zap objects when unneeded" #15451 043c6ee3 Read prefetched buffers from L2ARC Obtained from: OpenZFS OpenZFS commit: 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8 sys/contrib/openzfs/cmd/arc_summary | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 5 +- .../openzfs/include/os/freebsd/spl/sys/mutex.h | 1 + .../openzfs/include/os/linux/spl/sys/mutex.h | 21 +++-- sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 8 -- sys/contrib/openzfs/include/sys/dmu_objset.h | 1 + sys/contrib/openzfs/include/sys/fs/zfs.h | 7 ++ sys/contrib/openzfs/include/sys/spa.h | 2 +- sys/contrib/openzfs/include/sys/zfs_context.h | 2 + sys/contrib/openzfs/include/sys/zil_impl.h | 4 +- sys/contrib/openzfs/include/sys/zio_impl.h | 3 + sys/contrib/openzfs/lib/libzfs/libzfs.abi | 3 +- sys/contrib/openzfs/lib/libzpool/kernel.c | 9 ++ sys/contrib/openzfs/man/man4/zfs.4 | 71 +++++++++++--- sys/contrib/openzfs/man/man7/zfsprops.7 | 17 ++++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 10 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 29 ------ sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 12 +++ sys/contrib/openzfs/module/zcommon/zfs_prop.c | 11 +++ sys/contrib/openzfs/module/zfs/abd.c | 104 ++++++--------------- sys/contrib/openzfs/module/zfs/arc.c | 5 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 19 ++++ sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 7 +- sys/contrib/openzfs/module/zfs/spa.c | 41 ++++++-- sys/contrib/openzfs/module/zfs/spa_config.c | 17 ++-- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 5 +- sys/contrib/openzfs/module/zfs/zfs_quota.c | 18 +--- sys/contrib/openzfs/module/zfs/zil.c | 95 +++++++++---------- sys/contrib/openzfs/module/zfs/zio.c | 51 ++++++++-- .../openzfs/tests/zfs-tests/include/tunables.cfg | 2 +- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 32 files changed, 341 insertions(+), 247 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index e91cf5f22368,000000000000..39caf1355771 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 */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + *** 239 LINES SKIPPED *** From nobody Mon Oct 30 23:36: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 4SK8m05v3rz4yZ5p; Mon, 30 Oct 2023 23:36: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 4SK8m0535lz4WmP; Mon, 30 Oct 2023 23:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698708960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CFSIh1TTrztCjFW23m022zPiPAZdKvtWtai/8bPbEu8=; b=It4hny9TdWLB/ToWSoGujgMZv+ODJ99Qq1glvcT0YsdomIdqc6142FCGU54VWIRdrEplcl eLgGg2vm3a16+BMwMySNNK31uxeRvt4Ts2Z0UcrYX23D+NRZ9I5+D9e51L41Dh4OGdVMML Yml5foHt96O9M5asw9dDtu6E/3MxcLt3xtkO81D5MDz82ydn5ut6SM2P+ghj1vvZ+JSWa7 tPXvPJvPykv4Pd8KhV+fzV6rrQiqe83ODeE09bZyydoMi70pHhSpZXQL7/9/oPCTnHnwnr ptjZaYYGd9lOfzM84i7k9up69Ok4Y+amiR2Kq+cIeo2ljAklDM4GuytYSZTklw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698708960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CFSIh1TTrztCjFW23m022zPiPAZdKvtWtai/8bPbEu8=; b=ymHnLkCGaES72NsvUFe4rfQxlpKVbNwPK/0R4/h1de/TsPQOhSTWqIAJUoA/84UhcSZx5P GYKeN0tU1DxG90/Dy3kWwOK/aXMuUldGNmck+rW6u+21hIwyXi9mnfXAQVVL8sOb6FAJKv opQsAnh7Id5ogCG3FHL/yfj0DZGt2Ws8CRvE2SBS+6N5VTo497uuMziRG91WtVkZ2YmQC0 XmqP9a3ncb2zPR7xT4w5MgCL0JH6rIrbtc2zBZMuq1bgnHVxfcBN0QJw9WSlrqsi2ry6fP qTjoHCGwdCQnHY6cJxDHeATXZq3PJC2Z0snMnzpKTlsIjkD/Qsp22Zm/Cnl8WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698708960; a=rsa-sha256; cv=none; b=cTZWZkd5A2j8j5EJYL9xXWSLarQKHGxeVDpnMKoKiSGB+I3zx7tK9o41Ri4lLOgNZZXrfa pmo/iJlKMBOXuo+3XfPKjAKivR5tFa+G8ENVWvepZCOleQHovt1/hHtlTLt6VIwk5dSNmg rzVFJzO8zTl9ZICeNUPdwdd1XUnyFEgT0H3C8H8Vvyz14USBvYXqTbWy5deIsllZDuAbi6 fiuQjmes9pvn0IfEq+hcLaWCC3zPXOGIXRzzrEa2xpJ5CtRF4C+TJLIoncHIe0iI26XAgA Yl5w1SRfFu7RFw4Z+5ExraPRaCZwv1Pbvtj/7S3+0NUQx7ao+mc/fWxd6Jes7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SK8m045pjzh3y; Mon, 30 Oct 2023 23:36: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 39UNa04A095111; Mon, 30 Oct 2023 23:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UNa0hl095108; Mon, 30 Oct 2023 23:36:00 GMT (envelope-from git) Date: Mon, 30 Oct 2023 23:36:00 GMT Message-Id: <202310302336.39UNa0hl095108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6f7c45056f69 - main - tzsetup: make UTC the first (default) region List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f7c45056f6911b02e7c07011e3602775edad22d Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6f7c45056f6911b02e7c07011e3602775edad22d commit 6f7c45056f6911b02e7c07011e3602775edad22d Author: Brooks Davis AuthorDate: 2023-10-30 23:33:14 +0000 Commit: Brooks Davis CommitDate: 2023-10-30 23:35:21 +0000 tzsetup: make UTC the first (default) region Many sysadmins prefer to configure their systems to UTC and it's a reasonable default when installing, making it easier to get a usable system by just hitting repeatidly. Renumber UTC to 0 to preserve the finger memory of those selecting a region by shortcut. Reviewed by: jrtc27, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42383 --- usr.sbin/tzsetup/tzsetup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 4279f888a33f..f6440a0ea736 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -171,6 +171,7 @@ static struct continent_names { const char *name; struct continent *continent; } continent_names[] = { + { "UTC", &utc }, { "Africa", &africa }, { "America", &america }, { "Antarctica", &antarctica }, @@ -181,13 +182,13 @@ static struct continent_names { { "Europe", &europe }, { "Indian", &indian }, { "Pacific", &pacific }, - { "UTC", &utc } }; static struct continent_items { char prompt[3]; char title[30]; } continent_items[] = { + { "0", "UTC" }, { "1", "Africa" }, { "2", "America -- North and South" }, { "3", "Antarctica" }, @@ -198,14 +199,13 @@ static struct continent_items { { "8", "Europe" }, { "9", "Indian Ocean" }, { "10", "Pacific Ocean" }, - { "11", "UTC" } }; #define NCONTINENTS \ (int)((sizeof(continent_items)) / (sizeof(continent_items[0]))) static dialogMenuItem continents[NCONTINENTS]; -#define OCEANP(x) ((x) == 3 || (x) == 5 || (x) == 8 || (x) == 9) +#define OCEANP(x) ((x) == 4 || (x) == 6 || (x) == 9 || (x) == 10) static int continent_country_menu(dialogMenuItem *continent) From nobody Tue Oct 31 00: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 4SKBC84hCLz4ycjm; Tue, 31 Oct 2023 00:41:08 +0000 (UTC) (envelope-from kib@freebsd.org) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKBC72LwVz4cRl; Tue, 31 Oct 2023 00:41:07 +0000 (UTC) (envelope-from kib@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.17.1/8.17.1) with ESMTP id 39V0es1C004377; Tue, 31 Oct 2023 02:40:57 +0200 (EET) (envelope-from kib@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 39V0es1C004377 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 39V0esUA004376; Tue, 31 Oct 2023 02:40:54 +0200 (EET) (envelope-from kib@freebsd.org) X-Authentication-Warning: tom.home: kostik set sender to kib@freebsd.org using -f Date: Tue, 31 Oct 2023 02:40:54 +0200 From: Konstantin Belousov To: Benjamin Kaduk Cc: "Stephen J. Kiernan" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 95335dd3c19e - main - rtld: introduce STATIC_TLS_EXTRA Message-ID: References: <202310301742.39UHgSPp011580@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home 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:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4SKBC72LwVz4cRl On Mon, Oct 30, 2023 at 10:56:52AM -0700, Benjamin Kaduk wrote: > On Mon, Oct 30, 2023 at 10:42 AM Stephen J. Kiernan > wrote: > > > The branch main has been updated by stevek: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=95335dd3c19e0ade161bb4dc8462fc3d045ce4f8 > > > > commit 95335dd3c19e0ade161bb4dc8462fc3d045ce4f8 > > Author: Stephen J. Kiernan > > AuthorDate: 2023-10-29 21:13:10 +0000 > > Commit: Stephen J. Kiernan > > CommitDate: 2023-10-30 17:42:05 +0000 > > > > rtld: introduce STATIC_TLS_EXTRA > > > > The new STATIC_TLS_EXTRA variable provides a means for applications > > to increases the size of the extra static TLS space allocated by > > rtld beyond the default of '128'. This extra static TLS space is used > > for objects loaded with dlopen. > > > > The value specified in the variable must be no less than the default > > value and no greater than the maximum allowed value for size_t type. > > > > > > I think that we want to have a maximum allowed value that is smaller than > SIZE_T_MAX, both to prevent chance of this being used in attacks and to > prevent integer overflow. > > Perhaps something large but not incredibly large, like 1M? What attacks? > > > > If an invalid value is specified, rtld will ignore it and just use > > the default value. > > > > The rtld(1) man page is updated to document this new option. > > > > Obtained from: Juniper Networks, Inc. > > Differential Revision: https://reviews.freebsd.org/D42025 > > --- > > libexec/rtld-elf/aarch64/reloc.c | 2 +- > > libexec/rtld-elf/amd64/reloc.c | 2 +- > > libexec/rtld-elf/arm/reloc.c | 3 ++- > > libexec/rtld-elf/i386/reloc.c | 2 +- > > libexec/rtld-elf/powerpc/reloc.c | 3 ++- > > libexec/rtld-elf/powerpc64/reloc.c | 3 ++- > > libexec/rtld-elf/riscv/reloc.c | 2 +- > > libexec/rtld-elf/rtld.1 | 8 +++++++- > > libexec/rtld-elf/rtld.c | 21 +++++++++++++++++---- > > libexec/rtld-elf/rtld.h | 1 + > > 10 files changed, 35 insertions(+), 12 deletions(-) > > > > diff --git a/libexec/rtld-elf/aarch64/reloc.c > > b/libexec/rtld-elf/aarch64/reloc.c > > index c8f09d797215..907377f2619a 100644 > > --- a/libexec/rtld-elf/aarch64/reloc.c > > +++ b/libexec/rtld-elf/aarch64/reloc.c > > @@ -521,7 +521,7 @@ allocate_initial_tls(Obj_Entry *objs) > > * use. > > */ > > tls_static_space = tls_last_offset + tls_last_size + > > - RTLD_STATIC_TLS_EXTRA; > > + ld_static_tls_extra; > > > > _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); > > } > > diff --git a/libexec/rtld-elf/amd64/reloc.c > > b/libexec/rtld-elf/amd64/reloc.c > > index ce74c54cc5c3..9c5887def356 100644 > > --- a/libexec/rtld-elf/amd64/reloc.c > > +++ b/libexec/rtld-elf/amd64/reloc.c > > @@ -527,7 +527,7 @@ allocate_initial_tls(Obj_Entry *objs) > > * offset allocated so far and adding a bit for dynamic > > * modules to use. > > */ > > - tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; > > + tls_static_space = tls_last_offset + ld_static_tls_extra; > > > > > This calculation could overflow, as I see it (likewise for the other archs). So do not do it. From nobody Tue Oct 31 00:45: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 4SKBJl3pHxz4yd4M; Tue, 31 Oct 2023 00:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKBJl3Fqmz4dqf; Tue, 31 Oct 2023 00:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698713159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AWBbOl5ceyrygbSe+Lyf4/GoKyL5rc45KYjRBEc9gA=; b=tF51i5C8M0Se7Ld30tP0DGOCNmeXxD0n/laPGPdpVk3jWDX+B6JiJMSQNTYwXidvwXWfjO uYW/ExSnRZuSdSlXYCLQur5oQRM0a1jHHxtSGcFyMAk64zOvFe2arfWZ4cJvojhDExX6a/ BQbSIS2mG9I4yAW5pMiAllW6TYEAWEmSG8x6s/zlibI2dJcNBdWIah9W2+brUwoOtQ570r kZnQVtW/E9minoUkgrXHplW06mb4XDV+uKxY4inY2PkHpCgmqScnRhrYmHvhuDAdnya2fc HQ9qndM1uKv9I5jEQYive1ECZWE9EBI3m/OY9wvlKNSj8KmqwTHSSjtLtXwwZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698713159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AWBbOl5ceyrygbSe+Lyf4/GoKyL5rc45KYjRBEc9gA=; b=CluMpGXVj1RFi3LZaqReSoM4VvP57+pkGnWd2mULeUBjAO9wNIqfSyCc0C/kgXcFPW/KAE cI1RMn4/k7L22ZWp6Kinm/lLi1i1rcorqS3QDV2tTyG8HzBfTiIgORo9vb+LSioJvWLOAd XYtDyCq9TpmsbuVM1VzdLdyOSFJHdE/dsM8GGySQQYr3CslGuCACZWp/IluX0T/776kDsV CotrW48EtfU5SVcwsBnbG/VSiCuhpEU6pz32dHLBr6QWqS5qt9zFQ6RscwEXDqOT+u03yL /Ab4xWUGlQ34s9ev/Bz1CVeRQ0hnmgKFGMt39TF/g8oqWi5N46XkkLDd7OXplw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698713159; a=rsa-sha256; cv=none; b=mGB85brNCPuk2dmmKh2AA+atQ2bFawttE/VC+FHMA2HLAIoJ1Xa9fRjRBcbBINdqYs50o4 45gtZutpvC4JZ+5ymqME/y/40wXfkG9Qzp+aHkbsdPwcvu1d+IpNMSf5819TeU0XQJLDVV t1YOutouP27zFOTyOSm7V3dAOgLLni4GpGRl5COcXChUdf/yQ3qEz9C+WW2hQP80/BomGn 7pAmqOo3MijrwwRWFMAsLENWrjuZRANsUpR1vyMGmLpeUhd8gZU2LEd6q3p7RKjW6KuKv2 Os1gVeqvlNZQo2cbgkh//pjMMH0jdOe9GByL9PQcuDLyFWEzbljC6q6Ze5LqUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKBJl2DzPzj4L; Tue, 31 Oct 2023 00:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39V0jxRH012983; Tue, 31 Oct 2023 00:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39V0jxg2012980; Tue, 31 Oct 2023 00:45:59 GMT (envelope-from git) Date: Tue, 31 Oct 2023 00:45:59 GMT Message-Id: <202310310045.39V0jxg2012980@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: b174bec464ba - stable/13 - user stack randomization: only enable by default for 64bit 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: b174bec464ba8a072502e647adc9c03bb2881f17 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b174bec464ba8a072502e647adc9c03bb2881f17 commit b174bec464ba8a072502e647adc9c03bb2881f17 Author: Konstantin Belousov AuthorDate: 2023-10-24 21:44:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-31 00:45:48 +0000 user stack randomization: only enable by default for 64bit processes (cherry picked from commit 1798b44fda382c473c9fc7762e162613a39dc23c) --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 72273c2f32d9..6ab16e6cfb0c 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -200,7 +200,7 @@ SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, honor_sbrk, CTLFLAG_RW, &__elfN(aslr_honor_sbrk), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": assume sbrk is used"); -static int __elfN(aslr_stack) = 1; +static int __elfN(aslr_stack) = __ELF_WORD_SIZE == 64; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, stack, CTLFLAG_RWTUN, &__elfN(aslr_stack), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) From nobody Tue Oct 31 00:46: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 4SKBK531srz4ydHL; Tue, 31 Oct 2023 00:46: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 4SKBK52Xprz4f3H; Tue, 31 Oct 2023 00:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698713177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsblnBclUzuuXSxrb3LTlRjihwavvM0O4vgk6lchjyA=; b=lqdmt6TQlqYHIvraGJqhUE2D44Bzn2Lyv+uMeZszPFLIldDe9bb/lz5lLElyA9sFELV3lF XtJET49FY+hzZ28fnmk7tjyoxH2Ec3k9bBEjl47hm25iz9p3/mOXw7OyRQTNgSHVSPDjLM 37jCN9E3lnHKpRr3wi1LtBuJMo4IZXx3RZ8PBmITLndZWTsfb/SDZdxjBcu22O58T1Z7e7 gYMbiefGkey7D3xEB/L8zn6Cke1LZ7emO0OYpqSAz4OBNMCF8z+UXVzHiCTrK60Q5/t0/O TpyyYltP2VVkn3F0kCW3n26ig7knJL3DNlknKv3h+nGgIMrY4JzIbArX2Zgobw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698713177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YsblnBclUzuuXSxrb3LTlRjihwavvM0O4vgk6lchjyA=; b=gGSPG7b26qyvxo6NmkEcpJvYr3roOaVrQtkZbjIfrgv0ql1F+4DNyx83gQL98YyPydzzXk u3nwnfodC3XMl7KdrO33t5QtwKjTF844RCBohk9VDnrcEozKL10BWyF8H3Jo09U5FVKQGG X/p94ie73PxHIUzEvlvryRVkz4TTmW22xRAlLV8+VUD3Iz5Yo0SgpBxWmL9Z4yNy814EDf 20izXnmr3LlXFm0UJZJ4DBXWXza7htaDVVG0vKpSwjsbVToCSrwR7fV9y88iFVhm5ryO2v vG9Y0g/70ZmpkB3Btrp0igDhmTatItEfTkPTUGDgoIkCfmaiuze0LzspMIhzww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698713177; a=rsa-sha256; cv=none; b=Oj8ycPrK975fnLhlp5u8BQUAeZ8IM9vckcAxQMUGfdVWIAru9pDCfzPUtuvIEpyZRGfYpk YiwDIk+WnMc43uP03oKKP+GBvHOxNDgXabsRptMvPsguWgt1/TqSxITTBseWZHVr5Br85A hah3DAMUVOgExby6J0141vzgnd1zzlbgWUOE4YqR1p4D0H+x+0Re0A/vDVLJjVkDAj78iN Gq7dkSFyJpXrgPKzANRaQd4R/Lme/dQeqnvLt6fpGkKtVutl4YS6clFP7uZZ7grtjBUUFM VqYE/hZ8RERDZrGiLKxbPmABdXcCIQdha9HhcAxIdsHsobT1qakkd4w/xjS03Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKBK51brWzj4M; Tue, 31 Oct 2023 00:46: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 39V0kHUg013172; Tue, 31 Oct 2023 00:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39V0kHnX013169; Tue, 31 Oct 2023 00:46:17 GMT (envelope-from git) Date: Tue, 31 Oct 2023 00:46:17 GMT Message-Id: <202310310046.39V0kHnX013169@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: 4b2694fbcf2a - stable/14 - user stack randomization: only enable by default for 64bit 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: 4b2694fbcf2a63e31ab33645d9291f3264eb06f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4b2694fbcf2a63e31ab33645d9291f3264eb06f6 commit 4b2694fbcf2a63e31ab33645d9291f3264eb06f6 Author: Konstantin Belousov AuthorDate: 2023-10-24 21:44:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-31 00:46:10 +0000 user stack randomization: only enable by default for 64bit processes (cherry picked from commit 1798b44fda382c473c9fc7762e162613a39dc23c) --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index e01bccc93cb0..4ebd08082545 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -200,7 +200,7 @@ SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, honor_sbrk, CTLFLAG_RW, &__elfN(aslr_honor_sbrk), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": assume sbrk is used"); -static int __elfN(aslr_stack) = 1; +static int __elfN(aslr_stack) = __ELF_WORD_SIZE == 64; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, stack, CTLFLAG_RWTUN, &__elfN(aslr_stack), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) From nobody Tue Oct 31 04:09: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 4SKGqv2flYz4ypDw; Tue, 31 Oct 2023 04:09: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 4SKGqv261sz3QZN; Tue, 31 Oct 2023 04:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698725387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b38ryua2P5JGf78mDpUj+l/AdT6YGXYoUse0zbb2LXg=; b=rCjSDdjHOleNNyR83m8DwY7VgULHFGtwTo/3nsh5c2q+27cYEWod2WJe9WjjRYTalo9ct3 nmD6n1eNjEIm28fScRHdOIiSUf50DrYeBgSHBwepGwNpnFrArf4BPFaymBQ1pXNaaEto3J AzmOofs9gBiNUOcebIQsxqBgqPB4i89EEdOX7MFIMb3bjn8h2O3LUdz0V0ObZLDQAXN1tR aFOWTlhJuCUgyYbbffSxxGrMWsWaBpS8LjoLM3ajqNltt3bxAKssHgLwA81B55pCQEgJOG Wffg87wc+GCpkhbQnz9j7SQE0JKl/FdLg6WXREnlusKdem2zO77yRTGJKI1k0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698725387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b38ryua2P5JGf78mDpUj+l/AdT6YGXYoUse0zbb2LXg=; b=OZYcOVoTngNLJly2aiCj4R0jGoO30V4DOv7XK2YwMWKVOd+xcEFTfWl+WbcGEMVINHs17E 1jwW1zu/7CRUiALAJ6I9UjnvRTzgctQ+WPPfMdUqR4vL5CIwdXjls7BeWfv9jDLrdVFTcl n+tyez/qP4l2j2DCVhj5vRCCXMh2qd7RMW7cLagGSXFv0/GSZ0y3GpwmkFFRNhVivNmnXd xQPsisK3hLIr33DbB8esODNDNIKzow1P5vq1IRQGiMWtIcHR8HZqUrp8Hru/obfXR/v6bY /TZZ98f21DlNkp6unlEn5hD5zadd6UDOh5SOYpJaL8a4Qw8ijzXsAg/meBxeUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698725387; a=rsa-sha256; cv=none; b=ey+dMd9JucSkC11vZThNB4qB5FSj0mTwm6rmtGQTi5ts7yF8HsiKlPNUhO6B9PfohOSHdf rduHSAIvEtoczWP+5c4y5JI+u/WY52yWSVwTrRMX73tutwOVHRp4oUkPVN3mx1aSIwTRce LwaqiEmAQ/H6x4av8AQGmuReaCsWvl80P0zDyL7GgchpFs1dN8LhbAL67zCZL1rgH6MAXV E1245xnzTVDgvysh8tFl+0N8rOT0ehPNJtB0IRO3i8Wry7Q9zJLjgzi6UGvROeHIfAQHD6 QPsBioXhMVOobzyi7u062THL2/hOEsVKZoFPe4loQzJ8KD3oGv9N6aGg6umjTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKGqv10DFzpl1; Tue, 31 Oct 2023 04:09: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 39V49kHv048087; Tue, 31 Oct 2023 04:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39V49k9K048084; Tue, 31 Oct 2023 04:09:46 GMT (envelope-from git) Date: Tue, 31 Oct 2023 04:09:46 GMT Message-Id: <202310310409.39V49k9K048084@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: 224fc33f6038 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 224fc33f603884e7eb9ed219afdd4c57ddec3cb9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=224fc33f603884e7eb9ed219afdd4c57ddec3cb9 commit 224fc33f603884e7eb9ed219afdd4c57ddec3cb9 Author: Konstantin Belousov AuthorDate: 2023-10-31 04:07:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-31 04:07:10 +0000 setkey(8): make the policy specification more readable by applying markup and highlighting the semantical blocks. Sponsored by: NVidia networking MFC after: 1 week --- 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 Oct 31 12:48: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 4SKVL56GyRz4yLD4; Tue, 31 Oct 2023 12:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKVL55CF7z4dqH; Tue, 31 Oct 2023 12:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698756493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dA981iu78xFwdB+w9dTftVSXbF7Ges7NPiry0vSjUJM=; b=vz67wgWfe+M7MUAkXlHxjrtNtSgXb8FxVqxVR0P0jSN/gKq9hEIS0zgFZANDqNHXIfHK2o zwtms6gD0l2JGzOjp6a7ejX8jZSLqniL88Sm7jB4La4J7DxDpDMZ86KhI98M84HhhBxksd Mg9woHM02WDUW1cVzpXUlobpfGjdyRY8z3iFV9lu+HQOKOze92/x+15MOSifGtNj6bx4q3 tdlgTXGIGa1/WpA8c/lgWtE7sogIG5FT/0fENDLxvLVDJmxrpLuPhdn3O4xI8OW5HueBqD ZGQgw83UG0oo1/ojTEQyvu8H8353pN+o5DLjVN832uM58/dtTm+gbyGrj2qEFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698756493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dA981iu78xFwdB+w9dTftVSXbF7Ges7NPiry0vSjUJM=; b=e/RS3cUXezMcFxeqPl9unvlF8PxoCnJxcasoKbGVNa6e4gtmNm8Rslm215Ym9N9/XewR3h URo1/gLGTtDpcYTU4DX1aAb9ZPNnjp7t77bKnVop8Ajd011tqDrcWm7VmKNhe3/+3Zp3xp etVfMKZas58kF95KtQOWPH46DdVNUM5ii1mLIB+NJw7JVAWGBp5hnqDtpG3RfWTQN6PUv6 mGsqQxQdY2e/8UWY9ry70j2Zt46ecmjTonweHOb1LXAiZKY0t8YyuZ1F8WsuPbcHTKi/U5 ZUXlkCIsaQ87WsQqrHdl01rpaTfzO+Rj8kfmkc3ZPqqPsXnkm2c6bx9rxIW5wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698756493; a=rsa-sha256; cv=none; b=xdnVz9ltHaUuIRgwQf1B8WkzutY94ZtDx0lEj6FKTIM764kvoWHZy/fgBVQIvmkW8BkHqa j98Hxrz3lxjOWClOpRvQllt8ZJGGSPh5/HANeyxGmr2WMWYlqzp/MryvVusbDtyNr30yzd GfgPZ9oIYR1haQdbMbePfOju9x3qxK7tEFpU6kB5s09Ib23aPIbloP+4Mc94JiGbGnv5+b IGHEjv5bW8QOP2FuXa12QE2hut8qepCsrt3U6ivaNbw2oY9X+hyMAW6dse1xsiAlNXZwQz sBjB9GJlwcrw1cOreFPNUPCxvVr2s7CAtl0VayHPSyt7zsPnCumpFXPXocPCKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKVL548Dlz13PF; Tue, 31 Oct 2023 12:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VCmD6t014004; Tue, 31 Oct 2023 12:48:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VCmDgx014001; Tue, 31 Oct 2023 12:48:13 GMT (envelope-from git) Date: Tue, 31 Oct 2023 12:48:13 GMT Message-Id: <202310311248.39VCmDgx014001@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: a8bd34bfc0db - main - Giant: Postpone removal of Giant-locked drivers until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a8bd34bfc0db38c1c11e9c36b7dd849d607c17a8 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a8bd34bfc0db38c1c11e9c36b7dd849d607c17a8 commit a8bd34bfc0db38c1c11e9c36b7dd849d607c17a8 Author: Zhenlei Huang AuthorDate: 2023-10-31 12:45:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-31 12:45:14 +0000 Giant: Postpone removal of Giant-locked drivers until 15 Reviewed by: imp MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42401 --- sys/kern/kern_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index a7c22b7d118a..db5fe7a6a373 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -665,7 +665,7 @@ prep_cdevsw(struct cdevsw *devsw, int flags) if ((devsw->d_flags & D_GIANTOK) == 0) { printf( "WARNING: Device \"%s\" is Giant locked and may be " - "deleted before FreeBSD 14.0.\n", + "deleted before FreeBSD 15.0.\n", devsw->d_name == NULL ? "???" : devsw->d_name); } if (devsw->d_gianttrick == NULL) { From nobody Tue Oct 31 15:03: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 4SKYLJ5R6nz4yTrj; Tue, 31 Oct 2023 15:03: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 4SKYLJ4hjrz3SSN; Tue, 31 Oct 2023 15:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MkN7jqp6agPRXCJYnb1qYgkRx1rlMyFg6f54536iWA=; b=x0cbsy70LbuLusIHzJ/t5lmBfSeu9qdynCxI4y9yGnBblfCx8lFmV3FsDiVx5YotoOk2fa eBmbZr15rjoK/JYKmYAecDKeS6KVX+ekxlihezmRR5BqwX47GGwT+oFtAKDwDhLY/ZoLHa zMU4CJNHISZ6cb9N1BTtCdtCq7Z2l2s471yDl3lHVonD6U/jf365mzbbWqRycJUB9n4/65 QbLtf0C9vUIQiW/El5oFP4yIxySvH323UnORO8aGi3RPAKZzh990GcDZzZu6buB4sSSGxJ hWIuZaA3xQa/2d2vzZOVNeLLpAFu05VwebsJsPhz5QtSCHeIG0+kvWIMOS1IjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MkN7jqp6agPRXCJYnb1qYgkRx1rlMyFg6f54536iWA=; b=DJz4CYRdzOw0i86E28JzjmBdnEJpKCjC/LMrh5RPN6I7dFMVOWY1reNveDRRZ6KfNBzr40 /JU9z4XGpdOj7W/lNmntKutCf3r/gKaONxQU4sxOnzDxBbGzQSlUqLrRsbQeyLP61FZsfv V/dqM6ib0OlE+D/NM32trSmtLIr9brDKgoDCKpnokHgY2FyXe/W9jlyakpOL0ycrUlNEuD 9iLL8EvmFMVi2rnsTzrVfoaPYDxMx47nQIxd8+vPWppHphpoTfq4QA9gdkXBEfP+WaEDHY iJJtalScqxD5DWy85fWGafiC60XIhsw7u1CyrTrpGScORuyLFPYqKlbboKJcPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698764616; a=rsa-sha256; cv=none; b=q3fwvk97yWT+jvpzvzvikAD/26HUmwXUaueL+5aiFi1PFMA1uz6pydlA0kEikm1StRrQPj 9DCKG8N/lvKx0pwzwqz5QgPnRGqshZJlR0mjyyM2+nnrcNyu6wqwNO8cvvXI0vuQ8RgUEt 5g6jBY8BWPC49Ds7HnZPB7iM43MbNSsZ1UCTACbv++yD4tG6VA/ijjUUrnHbCS7K3MzU5p NzF9ULCoSupJmK1wbYbUbN9xSkYCgzXY1kBHHIhVnJFn05H3zujiiMc6H7o0H9/OfiOWh6 W14IxwUKHkw0BrSYsmtZQkMQL71EJmbIvOEyms7v4V+lQhXg/f+wrSLD7Qo4/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 4SKYLJ3l6Cz17QT; Tue, 31 Oct 2023 15:03: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 39VF3aLb048195; Tue, 31 Oct 2023 15:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VF3a5Z048193; Tue, 31 Oct 2023 15:03:36 GMT (envelope-from git) Date: Tue, 31 Oct 2023 15:03:36 GMT Message-Id: <202310311503.39VF3a5Z048193@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: d6d38b02ee57 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d6d38b02ee57920cc02a306a6d8d2aec9c4b759c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d6d38b02ee57920cc02a306a6d8d2aec9c4b759c commit d6d38b02ee57920cc02a306a6d8d2aec9c4b759c Author: Kristof Provost AuthorDate: 2023-10-17 16:10:39 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 15:03:22 +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 --- 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 1cd8412193dc..ec3ac106f34d 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 9963fe2b741b..fb165cf548b0 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1596,6 +1596,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 Oct 31 15:03: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 4SKYLK6zgXz4yTm0; Tue, 31 Oct 2023 15:03: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 4SKYLK63lxz3Shl; Tue, 31 Oct 2023 15:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zI4w6ZEfXm0lCZVSCpGjcRafpQHIm2zVsTphAoEVPkI=; b=LBMJ5CVJxU0kO5Ttch1M+gqvojkDuhTYCmiEpLhWNx48y5fgM4zyHs8jsgD0L73+qVKWTk C7ptAxJ3jGqmk9HMCvep+l9cA+2QZZ85LhMYEmv11CTGcb/Y5/eaSqdP+/Hl8G9prahHpL ZV1JC48WihpPIz8UOsaV/O/orVtvLzyheABPK5QBqmoGeZHfjMcWORtxFCMtL+kMT2X+RA /R/tEW0VRUhtXDwrbugDLUXicFlUYl36ibA3rrSl7mQQAkcJwbvHCUwHYZjqXRTx86MCJD zfsiMnEoqsHFeii4YiOspSTc3wcjaABlKgrYEuhXbzIXwG4apyT3kDlC3f+wPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zI4w6ZEfXm0lCZVSCpGjcRafpQHIm2zVsTphAoEVPkI=; b=pZV7QO9WO7HhrdP1NYTAfaH1TGNTQruYXVX2WTsG6finWJwTRQPVQS5FlNWAtKrXrYBrBv gU4ywkg4eNccYI5NledtKscRj1i5VolC14NQhDTWF6FK05ieJ5mv7Ogw3S9CMy7SzP4jUT MT+CCfGWhuAt9PzYT/kkiJRrUGlbvWIDH/L965cVq/7iCXMPAEwjsrHnuiAOcppc5C6d8P 0tE+4SBDlDB0hRiucsWpvt0AxqvaWYCpYHZrGpp7/J4UNR6LXUYA1ZbH6fW+NCvGtAUD85 uGY/IRM1qsCRm75iJL9AfdZUtUbI0d8m2XQWoHSKM7bF9MGoOH+CdKkaijZj6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698764617; a=rsa-sha256; cv=none; b=VgupApkqwxIVmymyJcAfqmA7CdN1rz0hXiebtUoZVUsptfcXlHuPXuRn7oJfPJJ6LXxqIQ 7QP5tTV69xnpAqmjesBdayBThjpW97nVgOsPyB6898HfkII/etWnXQ4c88E+HXYcbXh7jS IkaOSf4WB4awxu7lAgy9MeNOQDXPlKCCRdhydxTkcBJfu+z/tddATDSFC38WePzrUYEX/P SbciV5iha3ymNoteVtYmAXGR4D1Y/1MNGZOZZPW0Kqxdqs//nDP8LtjANDQsqxYnrpbvXx /mDaquX9eG692wFXTkhv6TIOmMjXx57ivJUFRYU90SquEzBuKQCmtHNlnROzlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKYLK4rl6z16tr; Tue, 31 Oct 2023 15:03: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 39VF3bdG048260; Tue, 31 Oct 2023 15:03:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VF3bIj048257; Tue, 31 Oct 2023 15:03:37 GMT (envelope-from git) Date: Tue, 31 Oct 2023 15:03:37 GMT Message-Id: <202310311503.39VF3bIj048257@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: 483d5c4075e0 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 483d5c4075e06e52d5daa23aef2b4f4a2eb64443 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=483d5c4075e06e52d5daa23aef2b4f4a2eb64443 commit 483d5c4075e06e52d5daa23aef2b4f4a2eb64443 Author: Kristof Provost AuthorDate: 2023-10-10 09:56:15 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 15:03:22 +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 --- 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 Oct 31 15:03: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 4SKYLM0GKvz4yTpJ; Tue, 31 Oct 2023 15:03: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 4SKYLL6pPfz3ST6; Tue, 31 Oct 2023 15:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TH9tnRPqq0CxRkK5adJBR/6oqAgruEJT0QYbRcMIJrc=; b=hP3JhsqeAnz2NA866aF2tIjvfaJsbkEmHTbwVQXCvMJFkAjCqNv7+DSQR/Ruzfu4Y2p2tP qG3GTmRSDsxDsiftymlrY+GXHYwc1ykLxmNpfjNEGyukpyEtwnv9AWcmKZ6+0aDmz9jCSz gbuuv15WL6jugG3+yjGydogAkxNU0IlJDwzB9pFXEf8KteMAWYB6Hs0yR7kfi5ED/eCbbe CjbqKpIDLjbX+eLm/XWjYx7IHeO5SWDRULmKk3JGi5qpuQ32SyZ2KY2gQ5EP9ICQIpOhFA ri33x+7Wj8yMSY0rudnYoNd9UZjm//fYrf6qmwIU+Y9YrtJjzQIvKkRSdR8qBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TH9tnRPqq0CxRkK5adJBR/6oqAgruEJT0QYbRcMIJrc=; b=uIDPdaQV6ka4FpxO9pb5W7/perfa2vLmY1osTx5CI25Ktd6nn2FK+Qhk3MLBw1Yy0ObVUT MsmcB3pQ97By7jaoBrU+di9+pjipIQzIYLctMb8fD1AnL9b4S24Uw2LoQ2FdxL8U4RD86j Yvhgw3QQFt9GnNUvEBT5gUGZ0gkfQPnBgBK8518SI8GUP+Exy4mDiL8Lpj5P3oYxijJRzZ DsNtkoY+uwqa8IrwIjed5PVoM+qA5OyC7DZ7EluGf62if3o1xN2nXlzXeq7pYZoa/4PQoG acebpGKNULXXTN116bD6SfqkLZYmqf9Mfb8j/RErWe46g5cU4sOspCX0wQSMGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698764619; a=rsa-sha256; cv=none; b=jNXFLMMM981jzvhQGaLOEpwxZRYPg26FkvC2Rzet2VtgfjCmWRWorauuQMWeJjwc8bf9AE /pbQP4/9LrlURcilycGuLbg9HeeKY8EowLCFnY0T3XZPXGewJ5XRK2usfNokTDeKgu2bkt 354qRFzoXeNkUii7Zg0yZg09TDvFSD/oYpXPRQ1T8Mm+8nDJQ3XpKGKhD9vCtD3sLzYj31 yWxfrlpI4Y16U2eZi3q1aHlDHosvlYCTAAk8uzIpdJdOx7j7N+bME3AD05KLjN+RW6U4lA DP7s+v8qVeZQ77VNyGClTsqeSBvOhYO08ngQnwl9pBttctsDpRmLpyTpD0+kIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKYLL5mWpz17Xh; Tue, 31 Oct 2023 15:03: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 39VF3cZm048314; Tue, 31 Oct 2023 15:03:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VF3cqW048311; Tue, 31 Oct 2023 15:03:38 GMT (envelope-from git) Date: Tue, 31 Oct 2023 15:03:38 GMT Message-Id: <202310311503.39VF3cqW048311@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: 2b1eb63fc9c6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2b1eb63fc9c6d6f64baaac59b7ea7c2a3228c03f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b1eb63fc9c6d6f64baaac59b7ea7c2a3228c03f commit 2b1eb63fc9c6d6f64baaac59b7ea7c2a3228c03f Author: Kristof Provost AuthorDate: 2023-10-27 12:13:57 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 15:03:22 +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 --- 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 1c8873dd6429..1554b81acf59 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -152,9 +152,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 Oct 31 15:03:39 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 4SKYLN1rNFz4yTrq; Tue, 31 Oct 2023 15:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKYLN19xrz3Sr6; Tue, 31 Oct 2023 15:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsXwsghuVZKwCub/3CQ/uZNJkRmNeo20+N6NLccQZGc=; b=G0lpaV+/ln+zxL4M7gWaY7y7QSvk7tnz23bz7wGwijvo0e0Fyj5um6Ixd4olALRN696D1a r3+QOUQa9HOE/gnA/+XKgzWx6ZSi8JlbbwLHE7HvqK9WCMup/GbHOVlHRA71iNKJbikpIM iRKYF7kvxFxB9MAqtyJQ/ooIoaxYaDE4kfPRZTkFUQw5S11Sv7uuHWD4cmAsnIAdzwSGWL hXbVzXaLE8cPfvCYd4bSp5bXTko4kn7pPmhEA9Gz45N5R+fU9q2IVe5tP9M9AncSrAnehR 9ihuuoi15G+tjy+KwxNw60yRlIMqpXdtfUwHI9J501LXT6kqAxiXcUU9CZx/jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698764620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsXwsghuVZKwCub/3CQ/uZNJkRmNeo20+N6NLccQZGc=; b=o1qkY26Wj+kHL9wVpGAxW/HEo4rZzYpys7K6EUHdHpkSaKDIXe7ULMy05FsddrgNgE7c++ 0JrufgHlB6SONFn8IZIWzUVCsPa62o+Cv8lgGwlGypFnkYTAGFpuGbkmUPGaqQa2ecjH+e vcy0TZqsbtI1Zr+/GJVA4qXr+ZdlT0Vrrd6QbNutRHjLFQPr5lJsWQGTgubSMACbmOB736 LDvJOwYW9+TumXB3Yhr1z1NCKFUzFM55UG0pjA5bHEETb2eLiS6xjKCTSic3H/SA0xHTdT XgodeL+1iwuajg4QXUOtbYnvAqqK1/ifwpbsb+ZJNpnbec5c7EEzneURFdyIyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698764620; a=rsa-sha256; cv=none; b=rnkh6jCweGrXRqnRZPZtXq6QFprYd822h9NnFc8sKaptZviIw1iCjTIfs7PiBtT0zk2fWk cyN72R1240VLM6CpnJvDj3vftazlHYKEUctOicjfT8b23qpixIiM5HZCqRDo3lu1alM67S Wkr5T5dICcwwSkDtLKxhy39OWGDZbLIHIbM0jrqK0tqT9J1FqGusnSXS8TPo+wIOS7jwHG 0cEimA3HhgHznHXwSLFbt9CPKqabzqP8qq6On5o5d85djlKTY4swVZPweSC/uu6e0c8ZGe yHdD28eXSXgKrOX23lRwhwlR+HSJ67YSFmyuzcTrbbOFkW9Ez/HwSvoQGXKQ/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 4SKYLM6pzZz17GF; Tue, 31 Oct 2023 15:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VF3d76048355; Tue, 31 Oct 2023 15:03:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VF3dsg048352; Tue, 31 Oct 2023 15:03:39 GMT (envelope-from git) Date: Tue, 31 Oct 2023 15:03:39 GMT Message-Id: <202310311503.39VF3dsg048352@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: ca9dbde88122 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ca9dbde88122beb079b55fb4580b200f73044da6 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca9dbde88122beb079b55fb4580b200f73044da6 commit ca9dbde88122beb079b55fb4580b200f73044da6 Author: Kristof Provost AuthorDate: 2023-10-27 14:45:07 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 15:03:22 +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 --- 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 03b7f24ce60a..b752d87e63c6 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2272,6 +2272,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 349e6c9ee4eb..b241e5173ef0 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 October 17, 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 @@ -3334,6 +3349,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 ec3ac106f34d..4990dce653b1 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 851bf8ee5b63..65d4b45afd79 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -380,6 +380,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 Oct 31 17:43: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 4SKcvJ5B5Hz4yg05; Tue, 31 Oct 2023 17:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKcvJ4Hm2z4GLR; Tue, 31 Oct 2023 17:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698774236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUz17JGcT+lKS1yiAMZhiW/nzzFe1OUBvoVhs3Th+CA=; b=bLP4Gci7qSJQzzy5bYX3Iq61Z5JaNrYZkp2ZdD8tiY//eV+Ra3XZ76SGtZFaLvXI+cAzr4 5gyxAgLFUgYcTsXoI1WD9uve4hCFdONdLBWIHvKglNkn3bG6/ubWiP3GsxZYU9ysb8FTwc uCEAB/ZoCbb8/J1JvQ2lRj8DzCqYn+UiHBIDmoMLeGBq4zolDJ1WW48wcZp2xgKrxum6yD MpldfoKXWXsifdnEkkfOtt2HNxDjeSdDb9BzwMCxbiZW6Za3LDX5Ou4JpUFHQSJL6bSigb YZgrpXmIdYA+IS9a7l0JA8M857wwVJsF+t+dgeHR6wfYYCR0/JldC731CXv0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698774236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUz17JGcT+lKS1yiAMZhiW/nzzFe1OUBvoVhs3Th+CA=; b=SNDAE9cvt64iuSR2wgGpK6SHiTrigrUdvsFvlyN4C8mUzD41gl8WdMQsQoKLSxv2H5Zys5 dNlH3tnESlO+D2OkzIEp9s5ZFl+yDDlQQzDMXdxVOpo/vcC6rqcPcOICckotaUw71VlaLb 3XKR5wL55rAkDloStlYAiuDsCRYksJetHs4MY27c8fIZ95hgHammNWVmcfS9/x7vJNjjaX 1DudPFPxkZyS+A7vQUuaFR4Xm2itwdaAEV7CpnvvoGzhqOtsnuFbHGBZJ8GqPqtG9DZS/P BJO5mBIjyA4lGCR1oGAsmue+r3r+zimCW6SMvlYvrEWdrKiq5GiepiuNmASgHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698774236; a=rsa-sha256; cv=none; b=ikneEy5TA1iSrG/ebDloEgy76pRpKF/wyDtfBJduSD9YadncPLb5jq+p6q+KEC1Zzlh/0R Mr9BloUFeoX+ZUevd/ovH3U77g1Jjlv2Hrqrxazioex+O6/5heOFCi/U4srjpyD5EnOtTw yi8O5XytqUj+mHuDqFEQasKM/wLGOs8mbtcgnBvI08Nk/+n1dGzkkUe19K6LBtXYQKjNQO rs44GNVLtF2A3n5vAsSIIKk0BrwdpcRb0Ky1kOzohJ2Sbm7srXAetsiEVoQUWsAjk0fM3h ikcLItu+4ZtC9jYRiNcpB2w24RLbzNOShuhwdjaHGydQe3Mq1gi+bU0M0ZI5TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKcvJ3M63z1C6H; Tue, 31 Oct 2023 17:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VHhuVe014718; Tue, 31 Oct 2023 17:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VHhuxW014715; Tue, 31 Oct 2023 17:43:56 GMT (envelope-from git) Date: Tue, 31 Oct 2023 17:43:56 GMT Message-Id: <202310311743.39VHhuxW014715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 7523a37f68ec - stable/14 - Fix build with gcc12. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7523a37f68ec31b9268d0efe93c5920add3ad8c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=7523a37f68ec31b9268d0efe93c5920add3ad8c0 commit 7523a37f68ec31b9268d0efe93c5920add3ad8c0 Author: Navdeep Parhar AuthorDate: 2023-10-27 23:39:12 +0000 Commit: Navdeep Parhar CommitDate: 2023-10-31 15:59:28 +0000 Fix build with gcc12. (cherry picked from commit c656f5c1a6f8482f24a5a716267311c3e62b3114) --- sys/fs/ext2fs/ext2_inode.c | 6 ++++++ sys/ufs/ffs/ffs_inode.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/fs/ext2fs/ext2_inode.c b/sys/fs/ext2fs/ext2_inode.c index 3ab566ee53fc..2c1cf9736fb5 100644 --- a/sys/fs/ext2fs/ext2_inode.c +++ b/sys/fs/ext2fs/ext2_inode.c @@ -232,7 +232,9 @@ ext2_ind_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred, struct inode *oip; e4fs_daddr_t bn, lbn, lastiblock[EXT2_NIADDR], indir_lbn[EXT2_NIADDR]; uint32_t oldblks[EXT2_NDADDR + EXT2_NIADDR]; +#ifdef INVARIANTS uint32_t newblks[EXT2_NDADDR + EXT2_NIADDR]; +#endif struct m_ext2fs *fs; struct buf *bp; int offset, size, level; @@ -348,11 +350,15 @@ ext2_ind_truncate(struct vnode *vp, off_t length, int flags, struct ucred *cred, * when we are done. */ for (i = 0; i < EXT2_NDADDR; i++) { +#ifdef INVARIANTS newblks[i] = oip->i_db[i]; +#endif oip->i_db[i] = oldblks[i]; } for (i = 0; i < EXT2_NIADDR; i++) { +#ifdef INVARIANTS newblks[EXT2_NDADDR + i] = oip->i_ib[i]; +#endif oip->i_ib[i] = oldblks[EXT2_NDADDR + i]; } oip->i_size = osize; diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index fb6e8dfb2f76..8ecd37e694e8 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -238,7 +238,9 @@ ffs_truncate(struct vnode *vp, struct inode *ip; ufs2_daddr_t bn, lbn, lastblock, lastiblock[UFS_NIADDR]; ufs2_daddr_t indir_lbn[UFS_NIADDR], oldblks[UFS_NDADDR + UFS_NIADDR]; +#ifdef INVARIANTS ufs2_daddr_t newblks[UFS_NDADDR + UFS_NIADDR]; +#endif ufs2_daddr_t count, blocksreleased = 0, blkno; struct bufobj *bo __diagused; struct fs *fs; @@ -546,11 +548,15 @@ ffs_truncate(struct vnode *vp, * when we are done. */ for (i = 0; i < UFS_NDADDR; i++) { +#ifdef INVARIANTS newblks[i] = DIP(ip, i_db[i]); +#endif DIP_SET(ip, i_db[i], oldblks[i]); } for (i = 0; i < UFS_NIADDR; i++) { +#ifdef INVARIANTS newblks[UFS_NDADDR + i] = DIP(ip, i_ib[i]); +#endif DIP_SET(ip, i_ib[i], oldblks[UFS_NDADDR + i]); } ip->i_size = osize; From nobody Tue Oct 31 19:29: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 4SKgFD3ZGnz4ynQP; Tue, 31 Oct 2023 19:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKgFD31h8z4P0y; Tue, 31 Oct 2023 19:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698780576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjAVF1LtN4DtueJuSbJBw2knOgig9Ev5fyaMwqA2IBo=; b=BwA+wWu5LdsSVXdyXz4AXt0huGySLyu2/ka9TQvECsic2myGwjqnYzo5vG/k3n453yiOg0 2VSqtccolWLZFMj9KxHPMeaTsaII8Luto7fT3KpPpZvH+9OE9qcvm/IR6SaLeEjrmW63qM d1QLdMY275GRHG64qic/3Ck5imh7KnqLByG0hMA+hcW8Pc44xFeMB3quc0SIoFjcR1f3kN boeeAmTF2AE5bU1kcx2fF+YpO0KYTAeiJl+KVpS7uP2l6vjmqTIui4qU3kW9YLuzTsrKje NYEhiFSS8/12ErXh8KEuqgmltFiKIDAfSYrZP4a6emKcXXCjFjoqEJlqDbK1AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698780576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjAVF1LtN4DtueJuSbJBw2knOgig9Ev5fyaMwqA2IBo=; b=Ww9MUQqMQdVVwiDiuMfJOCvJ92oDYQZvSuToubmnXl7Y0TxXc0FIQ22Gvm+gn3UbOKEAkT fhKP5H3VMCcxsYOKNcGrRAz9cH8D4hTf3SbpYQR6yxY0FrPn4MXFlYse6CR7f+IkOpvV2g 5gWt4uL45wJAfRPGnfD1sXn+V1f7lYu2GFkiW7JMXLQBDfKDa+bTlelEJPpBvAcneDWoLv MdDXe44y+Als3pLFz7n9CwM+4i+o2fUEr7pPbFURTuRNPrAMU4LVego9nmCL9ab3aAustz YgWZ5UVHR+iK66CUl//wtWQjfoBQmJbvjx6We3b5pYcKkEdZ7Ubfh55j2s8ccw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698780576; a=rsa-sha256; cv=none; b=cnVznwPvJJX8b86p3nVrTEbbnEUzCe5JN6gY988wBF75xOibcxBQFT2B5QyOycUrNik9ni 13HDkUKITsoYJVt7uEUC/AZ1XlB4atYXxC4ZOaZLKyq0KuzBW9O431Me8UuTEGQT42+oTA +B7AF9Zqe43NIcZQBeh47lTQIhWPswghAAVLoaTF+bu+KrpScZYnSJIMMjFd/YuCo5SnqE F4gwJDgQCro46X99frnxmyDXKxP0P2SgECLdR58/1LD4lJEBaW3xeP7cp8PBm8QdhANI7L VKkyiYUrxDpzOFi9msKy8KNGh693n5RHtUOSMu46Z6mesbQ7mhxepaI5gkIKiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKgFD24QTz1jX; Tue, 31 Oct 2023 19:29: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 39VJTaEg082277; Tue, 31 Oct 2023 19:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VJTaZ3082274; Tue, 31 Oct 2023 19:29:36 GMT (envelope-from git) Date: Tue, 31 Oct 2023 19:29:36 GMT Message-Id: <202310311929.39VJTaZ3082274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Kenneth D. Merry" Subject: git: 83823d063ab5 - main - Add IBM TS1170 density codes and specs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83823d063ab57db8d3954c1530d036f1ccdceb41 Auto-Submitted: auto-generated The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=83823d063ab57db8d3954c1530d036f1ccdceb41 commit 83823d063ab57db8d3954c1530d036f1ccdceb41 Author: Kenneth D. Merry AuthorDate: 2023-10-31 19:20:36 +0000 Commit: Kenneth D. Merry CommitDate: 2023-10-31 19:20:36 +0000 Add IBM TS1170 density codes and specs. These were obtained from a drive, but they agree with the IBM documentation. The bpi/bpmm values are the same as TS1160, but the number of tracks is much larger (18944 tracks vs 8704 for TS1160). The tapes are also longer, 1337m total. (According to the MAM on a sample JF tape. I don't have a JE tape handy to compare.) The end result is a 50TB raw capacity (150TB compressed) for TS1170 with a JF cartridge vs 20TB raw capacity (60TB compressed) for TS1160 with a JE cartridge. lib/libmt/mtlib.c: Add the TS1170 density codes to the denstiy table in libmt. usr.bin/mt/mt.1: Add the TS1170 density codes and specs to the density table in the mt(1) man page. As usual for TS drives, there is an encrypted and non-encrypted density code (0x79 and 0x59 respectively). MFC after: 3 days Sponsored by: Spectra Logic --- lib/libmt/mtlib.c | 2 ++ usr.bin/mt/mt.1 | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c index edcf747bd808..43f9c95bb797 100644 --- a/lib/libmt/mtlib.c +++ b/lib/libmt/mtlib.c @@ -642,6 +642,7 @@ static struct densities { { 0x56, 20670, 525018, "3592B5 (unencrypted)" }, { 0x57, 21850, 554990, "3592A6 (unencrypted)" }, { 0x58, 15142, 384607, "LTO-5" }, + { 0x59, 21850, 554990, "3592A7 (unencrypted)" }, { 0x5A, 15142, 384607, "LTO-6" }, { 0x5C, 19107, 485318, "LTO-7" }, { 0x5D, 19107, 485318, "LTO-M8" }, @@ -654,6 +655,7 @@ static struct densities { { 0x75, 20670, 525018, "3592A5 (encrypted)" }, { 0x76, 20670, 525018, "3592B5 (encrypted)" }, { 0x77, 21850, 554990, "3592A6 (encrypted)" }, + { 0x79, 21850, 554990, "3592A7 (encrypted)" }, { 0x8c, 1789, 45434, "EXB-8500c" }, { 0x90, 1703, 43245, "EXB-8200c" }, { 0, 0, 0, NULL } diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1 index 2cc649c43f13..5eb584336b2a 100644 --- a/usr.bin/mt/mt.1 +++ b/usr.bin/mt/mt.1 @@ -28,7 +28,7 @@ .\" .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 .\" -.Dd December 10, 2020 +.Dd October 31, 2023 .Dt MT 1 .Os .Sh NAME @@ -520,6 +520,7 @@ Value Width Tracks Density Code Type Reference Note 0x56 12.7 (0.5) 7680 20,670 (525,018) C 3592B5 (unencrypted) 0x57 12.7 (0.5) 8704 21,850 (554,990) C 3592A6 (unencrypted) 0x58 12.7 (0.5) 1280 15,142 (384,607) C LTO-5 +0x59 12.7 (0.5)18944 21,850 (554,990) C 3592A7 (unencrypted) 0x5A 12.7 (0.5) 2176 15,142 (384,607) C LTO-6 0x5C 12.7 (0.5) 3584 19,107 (485,318) C LTO-7 0x5D 12.7 (0.5) 5376 19,107 (485,318) C LTO-M8 14 @@ -532,6 +533,7 @@ Value Width Tracks Density Code Type Reference Note 0x75 12.7 (0.5) 5120 20,670 (525,018) C 3592A5 (encrypted) 0x76 12.7 (0.5) 7680 20,670 (525,018) C 3592B5 (encrypted) 0x77 12.7 (0.5) 8704 21,850 (554,990) C 3592A6 (encrypted) +0x79 12.7 (0.5)18944 21,850 (554,990) C 3592A7 (encrypted) 0x8c 8.0 (0.315) 1 1,789 (45,434) RLL CS EXB-8500c 5,9 0x90 8.0 (0.315) 1 1,703 (43,245) RLL CS EXB-8200c 5,9 .Ed From nobody Tue Oct 31 20:52:42 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 4SKj564nb3z4ysHC; Tue, 31 Oct 2023 20:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKj564G6dz4V8M; Tue, 31 Oct 2023 20:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698785562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kafurGtXYi3lWpoOlBwcBSnaGGvg5bDng1xYsMh78Vk=; b=hdFnopwdtBNlK3DSJVHmc2EMMikpcmd5knsrTWmPgZOuvNJX8O8/X2oauRnAbs5A1EpKjZ 3lhjiAJZ0uqze1OnQht16wCOK+e5XkOhAXk1fOPgFlOftrQ6VdMbPjjRhflDSxySjxxOKk ufYNjlx42kxW/OTPh4m08Ei2VX2UFn9+vPIKd/pcQ7RLYExvxVuMimxzmgDJ2liHZ4nyNO HAi9XY1G7vODV/Mkh2gfR0e7LR4kaTSy9I+kFNW29bkyxH0slGQfaViYlDNOx2erAQ+3Bz qJsw0XFZKB3w5oyRvOJEjsSA5rvDLFUr604VM9kw3FPDHN/Xco803JlnGFG/pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698785562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kafurGtXYi3lWpoOlBwcBSnaGGvg5bDng1xYsMh78Vk=; b=BdW9w75vwIEdH2ROT2hVVY1VhJEny4+OA6Oj05wW4lOpY2kQHhHHT7lG8Mb/+++t+vG67G msLOfxVhY39mfQMIqARdP8UC+S4i3wJ11t3tJQAL1PX0NJ7GfgT5zusI676BMk+Rf7eQ1S cVR//5/fASf6GuyXgSq6JJFAOupFcXW+Z+dE4vH2EyjHNEaXc9wGvYI491uAGx5D29TvTf sFniXwIqj/h9kTws1jFYOxlIvtC/Fw/EOiE84OncoGGEW1rK5+/nhjt6fSg37GUNilFnOg lRm54gHjzbHeKKbkocV26rskytCxcZHuyF3R1ZaMHDBH8X/mpuAA+thl1DPnfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698785562; a=rsa-sha256; cv=none; b=YmjOH7NUeRVtd7/Jsr61yQn1C2VP+XJYE1m56Gi4cViYT+vw4yLa9VK9cMEhSPJnSFyDn8 Syl0j2kXCa1X52MM2GP5yiDpGNIpKQHOhyJtSChc7OEiJuyWFWADhB0Jff4plb28P5HKvv X/ls5Z9GIK5lCYcB7AJ5wC4PtyiM7cH59W9BRZYFuM8qCtfRTsq45pgpTMFyE6JYJdUx1l h4NMFi7gfRhSURtbaNKfQF6rbPgEvi26Kuny/viSJA1UiI/8pDjOrsKw8b4AS7wfltXPhe PgheoAIKoargYiaPFbpLYKf+V89N5mmW/SkVwpReVQPp9+WENc25tQ0t35NW+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 4SKj563Kgpz3rH; Tue, 31 Oct 2023 20:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VKqgwH030304; Tue, 31 Oct 2023 20:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VKqgxd030301; Tue, 31 Oct 2023 20:52:42 GMT (envelope-from git) Date: Tue, 31 Oct 2023 20:52:42 GMT Message-Id: <202310312052.39VKqgxd030301@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: 1fc478fb48e9 - main - bhyve: ps2 implement command 0xf6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1fc478fb48e9a3ca31f9715164dac47038497a7e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1fc478fb48e9a3ca31f9715164dac47038497a7e commit 1fc478fb48e9a3ca31f9715164dac47038497a7e Author: Warner Losh AuthorDate: 2023-10-31 20:03:32 +0000 Commit: Warner Losh CommitDate: 2023-10-31 20:52:22 +0000 bhyve: ps2 implement command 0xf6 Implement PS2 Keyboard command 0xf6, which is "SET DEFAULTS". This is the same as 0xf5 (DISABLE KEYBOARD), but without disabling the keyboard (since that resets all the defaults as a side effect). Normally, we clear the fifo when we re-enable the keyboard. However, since this leaves the keyboard enabled, clear the fifo as part of this command and send an ack. Linux's keyboard driver sends this command on reboot. Other commands enable / reset the kebyoard, so it doesn't matter too much this isn't implemented for booting, eg ubuntu. Sponsored by: Netflix Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D42384 --- usr.sbin/bhyve/amd64/ps2kbd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/bhyve/amd64/ps2kbd.c b/usr.sbin/bhyve/amd64/ps2kbd.c index 6fe36dbc4a55..c9e122b8bbd3 100644 --- a/usr.sbin/bhyve/amd64/ps2kbd.c +++ b/usr.sbin/bhyve/amd64/ps2kbd.c @@ -53,6 +53,7 @@ /* keyboard device commands */ #define PS2KC_RESET_DEV 0xff +#define PS2KC_SET_DEFAULTS 0xf6 #define PS2KC_DISABLE 0xf5 #define PS2KC_ENABLE 0xf4 #define PS2KC_SET_TYPEMATIC 0xf3 @@ -300,6 +301,10 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val) fifo_put(sc, PS2KC_ACK); fifo_put(sc, PS2KC_BAT_SUCCESS); break; + case PS2KC_SET_DEFAULTS: + fifo_reset(sc); + fifo_put(sc, PS2KC_ACK); + break; case PS2KC_DISABLE: sc->enabled = false; fifo_put(sc, PS2KC_ACK); From nobody Tue Oct 31 21:27:40 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 4SKjsS50Ykz4xwFP; Tue, 31 Oct 2023 21:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKjsS4j2bz4Wx6; Tue, 31 Oct 2023 21:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698787660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0NTVQtBOkkXUpd8bjZjHfkvFnjW+kPV2KRsxR9TCkI=; b=xbrFn1CrSABCXYCts0u+rncoWptKp9AwrQfxfamZtyU8QsYPPV96pQEK8mZuPgLx3H10KA Mt+MRYi9tQHyX1IxZBut/buvYQ4kZa+fYWjmJBGgBGWHDjplJ9oDtlvb+vpG5KIt5ePdw6 N0g5/3GD+6Ozh0F/iZGmv3Fn5g1+Yxva6G/wEXA2LT1I18UOOnRtDzAuxxn8hYWcAjk+KX cn/qGLG0oiXHFTUfFz80QV7yP2U63lOtlXDx3TqDtv9lY0tydEMuIyljf122W6GXn3EGZk LXBUmM53aa6dxdmN1xzrpoHq/2bAJ2JqZ1whXeq9N2psiRZfb3rHMFZVQDCJJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698787660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0NTVQtBOkkXUpd8bjZjHfkvFnjW+kPV2KRsxR9TCkI=; b=SJ8IdxNDJYd+O+olLSnYUrag3lwlU2A1uJywhXUOs+aURBOb+XibWDyVr5PlosKUrNW4UU aQSoB0RhqlZ7HPcl1tYXFhOhB8JRcyD8FyR8cJMSyBb0J3OcSPjfyOpJHRX2qqFklAB6Bv 0SuHD2/8HLVtsdA4SFnWHPVEXQGGJCb2riqv9zBueqgNqaP1VHl7Blows6d6Tycp+7Frgn vXdRRxNE/680caWV1QNGTAdH+V+RoIkSAFVtFkjb5YC9dzkQ+VTtRbpTv7zunxX8vFsI8N zIr3EHPoVGZY6UkHN4F7Fm7WwV8naH5Z2pBiUpv/miSoL4BgjcVPYZ2gl2kLUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698787660; a=rsa-sha256; cv=none; b=Kdf+lj1fwJBWe8h/kxEnrX5t+fIqpmd/MdulFeO6O0TyiM8oEF/mLgWxAO+fariKSotYVE LbTZ2pOzCBBhMJsaB9MLgp36f7zCbjqtKfnKEXP5DwFV51ez8YOS8a6Y6U4gRVey38MotH R7n1wMwPybWtNzt5EREdiyybT8uLd+ZV1dIQTt0VN3waBL1EeVlmtm4G3VmzTx0IQsKMg0 rEah7jtsQGcR46J2wqPJNnlgAlt3rnsMiicNAbbgKOPspbmnB0WImQm/0+caZDG+2rbWp4 7lkZ/C/+Sgg/EQ4ATyLunGQpvkchGzZe0WXCtqMxNcUnoUwoIzg0z/W71GKInQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKjsS3lmMz4Ws; Tue, 31 Oct 2023 21:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VLReKH081358; Tue, 31 Oct 2023 21:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VLReES081354; Tue, 31 Oct 2023 21:27:40 GMT (envelope-from git) Date: Tue, 31 Oct 2023 21:27:40 GMT Message-Id: <202310312127.39VLReES081354@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: 0527c9bdc718 - main - ino64: Remove 'forward compat' code for this List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0527c9bdc7187a0b92511f021dcdbbac84f1c579 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0527c9bdc7187a0b92511f021dcdbbac84f1c579 commit 0527c9bdc7187a0b92511f021dcdbbac84f1c579 Author: Warner Losh AuthorDate: 2023-10-31 20:55:58 +0000 Commit: Warner Losh CommitDate: 2023-10-31 21:26:44 +0000 ino64: Remove 'forward compat' code for this Forward compatibility code was added for running newer ino64 binaries on older kernels as a transition aide. Now that ino64 has been in the tree 6 years, this code is no longer useful and should have been removed long ago. Remove it now. Should be no user-visible changes at this point as all the 'upgrade' scenarios it was intended for are long since past. Also need to remove this stuff from rtld since the _foo versions no longer exist. Sponsored by: Netflix Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42382 --- UPDATING | 12 ++++ lib/libc/sys/Makefile.inc | 8 --- lib/libc/sys/compat-ino64.h | 99 --------------------------- lib/libc/sys/fstat.c | 51 -------------- lib/libc/sys/fstatat.c | 47 ------------- lib/libc/sys/fstatfs.c | 51 -------------- lib/libc/sys/getdents.c | 7 +- lib/libc/sys/getdirentries.c | 114 -------------------------------- lib/libc/sys/getfsstat.c | 62 ----------------- lib/libc/sys/lstat.c | 13 +--- lib/libc/sys/stat.c | 13 +--- lib/libc/sys/statfs.c | 47 ------------- libexec/rtld-elf/rtld-libc/Makefile.inc | 4 +- 13 files changed, 21 insertions(+), 507 deletions(-) diff --git a/UPDATING b/UPDATING index 722d7d66acbe..1ee0731742b3 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20231027: + Forward compatibility (running the new code on old kernels) for the + "ino64" project have been removed. The need for it has passed long ago. + 20231018: Commit 57ce37f9dcd0 changed the internal KAPI between the nfscommon and nfscl modules. Both must be rebuilt from sources. @@ -1573,6 +1577,14 @@ https://lists.freebsd.org/archives/freebsd-current/2021-June/000153.html Switch back to the BSDL dtc (Device Tree Compiler). Set WITH_GPL_DTC if you require the GPL compiler. +20170619: + Forward compatibility for the "ino64" project have been committed. This + will allow most new binaries to run on older kernels in a limited + fashion. This prevents many of the common foot-shooting actions in the + upgrade as well as the limited ability to roll back the kernel across + the ino64 upgrade. Complicated use cases may not work properly, though + enough simpler ones work to allow recovery in most situations. + 20170618: The internal ABI used for communication between the NFS kernel modules was changed by r320085, so __FreeBSD_version was bumped to diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index f52487a3fef2..e9a9f8f5935c 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -38,14 +38,6 @@ SRCS+= getdents.c lstat.c mknod.c stat.c NOASM+= sched_getcpu.o PSEUDO+= _sched_getcpu.o -SRCS+= fstat.c fstatat.c fstatfs.c getfsstat.c statfs.c -NOASM+= fstat.o fstatat.o fstatfs.o getfsstat.o statfs.o -PSEUDO+= _fstat.o _fstatat.o _fstatfs.o _getfsstat.o _statfs.o - -SRCS+= getdirentries.c -NOASM+= getdirentries.o -PSEUDO+= _getdirentries.o - SRCS+= brk.c SRCS+= closefrom.c SRCS+= pipe.c diff --git a/lib/libc/sys/compat-ino64.h b/lib/libc/sys/compat-ino64.h deleted file mode 100644 index ded3c6c64124..000000000000 --- a/lib/libc/sys/compat-ino64.h +++ /dev/null @@ -1,99 +0,0 @@ -/*- - * Copyright (c) 2017 M. Warner Losh - * - * 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. - */ - -/* - * Forward compatibility shim to convert old stat buffer to - * new so we can call the old system call, but return data in - * the new system call's format. - */ -#define _WANT_FREEBSD11_STATFS -#include -#include - -#define _WANT_FREEBSD11_STAT -#include - -#include - -#define INO64_FIRST 1200031 - -static __inline void -__stat11_to_stat(const struct freebsd11_stat *sb11, struct stat *sb) -{ - - sb->st_dev = sb11->st_dev; - sb->st_ino = sb11->st_ino; - sb->st_nlink = sb11->st_nlink; - sb->st_mode = sb11->st_mode; - sb->st_uid = sb11->st_uid; - sb->st_gid = sb11->st_gid; - sb->st_rdev = sb11->st_rdev; - sb->st_atim = sb11->st_atim; - sb->st_mtim = sb11->st_mtim; - sb->st_ctim = sb11->st_ctim; -#ifdef __STAT_TIME_T_EXT - sb->st_atim_ext = 0; - sb->st_mtim_ext = 0; - sb->st_ctim_ext = 0; - sb->st_btim_ext = 0; -#endif - sb->st_birthtim = sb11->st_birthtim; - sb->st_size = sb11->st_size; - sb->st_blocks = sb11->st_blocks; - sb->st_blksize = sb11->st_blksize; - sb->st_flags = sb11->st_flags; - sb->st_gen = sb11->st_gen; - sb->st_padding0 = 0; - sb->st_padding1 = 0; - memset(sb->st_spare, 0, sizeof(sb->st_spare)); -} - -static __inline void -__statfs11_to_statfs(const struct freebsd11_statfs *sf11, struct statfs *sf) -{ - - sf->f_version = STATFS_VERSION; - sf->f_type = sf11->f_type; - sf->f_flags = sf11->f_flags; - sf->f_bsize = sf11->f_bsize; - sf->f_iosize = sf11->f_iosize; - sf->f_blocks = sf11->f_blocks; - sf->f_bfree = sf11->f_bfree; - sf->f_bavail = sf11->f_bavail; - sf->f_files = sf11->f_files; - sf->f_ffree = sf11->f_ffree; - sf->f_syncwrites = sf11->f_syncwrites; - sf->f_asyncwrites = sf11->f_asyncwrites; - sf->f_syncreads = sf11->f_syncreads; - sf->f_asyncreads = sf11->f_asyncreads; - sf->f_namemax = sf11->f_namemax; - sf->f_owner = sf11->f_owner; - sf->f_fsid = sf11->f_fsid; - memset(sf->f_spare, 0, sizeof(sf->f_spare)); - memset(sf->f_charspare, 0, sizeof(sf->f_charspare)); - strlcpy(sf->f_fstypename, sf11->f_fstypename, sizeof(sf->f_fstypename)); - strlcpy(sf->f_mntfromname, sf11->f_mntfromname, sizeof(sf->f_mntfromname)); - strlcpy(sf->f_mntonname, sf11->f_mntonname, sizeof(sf->f_mntonname)); -} diff --git a/lib/libc/sys/fstat.c b/lib/libc/sys/fstat.c deleted file mode 100644 index 4efeecfd0978..000000000000 --- a/lib/libc/sys/fstat.c +++ /dev/null @@ -1,51 +0,0 @@ -/*- - * Copyright (c) 2017 M. Warner Losh - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "namespace.h" -#include -#include -#include "compat-ino64.h" -#include - -#include "libc_private.h" - -#undef fstat -__weak_reference(_fstat, fstat); - -#pragma weak _fstat -int -_fstat(int fd, struct stat *sb) -{ - struct freebsd11_stat stat11; - int rv; - - if (__getosreldate() >= INO64_FIRST) - return (__sys_fstat(fd, sb)); - rv = syscall(SYS_freebsd11_fstat, fd, &stat11); - if (rv == 0) - __stat11_to_stat(&stat11, sb); - return (rv); -} diff --git a/lib/libc/sys/fstatat.c b/lib/libc/sys/fstatat.c deleted file mode 100644 index d83647f98da1..000000000000 --- a/lib/libc/sys/fstatat.c +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * Copyright (c) 2017 M. Warner Losh - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "namespace.h" -#include -#include -#include "compat-ino64.h" -#include - -#include "libc_private.h" - -int -fstatat(int fd, const char *path, struct stat *sb, int flag) -{ - struct freebsd11_stat stat11; - int rv; - - if (__getosreldate() >= INO64_FIRST) - return (__sys_fstatat(fd, path, sb, flag)); - rv = syscall(SYS_freebsd11_fstatat, fd, path, &stat11, flag); - if (rv == 0) - __stat11_to_stat(&stat11, sb); - return (rv); -} diff --git a/lib/libc/sys/fstatfs.c b/lib/libc/sys/fstatfs.c deleted file mode 100644 index 517ba2a420b6..000000000000 --- a/lib/libc/sys/fstatfs.c +++ /dev/null @@ -1,51 +0,0 @@ -/*- - * Copyright (c) 2017 M. Warner Losh - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "namespace.h" -#include -#include -#include "compat-ino64.h" -#include - -#include "libc_private.h" - -#undef fstatfs -__weak_reference(_fstatfs, fstatfs); - -#pragma weak _fstatfs -int -_fstatfs(int fd, struct statfs *buf) -{ - struct freebsd11_statfs statfs11; - int rv; - - if (__getosreldate() >= INO64_FIRST) - return (__sys_fstatfs(fd, buf)); - rv = syscall(SYS_freebsd11_fstatfs, fd, &statfs11); - if (rv == 0) - __statfs11_to_statfs(&statfs11, buf); - return (rv); -} diff --git a/lib/libc/sys/getdents.c b/lib/libc/sys/getdents.c index b34b7003a729..673b7d62d1ee 100644 --- a/lib/libc/sys/getdents.c +++ b/lib/libc/sys/getdents.c @@ -34,11 +34,6 @@ ssize_t getdents(int fd, char *buf, size_t nbytes) { - /* - * _getdirentries knows how to call the right thing and - * return it in the new format. It assumes that the entire - * libc expecting the new format. - */ - return (_getdirentries(fd, buf, nbytes, NULL)); + return (__sys_getdirentries(fd, buf, nbytes, NULL)); } diff --git a/lib/libc/sys/getdirentries.c b/lib/libc/sys/getdirentries.c deleted file mode 100644 index 92f43e74cab7..000000000000 --- a/lib/libc/sys/getdirentries.c +++ /dev/null @@ -1,114 +0,0 @@ -/*- - * Copyright (c) 2017 M. Warner Losh - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#define _WANT_FREEBSD11_DIRENT - -#include "namespace.h" -#include -#include -#include "compat-ino64.h" -#include -#include -#include -#include -#include -#include -#include -#include "libc_private.h" - -static ssize_t -__cvt_dirents_from11(const char *de11, ssize_t len11, char *de, ssize_t len) -{ - struct dirent *dst; - const struct freebsd11_dirent *src; - const char *edst, *esrc; - ssize_t rlen; - - src = (const struct freebsd11_dirent *)de11; - dst = (struct dirent *)de; - esrc = de11 + len11; - edst = de + len; - while ((const char *)src < esrc && (const char *)dst < edst) { - rlen = roundup(offsetof(struct dirent, d_name) + src->d_namlen + 1, 8); - if ((const char *)dst + rlen >= edst) - break; - dst->d_fileno = src->d_fileno; - dst->d_off = 0; /* nothing uses it yet, so safe for now */ - dst->d_reclen = rlen; - dst->d_type = src->d_type; - dst->d_pad0 = 0; - dst->d_namlen = src->d_namlen; - dst->d_pad1 = 0; - memset(dst->d_name, 0, roundup(src->d_namlen + 1, 8)); - memcpy(dst->d_name, src->d_name, src->d_namlen); - dst = (struct dirent *)((char *)dst + rlen); - src = (const struct freebsd11_dirent *)((const char *)src + src->d_reclen); - } - return ((char *)dst - de); -} - -#undef getdirentries -__weak_reference(_getdirentries, getdirentries); - -#pragma weak _getdirentries -ssize_t -_getdirentries(int fd, char *buf, size_t nbytes, off_t *basep) -{ - char *oldbuf; - size_t len; - ssize_t rv; - - if (__getosreldate() >= INO64_FIRST) - return (__sys_getdirentries(fd, buf, nbytes, basep)); - - /* - * Because the old system call returns entries that are smaller than the - * new, we could wind up in a situation where we have too many to fit in - * the buffer with the new encoding. So sacrifice a small bit of - * efficiency to ensure that never happens. We pick 1/4 the size round - * up to the next DIRBLKSIZ. This will guarnatee enough room exists in - * the dst buffer due to changes in efficiency in packing dirent - * entries. We don't check against minimum block size to avoid a lot of - * stat calls, we'll see if that's wise or not. - * TBD: Will this difference matter to lseek? - */ - len = roundup(nbytes / 4, DIRBLKSIZ); - oldbuf = malloc(len); - if (oldbuf == NULL) { - errno = EINVAL; /* ENOMEM not in possible list */ - return (-1); - } - rv = syscall(SYS_freebsd11_getdirentries, fd, oldbuf, len, basep); - if (rv == -1) { - free(oldbuf); - return (rv); - } - if (rv > 0) - rv = __cvt_dirents_from11(oldbuf, rv, buf, nbytes); - free(oldbuf); - - return (rv); -} diff --git a/lib/libc/sys/getfsstat.c b/lib/libc/sys/getfsstat.c deleted file mode 100644 index 60cd433c9d40..000000000000 --- a/lib/libc/sys/getfsstat.c +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * Copyright (c) 2017 M. Warner Losh - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "namespace.h" -#include -#include "compat-ino64.h" -#include -#include -#include -#include - -#include "libc_private.h" - -int -getfsstat(struct statfs *buf, long bufsize, int flags) -{ - struct freebsd11_statfs *statfs11 = NULL; - ssize_t len = 0; - int rv, i; - - if (__getosreldate() >= INO64_FIRST) - return (__sys_getfsstat(buf, bufsize, flags)); - if (buf != NULL) { - len = sizeof(struct freebsd11_statfs) * /* Round down on purpose to avoid */ - (bufsize / sizeof(struct statfs)); /* overflow on translation. */ - statfs11 = malloc(len); - if (statfs11 == NULL) { - errno = ENOMEM; - return (-1); - } - } - rv = syscall(SYS_freebsd11_getfsstat, statfs11, len, flags); - if (rv != -1 && buf != NULL) { - for (i = 0; i < rv; i++) - __statfs11_to_statfs(&statfs11[i], &buf[i]); - } - free(statfs11); - return (rv); -} diff --git a/lib/libc/sys/lstat.c b/lib/libc/sys/lstat.c index c9c3351e79fc..b335946d2f3c 100644 --- a/lib/libc/sys/lstat.c +++ b/lib/libc/sys/lstat.c @@ -27,22 +27,15 @@ #include #include "namespace.h" #include +#include #include -#include "compat-ino64.h" +#include #include - #include "libc_private.h" int lstat(const char *path, struct stat *sb) { - struct freebsd11_stat stat11; - int rv; - if (__getosreldate() >= INO64_FIRST) - return (__sys_fstatat(AT_FDCWD, path, sb, AT_SYMLINK_NOFOLLOW)); - rv = syscall(SYS_freebsd11_lstat, path, &stat11); - if (rv == 0) - __stat11_to_stat(&stat11, sb); - return (rv); + return (__sys_fstatat(AT_FDCWD, path, sb, AT_SYMLINK_NOFOLLOW)); } diff --git a/lib/libc/sys/stat.c b/lib/libc/sys/stat.c index dc9ef16c79e7..88a4e784adff 100644 --- a/lib/libc/sys/stat.c +++ b/lib/libc/sys/stat.c @@ -27,22 +27,15 @@ #include #include "namespace.h" #include +#include #include -#include "compat-ino64.h" +#include #include - #include "libc_private.h" int stat(const char *path, struct stat *sb) { - struct freebsd11_stat stat11; - int rv; - if (__getosreldate() >= INO64_FIRST) - return (__sys_fstatat(AT_FDCWD, path, sb, 0)); - rv = syscall(SYS_freebsd11_stat, path, &stat11); - if (rv == 0) - __stat11_to_stat(&stat11, sb); - return (rv); + return (__sys_fstatat(AT_FDCWD, path, sb, 0)); } diff --git a/lib/libc/sys/statfs.c b/lib/libc/sys/statfs.c deleted file mode 100644 index b8ac38b131ca..000000000000 --- a/lib/libc/sys/statfs.c +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * Copyright (c) 2017 M. Warner Losh - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "namespace.h" -#include -#include -#include "compat-ino64.h" -#include - -#include "libc_private.h" - -int -statfs(const char *path, struct statfs *buf) -{ - struct freebsd11_statfs statfs11; - int rv; - - if (__getosreldate() >= INO64_FIRST) - return (__sys_statfs(path, buf)); - rv = syscall(SYS_freebsd11_statfs, path, &statfs11); - if (rv == 0) - __statfs11_to_statfs(&statfs11, buf); - return (rv); -} diff --git a/libexec/rtld-elf/rtld-libc/Makefile.inc b/libexec/rtld-elf/rtld-libc/Makefile.inc index 91eb6f5cabec..c3a74fbecbdc 100644 --- a/libexec/rtld-elf/rtld-libc/Makefile.inc +++ b/libexec/rtld-elf/rtld-libc/Makefile.inc @@ -56,8 +56,8 @@ CFLAGS.strtok.c+=-Wno-cast-qual _libc_other_objects= sigsetjmp lstat stat fstat fstatat fstatfs syscall \ cerror geteuid getegid sigfastblock munmap mprotect \ sysarch __sysctl issetugid __getcwd utrace getpid \ - thr_self thr_kill pread mmap lseek _exit _fstat _fstatat _fstatfs \ - getdirentries _getdirentries _close _fcntl _open _openat _read \ + thr_self thr_kill pread mmap lseek _exit \ + getdirentries _close _fcntl _open _openat _read \ _sigprocmask _write readlink __realpathat _setjmp setjmp setjmperr From nobody Wed Nov 1 02:47: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 4SKrz261rzz4yZdm; Wed, 1 Nov 2023 02:47:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKrz20trYz4NqN; Wed, 1 Nov 2023 02:47:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id xpuiqPwiz8jpTy1GuqzR8R; Wed, 01 Nov 2023 02:47:57 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id y1Gtq9IqpnCF0y1Guq9RjQ; Wed, 01 Nov 2023 02:47:56 +0000 X-Authority-Analysis: v=2.4 cv=MPFzJeVl c=1 sm=1 tr=0 ts=6541bc5c a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=bhdUkHdE2iEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=5mwuUaf1-w-P0o8vk6MA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E4600C41; Tue, 31 Oct 2023 19:47:54 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id B8B0A40F; Tue, 31 Oct 2023 19:47:54 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 0527c9bdc718 - main - ino64: Remove 'forward compat' code for this In-reply-to: <202310312127.39VLReES081354@gitrepo.freebsd.org> References: <202310312127.39VLReES081354@gitrepo.freebsd.org> Comments: In-reply-to Warner Losh message dated "Tue, 31 Oct 2023 21:27:40 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 31 Oct 2023 19:47:54 -0700 Message-Id: <20231101024754.B8B0A40F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfMv0fAt/eBqWAAfnERNIPed7xLhPTifTua5Qu7Hcy66ZmGdN+jzKpSnOlMQtTN5VXxnuFGsJ45iKpiftgYRzKlG41vs2R7h6flj0Bl+oRviNsZKO6kVB B08Rezq7huer6lC4D2Y55VrYJGhpCYyDdsswbGKAH11qj4ypKB5nPN3L4/B7EsoGF3D01MMZWLLDSGaGzKmA8+wVth/fK4j79icTgrU6z72A+N+edhMg1xbL 3KfB+3PvRfZtoZ8bri58WNCXjrdpG6CzHYSRRXzc5cYWQSekgIMBMCWVZSEASrTihIFFkqP5xIfTF/ZacJhWl+gT3gpwoXObaRFUKhmKNQw= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4SKrz20trYz4NqN In message <202310312127.39VLReES081354@gitrepo.freebsd.org>, Warner Losh write s: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0527c9bdc7187a0b92511f021dcdbbac > 84f1c579 > > commit 0527c9bdc7187a0b92511f021dcdbbac84f1c579 > Author: Warner Losh > AuthorDate: 2023-10-31 20:55:58 +0000 > Commit: Warner Losh > CommitDate: 2023-10-31 21:26:44 +0000 > > ino64: Remove 'forward compat' code for this > > Forward compatibility code was added for running newer ino64 binaries on > older kernels as a transition aide. Now that ino64 has been in the tree > 6 years, this code is no longer useful and should have been removed long > ago. Remove it now. Should be no user-visible changes at this point as > all the 'upgrade' scenarios it was intended for are long since past. > > Also need to remove this stuff from rtld since the _foo versions > no longer exist. > > Sponsored by: Netflix > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D42382 > --- > UPDATING | 12 ++++ > lib/libc/sys/Makefile.inc | 8 --- > lib/libc/sys/compat-ino64.h | 99 --------------------------- > lib/libc/sys/fstat.c | 51 -------------- > lib/libc/sys/fstatat.c | 47 ------------- > lib/libc/sys/fstatfs.c | 51 -------------- > lib/libc/sys/getdents.c | 7 +- > lib/libc/sys/getdirentries.c | 114 ------------------------------ > -- > lib/libc/sys/getfsstat.c | 62 ----------------- > lib/libc/sys/lstat.c | 13 +--- > lib/libc/sys/stat.c | 13 +--- > lib/libc/sys/statfs.c | 47 ------------- > libexec/rtld-elf/rtld-libc/Makefile.inc | 4 +- > 13 files changed, 21 insertions(+), 507 deletions(-) > > diff --git a/UPDATING b/UPDATING > index 722d7d66acbe..1ee0731742b3 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: > world, or to merely disable the most expensive debugging functionality > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20231027: > + Forward compatibility (running the new code on old kernels) for the > + "ino64" project have been removed. The need for it has passed long ago. > + > 20231018: > Commit 57ce37f9dcd0 changed the internal KAPI between the > nfscommon and nfscl modules. Both must be rebuilt from sources. > @@ -1573,6 +1577,14 @@ https://lists.freebsd.org/archives/freebsd-current/202 > 1-June/000153.html > Switch back to the BSDL dtc (Device Tree Compiler). Set WITH_GPL_DTC > if you require the GPL compiler. > > +20170619: > + Forward compatibility for the "ino64" project have been committed. This > + will allow most new binaries to run on older kernels in a limited > + fashion. This prevents many of the common foot-shooting actions in the > + upgrade as well as the limited ability to roll back the kernel across > + the ino64 upgrade. Complicated use cases may not work properly, though > + enough simpler ones work to allow recovery in most situations. > + > 20170618: > The internal ABI used for communication between the NFS kernel modules > was changed by r320085, so __FreeBSD_version was bumped to Given the notes above, should we also have a __FreeBSD_version bump? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Nov 1 04:25: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 4SKv7g4xLMz4yhS0; Wed, 1 Nov 2023 04:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SKv7g2909z4Wnp; Wed, 1 Nov 2023 04:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698812735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z4iVw3QIJOBsZYGiLIYfuSiXYyaOhT+2OaHzrOzXEnc=; b=UKdlm0Sq0QAwp88hiiB819z6lhqXZy6Bb0x4+aslma8HHmNabq8wQh1oD4Kal8SwJpdkRq vBFZIvdJtUlfgnqJ+HCMCmL9QwjFtylLhEUPOfdo99zkTLGejHFzWVRVr3fkatmB4P9WWE BzU/SjyiFUGDw1JJxIngCJqgxXucKE/QJCiICF38Gcg6P5kRGSpTgvqEzvk1ioEJtfJK+e gJZApROXB5G36LjKVrjy76V0SBmPchLxfz1kZN1DnXuwJC81FZB18WaQsi130ghCsAtPTy xmBgsWbC2FSoKgxVjRn3DqOxRWtEfVLsUzwRN+psKYS4UXGFChu4grLY8EK+1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698812735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z4iVw3QIJOBsZYGiLIYfuSiXYyaOhT+2OaHzrOzXEnc=; b=yFtbGCaJAuU0C57N0xPo4XfaHo1/h2ODCBmfYT8YjoaDQKp8niCf66/3S8N4/IAzW1+6JG L+PgnjmAWVvmZM1kqzXTvB2hTk6HI1JLNqzFsi681Bv3YOiC6EdPHcqw7N8nA3JjJYvzVM rozn/kOxA8Duufc1R0WsFmOUd3HkGtdX3y7CmZModZdNhhVU/rCOSpLIZO2K/7MUHig5ph Ltz/wf15eeOcCJ84Osp2hKiFe8781g6zhlHzuWPJ+RbPTDYCOAf62MaLUSGqSFTPdDs6QV s3eEdUF1a4Q/OMjgNB2IJ0NcknmevvdAAp+OTukKwItzc64Yz5tDuC8HlU17jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698812735; a=rsa-sha256; cv=none; b=pv8ZlEjmKRpavXfhgUhsdx22muVowr5jCuGugedxtEO7J+OaO0YxMAxrUUeDy6dGdhugws K7TDerDBz0fh/qThUHpXM/v3ALk/qvTX2TMsG9umbCUMCbBB/T5UTYm3KKGNxOzQOEjsVa cwAkRVyQxGdQVdEP4+0bZa1h4oy/WS0Cpbvex3AT7GnZc8H4pdO8dTgRrWOftxiEoYxZE9 M4XxRqWVbrcWUiwcI65EY96ry00J+GrG8DfwP45C9s1ENX0Fhd/6du2dSJNrAsIWig4wtl TffYVQZ9OzMPwON728obplqGIp8Atv4I4BJ3ewW3uNgcFEGKzex3NAnMt7rBpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SKv7g12vRzXY7; Wed, 1 Nov 2023 04:25: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 3A14PZOu093772; Wed, 1 Nov 2023 04:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A14PZSP093769; Wed, 1 Nov 2023 04:25:35 GMT (envelope-from git) Date: Wed, 1 Nov 2023 04:25:35 GMT Message-Id: <202311010425.3A14PZSP093769@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: ef85fd507e6e - main - param.h: FreeBSD_version 1500003: ino64 forward compat removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef85fd507e6e1784a726bccd485129e00bb63311 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef85fd507e6e1784a726bccd485129e00bb63311 commit ef85fd507e6e1784a726bccd485129e00bb63311 Author: Warner Losh AuthorDate: 2023-11-01 04:22:33 +0000 Commit: Warner Losh CommitDate: 2023-11-01 04:24:22 +0000 param.h: FreeBSD_version 1500003: ino64 forward compat removal Bump FreeBSD_version to 1500003 to mark the removal of the forward compat code for the inode64 conversion. This removal should be a nop. Sponsored by: Netflix --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 929458626a85..3595b0a43d36 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500002 +#define __FreeBSD_version 1500003 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Nov 1 08:04: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 4SL00j5HrLz4yxG6 for ; Wed, 1 Nov 2023 08:04: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 4SL00j3C3gz4tSK; Wed, 1 Nov 2023 08:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698825893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sJD3RiOok5ysk8vBYDKqEbrA0cfqS7SNc4S5Mh2/9c=; b=LrFapjKnG59tC7oYOdX3gVxiAAqZ3RDnGtCoUEzoP+ZPAb2Mq6tOU01UYG2y31BjIxSI0f EhXNNW0ufPEkC1DI2uo13ZmpL9XH5D38phriDJp74AJDj1uObF0x4Vcr6Bi6kCha8yADBE SjggMdWQmuX4nSiER5pXyqkcTlKH+trmZ5t7P+VBcDE4cHMu23pq7SvG6p7NaafThCzqQ1 dv/STtJZ+UttLrqVzG499ubaMlGkVJN4VcViO+IZefOt/kBctOVc45J+FaCOiKZr1T7SNa utrR6VbqMUAv8zA/ekSZPVqmCgU1mtfjpKC5REpp6jWTKF1+teWh7dfLKfBOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698825893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sJD3RiOok5ysk8vBYDKqEbrA0cfqS7SNc4S5Mh2/9c=; b=J/EfAaH66OUS0QeaI2guwTrE/rinXjpdgY5KZGKGSASC2FjtxAwt9s8D+ODYR7CctTXl3+ 4Znm4ODykXTo2Il0d4Gv8usLNrxhc++c0X9aABo9YheVlPx7aJRIv9W9VE+fja548AS5X0 vBevvrly3+TONxKgv3spN/t2mcLirPOpBr2KNqA/4hLlfIpP0TcS9G1CIxAC9iG/07bWxb lpTti97ULmnggv003CwWajb5MMR1TXKmAwgjMAWHy6FA8wik+ZXU4LLAY/7ZybDToZvpKq jH5KwtOS9YWGPgDkUWRHhLwNmh1phZBvS9pFjOzvu4rGE4wSgpMxtmOBxNHV5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698825893; a=rsa-sha256; cv=none; b=IxBWe8JDqcT6FLCY6jS2hHBH5yWsuLUXzS/sJ7+boKsO9hT4hOE+QiJP8WmSFAMK0sFJNU sbKieJkXIX1q5tPcbI3qiCx0Br3lgq0K0uTfKn7dvBSvErYd8gDmYwMQSwQCoTEblBuBZZ gzEFCk6NbBWPI1KlVXnDxFfifWPLK4j4QSjRK3NV3Uqh3VgLbVQohIkPfCOscd5O6xUFyL V1zsyZ9YVui2YnVykcfIbiVAyNFUw2ocMwZlmJKk2cGSr3Cpuvr5zzcf8LmBA4muChrQx1 ZW+vYZlO8pTd7fKyV2fjCsSpk9q2SLitlBEgXnbvKhyJ5Qr4zHbKBqAk0sNBTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL00j29BCzf59; Wed, 1 Nov 2023 08:04: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 3A184rLB064594; Wed, 1 Nov 2023 08:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A184rqW064593; Wed, 1 Nov 2023 08:04:53 GMT (envelope-from git) Date: Wed, 1 Nov 2023 08:04:53 GMT Message-Id: <202311010804.3A184rqW064593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 043c6ee3b6bf..41e55b476bcf - 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: 41e55b476bcfc90f1ad81c02c5375367fdace9e9 X-Git-Oldrev: 043c6ee3b6bfb55f8d36e1f048ff13128c279fb8 X-Git-Newrev: 41e55b476bcfc90f1ad81c02c5375367fdace9e9 Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=043c6ee3b6bf..41e55b476bcf c3773de16866 ZIL: Cleanup sync and commit handling 05a7348a7e7e RAIDZ: Use cache blocking during parity math 514d661ca1d5 Tune zio buffer caches and their alignments 799e09f75a31 Unify arc_prune_async() code dbe839a9ca1d zvol: Cleanup set property 60387facd267 zvol: Implement zvol threading as a Property 9ccdb8becdc6 zvol: fix delayed update to block device ro entry cba99a046e34 Add all read-only compatible zpool features to grub2 compatibility 763ca47fa818 Fix block cloning between unencrypted and encrypted datasets 41e55b476bcf Fix nfs_truncate_shares without /etc/exports.d From nobody Wed Nov 1 08:21: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 4SL0Mj1zDhz4yylv; Wed, 1 Nov 2023 08:21: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 4SL0Mh6625z3CLj; Wed, 1 Nov 2023 08:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698826880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g6BQDv62V+/A6ReVkY0RsXX8O1PYG3+Fo+6Oe9L1Kas=; b=g0kcX5rzGlskxrF/bDgBQi7+K6Gbs9Ie4mym1ynbEaqDxgIu1suI82WJ9bKiX3oiZROQRr H2yqa4NC5it6xOJ7G0auZ3aJVMn7Bj8n84C/kXGvIE5gsh1dhA/HJaG3Om1P4hqgsqTFx9 Yi7GDMZIvTUg/lJT21yTJsEabNcsR5pT+QNf9/qWXR83sDNWmD03Gv4WpiV+APcM7uZMCR Buk7J+SZZdVMhPj4zmeJ6DKlYd6bMFSGJJ+x204i6V+k+w4slYhzMmrcdRs+UtYQKByXO2 BBlS0D8tNMYN9GcIccRlggeEb0DIWyjM3AiU2fUDyGy8IEglcqqik2c2hiEL4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698826880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g6BQDv62V+/A6ReVkY0RsXX8O1PYG3+Fo+6Oe9L1Kas=; b=qkDJdgOlUPog/tpYyCcHVBB3eDbD0+rgAdghAqGz5HbNuGjAxoF0ADJO4GrROilvSp35pc WFGQVnlIZS5kNE2kHxX7nHdhXaXqpZnP92/wMwf6dATXpgzo0kMbdpvJdI+Tbuz5DbdLRo sVvlkbIJh+/6f07Idw/hsqc/Lbg+0S5KuvrXfEZbsfXQxUAc1By0oDzZSkc4A5bMkWfFl0 odVwuMQxu2YRDm8n6G1VN0Y0ZdUso7Cgjkn0+CBOf4uwUsULciwSqu7flrjHPnib6/3p2f ejwPTxF2Ay7n0KnFBRVRhEbNeG4ZET8W6n9XdeJvBqFuYA3dQN7IoAgXRkB9EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698826880; a=rsa-sha256; cv=none; b=AAIvYpI7TZU7DvtyrNxpa8XYrKkGisEkHCO/7LoED05rDEUuIzCDneDPyLUW9DAwrWUNbC 1/wzOf+LfHdtQASVk3yG7oQQUX80wQFbhGDnonRiyP8f0VDxqbRTymBhrN5qkQDNHFgkeK MX7XMP0avbObxVbK0fl1YPLtmd7JTD/s+kDLQS5rAilnL0Cwqq8DSbR59+/f7iQZVtEEdq 8vHaqHzj+txKeLLygp5y0tSK8Rx6E8P79Ls9LrQxr8CnPOvz5P3/noWn2SYdOfPhG7iAnY kQowZSS4gugAjYG3MPZK1F3CNg0AXsvAHaqLOJzEiVatI5N0lS6+7FKp8cJKgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL0Mh55CwzfLk; Wed, 1 Nov 2023 08:21: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 3A18LK1a093675; Wed, 1 Nov 2023 08:21:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A18LKqx093672; Wed, 1 Nov 2023 08:21:20 GMT (envelope-from git) Date: Wed, 1 Nov 2023 08:21:20 GMT Message-Id: <202311010821.3A18LKqx093672@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: 1692e50f2573 - main - vfs: bring getnewvnode manpage closer to reality List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1692e50f25730bfa0c579396bc2f79973717b30b Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1692e50f25730bfa0c579396bc2f79973717b30b commit 1692e50f25730bfa0c579396bc2f79973717b30b Author: Mateusz Guzik AuthorDate: 2023-11-01 08:20:12 +0000 Commit: Mateusz Guzik CommitDate: 2023-11-01 08:21:10 +0000 vfs: bring getnewvnode manpage closer to reality --- share/man/man9/getnewvnode.9 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9 index 9c0219af1bba..89f8bfc0aa6e 100644 --- a/share/man/man9/getnewvnode.9 +++ b/share/man/man9/getnewvnode.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.Dd November 21, 2001 +.Dd November 1, 2023 .Dt GETNEWVNODE 9 .Os .Sh NAME @@ -35,14 +35,12 @@ .In sys/vnode.h .In sys/mount.h .Ft int -.Fn getnewvnode "const char *tag" "struct mount *mp" "vop_t **vops" "struct vnode **vpp" +.Fn getnewvnode "const char *tag" "struct mount *mp" "struct vop_vector *vops" "struct vnode **vpp" .Sh DESCRIPTION The .Fn getnewvnode function initializes a new vnode, assigning it the vnode operations passed in .Fa vops . -The vnode is either freshly allocated, or taken from the head of the -free list depending on the number of vnodes already in the system. .Pp The arguments to .Fn getnewvnode @@ -61,7 +59,8 @@ Points to the new vnode upon successful completion. .Sh RETURN VALUES .Fn getnewvnode returns 0 on success. -There are currently no failure conditions - that do not result in a panic. +.Sh BUGS +It never return an error, instead either succeeds or blocks indefinitely. .Sh AUTHORS This manual page was written by .An Chad David Aq Mt davidc@acns.ab.ca . From nobody Wed Nov 1 08:29: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 4SL0YV6skKz500YB; Wed, 1 Nov 2023 08:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SL0YV5kmXz3FJv; Wed, 1 Nov 2023 08:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698827390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBYZM76vZFiNk4mwdpS7gMHwSk7tX77fBTzoulBm0+M=; b=GUsTSfSyC3Lt91y6sepXSYRpbEnOsrNuYikWfOwvnP+YGWFGs1KUE4GbNpF/0XC8c8DxFc N/FTi4JkEQj2NxeuuqD6Ck8IDlhz3E9PuATc+ggrGGN57ZBOKdo0xNO0SziGBSTddLZzHu LKj1S8DExmVidUu8BMx8R6fA2nQWoC3Cd+vJ/96tgl+MnoyDykFptlAIsA6Ui1E89CPPAp fMfe4gsmu+gNgT7y5Khw15Y5UA6L/euvkZ/TLFTmdNeGvUY9vaKy8Q2SR9CuUIKM30sKXI nY16qViqtxEiL7TQH9AC9gltNNp68o2mcpbqPkP+LfRjNDvm3Pwv1jdHilS1ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698827390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBYZM76vZFiNk4mwdpS7gMHwSk7tX77fBTzoulBm0+M=; b=LfA6+VnFlmXZvPJx4mj4xoavC4ULGe2KeKKnmhs+HImrunIUwTctf02iffFKlDor1YnDZC gmwAmJ6uynG1ge/ksdimvb2k8hMtExe7KAR0so6MFEY1bzotQ9X3Ida2WcHxBPWTYVI7xA W27OLu5l38Oevr/6j8AuXLbSkAK1NTecwpMtIFZ27+Bw/zbjR9XuucebEzXuiFRkDKeKod 5q7IgFlyYog9TSfkAe6Iv1jvxEZ2T9shcVguOCW/9KMRkusF40LXKpBGfBe2CH2ojOKacK Gi3kkuNvEiQG7r8/8VKLQFpZF79vfDam1F/G0BnCM2RegN7YUTu3/hV6RPya6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698827390; a=rsa-sha256; cv=none; b=IF/bHPaVseFruh8e4x/XlXEd8AWJV5rZW7qVN1XTccp/fGUM49YIUFFwvIrxLqWa7/nhHm vsPfZJrfmowFKkr29ZeLQRq6ScEQPDJZBP+QEg7c4NpxvN8WonjE96C+i+vVvENjvDUtHa qcj6zWoWSO4QzkGbrO507oGN27Y+ZKeRJCVw/jKcLWLjriliKUsXQicuaoDFI7aseKiFfu /k5824qz8KC9k5U4ab+cFU/F8u0FkhzyulBhHyQO37MLl368Ggbr+J+GKAXL+nhrcxVZnZ ijr8S2Ecvb9dbCQwWndrQmm1eMbgfWSS6KmmTYoFFC+1oiGj0jb8Cny+GFvy4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL0YV4j6PzfWr; Wed, 1 Nov 2023 08:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A18ToTf097796; Wed, 1 Nov 2023 08:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A18Toju097794; Wed, 1 Nov 2023 08:29:50 GMT (envelope-from git) Date: Wed, 1 Nov 2023 08:29:50 GMT Message-Id: <202311010829.3A18Toju097794@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: 8b916c35c288 - main - vfs: fix a typo introdued in previous List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8b916c35c2885867df2351a94a4b22100ad8eade Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8b916c35c2885867df2351a94a4b22100ad8eade commit 8b916c35c2885867df2351a94a4b22100ad8eade Author: Mateusz Guzik AuthorDate: 2023-11-01 08:29:29 +0000 Commit: Mateusz Guzik CommitDate: 2023-11-01 08:29:29 +0000 vfs: fix a typo introdued in previous Reported by: pstef --- share/man/man9/getnewvnode.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9 index 89f8bfc0aa6e..d35c1a080158 100644 --- a/share/man/man9/getnewvnode.9 +++ b/share/man/man9/getnewvnode.9 @@ -60,7 +60,7 @@ Points to the new vnode upon successful completion. .Fn getnewvnode returns 0 on success. .Sh BUGS -It never return an error, instead either succeeds or blocks indefinitely. +It never returns an error, instead either succeeds or blocks indefinitely. .Sh AUTHORS This manual page was written by .An Chad David Aq Mt davidc@acns.ab.ca . From nobody Wed Nov 1 08:40:39 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 4SL0p050fyz501KK; Wed, 1 Nov 2023 08:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SL0p011djz3Gtr; Wed, 1 Nov 2023 08:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698828040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3/z9SgEwVlj/Jk8KhT8+Npz+sNkV7wDykusZ597QU4Y=; b=thSvisxpf3au9lM3Z3ZYZnEG2/sgDkeMIdhbSV4X4UIn4tIR6jw5JMD01KkLD9Lnigfa1x 1c54gw1Z1SU/ZmkXkKBpoIPZh4l8/l0VINVUbt+7Z2z2w2VpinRtgtoUEqBNj+5+8apRJF hICUUwVqr+8wavoWfXdfxRYuZVLCSbcHqznqMlNed3A09ytN4j4URqDRYa7rjsy+65FeAV 7y9CHPtyDxBn4ujUnVAsFiB9WvIuR3rykZdVgESTH3kqhR38z00CU5w2fpKFEZrdDZICYV LAFKNROklmyvld1L+XUlfGLgQI20hL2AObKDQnbIZ26pmfE2JvT1e4Vp5qLADg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698828040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3/z9SgEwVlj/Jk8KhT8+Npz+sNkV7wDykusZ597QU4Y=; b=kEd172FenoFj5GBHWLyJWSn9wcKX0OYvIMp0DNkveVFTv39UjsKiboWDF67UBWIe6Tf26q j2/OHWBnma6v0jp5FuSci1R66yc3kSciFRCXpy52KR18clzl253SYCbpOlB3L/uC2LCTaU uDtGvekq5uZcMWNNBdrlKTAP5GxXS/bWL5ZVqnH6/G5MK7Js6ZjvG9L45svgIR/O1YTAFI ttTQU5Q8Ni36mkXvllSRN+SoL6ZD+3kWDSjtSdiNaZXoTuiFIV3GOOvYEmbRAW5ejAdII7 SEq4zELY00rqhgENnawfay6wLvdUhk7F0m+ul1Qby49Gjq/1Xo1MTls4pLh5TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698828040; a=rsa-sha256; cv=none; b=LzV/b0ewGxi0EFpDbly6zhpz7r9tNa9BVLiYqvMp5Jdzt2IVEmELreG9SSkqCdSlcIIWvv YsB/xwH3Tcm+bq8f2iWWKLouGBiIbzhqBtN/d+MpFwqWYtRtkRYG/bAm4hT45NaQ58+3Qr xiWYKh1YQRU/Y3qcmOlwfvZExhxtbvhIP0tkFsB92GWCoINuZAmY446oXUyIhYPn/08xRa hHfg26JE4MCWWqBlLTLCOdJmJfct0wX5VsusHQvU46yD60Mb2RvqUySVvfswYDZJh4M01m iz2lJim1qgHW2PZnzYXpBPu4BohYqSaEzKkyy6S27cQqIAuPmnLqwJQrwD46Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL0p000mwzg71; Wed, 1 Nov 2023 08:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A18edb5023653; Wed, 1 Nov 2023 08:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A18ed2m023650; Wed, 1 Nov 2023 08:40:39 GMT (envelope-from git) Date: Wed, 1 Nov 2023 08:40:39 GMT Message-Id: <202311010840.3A18ed2m023650@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: 0c5cd045bfb8 - main - vfs: remove majority of stale commentary about free list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c5cd045bfb847428a8a5e0e91e6fc3cf27a17c2 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=0c5cd045bfb847428a8a5e0e91e6fc3cf27a17c2 commit 0c5cd045bfb847428a8a5e0e91e6fc3cf27a17c2 Author: Mateusz Guzik AuthorDate: 2023-11-01 08:28:28 +0000 Commit: Mateusz Guzik CommitDate: 2023-11-01 08:39:05 +0000 vfs: remove majority of stale commentary about free list There is no "free list" for a long time now. While here slightly tidy up affected comments in other ways. Note that the "free vnode" term is a misnomer at best and will also need to get sorted out. --- sys/kern/vfs_subr.c | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 881e9452a6db..b12b257ce340 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1224,7 +1224,7 @@ restart: * If it's been deconstructed already, it's still * referenced, or it exceeds the trigger, skip it. * Also skip free vnodes. We are trying to make space - * to expand the free list, not reduce it. + * for more free vnodes, not reduce their count. */ if (vp->v_usecount > 0 || vp->v_holdcnt == 0 || (!reclaim_nc_src && !LIST_EMPTY(&vp->v_cache_src))) @@ -1319,7 +1319,7 @@ SYSCTL_INT(_vfs_vnode_vnlru, OID_AUTO, max_free_per_call, CTLFLAG_RW, "limit on vnode free requests per call to the vnlru_free routine"); /* - * Attempt to reduce the free list by the requested amount. + * Attempt to recycle requested amount of free vnodes. */ static int vnlru_free_impl(int count, struct vfsops *mnt_op, struct vnode *mvp, bool isvnlru) @@ -1761,7 +1761,7 @@ vnlru_proc(void) /* * If numvnodes is too large (due to desiredvnodes being * adjusted using its sysctl, or emergency growth), first - * try to reduce it by discarding from the free list. + * try to reduce it by discarding free vnodes. */ if (rnumvnodes > desiredvnodes + 10) { vnlru_free_locked_vnlru(rnumvnodes - desiredvnodes); @@ -1772,7 +1772,7 @@ vnlru_proc(void) * Sleep if the vnode cache is in a good state. This is * when it is not over-full and has space for about a 4% * or 9% expansion (by growing its size or inexcessively - * reducing its free list). Otherwise, try to reclaim + * reducing free vnode count). Otherwise, try to reclaim * space for a 10% expansion. */ if (vstir && force == 0) { @@ -1858,10 +1858,7 @@ SYSINIT(vnlru, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, */ /* - * Try to recycle a freed vnode. We abort if anyone picks up a reference - * before we actually vgone(). This function must be called with the vnode - * held to prevent the vnode from being returned to the free list midway - * through vgone(). + * Try to recycle a freed vnode. */ static int vtryrecycle(struct vnode *vp, bool isvnlru) @@ -1976,14 +1973,10 @@ vn_alloc_hard(struct mount *mp, u_long rnumvnodes, bool bumped) } /* - * Grow the vnode cache if it will not be above its target max - * after growing. Otherwise, if the free list is nonempty, try - * to reclaim 1 item from it before growing the cache (possibly - * above its target max if the reclamation failed or is delayed). - * Otherwise, wait for some space. In all cases, schedule - * vnlru_proc() if we are getting short of space. The watermarks - * should be chosen so that we never wait or even reclaim from - * the free list to below its target minimum. + * Grow the vnode cache if it will not be above its target max after + * growing. Otherwise, if there is at least one free vnode, try to + * reclaim 1 item from it before growing the cache (possibly above its + * target max if the reclamation failed or is delayed). */ if (vnlru_free_locked_direct(1) > 0) goto alloc; @@ -2038,7 +2031,7 @@ vn_free(struct vnode *vp) } /* - * Return the next vnode from the free list. + * Allocate a new vnode. */ int getnewvnode(const char *tag, struct mount *mp, struct vop_vector *vops, @@ -3221,16 +3214,10 @@ v_init_counters(struct vnode *vp) } /* - * Grab a particular vnode from the free list, increment its - * reference count and lock it. VIRF_DOOMED is set if the vnode - * is being destroyed. Only callers who specify LK_RETRY will - * see doomed vnodes. If inactive processing was delayed in - * vput try to do it here. - * - * usecount is manipulated using atomics without holding any locks. + * Get a usecount on a vnode. * - * holdcnt can be manipulated using atomics without holding any locks, - * except when transitioning 1<->0, in which case the interlock is held. + * vget and vget_finish may fail to lock the vnode if they lose a race against + * it being doomed. LK_RETRY can be passed in flags to lock it anyway. * * Consumers which don't guarantee liveness of the vnode can use SMR to * try to get a reference. Note this operation can fail since the vnode @@ -3882,9 +3869,9 @@ vdbatch_dequeue(struct vnode *vp) } /* - * Drop the hold count of the vnode. If this is the last reference to - * the vnode we place it on the free list unless it has been vgone'd - * (marked VIRF_DOOMED) in which case we will free it. + * Drop the hold count of the vnode. + * + * It will only get freed if this is the last hold *and* it has been vgone'd. * * Because the vnode vm object keeps a hold reference on the vnode if * there is at least one resident non-cached page, the vnode cannot @@ -4200,7 +4187,7 @@ loop: } /* - * Recycle an unused vnode to the front of the free list. + * Recycle an unused vnode. */ int vrecycle(struct vnode *vp) From nobody Wed Nov 1 09:06:05 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 4SL1MK5PGPz503j7; Wed, 1 Nov 2023 09:06: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 4SL1MK4jsCz3Jx0; Wed, 1 Nov 2023 09:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FePaRcymf7+skO4TCApyNiVhYG51rwjuo0lf4GQaJIs=; b=MukyETaqNw7djmJFUd3f5CJBeHm2hxeG3J4G3K4BfzzlwQ1aEnvEBDJs32pZry/RvWuRBE ATr/e9IBYWxuIyBMah7yPdwiNwHshi+RQvSW6TmTHpKGZOwFNHo8Bj301mR8Fhmsf1foF2 +4Wo0VMrSxMkSJVrRabo6bLS5p8wQmVMzem/X6HJcmXNHBu58HcGyf4Ed6wHlznlJbsHIG JhI/cGjQRGsQNFQHUEGBphz8r9bazmTVew7As4Q3Pz6zcaWnzdBAszhwSxGMv0FOtbqTG9 KW/9iMBDoqQguE/b170UXKAOt9qiS4g1ZGZb2J/KSikupa2CnWlO0nttOz7cAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FePaRcymf7+skO4TCApyNiVhYG51rwjuo0lf4GQaJIs=; b=qwjHhOICmxfIKBKljuBuzxZCwY5hMOn43kowM/Kk8EfuviCnYDLM87IFbuHfudGLONBHbp xBJxFfXZ+mQN0z5RRANjzxYklLjFSrlozwdfDnO+7tDDrkvzkOyLPciNY7yMyAZ1qNnvgj OcpWp7PYkEMVOhT4NyJho1TS6hxaRV9x3lZbcz2YSJ/wsAfbniNHdS/0ugJ4gd0oMPhFnA T2WtKb14PRcub9dW+26vsOfNDqo281KCEm6oachgGRCzFUHXFv7iEx26VrF7wL1+cpIR2k 4gMiVr5nNwKX81MTl9HEfN6t4Crijfn+WGWxllV9q9wPd6z5foLHoe8i7grfvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829565; a=rsa-sha256; cv=none; b=DK7IazeVo0fTS8NqXi2w4tcqsMjwfCEHqwYr6mbrAErZ6z1AHNu+256DiQt+NzQUa43tW7 Fdgou7tA/VtEdfEInZw60wpokG/xtMiFhyTAR73OZIUPuEeesrV0k7xI+qyMXCnejfMdJR u8tQctF1GdbC4fKI2Ve29WvUM1lG+eRyrBTSciLNGMf40VfkBiJGxPVALPFnyJ1SftBU7R bXpQLGav7+LbQ3n+5h1FaGu8uO5R4Om3LnHh42Ja18uoCetc+3h2uNw2Ocq1u8g7jLpB9B w5DM0uAJiS3QfNae+zaWkJ58cCWWTX/Ni1tjD3EDzUQ2pipUPaMi9aTqdaBDJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1MK3nQBzfvL; Wed, 1 Nov 2023 09:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A1965RS064950; Wed, 1 Nov 2023 09:06:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A19654x064940; Wed, 1 Nov 2023 09:06:05 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:05 GMT Message-Id: <202311010906.3A19654x064940@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: eff832ae7b24 - stable/14 - netlink: fix potential llentry lock leak in newneigh handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: eff832ae7b248c499464cad93c365a1594715e07 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=eff832ae7b248c499464cad93c365a1594715e07 commit eff832ae7b248c499464cad93c365a1594715e07 Author: R. Christian McDonald AuthorDate: 2023-10-23 11:23:55 +0000 Commit: Kristof Provost CommitDate: 2023-11-01 09:05:49 +0000 netlink: fix potential llentry lock leak in newneigh handler The netlink newneigh handler has the potential to leak the lock on llentry objects in the kernel. This patch reconciles several paths through the newneigh handler that could result in a lock leak. MFC after: 1 week Reviewed by: markj, kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42307 (cherry picked from commit ae2ca32781a90abe987e128ca167ab400a87f369) --- sys/netlink/route/neigh.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 9914e7febf57..5be0c1f9d91f 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -436,17 +436,18 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * struct llentry *lle_tmp = lla_lookup(llt, LLE_EXCLUSIVE, attrs.nda_dst); if (lle_tmp != NULL) { error = EEXIST; - if (hdr->nlmsg_flags & NLM_F_EXCL) { - LLE_WUNLOCK(lle_tmp); - lle_tmp = NULL; - } else if (hdr->nlmsg_flags & NLM_F_REPLACE) { + if (hdr->nlmsg_flags & NLM_F_REPLACE) { + error = EPERM; if ((lle_tmp->la_flags & LLE_IFADDR) == 0) { + error = 0; /* success */ lltable_unlink_entry(llt, lle_tmp); + llentry_free(lle_tmp); + lle_tmp = NULL; lltable_link_entry(llt, lle); - error = 0; - } else - error = EPERM; + } } + if (lle_tmp) + LLE_WUNLOCK(lle_tmp); } else { if (hdr->nlmsg_flags & NLM_F_CREATE) lltable_link_entry(llt, lle); @@ -456,14 +457,11 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * IF_AFDATA_WUNLOCK(attrs.nda_ifp); if (error != 0) { - if (lle != NULL) - llentry_free(lle); + /* throw away the newly allocated llentry */ + llentry_free(lle); return (error); } - if (lle_tmp != NULL) - llentry_free(lle_tmp); - /* XXX: We're inside epoch */ EVENTHANDLER_INVOKE(lle_event, lle, LLENTRY_RESOLVED); LLE_WUNLOCK(lle); From nobody Wed Nov 1 09:06:05 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 4SL1MK6V2Qz503qf; Wed, 1 Nov 2023 09:06: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 4SL1MK5xXCz3K0B; Wed, 1 Nov 2023 09:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaAKIoHa64O5KWWC69fX3PFN4gLGCeyL8sHYkakqsx8=; b=XSt5REMY7K3pF2A11IOzXeifITonaqo4XahxawB6//XcjfFp400WFWYP3IEav6zBurabwh rZmIkZEZ6uSFww6Z1yERVphxLp67UpDBzkJlLcb0LepR0HDDTJaEH5/OXNjCb4F+yyd7+2 NA4TIjk+s/Ngazqtr5sn+gYgTrRkv0STn2x7QfHz2UYDXasW8nUgJ1bP+mTA0xqgZPdk6L zANIKKofZhlmsOR4BB1zGFc9bjB4UQPgK5pfDy4h/wWKmm/TBARzPFrYMaxWDZxPpHHmLc IOWR2luHsNalYS60P0O6uczijFQhnG65ErpEN4fNoClt2BS865Mmqr5dANtA4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaAKIoHa64O5KWWC69fX3PFN4gLGCeyL8sHYkakqsx8=; b=nWySPlRT179NwrwK4X4E+wzooWKHfwl9Ej9+fB4f1cuQA1T6gWjFjcCD9dg+nlK5jQaD/q AW0IbGzZSkZT3x1RN+qVlaxOLYwb/mDIJmIKbDliEm9f+Y3nZxYBDEZZqIVCumn++x4ukE yuarVKAE7dr+Tyhzc0uH9wJSp4ndmDm0YTrIFzrEOCNU8VeQG5Q8tqeCo58bTXADizM5Ev HrARtXg8UIYoDzGX/U2mP6MGR8rBEypqAvZ242BEtRYVll7FUMTfadKa0L5BzublxR1h3j tUBcIcMcq0jHYN+g1ECnDPM6n06CRsw1iWhhfVf1HksWAByBH8gVdobt8mxKqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829565; a=rsa-sha256; cv=none; b=JpHsDdfNV65JZ5T+jtFQEYpzMt4c/Tv1fU3SnEjl2FKcf+pzaMfNIaoZ1guiSl7Bs8cbES 7WcVpr5ah8XaKrtp3JxIFyVSiN0jLGTNocno+1TMGYAVgE20/dlHapLd1hCmNDnG5qunfk udLx8qSpbch0ZA57ZE63/n/68LV2Sk7h6fCk8jnzHPygg4jHRkqgy8rVGiAzDusNndERXV Bg8NnQA3UU/yXDrPD8VR9KyZZghC3vbrbLvw4EcWzxRlI5X7IQfdeRV6JYDOxUI06DAs6V 9+bYUB8mbtUDDh7fAlxgDht3xsZd8vBhjCLmiC/zbjlBopWwKHNHGHeBZ79ifg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1MK4vLTzgVG; Wed, 1 Nov 2023 09:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A1965TT065041; Wed, 1 Nov 2023 09:06:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A19653R065038; Wed, 1 Nov 2023 09:06:05 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:05 GMT Message-Id: <202311010906.3A19653R065038@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: ec4ae3856656 - stable/13 - netlink: allow creation of temporary lle entries. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: ec4ae38566569bfac4e18e1fb2ce61fec1e2361b Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec4ae38566569bfac4e18e1fb2ce61fec1e2361b commit ec4ae38566569bfac4e18e1fb2ce61fec1e2361b Author: Alexander V. Chernikov AuthorDate: 2023-04-25 11:08:47 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 08:08:44 +0000 netlink: allow creation of temporary lle entries. MFC after: 2 weeks (cherry picked from commit a2728a9a5b8da974e238e6413a980134dbd6297f) --- sys/netlink/route/neigh.c | 58 +++++++++++++++++++++++++++++++++++------------ sys/netlink/route/neigh.h | 8 ++++++- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 097b75298745..140194b4ad32 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -119,6 +119,14 @@ lle_flags_to_nl_flags(const struct llentry *lle) return (nl_flags); } +static uint32_t +get_lle_next_ts(const struct llentry *lle) +{ + if (lle->la_expire == 0) + return (0); + return (lle->la_expire + lle->lle_remtime / hz + time_second - time_uptime); +} + static int dump_lle_locked(struct llentry *lle, void *arg) { @@ -179,6 +187,13 @@ dump_lle_locked(struct llentry *lle, void *arg) /* TODO: provide confirmed/updated */ cache->ndm_refcnt = lle->lle_refcnt; + int off = nlattr_add_nested(nw, NDA_FREEBSD); + if (off != 0) { + nlattr_add_u32(nw, NDAF_NEXT_STATE_TS, get_lle_next_ts(lle)); + + nlattr_set_len(nw, off); + } + if (nlmsg_end(nw)) return (0); enomem: @@ -282,6 +297,7 @@ struct nl_parsed_neigh { struct sockaddr *nda_dst; struct ifnet *nda_ifp; struct nlattr *nda_lladdr; + uint32_t ndaf_next_ts; uint32_t ndm_flags; uint16_t ndm_state; uint8_t ndm_family; @@ -289,18 +305,24 @@ struct nl_parsed_neigh { #define _IN(_field) offsetof(struct ndmsg, _field) #define _OUT(_field) offsetof(struct nl_parsed_neigh, _field) -static struct nlfield_parser nlf_p_neigh[] = { +static const struct nlattr_parser nla_p_neigh_fbsd[] = { + { .type = NDAF_NEXT_STATE_TS, .off = _OUT(ndaf_next_ts), .cb = nlattr_get_uint32 }, +}; +NL_DECLARE_ATTR_PARSER(neigh_fbsd_parser, nla_p_neigh_fbsd); + +static const struct nlfield_parser nlf_p_neigh[] = { { .off_in = _IN(ndm_family), .off_out = _OUT(ndm_family), .cb = nlf_get_u8 }, { .off_in = _IN(ndm_flags), .off_out = _OUT(ndm_flags), .cb = nlf_get_u8_u32 }, { .off_in = _IN(ndm_state), .off_out = _OUT(ndm_state), .cb = nlf_get_u16 }, { .off_in = _IN(ndm_ifindex), .off_out = _OUT(nda_ifp), .cb = nlf_get_ifpz }, }; -static struct nlattr_parser nla_p_neigh[] = { +static const struct nlattr_parser nla_p_neigh[] = { { .type = NDA_DST, .off = _OUT(nda_dst), .cb = nlattr_get_ip }, { .type = NDA_LLADDR, .off = _OUT(nda_lladdr), .cb = nlattr_get_nla }, { .type = NDA_IFINDEX, .off = _OUT(nda_ifp), .cb = nlattr_get_ifp }, { .type = NDA_FLAGS_EXT, .off = _OUT(ndm_flags), .cb = nlattr_get_uint32 }, + { .type = NDA_FREEBSD, .arg = &neigh_fbsd_parser, .cb = nlattr_get_nested }, }; #undef _IN #undef _OUT @@ -350,11 +372,6 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * return (EINVAL); } - if (attrs.ndm_state != NUD_PERMANENT) { - NLMSG_REPORT_ERR_MSG(npt, "ndm_state %d not supported", attrs.ndm_state); - return (ENOTSUP); - } - const uint16_t supported_flags = NTF_PROXY | NTF_STICKY; if ((attrs.ndm_flags & supported_flags) != attrs.ndm_flags) { NLMSG_REPORT_ERR_MSG(npt, "ndm_flags %X not supported", @@ -380,26 +397,36 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * return (EINVAL); } - int lle_flags = LLE_STATIC | ((attrs.ndm_flags & NTF_PROXY) ? LLE_PUB : 0); + int lle_flags = (attrs.ndm_flags & NTF_PROXY) ? LLE_PUB : 0; + if (attrs.ndm_flags & NTF_STICKY) + lle_flags |= LLE_STATIC; struct llentry *lle = lltable_alloc_entry(llt, lle_flags, attrs.nda_dst); if (lle == NULL) return (ENOMEM); lltable_set_entry_addr(attrs.nda_ifp, lle, linkhdr, linkhdrsize, lladdr_off); - /* llentry created, try to insert or update :*/ + if (attrs.ndm_flags & NTF_STICKY) + lle->la_expire = 0; + else + lle->la_expire = attrs.ndaf_next_ts - time_second + time_uptime; + + /* llentry created, try to insert or update */ IF_AFDATA_WLOCK(attrs.nda_ifp); LLE_WLOCK(lle); struct llentry *lle_tmp = lla_lookup(llt, LLE_EXCLUSIVE, attrs.nda_dst); if (lle_tmp != NULL) { + error = EEXIST; if (hdr->nlmsg_flags & NLM_F_EXCL) { LLE_WUNLOCK(lle_tmp); lle_tmp = NULL; - error = EEXIST; } else if (hdr->nlmsg_flags & NLM_F_REPLACE) { - lltable_unlink_entry(llt, lle_tmp); - lltable_link_entry(llt, lle); - } else - error = EEXIST; + if ((lle_tmp->la_flags & LLE_IFADDR) == 0) { + lltable_unlink_entry(llt, lle_tmp); + lltable_link_entry(llt, lle); + error = 0; + } else + error = EPERM; + } } else { if (hdr->nlmsg_flags & NLM_F_CREATE) lltable_link_entry(llt, lle); @@ -455,6 +482,7 @@ rtnl_handle_delneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * LLE_WUNLOCK(lle); lle = NULL; error = EPERM; + NLMSG_REPORT_ERR_MSG(npt, "unable to delete ifaddr record"); } else lltable_unlink_entry(llt, lle); } else @@ -554,7 +582,7 @@ rtnl_lle_event(void *arg __unused, struct llentry *lle, int evt) nlmsg_flush(&nw); } -static const struct nlhdr_parser *all_parsers[] = { &ndmsg_parser }; +static const struct nlhdr_parser *all_parsers[] = { &ndmsg_parser, &neigh_fbsd_parser }; void rtnl_neighs_init(void) diff --git a/sys/netlink/route/neigh.h b/sys/netlink/route/neigh.h index d6835505ea74..eacacc09711a 100644 --- a/sys/netlink/route/neigh.h +++ b/sys/netlink/route/neigh.h @@ -49,7 +49,7 @@ enum { NDA_DST, /* binary: neigh l3 address */ NDA_LLADDR, /* binary: neigh link-level address */ NDA_CACHEINFO, /* binary, struct nda_cacheinfo */ - NDA_PROBES, /* XXX */ + NDA_PROBES, /* u32: number of probes sent */ NDA_VLAN, /* upper 802.1Q tag */ NDA_PORT, /* not supported */ NDA_VNI, /* not supported */ @@ -63,11 +63,17 @@ enum { NDA_FLAGS_EXT, /* u32: ndm_flags */ NDA_NDM_STATE_MASK, /* XXX */ NDA_NDM_FLAGS_MASK, /* XXX */ + NDA_FREEBSD, /* nested: FreeBSD-specific */ __NDA_MAX }; #define NDA_MAX (__NDA_MAX - 1) +enum { + NDAF_UNSPEC, + NDAF_NEXT_STATE_TS, /* (u32) seconds from time_uptime when moving to the next state */ +}; + /* ndm_flags / NDA_FLAGS_EXT */ #define NTF_USE 0x0001 /* XXX */ From nobody Wed Nov 1 09: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 4SL1ML6dP0z503jB; Wed, 1 Nov 2023 09: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 4SL1ML60spz3KJq; Wed, 1 Nov 2023 09: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=1698829566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdBzidDBTWXTQn2EdlT99dyBYeroRu+F49L0ZTutjxA=; b=y4q1yboUIJShX9AEET/GQuK/381rqFyCVICW4zWSubh/0fErH2wuiZE7dPssZEqoW7fRHo uEhe8d4MNcnxeg64/PyW+HZuecLbf2zuDAlkVzvRTnjPMr3MoGQMxDJVM9lmxM9E9Nk8Zc r+DgnwUOjdqmhPNIYdjKZDE/xwr24Rgx8r8oEaRSf7qmKq9o/0ZoQq9qRAnIPoofqmmS9P ZrY6B/tHrJAGoICpVELrxvedZq8CG4iCZ+Z4JI7GIjmKVGP/HtBVrWb102duZqSFBLkQ1X xfTUqn654hP6L37o8Sj6+A1JFCkNYaWRBuV/DqBu1dlZ07unHaUo9hbiiWKJkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rdBzidDBTWXTQn2EdlT99dyBYeroRu+F49L0ZTutjxA=; b=HgphoUsPaSH4DmQ2zNgaBOKNKgEkvq89hGMtE463xDL7oHZO7DeGFPjaeG9akjRRIbgNp8 QiEdpXhBkJtDptexSWkExlT7QsoXrQafxn8v5bKtEwNwskLeQj3USorrXOKtr2ihnAfReh zOMTdxSqGaNmfSu8nuFd6mhnPGudMx+4AI8wI9EXhO9NpoaAAyVnJriOjhq9jg2VBqyTWk LAvA7GMkTn3xmBBN3VFPOXl81p+WjdUMoWowO2DH5VseoBYs1w8feuJLDgFNQ/X0eQVImV JZe1ANxMx4h+CHHUDGAHjbfe3ntC9M5Ja2H3MIFAl/42fMz0yYR5tEDWbhi6mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829566; a=rsa-sha256; cv=none; b=kQgP1wNR9auSBcdCu7lMqGtyg0QL+9zRzMk/LqRN77Ad1ezTn8jheF0GNtk0GG8QSNAnJJ 0NEETnr57G7pXI+7n1TcYF6voEtJHnFC6szqgqZNq4R3XXEWSC+SPlFIN9zvCkOSa6JexC Nll8G6wSJrSauSGRoJimBcvfVRWKrhSjZgW6NZYVXJW/VpaohIG8va+C1U7zTH5ut8zCN2 m8avnO6f1/innZ3Z42ccnJV9Rmms3/55CVNmUq/mTFbJwhDkcrCNaHpaazW9KU59SDfsBe n6Rn1SylGsZLk+v8xqaiIE0cPd7QOFPlKnlbsi9bI8lPzWZ7RrZFkQ7jjCGlgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1ML4kBDzfvM; Wed, 1 Nov 2023 09: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 3A1966Lv065080; Wed, 1 Nov 2023 09: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 3A1966wN065077; Wed, 1 Nov 2023 09:06:06 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:06 GMT Message-Id: <202311010906.3A1966wN065077@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: 9f5ab6bddfc0 - stable/14 - libpfctl: fix pfctl_do_ioctl() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9f5ab6bddfc0974b385f2a198878f739424fd040 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9f5ab6bddfc0974b385f2a198878f739424fd040 commit 9f5ab6bddfc0974b385f2a198878f739424fd040 Author: Kristof Provost AuthorDate: 2023-10-23 11:43:52 +0000 Commit: Kristof Provost CommitDate: 2023-11-01 09:05:49 +0000 libpfctl: fix pfctl_do_ioctl() pfctl_do_ioctl() copies the packed request data into the request buffer and then frees it. However, it's possible for the buffer to be too small for the reply, causing us to allocate a new buffer. We then copied from the freed request, and freed it again. Do not free the request buffer until we're all the way done. PR: 274614 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42329 (cherry picked from commit 2cffb52514b070e716e700c7f58fdb8cd9b05335) --- lib/libpfctl/libpfctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 1eccf3dfbcdf..d5347a7f8a84 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -72,7 +72,6 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) retry: nv.data = malloc(size); memcpy(nv.data, data, nvlen); - free(data); nv.len = nvlen; nv.size = size; @@ -90,13 +89,15 @@ retry: if (ret == 0) { *nvl = nvlist_unpack(nv.data, nv.len, 0); if (*nvl == NULL) { - free(nv.data); - return (EIO); + ret = EIO; + goto out; } } else { ret = errno; } +out: + free(data); free(nv.data); return (ret); From nobody Wed Nov 1 09: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 4SL1MM0XCdz503ng; Wed, 1 Nov 2023 09: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 4SL1ML6Z9Sz3K3P; Wed, 1 Nov 2023 09: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=1698829567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQ+vCrOVxLFY0q/zUicEjRprFH4RPnkTM5Jq/gnuEqE=; b=hZf+OS3iZ4SalzjBMRacuyW3MYwh7L5/5ltQkY+LzKOu1DT3uZZE7QmYG3oVyXlSsvW/Ja NiSp5B5rdDfR1tdzNIerPWvmYOD9TtGIoyHrGw8oAw6qPGKmsCvjhj/4dUFKOb+SdBvUWy sFuLiPhGLMw9UlQv95Ts5SPzAVck9lR1XyqqpLvZm8LyRwZPCfoTFMbFTQmBLe6OL5qxtp 6doP1mGMCZQPtg8a6xAyKYAN3E3gddPQJRou5SvUMTeXfUGUQ3By6d0fXKoi8nsbpKaXPa ep59OMRG5Gfc81QibnTxJKvpeFyeQGLIhDK8oVmaDkK/qwax5nFg8PWrYwxWOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dQ+vCrOVxLFY0q/zUicEjRprFH4RPnkTM5Jq/gnuEqE=; b=ZCEpBthZ+Y9OM7eWyVv3zIBOgDGmaObn62oL/HCzfX5iP5ktHUdHGa4Zjso45CyCKTIgGW xv+atQ1ymvt6EH+WeI4V6gO9tERT4zj++LYHypO0HGZg4YVjmdFeGsep4aKR8jcReLCWAQ hyrhFlLgckkkfiKeUzkOaJBY7+TtkfYU5AnBDLjGCpn5fby283/DnJOM4xR9FMdwPJZqdn kuiFX3f3zMnszSbR9P9CBGstTp97cNGOe+UYSWTLhyOuN2Ir4Ds0otc6YbVCt/Hg2uQJ2F zyMUVeSlxHkrx9tEG+NMiPMl+P5ESKpdC4120b6VEFZ4IlkRyDuPBcjhl7UrSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829567; a=rsa-sha256; cv=none; b=XNB6BlzcB7Lu7+a1q4EA8Y3HhwKUGu4IQnIfKcUvDYYcYtYqf9MQ2v7PKsQruMxieDF7Ob hb2yKUMtNAg7bZLrVqDVhMI1LvPISJNCmSvWQUw4CvcjgJK3XvbF0HGbRCwoMSsPdZQpwD JKc7uXlIsJnpILd5EJuTZZF4228ZuSBh3J3YsY7uEHABPFcdbtasu3GktMS2I7bcx6A5Yu 6D/O2OeSY0z0phmPbkMwnbzmdKKlQcNL2JpVvPEWvzMzF3vP88+Wc4hKBfzYsaSvNczlkL c90Tp0XLYZBNMVXIx2jHBb/0f/1S8QrRf24HNZ7F39gfrHsGFJBxFfuQd31uyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1ML5T2bzg6G; Wed, 1 Nov 2023 09: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 3A1966a0065134; Wed, 1 Nov 2023 09: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 3A1966gm065132; Wed, 1 Nov 2023 09:06:06 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:06 GMT Message-Id: <202311010906.3A1966gm065132@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: 9abf60f5cebf - stable/13 - netlink: fix potential llentry lock leak in newneigh handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9abf60f5cebf1904959daacb4084113acc78a173 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9abf60f5cebf1904959daacb4084113acc78a173 commit 9abf60f5cebf1904959daacb4084113acc78a173 Author: R. Christian McDonald AuthorDate: 2023-10-23 11:23:55 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 08:08:44 +0000 netlink: fix potential llentry lock leak in newneigh handler The netlink newneigh handler has the potential to leak the lock on llentry objects in the kernel. This patch reconciles several paths through the newneigh handler that could result in a lock leak. MFC after: 1 week Reviewed by: markj, kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42307 (cherry picked from commit ae2ca32781a90abe987e128ca167ab400a87f369) --- sys/netlink/route/neigh.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 140194b4ad32..dcb37313d0db 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -416,17 +416,18 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * struct llentry *lle_tmp = lla_lookup(llt, LLE_EXCLUSIVE, attrs.nda_dst); if (lle_tmp != NULL) { error = EEXIST; - if (hdr->nlmsg_flags & NLM_F_EXCL) { - LLE_WUNLOCK(lle_tmp); - lle_tmp = NULL; - } else if (hdr->nlmsg_flags & NLM_F_REPLACE) { + if (hdr->nlmsg_flags & NLM_F_REPLACE) { + error = EPERM; if ((lle_tmp->la_flags & LLE_IFADDR) == 0) { + error = 0; /* success */ lltable_unlink_entry(llt, lle_tmp); + llentry_free(lle_tmp); + lle_tmp = NULL; lltable_link_entry(llt, lle); - error = 0; - } else - error = EPERM; + } } + if (lle_tmp) + LLE_WUNLOCK(lle_tmp); } else { if (hdr->nlmsg_flags & NLM_F_CREATE) lltable_link_entry(llt, lle); @@ -436,14 +437,11 @@ rtnl_handle_newneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * IF_AFDATA_WUNLOCK(attrs.nda_ifp); if (error != 0) { - if (lle != NULL) - llentry_free(lle); + /* throw away the newly allocated llentry */ + llentry_free(lle); return (error); } - if (lle_tmp != NULL) - llentry_free(lle_tmp); - /* XXX: We're inside epoch */ EVENTHANDLER_INVOKE(lle_event, lle, LLENTRY_RESOLVED); LLE_WUNLOCK(lle); From nobody Wed Nov 1 09: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 4SL1MN0Mkjz503ql; Wed, 1 Nov 2023 09: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 4SL1MM72szz3KVb; Wed, 1 Nov 2023 09: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=1698829568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLEStKKfU9Lx6d8kXZVf4SMbaP65PT1inBGpxHsqaoQ=; b=ic2RaThb6d1UGsjAe3wYkHB/UY+XzhvvAXI6U1+H2UJYDk0R4I9JmSE4vTU2ioXL/C/v84 dIDBQ28ngjuJ4MD57AhUOBPs7SN7uQvtexwDV46v8XXJigXOqkusJ82tzfppqmLVkBcXRc Yde0R9ClhbAaSM2x5v9wDbzbAimraLyZOXOgM1Gio4scFJyH1QfDe8XzLdIwgElc4fDB5X EaeBSmxIJbsxTVDoAP34mPQRlBhI0yGA0uZFVQmHYTrpgydbR+2VLx8cbZ7wAIXJN3sdKe iUA8AjH4uzLHln6z7qGhK0Mm5GO6g9Ma+irAe+1fV4i8hn+zXgLstmduvYDQVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLEStKKfU9Lx6d8kXZVf4SMbaP65PT1inBGpxHsqaoQ=; b=puLPfz7KcvNQnGLaAKs3FWD5O8aw034W5O5BFhrKusQ3FxGsqtuJPnRdbqLxohZOOOPrbR cp6reJm5xaGL0cCOXt+tsOPUmqr+LEDJXoSaHzp50jyjZktCOT9UlhHKSgFhhM48TMnfts LQRottXIlVy66w4CplQ/J61ijXrv2KjUvdYywL/SEVp+KerHS7lS49GvP78kw9NBJUCHug h/VJjtxXLvK/fWzi5XHbTVn5wtM/72U6qjz/yoF1ItkziM100hYJuY07DErgYRGA/MexbA xM4GjoZRg/PpImvIJ1YKY8Woujr3YwnGgFP4Os0zQXULTRCI6+SYUTesNOPPwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829568; a=rsa-sha256; cv=none; b=FxkpO5AIT/eZ9N2Qi5sYfY+iMQlkgC5xTFCwxeqcClN0mNiN/kJGqmefJ6uymQsvugME54 g7GlKzRmBNBsv/s2i8jb0ujz7zyFAYGEUGU5aZOMhgPpluB5SDjtTGl2XLuefAOvmLFrsP ELd9INu4qPfRhdmVvk8T5dZ3CFB16HhL+274/2ujdYhu+8zhBWyg2MY0XkrB5LTExvbUUu /cxp4bL+jqcp7M5wFfmBbBmfLpL5DKZL48EQW9cP2bmUfsyi3M/ImkVNYOXq4LFkEXGuIf NtBVkNq4nRD5I5oI1qkRgDk1iNVciIAxRuGuMv1ThQXWEZoi8RnhMgzmeZP9IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1MM67sfzfvN; Wed, 1 Nov 2023 09: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 3A1967WJ065209; Wed, 1 Nov 2023 09: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 3A1967Sl065206; Wed, 1 Nov 2023 09:06:07 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:07 GMT Message-Id: <202311010906.3A1967Sl065206@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: a17aa2314d50 - stable/13 - libpfctl: fix pfctl_do_ioctl() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: a17aa2314d5078060417cbfba30b20088359ec21 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a17aa2314d5078060417cbfba30b20088359ec21 commit a17aa2314d5078060417cbfba30b20088359ec21 Author: Kristof Provost AuthorDate: 2023-10-23 11:43:52 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 08:08:46 +0000 libpfctl: fix pfctl_do_ioctl() pfctl_do_ioctl() copies the packed request data into the request buffer and then frees it. However, it's possible for the buffer to be too small for the reply, causing us to allocate a new buffer. We then copied from the freed request, and freed it again. Do not free the request buffer until we're all the way done. PR: 274614 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42329 (cherry picked from commit 2cffb52514b070e716e700c7f58fdb8cd9b05335) --- lib/libpfctl/libpfctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 54e8fedbe4df..c9a5190d790c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -72,7 +72,6 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) retry: nv.data = malloc(size); memcpy(nv.data, data, nvlen); - free(data); nv.len = nvlen; nv.size = size; @@ -90,13 +89,15 @@ retry: if (ret == 0) { *nvl = nvlist_unpack(nv.data, nv.len, 0); if (*nvl == NULL) { - free(nv.data); - return (EIO); + ret = EIO; + goto out; } } else { ret = errno; } +out: + free(data); free(nv.data); return (ret); From nobody Wed Nov 1 09: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 4SL1MN091Qz503lZ; Wed, 1 Nov 2023 09: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 4SL1MM6JfDz3KVY; Wed, 1 Nov 2023 09: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=1698829567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZFvrvRm1dS7oAq++GjOIORBwEffM8euT3KH4SYL/E4=; b=ZWdKP5jo9gv7J47LbKJ9gazYb5yH1V/Kq0E36RGX+KLzkzLpPgK+pPGwFTsbjxdXFTxeEI JKsG1poFi+Ap5TFxC9hss6j3n2VFurcgwnMdLml7bzJzLRJHYY/OZihwB0MljjkAvMVwNc JseWPKSxd1HRU5mm+WO5b1IUh89aZfnJ0u2nkDEVqnyiQqoW69Q4hjxQz1Ojm1UX8yx+Jk kKGlnp8Uo4rtZno9y2sQ347oWfm+t8wUAabQGvaXzgKTf75oJJogIEj4vmR3DpjzVlqeaZ Qb9tJ/PlAZ/rKMWFLL+bG+3y0VK2dSzYOzV7cRPCkWt4obkmYk/mB8xAJJYZxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZFvrvRm1dS7oAq++GjOIORBwEffM8euT3KH4SYL/E4=; b=c3hkLCuQInSsrB9GbC04YLdfAsCQT9vI3CZqU0c+EZx+fBDt3lIeaEMJro8co5cBgoTFyG ybiw5HUpLDlLfxOUwQXXkTpSklzYf/Ow/DbXRmg+fSFXAtOWMsIyv2N7BiS3H6s9hXOlnH owvkTyMroUecAIQEMukSgqhKs8HlcBEMSw0Hn7lVJ0dYGQLORHeKG6zYZX0/mkCRym1SLk 9/+CMTvBlIUYLrFd6Z4B2KHsgwjWP4wldruToqeZmHs+wrQWBDKn/LnD84bftys9DyGlkE ysjRMLYQmSwLPOH0acCDemwoBaeR+VLbdD+L3qUEiohwR0NjiCHgDm0U44xSaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829567; a=rsa-sha256; cv=none; b=RbjDyNqY5pf0z4TAIKB1t5p9VPDxxtYJ1I8Ahgp2j40zQXKeMTceAnJsRCq2y8SeqdD7Lt f2Le2NeMv7ZQd8WRlPLVA52hJWFlTz8Lk74DkVdCPjK3DTh9iyFQc+RQUdSX/nrEX+IM19 zJAbAv3hQIrTKPZohESd/upvVgXe36AG7/kBYzuggrya2U2wMWCIgHqLhjQU0vk5hrT7VW 3OHxyb+SVarrN0zV6M0voJ5F1DffCWF5zrKdPuySivc5veIw+x87aCnU6Ft1szH4i2N89P 7XV0fKlyyvYegx3d117ya40HXeb3YsCqXmpiKhT8vCdFHrDtCa1UefTK3hYeQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1MM5NctzgRf; Wed, 1 Nov 2023 09: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 3A19678K065173; Wed, 1 Nov 2023 09: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 3A1967lB065170; Wed, 1 Nov 2023 09:06:07 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:07 GMT Message-Id: <202311010906.3A1967lB065170@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: 275078f17251 - stable/14 - libpfctl: fix Coverity issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 275078f1725179371dd53c7abac1850b98dac1a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=275078f1725179371dd53c7abac1850b98dac1a0 commit 275078f1725179371dd53c7abac1850b98dac1a0 Author: Kristof Provost AuthorDate: 2023-10-23 11:46:11 +0000 Commit: Kristof Provost CommitDate: 2023-11-01 09:05:49 +0000 libpfctl: fix Coverity issues - handle snl_finalize_msg() returning NULL - insert the correct data into the states list - add missing nvlist_destroy() - incorrect order for array bounds Coverity: 1522929, 1522925, 1522923, 1522921, 1522780, 1522770, 1522764, 1487785, 1471250 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42330 (cherry picked from commit 4abc3b482e0d246cd3518622223795c8de102130) --- lib/libpfctl/libpfctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index d5347a7f8a84..2bdc14e8868a 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -758,6 +758,8 @@ pfctl_get_eth_ruleset(int dev, const char *path, int nr, strlcpy(ri->name, nvlist_get_string(nvl, "name"), PF_ANCHOR_NAME_SIZE); + nvlist_destroy(nvl); + return (0); } @@ -856,8 +858,8 @@ pfctl_add_eth_rule(int dev, const struct pfctl_eth_rule *r, const char *anchor, pfctl_nv_add_rule_addr(nvl, "ipdst", &r->ipdst); labelcount = 0; - while (r->label[labelcount][0] != 0 && - labelcount < PF_RULE_MAX_LABEL_COUNT) { + while (labelcount < PF_RULE_MAX_LABEL_COUNT && + r->label[labelcount][0] != 0) { nvlist_append_string_array(nvl, "labels", r->label[labelcount]); labelcount++; From nobody Wed Nov 1 09: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 4SL1MP4MLzz503nm; Wed, 1 Nov 2023 09:06: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 4SL1MP1Kn9z3K1L; Wed, 1 Nov 2023 09: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=1698829569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fH5IydDJkINmvswSv9/H5FUTv2M3qNAjHL/gsX07s5Q=; b=DRN9685UGVnExgFZ9Rv5+CH30vHlVuV3xFV4aCbmcdx/sVY86oFvhBMZXJvRJBlvKs21Fl aLZhqgK9RXw+WyCirsRalgLPO3f/fZNJQpbrAWiqrx9cnInKxTjoHv/PBdBvDqZLwQ0d2J 6glDtBfr14DttZEBSilE6nZEVErdvG/Zl8+eBUx5hm4arnjBwllyZqrZ4RMfYaAwqQ7nXF 35iPi4KEmEGJIJVo8q5RikYdifqMH19+MvUK1yyPUks0SIiee05Y4hpvmGtjAOMdoBCTgm rSWrEivB2CPcylCcBW7ytMh9z9h+WTM4HjK0dSp6M0j/7pQU4OPyHqYcuOhETA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fH5IydDJkINmvswSv9/H5FUTv2M3qNAjHL/gsX07s5Q=; b=pczDZBWUh+a8+IPKal0bhfba6FHcCM1lni7hYnb7WDppmhBx+79gSFckMm/S8vTP9uqTiF EUzV/UHP2Th6jHxEfWyMOuQaG0XLXdYYBkDqsYOf4nmQHqLg9MGQJiIfapTZqlOZeWLcjT C8w3v8uD3/orxD8vivlG2Md+fxQLEWR4eB1cVk+lZ8n39ikRRXXSGDq/ZfxhdFOrYNrGsW OmkuZq1bHQ4QhVii5RNHVWeLgjCyTlZlhMttzdSnLUVhM/C2F0oQctxOmsHPRbhDA6pe63 kQcLt/6Fi+2UfAy8/xGW268Lu9s/C+SLUcAbE7r+ZwVSArCYHIdSCqdNI2EgHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829569; a=rsa-sha256; cv=none; b=Jqi2QWIBfczAufWYsdMss/CZKZAWbjtpdomRC+gTz9wt05E4z/OoXu6uelCmnM0nAB79Wu Z9elYAzX+zfe8tLBhNl0aGLzS36bVoyTk/vwzwGx6Jg2sDyzpknO0VSFmckHycWZGjb9uQ q1P9FFrgodh3Ci0H0Fkb9tL95OnIO5ayBEMFODFjMSCC7eYlYhxAkqAn9VzU1Byg0abSry hQylMDD8OPpM63cEtGV6tTbDi9Yb0fFoBnC+neU0i4001iWZaxHvkNpnjs4+OnPnVeAntf rCjqHRQm2ygV05utaXBU6mY2ReMZjXAKcucPGlhJ82qIMHNI4anDLRnaMfiWZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1MN6w9NzghV; Wed, 1 Nov 2023 09: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 3A1968J6065296; Wed, 1 Nov 2023 09: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 3A1968Uo065292; Wed, 1 Nov 2023 09:06:08 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:08 GMT Message-Id: <202311010906.3A1968Uo065292@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: c2e7cbe0edb5 - stable/13 - libpfctl: fix Coverity issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c2e7cbe0edb5d3f834aba93311ba8ed027e5dd40 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2e7cbe0edb5d3f834aba93311ba8ed027e5dd40 commit c2e7cbe0edb5d3f834aba93311ba8ed027e5dd40 Author: Kristof Provost AuthorDate: 2023-10-23 11:46:11 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 08:11:36 +0000 libpfctl: fix Coverity issues - handle snl_finalize_msg() returning NULL - insert the correct data into the states list - add missing nvlist_destroy() - incorrect order for array bounds Coverity: 1522929, 1522925, 1522923, 1522921, 1522780, 1522770, 1522764, 1487785, 1471250 Reviewed by: emaste MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42330 (cherry picked from commit 4abc3b482e0d246cd3518622223795c8de102130) --- lib/libpfctl/libpfctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index c9a5190d790c..e0fc90960d7c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -636,9 +636,9 @@ pfctl_add_rule(int dev, const struct pfctl_rule *r, const char *anchor, pfctl_nv_add_rule_addr(nvlr, "dst", &r->dst); labelcount = 0; - while (r->label[labelcount][0] != 0 && - labelcount < PF_RULE_MAX_LABEL_COUNT) { - nvlist_append_string_array(nvlr, "labels", + while (labelcount < PF_RULE_MAX_LABEL_COUNT && + r->label[labelcount][0] != 0) { + nvlist_append_string_array(nvl, "labels", r->label[labelcount]); labelcount++; } From nobody Wed Nov 1 09: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 4SL1MP4Pl7z503ct; Wed, 1 Nov 2023 09:06: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 4SL1MP1KYRz3K1K; Wed, 1 Nov 2023 09: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=1698829569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrIXukCsGxX8bHGMTjiQuzoJ7Xf6OPhoTf8SYI2Y0PE=; b=bz5psSnC4NmHQ3zHCqWd2hSkvDs3xpGpd4FqxN1uRzxhjbOAPe/kYHWfZOjcdp1ZDwutKr OIyGhOaZeXEHHuNbZIFRcGq1CjxY4v+p2TCz/4Mvkd1bNmhPvFaw4e1bOMcXNYscXgQCTP /mNCkGOp3FtFjSUBCXSPWmTNmye5lPSlWCyLF+xBoyx5e05A6eyuRgw+m1HUU3gGQH0mQx gITr1sZ/H5TMOULyP9pZo6XWoj30Q0bOn2iTAQGGqvj3lXnQkuo1kRpbQYYTF5z+hSHpzB 8y10ySnvB1WW5wngfDyF+nLkuJn2LU6n/L5q0rQmxuCFggllmJlyvFsAvHOo5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrIXukCsGxX8bHGMTjiQuzoJ7Xf6OPhoTf8SYI2Y0PE=; b=H/EvI3caSbaTzTgr2kV7/TciGVdo9uy5agO+z+sPg4Zti4eCiCRxljU5HXsYp2fQBc5Cm/ co1pgDv74znWC6oUriOXHB3X5Dz2wCVrcrgzjdf51Rj4XaZRbuzbxKVls4BF1RDhdIlKKv q4tdVv8DVW/9sSVUXdGSh867p4rqEIDpivUGsswDdYb3T6ihe9AtyjqPy4jXqXHZkTdX4H hrCXLr71R/bOfamqLeLogFqbQTZwkGUEQZPJX4c46tOTjFvGJL200xLK/m+fbdvz62wJYP f7xDIQNi9gEjrF8fGFgUxfhnKwTWw+KvL6rpbzzamKb3IKXiroyFVX0N8030vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829569; a=rsa-sha256; cv=none; b=IxmWlMeuNmVRHHSJ/g/ZAXGMrVeAH1trgzQI7P9fxU/pJs0chKpYvV073owLcgFrorwMH3 XkXulpcU5xhIhAJYWTSzBU7kp11MYPsZUyQUQm8ZoUHMrg/OmQ7yNFRkp3euDYZbBG2f6n Uj4iQVcGaR6b4MndyE5YHL/eo8s6qiBOCbkDPGjQSLpoY9oc/g6nZnOXE0ERKfNqQNh9Ci rBssWa75NVEAyjS2p5nP8+vytyAz9oUNREM7fJ65667BMOn1OfRVREwWuy6xqBL2+AN10c 9cRweklhn4nU9pn9IpKrI0skwKzh4jQddf+aHmU1wocP4Y0rAk4/ASMFz3yZMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1MN6gk5zfvP; Wed, 1 Nov 2023 09: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 3A19684a065295; Wed, 1 Nov 2023 09: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 3A1968Fo065287; Wed, 1 Nov 2023 09:06:08 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:08 GMT Message-Id: <202311010906.3A1968Fo065287@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: 14cd670053ec - stable/14 - pf: update pf(4) man page to list DIOCGETSTATESV2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 14cd670053eccc61b2930ed467bd0476d69fb9f7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=14cd670053eccc61b2930ed467bd0476d69fb9f7 commit 14cd670053eccc61b2930ed467bd0476d69fb9f7 Author: Kristof Provost AuthorDate: 2023-10-23 15:11:15 +0000 Commit: Kristof Provost CommitDate: 2023-11-01 09:05:49 +0000 pf: update pf(4) man page to list DIOCGETSTATESV2 The nvlist based state retrieval ioctl has been replaced by an old-style ioctl for performance reasons. Document that one. Reported by: Michael Gmelin MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42331 (cherry picked from commit 6869f90bf5bbb2f5ae5400e3a435b3680991321d) --- share/man/man4/pf.4 | 103 +++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 54 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 4f0ff50d3db5..b757376e0183 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 12, 2023 +.Dd October 20, 2023 .Dt PF 4 .Os .Sh NAME @@ -419,65 +419,60 @@ Set the debug level. enum { PF_DEBUG_NONE, PF_DEBUG_URGENT, PF_DEBUG_MISC, PF_DEBUG_NOISY }; .Ed -.It Dv DIOCGETSTATESNV Fa "struct pfioc_nv *nv" +.It Dv DIOCGETSTATESV2 Fa "struct pfioc_states_v2 *ps" Get state table entries. .Bd -literal -nvlist pf_state_key { - nvlist pf_addr addr[2]; - number port[2]; - number af; - number proto; -}; - -nvlist pf_state_scrub { - bool timestamp; - number ttl; - number ts_mod; -}; - -nvlist pf_state_peer { - nvlist pf_state_scrub scrub; - number seqlo; - number seqhi; - number seqdiff; - number max_win; - number mss; - number state; - number wscale; -}; - -nvlist pf_state { - number id; - string ifname; - nvlist pf_state_key stack_key; - nvlist pf_state_key wire_key; - nvlist pf_state_peer src; - nvlist pf_state_peer dst; - nvlist pf_addr rt_addr; - number rule; - number anchor; - number nat_rule; - number expire; - number packets[2]; - number bytes[2]; - number creatorid; - number direction; - number log; - number state_flags; - number timeout; - number sync_flags; +struct pfioc_states_v2 { + int ps_len; + uint64_t ps_req_version; + union { + void *ps_buf; + struct pf_state_export *ps_states; + }; }; -nvlist pf_states { - number count; - nvlist pf_state states[]; +struct pf_state_export { + uint64_t version; + uint64_t id; + char ifname[IFNAMSIZ]; + char orig_ifname[IFNAMSIZ]; + struct pf_state_key_export key[2]; + struct pf_state_peer_export src; + struct pf_state_peer_export dst; + struct pf_addr rt_addr; + uint32_t rule; + uint32_t anchor; + uint32_t nat_rule; + uint32_t creation; + uint32_t expire; + uint32_t spare0; + uint64_t packets[2]; + uint64_t bytes[2]; + uint32_t creatorid; + uint32_t spare1; + sa_family_t af; + uint8_t proto; + uint8_t direction; + uint8_t log; + uint8_t state_flags_compat; + uint8_t timeout; + uint8_t sync_flags; + uint8_t updates; + uint16_t state_flags; + uint16_t qid; + uint16_t pqid; + uint16_t dnpipe; + uint16_t dnrpipe; + int32_t rtableid; + uint8_t min_ttl; + uint8_t set_tos; + uint16_t max_mss; + uint8_t set_prio[2]; + uint8_t rt; + char rt_ifname[IFNAMSIZ]; + uint8_t spare[72]; }; .Ed -.Pp -If -.Va pfioc_nv.size -is insufficiently large, as many states as possible that can fit into this -size will be copied into the supplied buffer. .It Dv DIOCCHANGERULE Fa "struct pfioc_rule *pcr" Add or remove the .Va rule From nobody Wed Nov 1 09: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 4SL1MQ1zJvz503jT; Wed, 1 Nov 2023 09: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 4SL1MQ1R54z3KSp; Wed, 1 Nov 2023 09: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=1698829570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bjr44JNysVqradx9Sj8guBn8byheGBKi0kTrmBRqmYw=; b=cYHVDcUtbNHAgFwP+oddFvXPaSXycjXtNfo4k43h2owPrDIUk95Z/u28Ik8YCjU3I8I8mV UODWumSIt9Ao6JUHmLaD3Bq5q1svNiu9gFcvk/q28aldAIABMYOlgx5YUY/dVpTRbB/xBx 0FHGMp8LMXrrIthwy1ehEkfl0KqRyV9h9xojo9Eke7T7tnoOX2yldFq3ani890KY3ZhYIg HBK9S5Iv4qEvEJsQnFuxJUj7NkVfDz4i5Z+k7fSYigh7ySIbKrlydYcfJ2CgQKyCkP7+ct U4PbtyZ0nfp48DA3+0m68HEgCls9RfuVcUcGy7TH78qdBi5yVOS128/uJv/nNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698829570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bjr44JNysVqradx9Sj8guBn8byheGBKi0kTrmBRqmYw=; b=GgVoZGGlW+s8jQWVXIg2YYMTt+t+RZYiTTsPjF16atiUSnNSMDlq2JJG6ACf6JqW2+WUYP zwprGZFYt+tAOlc7mVhaeVfd7VGrgaMtx5vNVRpzD9YSx66gtyNQuiDuEy1weHamrMfcam hILI6mOSQ+4m/zrbdgl7LaTkiMsPnq0+fjQQckdPj5K2lpB2ChrZAzk7z3Z7IuDsQQZIF5 3uU25fq/TlnoN5D8b95hrEBejzTE6NOCRahNuZrxHfdhtN+DCHHFLwvBOwfrO7oHm/xG7T x4+YmW/q9O5z3CY+FIJIYwwuXvt1MTSuZzW3BpQpeybX9/vmr00FTF1bdHjA4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698829570; a=rsa-sha256; cv=none; b=lZhbPuy+XUok9xy2MROdUM58Ic5biB/5FXm2IWSsbzIqXF+3awJ5g2EjKg142RHdc7yicX fKTr7RVr1fFj2KlYeeInJKHpPXizSnTBVZoNZNnBm5rk1UewJ7Vajc2wOo2XpQY36MDqIL JjIf73Veg5yEbvqlp/X3EnbgNQ8quciYpwNx+en94BKajdLcmjYNIdi5QivfeawpJ3M5AB DH41bX58rYCqFkB+A22YAKvSostrCdQaq6A9WbmZmsiOwabbAGDV0CrJwP1G3woCTVCHGP hHQUk1CiXwcvjZHElnPvWtJKX94MzaeQtOazQrd4o0wXunhve180IFpiR3a0lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1MQ0P5CzgRg; Wed, 1 Nov 2023 09: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 3A1969UQ065382; Wed, 1 Nov 2023 09: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 3A1969xU065370; Wed, 1 Nov 2023 09:06:09 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:06:09 GMT Message-Id: <202311010906.3A1969xU065370@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: 931c22cb9825 - stable/13 - pf: update pf(4) man page to list DIOCGETSTATESV2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 931c22cb9825a9ee9112c7dec7527f9e102ee659 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=931c22cb9825a9ee9112c7dec7527f9e102ee659 commit 931c22cb9825a9ee9112c7dec7527f9e102ee659 Author: Kristof Provost AuthorDate: 2023-10-23 15:11:15 +0000 Commit: Kristof Provost CommitDate: 2023-10-31 08:12:45 +0000 pf: update pf(4) man page to list DIOCGETSTATESV2 The nvlist based state retrieval ioctl has been replaced by an old-style ioctl for performance reasons. Document that one. Reported by: Michael Gmelin MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42331 (cherry picked from commit 6869f90bf5bbb2f5ae5400e3a435b3680991321d) --- share/man/man4/pf.4 | 103 +++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 54 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 4f0ff50d3db5..b757376e0183 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 12, 2023 +.Dd October 20, 2023 .Dt PF 4 .Os .Sh NAME @@ -419,65 +419,60 @@ Set the debug level. enum { PF_DEBUG_NONE, PF_DEBUG_URGENT, PF_DEBUG_MISC, PF_DEBUG_NOISY }; .Ed -.It Dv DIOCGETSTATESNV Fa "struct pfioc_nv *nv" +.It Dv DIOCGETSTATESV2 Fa "struct pfioc_states_v2 *ps" Get state table entries. .Bd -literal -nvlist pf_state_key { - nvlist pf_addr addr[2]; - number port[2]; - number af; - number proto; -}; - -nvlist pf_state_scrub { - bool timestamp; - number ttl; - number ts_mod; -}; - -nvlist pf_state_peer { - nvlist pf_state_scrub scrub; - number seqlo; - number seqhi; - number seqdiff; - number max_win; - number mss; - number state; - number wscale; -}; - -nvlist pf_state { - number id; - string ifname; - nvlist pf_state_key stack_key; - nvlist pf_state_key wire_key; - nvlist pf_state_peer src; - nvlist pf_state_peer dst; - nvlist pf_addr rt_addr; - number rule; - number anchor; - number nat_rule; - number expire; - number packets[2]; - number bytes[2]; - number creatorid; - number direction; - number log; - number state_flags; - number timeout; - number sync_flags; +struct pfioc_states_v2 { + int ps_len; + uint64_t ps_req_version; + union { + void *ps_buf; + struct pf_state_export *ps_states; + }; }; -nvlist pf_states { - number count; - nvlist pf_state states[]; +struct pf_state_export { + uint64_t version; + uint64_t id; + char ifname[IFNAMSIZ]; + char orig_ifname[IFNAMSIZ]; + struct pf_state_key_export key[2]; + struct pf_state_peer_export src; + struct pf_state_peer_export dst; + struct pf_addr rt_addr; + uint32_t rule; + uint32_t anchor; + uint32_t nat_rule; + uint32_t creation; + uint32_t expire; + uint32_t spare0; + uint64_t packets[2]; + uint64_t bytes[2]; + uint32_t creatorid; + uint32_t spare1; + sa_family_t af; + uint8_t proto; + uint8_t direction; + uint8_t log; + uint8_t state_flags_compat; + uint8_t timeout; + uint8_t sync_flags; + uint8_t updates; + uint16_t state_flags; + uint16_t qid; + uint16_t pqid; + uint16_t dnpipe; + uint16_t dnrpipe; + int32_t rtableid; + uint8_t min_ttl; + uint8_t set_tos; + uint16_t max_mss; + uint8_t set_prio[2]; + uint8_t rt; + char rt_ifname[IFNAMSIZ]; + uint8_t spare[72]; }; .Ed -.Pp -If -.Va pfioc_nv.size -is insufficiently large, as many states as possible that can fit into this -size will be copied into the supplied buffer. .It Dv DIOCCHANGERULE Fa "struct pfioc_rule *pcr" Add or remove the .Va rule From nobody Wed Nov 1 09:14: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 4SL1XW2cvZz504Q0; Wed, 1 Nov 2023 09:14: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 4SL1XW2QW7z3NrV; Wed, 1 Nov 2023 09:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698830043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjtISXVURNgnX8mCJCK3on36ceKvzDxGw1pIeF4uLYA=; b=daPb2YOyJN7h8Fp1khqoRuAKXPIaM6cPE4+B9l8G8IwiX5pQTnUWI5da8Imd/65CtrlZ39 Jou/q9dV2zECCrA+YXAdgfyqqZr5SMrXJygI3NKJRfm/vet22X5p+0Sv0AfkBi1WxG/WWi 5mXVO7nGJ6SJbaQEtdrHssWDTNHrw8Y2vooirHOxlNUteas+tUU0Ht5FB3Q5kRFP6Nnqol GOHQXBwFXuYHKlKFE+1tNXpnJi/J0clZt/7pZ+bFizHB3yLI5fjXpN4UyJjsBolOZZk+O3 hw5/7PdfpUWVy7701rbmi7AFnT1vR4Qc8vORKVgLkYQXk89SBSvARrfae2cDIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698830043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjtISXVURNgnX8mCJCK3on36ceKvzDxGw1pIeF4uLYA=; b=EduAEf0JzHpTkfIaeH3FtGSmBKxjlxfGXbbic7XHw8NjgEy+fU7JtFwI+v8eUROlphJYM0 pgkbltd2/70yKgjICSHrPQd0jew8eGjBnwR6msxazEoeHoI3gisFqO8DPO5DrfePm1A2GY P94toJIGg+rtyhu1w/1weScjaAsKdFJFTdk+VyT3VyfvN1vivSUr3DRvumgLjlChlB0iR1 KZqDj5H/jjCJx471u9sl54Uz6KQNB21CGx7MyNFIJ62s93I7ge4JxXYBz9BZbNzg9kSM0y rwTdhG5AhKGRtq3oH4VPNvW35azUSnhkEHASmlco8dHgf0gF9d7H7exSt4m7/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698830043; a=rsa-sha256; cv=none; b=RkHbAg/hg4Men91e1mHWkMCdTwOl4fEyqTmdooFaI6N6++UNrCcct4Vsy+VBlYY66PUz1k KmKHrAGKDrFt8KYqu9CaQKyR35d7+q9LwW3vmJiYgpBmZYm52fdv1sr+cuqQiGFBcwi9mA ZQDbRcR7GGmrusxlcYC0cKuCmhMOu4/diPTNcalQrv8zXkQ4w2Yk9R5K3mlrAEK5cLyEJ/ 15MdadO1581L8lGaZB70vERwrC/VxUUy0UlrU5s4/k4FGKl0kBjFJ4WJI0SZNBDnTslH7/ YNQp+Ko8Z7fzB3j6CZGsdJ4keTisBgSIdZgqMbB3Bdpn0EgzehQch8BHi0ivRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1XW1VSfzg6y; Wed, 1 Nov 2023 09:14: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 3A19E3CW082521; Wed, 1 Nov 2023 09:14:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A19E2qQ082519; Wed, 1 Nov 2023 09:14:02 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:14:02 GMT Message-Id: <202311010914.3A19E2qQ082519@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: f8b1db88b827 - main - zfs: merge openzfs/zfs@41e55b476 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f8b1db88b827cf24ae14c55a2e762313f0f9911c Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f8b1db88b827cf24ae14c55a2e762313f0f9911c commit f8b1db88b827cf24ae14c55a2e762313f0f9911c Merge: 0c5cd045bfb8 41e55b476bcf Author: Martin Matuska AuthorDate: 2023-11-01 09:12:47 +0000 Commit: Martin Matuska CommitDate: 2023-11-01 09:13:42 +0000 zfs: merge openzfs/zfs@41e55b476 Notable upstream pull request merges: #15366 c3773de1 ZIL: Cleanup sync and commit handling #15409 dbe839a9 zvol: Cleanup set property #15409 60387fac zvol: Implement zvol threading as a Property #15409 9ccdb8be zvol: fix delayed update to block device ro entry #15448 05a7348a RAIDZ: Use cache blocking during parity math #15452 514d661c Tune zio buffer caches and their alignments #15456 799e09f7 Unify arc_prune_async() code #15465 763ca47f Fix block cloning between unencrypted and encrypted datasets To make the module version better comparable, the module version number now includes the commit count since last tag. Obtained from: OpenZFS OpenZFS commit: 41e55b476bcfc90f1ad81c02c5375367fdace9e9 .../openzfs/cmd/zpool/compatibility.d/grub2 | 10 ++ .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 1 - sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 2 +- sys/contrib/openzfs/include/sys/abd.h | 6 +- sys/contrib/openzfs/include/sys/arc.h | 2 +- sys/contrib/openzfs/include/sys/arc_impl.h | 1 - sys/contrib/openzfs/include/sys/fs/zfs.h | 1 + sys/contrib/openzfs/include/sys/zfs_ioctl.h | 1 - sys/contrib/openzfs/include/sys/zfs_znode.h | 2 +- sys/contrib/openzfs/include/sys/zvol.h | 5 +- sys/contrib/openzfs/include/sys/zvol_impl.h | 5 +- sys/contrib/openzfs/lib/libshare/os/linux/nfs.c | 18 +++ sys/contrib/openzfs/lib/libzfs/libzfs.abi | 3 +- sys/contrib/openzfs/man/man7/zfsprops.7 | 12 ++ sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 62 -------- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 32 ++++ .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 21 ++- .../openzfs/module/os/freebsd/zfs/zvol_os.c | 38 ++--- sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 51 ------ .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 36 +++-- .../openzfs/module/os/linux/zfs/zpl_super.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 11 +- sys/contrib/openzfs/module/zcommon/zfs_prop.c | 3 + sys/contrib/openzfs/module/zfs/abd.c | 24 ++- sys/contrib/openzfs/module/zfs/arc.c | 52 +++++++ .../openzfs/module/zfs/vdev_raidz_math_impl.h | 156 +++++++++++-------- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 25 ++- sys/contrib/openzfs/module/zfs/zfs_log.c | 14 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 25 +-- sys/contrib/openzfs/module/zfs/zio.c | 89 +++++------ sys/contrib/openzfs/module/zfs/zvol.c | 172 ++++++++------------- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 33 files changed, 449 insertions(+), 439 deletions(-) diff --cc sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h index 56a0ac96ac19,7f0f24325d59..e7ebcccbe0ce --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h @@@ -284,9 -284,7 +284,8 @@@ typedef struct zfid_long #define SHORT_FID_LEN (sizeof (zfid_short_t) - sizeof (uint16_t)) #define LONG_FID_LEN (sizeof (zfid_long_t) - sizeof (uint16_t)) - extern uint_t zfs_fsyncer_key; extern int zfs_super_owner; +extern int zfs_bclone_enabled; extern void zfs_init(void); extern void zfs_fini(void); diff --cc sys/modules/zfs/zfs_config.h index 39caf1355771,000000000000..5344d981882b 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 */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + *** 257 LINES SKIPPED *** From nobody Wed Nov 1 09:29: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 4SL1tg1X10z505ZG; Wed, 1 Nov 2023 09: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 4SL1tg13Wqz3R5L; Wed, 1 Nov 2023 09: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=1698830987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsHurrNvAP9Lg5gYxwV7vZ5/5Of7d9fJaMmpwV4oGVo=; b=WqQk22M+F9p2tdMg2ehOoLCcZKquU6sfbJTpU7HQsngVT8e80pEq6oBgWG+DtbhN69i5Np hIFZ4XwlFA7OnsPQv/hmd1PJshKZbk7jh7vMKCo4HhfXMRs7Ls1SVkbfk7NNwPYEi8Rsai XweR34hxh0/QE6Fotdf+sWeFt2ORSMf8/DN7UTqaGEgh7Z74f4HLUBcgLlPYcKkfRKirOK +NAa3lSD4wD4laEJzJyLGL8TVV9KKoIaZuRAuH2qdvVVVO5YBMuxitqAkErjjcw0HQkcvJ DgYu6gDYlKhEqx0qb3J5IH1mP4JwY/f4QO9ixIxasJGH9+usRb5suzO4qE/XwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698830987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsHurrNvAP9Lg5gYxwV7vZ5/5Of7d9fJaMmpwV4oGVo=; b=ptGhqkeIoW/5YkbFHjfzdsuuvGE8lcVvvEM+mMDseHqlIm4ZMcEx5gtdPfD+mIrUiQ0gue 3B4xgIGQn79YI7Nga66UWCxhwQIzI2SxR1hmf3Uic5wxXPjG0ofaIZSilBE8WdSUS18RwV W9tkcMWtx6vTk0Jcgg5Nky/2NRcHjsWl49zQ2SRdHgb2qv/H9l+lxw+D7ve6alu7fFBjhJ mmiv9wzFRbm99/QQkSsX4V9S+Gj+oOX0PVjrC5SMcnzg9oDtSh7V7GGmyLsMNjg0QgqDxw AB3Z1MNe6tleOd0EB63FkwVpRzBjtsozLNq6r8hrk3hk7Ti+J9qS5cJ0hmpxTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698830987; a=rsa-sha256; cv=none; b=AAV14Xb9ZNUCcmqHn/vydC6DZ3ZLIBTGJAThrJUUK07zhcWXU78sLMBqFXRDkBD60wQKPJ uAl4KZJtGYlcAqkgzAx8Th09AAPXY6uCal0q6yv0E3CGUgammZBfifAC0i5B1RqJIN9nsW dS9D0a8PJbnbJLFpCtD4P/13aXkk38YdSOBfsvXilg3PUpoU9ImN72tsLwFqIgBnfj28ps eLn7hWzlxMkS0zEhTVu6Vd6hHnJUgEf5EIeK16Urg/j5DWyC8JxgYnJdNKXLGz7/EOZguV U0cIi1kGBkBbkEvA3LAMjSgulHp3uEEFN20PakC/DPAfQkQubxDP5Mfzg+EaGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1tg074rzh4R; Wed, 1 Nov 2023 09: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 3A19TkEh099506; Wed, 1 Nov 2023 09:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A19TkvM099503; Wed, 1 Nov 2023 09:29:46 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:29:46 GMT Message-Id: <202311010929.3A19TkvM099503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: c5eb93ef57f4 - stable/14 - zfs: cherry-pick change from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c5eb93ef57f4905f7aea9566ab45be1a75ada150 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c5eb93ef57f4905f7aea9566ab45be1a75ada150 commit c5eb93ef57f4905f7aea9566ab45be1a75ada150 Author: Martin Matuska AuthorDate: 2023-10-31 20:49:41 +0000 Commit: Martin Matuska CommitDate: 2023-11-01 09:29:34 +0000 zfs: cherry-pick change from master #15465 763ca47f Fix block cloning between unencrypted and encrypted datasets Fixes a kernel panic when block cloning is enabled and system is trying to read data from a file copied using copy_file_range(2), e.g. with cp(1) from an unencrypted dataset into an encrypted dataset on the same ZFS pool. As the file has not been encrypted, to fix the filesystem inconsistency and to avoid future panics it must be deleted (metadata is readable). Obtained from: OpenZFS OpenZFS commit: 763ca47fa81808be62ab5e02357e896233f24abc --- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/openzfs/module/zfs/zfs_vnops.c b/sys/contrib/openzfs/module/zfs/zfs_vnops.c index 40d6c87a754e..84e6b10ef37c 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_vnops.c +++ b/sys/contrib/openzfs/module/zfs/zfs_vnops.c @@ -1094,6 +1094,15 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp, ASSERT(!outzfsvfs->z_replay); + /* + * Block cloning from an unencrypted dataset into an encrypted + * dataset and vice versa is not supported. + */ + if (inos->os_encrypted != outos->os_encrypted) { + zfs_exit_two(inzfsvfs, outzfsvfs, FTAG); + return (SET_ERROR(EXDEV)); + } + error = zfs_verify_zp(inzp); if (error == 0) error = zfs_verify_zp(outzp); From nobody Wed Nov 1 09:30: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 4SL1vc0Df5z505gy; Wed, 1 Nov 2023 09:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SL1vb5wMHz3RYS; Wed, 1 Nov 2023 09:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698831035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v/EsQJjKiWOfv7EWzNgFr/s+LEen8ZBRXDHIMwKZ2Zs=; b=jdAv0KODopFSFLp18iKcvikNLuu0HosGOZAPWuRn+pW/5VcrRebedFD0382w2jwKC3U6+t uam7+IAZPdEVuvvJDbuu6EIAhxsuw/Xk/dssDK+Vsa8NKs9iH79LWdDsuix8fJGNTCSNNc UitlAHggwNBkQsO9GlDfrAn2O/y5o4DMfh71Rdy9DgWmlPOuYDDjdnZfnTIe1IEB/JX1wb qzXtNGKcnutOJwZWsCjcq2lNP98EqciSKtC4agUGzYrnrAvnTRZifdPU5F6WaMVXA0412P jU/W/LfQsUhubggyFoYN+j7C14F13powj4PZyNbSRTFjBWwx77ldHApOV0dDgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698831035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v/EsQJjKiWOfv7EWzNgFr/s+LEen8ZBRXDHIMwKZ2Zs=; b=drHrs49Kpj0nIQjMfdTkAx7k5QRfy4ewfmuwFkv6kHk03BSoF3T583bASfRxZZ6v+JOkBP 37mBJNovc1wdLGE4rBo9Is5tML+7N0swcX5l7lUDFIdHVX/V2bNZPDsrWbRmzoSG172M5Z qSwJpf6PYgeVrBISPV6PLsnFIDwXSGKmDMajkb/DJxQiQm/jlaMZTLdhsP4tNfiPxz4Jvz 21RxVHdYV/B0qqtr5lUmzzUhe3dhHva6bztV6EDXGIwM35ZokFNMtTzxJEr/KJmSic9qxV 8lg7fYWV7rGnWk8SgULwawMeArEt9a4V1SPaC07gSODMkrQRrt2Kg57n2BFclQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698831035; a=rsa-sha256; cv=none; b=CTBiy+FYZ/fS6rmwovsD0FZyGByRwWPCx/6RaJEjU0l5vZhAfqYe4541GMrw0no+x+ohNG 3BSvAAa37EGg+Kx7f2E5BJBTKzKwd0aBah8SF5LvwagEQvoYa765V2eO+9WxfWjMparp3J qjKHZf9dcqB+k0zF2zi7D8cPtSwFAZsjEZPnkVr8heuVxftjIzEpa4wpN/p3cWcvMloLqs BrMJMLAe+4v/GftUnbZb+E92BL8XbrtdSoK6CNKISMgj1QrOedn801wPhOa4eyrtNLxuOs wJwZ8ha+FhEZVmuU22qst2do2LhoULWgWnwfXOuX9quKOX17pF/03UUdd4+4dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL1vb4khczgkq; Wed, 1 Nov 2023 09:30: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 3A19UZXi008309; Wed, 1 Nov 2023 09:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A19UZFg008306; Wed, 1 Nov 2023 09:30:35 GMT (envelope-from git) Date: Wed, 1 Nov 2023 09:30:35 GMT Message-Id: <202311010930.3A19UZFg008306@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: aa64a8f5c35c - main - udplite: fix checksum computation on the sender side List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: aa64a8f5c35c13b1c325f1a4597c987a37bec5da Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=aa64a8f5c35c13b1c325f1a4597c987a37bec5da commit aa64a8f5c35c13b1c325f1a4597c987a37bec5da Author: Michael Tuexen AuthorDate: 2023-11-01 09:24:56 +0000 Commit: Michael Tuexen CommitDate: 2023-11-01 09:24:56 +0000 udplite: fix checksum computation on the sender side Don't fill the fields of the UDP/IP header not used for the checksum computation before performing the checksum computation. Reviewed by: glebius MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42275 --- sys/netinet/udp_usrreq.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cbda7f536262..a96ec22c5992 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1330,8 +1330,12 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, * into network format. */ ui = mtod(m, struct udpiphdr *); - bzero(ui->ui_x1, sizeof(ui->ui_x1)); /* XXX still needed? */ - ui->ui_v = IPVERSION << 4; + /* + * Filling only those fields of udpiphdr that participate in the + * checksum calculation. The rest must be zeroed and will be filled + * later. + */ + bzero(ui->ui_x1, sizeof(ui->ui_x1)); ui->ui_pr = pr; ui->ui_src = laddr; ui->ui_dst = faddr; @@ -1356,16 +1360,6 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, cscov_partial = (cscov == 0) ? 0 : 1; } - /* - * Set the Don't Fragment bit in the IP header. - */ - if (inp->inp_flags & INP_DONTFRAG) { - struct ip *ip; - - ip = (struct ip *)&ui->ui_i; - ip->ip_off |= htons(IP_DF); - } - if (inp->inp_socket->so_options & SO_DONTROUTE) ipflags |= IP_ROUTETOIF; if (inp->inp_socket->so_options & SO_BROADCAST) @@ -1399,9 +1393,16 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, m->m_pkthdr.csum_flags = CSUM_UDP; m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); } + /* + * After finishing the checksum computation, fill the remaining fields + * of udpiphdr. + */ + ((struct ip *)ui)->ip_v = IPVERSION; + ((struct ip *)ui)->ip_tos = tos; ((struct ip *)ui)->ip_len = htons(sizeof(struct udpiphdr) + len); - ((struct ip *)ui)->ip_ttl = inp->inp_ip_ttl; /* XXX */ - ((struct ip *)ui)->ip_tos = tos; /* XXX */ + if (inp->inp_flags & INP_DONTFRAG) + ((struct ip *)ui)->ip_off |= htons(IP_DF); + ((struct ip *)ui)->ip_ttl = inp->inp_ip_ttl; UDPSTAT_INC(udps_opackets); /* From nobody Wed Nov 1 14:32: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 4SL8cC3qbHz4rxxd; Wed, 1 Nov 2023 14:32: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 4SL8cC3LYrz4VDk; Wed, 1 Nov 2023 14:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698849163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvejniOKfGZfvl3AaTEr3CEvW9m9NQOBG5cm62hC8SQ=; b=SuyVsa+y/7yUMfqodJ/5dJw3sSWaGdEFDmEoNXPW953sgxQnal5/fBUSbFQt76R0dqOE5Q Gwdcz+5YfDdjvh8kI8PuSuwWlst9mb5oY+GfrBabDie5/mCXAJjLTs6zwDeHF+jKDYhEev KW7I3RarQmEkpIHbwn58hXShB1erCcT8t2q/4Oh4tCmwt/QUVlQhtq2tmogYsGWNQU/6Fw Vz0S0iMmF74LzqzAB0ExjmII6n7nn8kcEY5KoJpThlMWUi4jxSM4emJ18764mwWMJjKymu AhkdW/MfOyYo6jMos/g/pVyUVbpLuIDvmn+s+kd5u+kJuBgvwrULtVykvEERCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698849163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvejniOKfGZfvl3AaTEr3CEvW9m9NQOBG5cm62hC8SQ=; b=N8kR653BFskbA/IMWkcL5AdsgyueZZ5mdhsMd4AcHefjiaWE5HtD8Agm1AG8lbonc6AaHh psQVmySFZ6qE8qj4NVlhpRRGWl+G14IV/2FmA363BIvoCaswdPn4xb5a3EvWba8XrIErw/ MIvYdb6sKXHa77PxXa/rMugDt0C61U6XyLVbbzEyaHf9qyZrTPR2fIYd8BC3VI3d+5imAh 4V8neZTAcBR51AoXBvK5+yYYezViIztgjpx4pdT7QgwOozeGizBvV6rqhOBMGKmkwzWMym l48aWQjsXheoSrOKJ4L/gIQS5dxDDAJd3mep3q2OBgRwJ9IkdCFL+eK7dLUW8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698849163; a=rsa-sha256; cv=none; b=lk5xq8bPYJsfSZ1GQf0G1HjRoV7nLhYU88vG853VkJTsYhBEkvZXJfU/oUcvd1jioJGHsu Z743r2PdFNt+1m7CL9kCvvcmjbvFd7Oy2d7wldOb2q9JeQ9pwOHmNM6WTy1VmnnSAirts7 8Wjh/41flJwpe4Jb7fgLxBOyk36usEDbYGBKmHAUE9JilH1SuWPT+D4em75Re6gD/63Box ivJCduS3HC/StTivy2mTveEUcJvtk/wYiGjpnGefU72QPJXPlmHkecuYxbYNNPVpBSpO67 3KQ8oH0CU4VbgJu+cFUoqjuY9udfGn/856wglWPuJ3TOIl6YstYlvhijrZ4KBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL8cC2Q3vzqh8; Wed, 1 Nov 2023 14:32: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 3A1EWhPJ015122; Wed, 1 Nov 2023 14:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1EWhEZ015119; Wed, 1 Nov 2023 14:32:43 GMT (envelope-from git) Date: Wed, 1 Nov 2023 14:32:43 GMT Message-Id: <202311011432.3A1EWhEZ015119@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: f38bad0ab0fc - main - Remove MOVED_LIBS handling from list-old-libs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f38bad0ab0fca9b1f665b2ba79098edf993c0854 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f38bad0ab0fca9b1f665b2ba79098edf993c0854 commit f38bad0ab0fca9b1f665b2ba79098edf993c0854 Author: Ed Maste AuthorDate: 2023-10-16 12:46:31 +0000 Commit: Ed Maste CommitDate: 2023-11-01 14:32:31 +0000 Remove MOVED_LIBS handling from list-old-libs In 922337e8d398 I added MOVED_LIBS into list-old-files, so that delete-old-files would remove the old /usr/lib/libc++.so.1 as soon as possible (after the library moved to /lib). I left it in list-old-libs in case a user updated their src tree between delete-old-files and delete-old-libs. Now that some time has passed, tremove the redundant MOVED_LIBS entry. PR: 272642 Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b3503c93cffc..6bdb933c813e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3372,7 +3372,7 @@ check-old-files: .PHONY list-old-libs: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V "OLD_LIBS:ts\n" -V "MOVED_LIBS:ts\n" \ + -V "OLD_LIBS:ts\n" \ ${_ALL_libcompats:@v@-V "OLD_LIBS:Mlib/*:S,^lib,usr/lib$v,:ts\n"@} \ ${_ALL_libcompats:@v@-V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} \ ${_ALL_libcompats:@v@-V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib$v,:ts\n"@} | \ From nobody Wed Nov 1 14:41: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 4SL8pk3npfz4ryhN; Wed, 1 Nov 2023 14:41: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 4SL8pk3Hqzz4X8p; Wed, 1 Nov 2023 14:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698849710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LDiUR3Ub1tDWzBco81JUBR9KU0WkoVlXIxHfWqk1XDg=; b=el74EzQ/FVpXutvn/57CfNC4kJeuF+bU/g0Af+o9M+kLzbxDvvezx3WVBdvNQrWjMXnfTK SEk9c68c7KU9limh5izxOP+GehunqRMYq2NozmD5Pk5YChfBKUZ0OTXWDMyCxvva/8YIaV SSlfsiFF1SrFKF+RpJynnkAaYFFsP+/SynDUkfZzx2Mwcps5Q1AlzZERnVCOnjG8RCxzbR 0hkkBrgh2GEL87eFZH76yXZFrVc+W2WPYKecinWpUN3HSqM5Uo4eZfOHC9koTxJUACZjr6 P2EVs7O48JBn12IWFLoOiVSOL6aElcUvIptitTk5UPlgSUBbn1/+bgKVSoGQcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698849710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LDiUR3Ub1tDWzBco81JUBR9KU0WkoVlXIxHfWqk1XDg=; b=Wqh2FPaZMm1yBIt4xE8AcuIh1G9m+RmxvaJwcYPp19FyLOIO6bnxf4y1RdpVdzFDFgao0k dCTBiXRaDCF4B6Yaz46rdApOCWKtYkM1TQPItKvfcgSK08+zIhRHxhMjW8dtkD47cQldsp tibSEgv83B+rC7U9rjnG1QtLg7rWjzNSzNcFTk+/Vy/rxGOG8TFlmu7T6HL3rOqeezmAbn Jz4kz7vDGjNVJcBgb432KU4tkn1pfnrROVeWtErU6JIpDMP6QSxNb9xUzjp9sV4gMRDSUm 38tD0uBo3ZNpFEnHRswMFkqtbfjuH34U1V9iImSY6RHy/dFgewVx27Rm032QqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698849710; a=rsa-sha256; cv=none; b=H1KxJNzrrI2+fneWlGZPZ4Z3K9dxPrNX0FgA49DXOU5UMptcAvz62kuFejZE2vW/Lir3va BntKOjxSp/NG34r6qM64POHv+/ZGqMK98DCR8rjuHbKxTe4bfHp9M/66g9Ws6xKboCu//V UfbV326FNk8D/r21EnkyFJpZATStmNnZOIdEB2meoxsAFsL4rPFMKAL4WtMci4HkMR/GoU u3xMv77ZCf5NtTpySMdwcLswTKvLydpv/VLc+PO2OSic+KfLQ6kTlrD7pE76LlFuOxcPvz xFX6biqCgk0GVQH84P8/+gxa9TJby2YyF95EyLqGDyhJ0PIxTnUm/ppq6cB7Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SL8pk2LFkzqqJ; Wed, 1 Nov 2023 14:41: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 3A1EfoVa030249; Wed, 1 Nov 2023 14:41:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1EfoBC030246; Wed, 1 Nov 2023 14:41:50 GMT (envelope-from git) Date: Wed, 1 Nov 2023 14:41:50 GMT Message-Id: <202311011441.3A1EfoBC030246@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: b68d2789f0d7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: b68d2789f0d745d420203ca7dae9408f81cc7206 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b68d2789f0d745d420203ca7dae9408f81cc7206 commit b68d2789f0d745d420203ca7dae9408f81cc7206 Author: Igor Ostapenko AuthorDate: 2023-11-01 12:21:16 +0000 Commit: Kristof Provost CommitDate: 2023-11-01 14:41:36 +0000 ip_var.h: align comment style MFC after: 2 weeks Reviewed by: kp Pull Request: https://github.com/freebsd/freebsd-src/pull/883 --- 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 Wed Nov 1 16:23: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 4SLC4L3V8Zz4ybGq; Wed, 1 Nov 2023 16:23: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 4SLC4L30Y9z3Fqd; Wed, 1 Nov 2023 16:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698855826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=94HJla/Iq7gX7C2pBK5oi77IVovV7P9E4B8brB2XCqc=; b=KoErcBT3nEIzAtRkMFinssmoY6aFsgeY6KAnAhbHdtulbuXoKM1HrIYUa7A8yF7/yv66JS t1JfwBmpKzN9LPhn26Ou8a+S+vZHfOv8MbP/vZyeraC/MGLAcGTvBX4KfIOfe3fL7n7nUl 13sVbtlc5HBkE3An4QPN1NiTCpy0Y147MScomLRrdYf/N3l8JXnBvgMpINu7EY/PKV5DCE QkK7WBaPrNh6mx6+BtdAAv9PrvrKaQn/EZL7C3Gi7NwG/LvdqdoH0cuRrOOGri7kM64Jnr Nt62lhJlsWrLcJY3OL9iT0b51onOvP+Wgo4defXP1/t99oSAuAo3BDAmPXzwzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698855826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=94HJla/Iq7gX7C2pBK5oi77IVovV7P9E4B8brB2XCqc=; b=sq/zWzbmlf6J2W3mQT0vl4kYJH8APT4Bv2DnFXb/h5+ZPg0maDH17L7xQz1WEbpg23s/21 5IcyUVP1yzdWZNGO2EOD0dEkNDuApXWQ9Q20vGtP2QO9v3Y+vaCRDMPyhCQ3+Gm4wC1/c1 bFuJNnm3M2ALLORH5ycNa4ayafECsCDp4vv9W9nHN5odkYitk07G1as8btX7iE5/PnAxzS Tl6EXvIbYYyg7XUsXdH6/0o3u21DNcLiGstjKn9vI3wHxoRfTvsnZwDgkVxndHkni4N0Fc +O6TCuTrMXV4O/43cs/vkybyQmk4piYIZXo4uoKrgd14GL95temv0YcwRurBbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698855826; a=rsa-sha256; cv=none; b=y2vX7k2KzqlQ22/+fqmkpZU/yssn5SHbUtTP6hmEQJtpZvJi1RoA8pfzU3c6QvvInulZ+5 wwjlX5Foo9nFX/VDtGr2KySYbV/tfTiz3UT9G9qsA4FuVDjUTm1bOtWz9NRwKz6MFUbu3J cY6DAuosXbZ+g5pL/7nxpmsby0mOqJUrITf4YBJHirM5oLbIjz22sZaxo2dFUQrHCrnDZf GZjBBtdDTGmp9f17EiSwJPt+B9o6Ba84c3E3rFS3bABidNkGoNnhaZIUG7MQzXl/LFQlP9 LrlPbNtx6RQLQcUvULvk9gsxVn2C6e7i+YU6PjIsWAQwh51XOkwtoCZp1ZzrnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLC4L23tlzssY; Wed, 1 Nov 2023 16:23: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 3A1GNkIb099554; Wed, 1 Nov 2023 16:23:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1GNkxi099551; Wed, 1 Nov 2023 16:23:46 GMT (envelope-from git) Date: Wed, 1 Nov 2023 16:23:46 GMT Message-Id: <202311011623.3A1GNkxi099551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5019a5acc5b0 - stable/14 - Giant: Postpone removal of Giant-locked drivers until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5019a5acc5b01804e9dccd3796e9e0ea7c82ba90 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5019a5acc5b01804e9dccd3796e9e0ea7c82ba90 commit 5019a5acc5b01804e9dccd3796e9e0ea7c82ba90 Author: Zhenlei Huang AuthorDate: 2023-10-31 12:45:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-01 16:22:22 +0000 Giant: Postpone removal of Giant-locked drivers until 15 Reviewed by: imp MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42401 (cherry picked from commit a8bd34bfc0db38c1c11e9c36b7dd849d607c17a8) --- sys/kern/kern_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index a7c22b7d118a..db5fe7a6a373 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -665,7 +665,7 @@ prep_cdevsw(struct cdevsw *devsw, int flags) if ((devsw->d_flags & D_GIANTOK) == 0) { printf( "WARNING: Device \"%s\" is Giant locked and may be " - "deleted before FreeBSD 14.0.\n", + "deleted before FreeBSD 15.0.\n", devsw->d_name == NULL ? "???" : devsw->d_name); } if (devsw->d_gianttrick == NULL) { From nobody Wed Nov 1 16:25: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 4SLC6J6fBnz4ybFB; Wed, 1 Nov 2023 16:25: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 4SLC6J66cmz3G2p; Wed, 1 Nov 2023 16:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698855928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsIhyuvoLaXYyyYsZNux4OXw9Ms9mv+h8wMPJCqCC+Y=; b=KRbPRlw8WlDJSkZPFy3xqtwTckSQeowpvWOzjV4K2lbKr3orateMWMQal2T/C9zeCau96l wbOBf0SgjbGopF3QgI9QMK+wRI5OPlCE1ISP2upx6whdUzFzZY9EK+jc6Snwy2z4GbGzTP WBxXQA0lIsDiWWmKEpGMLlQUlRfVX71NH3inxZpi5LqrQACOgy/Nud8pN0hvuItq5wpSJr Ozu4q64wI5JyEoXGu6FaylvceNInhm+NDUNBOUtOPacewIygzimbRnoAIvbYXFK0zcU+Cw 8ABIZBQfA2JUV41w7Tk5oMbGl52mluwliTp0U0QjoBy/AePusIjBMHMx8l5jGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698855928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LsIhyuvoLaXYyyYsZNux4OXw9Ms9mv+h8wMPJCqCC+Y=; b=e6lQPk0HNFmAkvwmSjqTaHiAtWOaqTzviUAyR1ARwicRB3+GqJb8BClKWV9RqOHtH5DfVN EzT+PckC9vK1l5591NpQnGc1T5nF3nyi4Zu9uX12P1dDxCkbiW8azGbaSFN18eWIRUSZwl mjcT7aY62ye7d0zZfSpB0v6tECxhhvbWYNpLcGSzOsGUUledH1QY06gaEc8u2Mc9nEduby sO05qXIlTPc47052QYGAKZkX9y1E09XQr34NNIDJIBhMVBGdMQEPtc7li9NjJdz+WB3t4Z bQeJNjy50DuEy6jnqXeDasbIJk24ByyfeHBGB7VCM95xcbPYJO5XYgRktiRySg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698855928; a=rsa-sha256; cv=none; b=GR5zxEk8iwPtfw/l/EwqAbXpUcSJbXBHvMLA7az7ECEs4O/DemE7+BXaby4WLeNOqjMrqd +d/NUNxQ90bzVICdRroSDIEKB+KsVkft9c2G1pbsxkz3G0BIdm443eK02lYVoOTazfwAlC jp+gPtS9lFTEA32JIvGWB9+6Y2iWDu7qal76XxAcmWIf626g6kdFA9KIOp+Ybd1Tod+WJa UfdjmnGiHiIOPY9M+mY1TebcJTvd6BCXk4fffVD/MgHd9pM5aQhYlisw7p5vs2rndgZqUF jS0R+IrkOXRXY4UCfoIpB69hUpIKK4RMmm4/SnxuvQULDNbzgrkipJ+aplxgPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLC6J59XcztP9; Wed, 1 Nov 2023 16:25: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 3A1GPSKf000090; Wed, 1 Nov 2023 16:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1GPSxE000087; Wed, 1 Nov 2023 16:25:28 GMT (envelope-from git) Date: Wed, 1 Nov 2023 16:25:28 GMT Message-Id: <202311011625.3A1GPSxE000087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e9ad6b456b02 - stable/13 - Giant: Postpone removal of Giant-locked drivers until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e9ad6b456b02845e07924827107c5a1d2836f3e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e9ad6b456b02845e07924827107c5a1d2836f3e2 commit e9ad6b456b02845e07924827107c5a1d2836f3e2 Author: Zhenlei Huang AuthorDate: 2023-10-31 12:45:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-01 16:24:14 +0000 Giant: Postpone removal of Giant-locked drivers until 15 Reviewed by: imp MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42401 (cherry picked from commit a8bd34bfc0db38c1c11e9c36b7dd849d607c17a8) (cherry picked from commit 5019a5acc5b01804e9dccd3796e9e0ea7c82ba90) --- sys/kern/kern_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index a3af24a43b61..6bb75883d1e4 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -665,7 +665,7 @@ prep_cdevsw(struct cdevsw *devsw, int flags) if ((devsw->d_flags & D_GIANTOK) == 0) { printf( "WARNING: Device \"%s\" is Giant locked and may be " - "deleted before FreeBSD 14.0.\n", + "deleted before FreeBSD 15.0.\n", devsw->d_name == NULL ? "???" : devsw->d_name); } if (devsw->d_gianttrick == NULL) { From nobody Wed Nov 1 23:22: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 4SLNMB2kMYz50JMw; Wed, 1 Nov 2023 23:22: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 4SLNMB2TGJz4QQq; Wed, 1 Nov 2023 23:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698880934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pcz9Yg4QW4DO8foKcm6O0vL0pkaKk32zjPmbf/smNEc=; b=JHTgE0OkkEwnp2kDdjl04SqZeGNkY4oJ7CnOlYe9DdNQ3IX2TyL7xH6Uylvk3JHu1oH63o Q9rvspmghExiIcD3s4/zTjIjG5kLIO+82DuKIewDQSKnBnYax1STPS9z1JeRWn/9GPFaa0 Su1IbBc1dGfQcQ/+xN6c+RcFLwL0BFRNPwEmONA1qOL3cvCQeO+1HdCeMnKJN9DkSguPBd KJuQcjS/CbXsj8vS5ZledNbo9HIvtgGFL5ZMS3Lg+nY3fQWb3c21mmMJfzSQ55PDrcko5J vupyTG8Qkb2H9P5rE3Daj1yzEbwqRVIzT2g14RJ9MMNs2qbaE20RkPUm9sVzOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698880934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pcz9Yg4QW4DO8foKcm6O0vL0pkaKk32zjPmbf/smNEc=; b=nciX60GVKUl75vUgSJZwsLCY4ilN6iDSoy2el1xCS0fIkO5bl9bGkqoZpY1+nOVpWSTXRN D3Zb6K0nGI+OygFgm708gAe19xACscnvUSM6AmdZ0FAjqm8iMdOWlOcxAaLbgOEJ3HNwIK 2LJUprr3Pvd3gcM+79BgcDVJlCK4fCL4/08TSB8rDAf+IDJPQCOcsxWgc+UsEQGJxjZY/n AEr8ewo9X/owyGiHomcCHKzzBTGwemD05hoVRSxalIEk/ppZTeYrobZr15Lu5FYkNgNOd2 kEzS78dpgn/NIPU+ZNGZjmGc3lrk0VBqEndGra/zmYbidG8bT2T3bj0e6oUD+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698880934; a=rsa-sha256; cv=none; b=v5BJMcyBB3kTDvT8fJMdeR3uK7hqxwTkdYPbl/sx0o5S6UZ+lh8FFAPOhMmoTlAQXHDgeh Jak1fjeX+nCyMbpCb/dghfOEdlqtpDptin72qeGUb9AyViATlBk9dGyoai+qG2bJU7GWMH nrXgp/r8KXdQlNsFCJHITfFaFdUyZegAt+ShacUvunq2C7T9p0+oiZh6uDzficRCnWqDmf 8nKh5q5pcqLDJK0196SskBruNxGW/CLBh0vyPGR6YGlJ8Ja0J0mSZs1D2CLhjMk04bdbV6 qaEaj6hxbVBJt/TPhGFyS0nE+Wg4iGpIXS1Z47c1VWehrRCRZCRROighMslEEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLNMB1YL6z15Fr; Wed, 1 Nov 2023 23:22: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 3A1NME3D096383; Wed, 1 Nov 2023 23:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1NMD6l096307; Wed, 1 Nov 2023 23:22:13 GMT (envelope-from git) Date: Wed, 1 Nov 2023 23:22:13 GMT Message-Id: <202311012322.3A1NMD6l096307@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: 559a218c9b25 - main - libc: Purge unneeded cdefs.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 559a218c9b257775fb249b67945fe4a05b7a6b9f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=559a218c9b257775fb249b67945fe4a05b7a6b9f commit 559a218c9b257775fb249b67945fe4a05b7a6b9f Author: Warner Losh AuthorDate: 2023-11-01 22:43:37 +0000 Commit: Warner Losh CommitDate: 2023-11-01 22:44:30 +0000 libc: Purge unneeded cdefs.h These sys/cdefs.h are not needed. Purge them. They are mostly left-over from the $FreeBSD$ removal. A few in libc are still required for macros that cdefs.h defines. Keep those. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42385 --- lib/libc/aarch64/gen/flt_rounds.c | 1 - lib/libc/aarch64/gen/fpgetmask.c | 1 - lib/libc/aarch64/gen/fpsetmask.c | 1 - lib/libc/aarch64/gen/infinity.c | 1 - lib/libc/aarch64/gen/makecontext.c | 1 - lib/libc/aarch64/sys/__vdso_gettc.c | 1 - lib/libc/amd64/gen/flt_rounds.c | 1 - lib/libc/amd64/gen/infinity.c | 1 - lib/libc/amd64/gen/makecontext.c | 1 - lib/libc/amd64/gen/signalcontext.c | 1 - lib/libc/amd64/string/bcopy.c | 1 - lib/libc/amd64/string/bzero.c | 1 - lib/libc/amd64/string/strcpy.c | 1 - lib/libc/amd64/string/strnlen.c | 1 - lib/libc/amd64/sys/amd64_get_fsbase.c | 1 - lib/libc/amd64/sys/amd64_get_gsbase.c | 1 - lib/libc/amd64/sys/amd64_set_fsbase.c | 1 - lib/libc/amd64/sys/amd64_set_gsbase.c | 1 - lib/libc/arm/aeabi/aeabi_atexit.c | 1 - lib/libc/arm/aeabi/aeabi_double.c | 1 - lib/libc/arm/aeabi/aeabi_float.c | 1 - lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 1 - lib/libc/arm/aeabi/aeabi_unwind_exidx.c | 1 - lib/libc/arm/gen/arm_drain_writebuf.c | 1 - lib/libc/arm/gen/arm_initfini.c | 1 - lib/libc/arm/gen/arm_sync_icache.c | 1 - lib/libc/arm/gen/fabs.c | 1 - lib/libc/arm/gen/flt_rounds.c | 1 - lib/libc/arm/gen/fpgetmask_vfp.c | 1 - lib/libc/arm/gen/fpgetround_vfp.c | 1 - lib/libc/arm/gen/fpgetsticky_vfp.c | 1 - lib/libc/arm/gen/fpsetmask_vfp.c | 1 - lib/libc/arm/gen/fpsetround_vfp.c | 1 - lib/libc/arm/gen/fpsetsticky_vfp.c | 1 - lib/libc/arm/gen/getcontextx.c | 1 - lib/libc/arm/gen/infinity.c | 1 - lib/libc/arm/gen/makecontext.c | 1 - lib/libc/arm/gen/signalcontext.c | 1 - lib/libc/arm/sys/__vdso_gettc.c | 1 - lib/libc/compat-43/creat.c | 1 - lib/libc/compat-43/gethostid.c | 1 - lib/libc/compat-43/getwd.c | 1 - lib/libc/compat-43/killpg.c | 1 - lib/libc/compat-43/sethostid.c | 1 - lib/libc/compat-43/setpgrp.c | 1 - lib/libc/compat-43/setrgid.c | 1 - lib/libc/compat-43/setruid.c | 1 - lib/libc/compat-43/sigcompat.c | 1 - lib/libc/csu/aarch64/reloc.c | 1 - lib/libc/csu/amd64/reloc.c | 1 - lib/libc/csu/i386/reloc.c | 1 - lib/libc/csu/powerpc64/reloc.c | 1 - lib/libc/db/btree/bt_close.c | 1 - lib/libc/db/btree/bt_conv.c | 1 - lib/libc/db/btree/bt_debug.c | 1 - lib/libc/db/btree/bt_delete.c | 1 - lib/libc/db/btree/bt_get.c | 1 - lib/libc/db/btree/bt_open.c | 1 - lib/libc/db/btree/bt_overflow.c | 1 - lib/libc/db/btree/bt_page.c | 1 - lib/libc/db/btree/bt_put.c | 1 - lib/libc/db/btree/bt_search.c | 1 - lib/libc/db/btree/bt_seq.c | 1 - lib/libc/db/btree/bt_split.c | 1 - lib/libc/db/btree/bt_utils.c | 1 - lib/libc/db/db/db.c | 1 - lib/libc/db/hash/hash.c | 1 - lib/libc/db/hash/hash_bigkey.c | 1 - lib/libc/db/hash/hash_buf.c | 1 - lib/libc/db/hash/hash_func.c | 1 - lib/libc/db/hash/hash_log2.c | 1 - lib/libc/db/hash/hash_page.c | 1 - lib/libc/db/hash/ndbm.c | 1 - lib/libc/db/mpool/mpool-compat.c | 1 - lib/libc/db/mpool/mpool.c | 1 - lib/libc/db/recno/rec_close.c | 1 - lib/libc/db/recno/rec_delete.c | 1 - lib/libc/db/recno/rec_get.c | 1 - lib/libc/db/recno/rec_open.c | 1 - lib/libc/db/recno/rec_put.c | 1 - lib/libc/db/recno/rec_search.c | 1 - lib/libc/db/recno/rec_utils.c | 1 - lib/libc/db/test/btree.tests/main.c | 1 - lib/libc/db/test/dbtest.c | 1 - lib/libc/db/test/hash.tests/driver2.c | 1 - lib/libc/db/test/hash.tests/tcreat3.c | 1 - lib/libc/db/test/hash.tests/tdel.c | 1 - lib/libc/db/test/hash.tests/thash4.c | 1 - lib/libc/db/test/hash.tests/tread2.c | 1 - lib/libc/db/test/hash.tests/tseq.c | 1 - lib/libc/db/test/hash.tests/tverify.c | 1 - lib/libc/gdtoa/_hdtoa.c | 1 - lib/libc/gdtoa/_hldtoa.c | 1 - lib/libc/gdtoa/_ldtoa.c | 1 - lib/libc/gdtoa/machdep_ldisQ.c | 1 - lib/libc/gdtoa/machdep_ldisd.c | 1 - lib/libc/gdtoa/machdep_ldisx.c | 1 - lib/libc/gen/__getosreldate.c | 1 - lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c | 1 - lib/libc/gen/__xuname.c | 1 - lib/libc/gen/_once_stub.c | 1 - lib/libc/gen/_pthread_stubs.c | 1 - lib/libc/gen/_rand48.c | 1 - lib/libc/gen/_spinlock_stub.c | 1 - lib/libc/gen/_thread_init.c | 1 - lib/libc/gen/arc4random-compat.c | 1 - lib/libc/gen/arc4random.c | 1 - lib/libc/gen/auxv.c | 1 - lib/libc/gen/basename.c | 1 - lib/libc/gen/basename_compat.c | 1 - lib/libc/gen/cap_sandboxed.c | 1 - lib/libc/gen/check_utility_compat.c | 1 - lib/libc/gen/clock_getcpuclockid.c | 1 - lib/libc/gen/ctermid.c | 1 - lib/libc/gen/devname-compat11.c | 1 - lib/libc/gen/dirfd.c | 1 - lib/libc/gen/dirname.c | 1 - lib/libc/gen/dirname_compat.c | 1 - lib/libc/gen/dlfcn.c | 1 - lib/libc/gen/drand48.c | 1 - lib/libc/gen/dup3.c | 1 - lib/libc/gen/erand48.c | 1 - lib/libc/gen/errno.c | 1 - lib/libc/gen/eventfd.c | 1 - lib/libc/gen/exect.c | 1 - lib/libc/gen/fdevname.c | 1 - lib/libc/gen/feature_present.c | 1 - lib/libc/gen/fmtcheck.c | 1 - lib/libc/gen/fmtmsg.c | 1 - lib/libc/gen/ftok.c | 1 - lib/libc/gen/fts-compat.c | 1 - lib/libc/gen/fts-compat11.c | 1 - lib/libc/gen/ftw-compat11.c | 1 - lib/libc/gen/ftw.c | 1 - lib/libc/gen/getbootfile.c | 1 - lib/libc/gen/getentropy.c | 1 - lib/libc/gen/getgrent.c | 1 - lib/libc/gen/getmntinfo-compat11.c | 1 - lib/libc/gen/getpagesizes.c | 1 - lib/libc/gen/getpeereid.c | 1 - lib/libc/gen/getprogname.c | 1 - lib/libc/gen/getpwent.c | 1 - lib/libc/gen/getutxent.c | 1 - lib/libc/gen/glob-compat11.c | 1 - lib/libc/gen/glob-compat11.h | 1 - lib/libc/gen/jrand48.c | 1 - lib/libc/gen/lcong48.c | 1 - lib/libc/gen/ldexp.c | 1 - lib/libc/gen/libc_dlopen.c | 1 - lib/libc/gen/lockf.c | 1 - lib/libc/gen/lrand48.c | 1 - lib/libc/gen/memalign.c | 1 - lib/libc/gen/modf.c | 1 - lib/libc/gen/mrand48.c | 1 - lib/libc/gen/nftw-compat11.c | 1 - lib/libc/gen/nftw.c | 1 - lib/libc/gen/nrand48.c | 1 - lib/libc/gen/pmadvise.c | 1 - lib/libc/gen/posix_spawn.c | 1 - lib/libc/gen/pututxline.c | 1 - lib/libc/gen/readdir-compat11.c | 1 - lib/libc/gen/readpassphrase.c | 1 - lib/libc/gen/recvmmsg.c | 1 - lib/libc/gen/scandir-compat11.c | 1 - lib/libc/gen/seed48.c | 1 - lib/libc/gen/semctl.c | 1 - lib/libc/gen/sendmmsg.c | 1 - lib/libc/gen/setproctitle.c | 1 - lib/libc/gen/setprogname.c | 1 - lib/libc/gen/statvfs.c | 1 - lib/libc/gen/sysctlbyname.c | 1 - lib/libc/gen/sysctlnametomib.c | 1 - lib/libc/gen/tls.c | 1 - lib/libc/gen/trivial-getcontextx.c | 1 - lib/libc/gen/utxdb.c | 1 - lib/libc/gen/waitid.c | 1 - lib/libc/gen/wordexp.c | 1 - lib/libc/gmon/gmon.c | 1 - lib/libc/gmon/mcount.c | 1 - lib/libc/i386/gen/flt_rounds.c | 1 - lib/libc/i386/gen/infinity.c | 1 - lib/libc/i386/gen/makecontext.c | 1 - lib/libc/i386/gen/signalcontext.c | 1 - lib/libc/i386/sys/i386_clr_watch.c | 1 - lib/libc/i386/sys/i386_get_fsbase.c | 1 - lib/libc/i386/sys/i386_get_gsbase.c | 1 - lib/libc/i386/sys/i386_get_ioperm.c | 1 - lib/libc/i386/sys/i386_get_ldt.c | 1 - lib/libc/i386/sys/i386_set_fsbase.c | 1 - lib/libc/i386/sys/i386_set_gsbase.c | 1 - lib/libc/i386/sys/i386_set_ioperm.c | 1 - lib/libc/i386/sys/i386_set_ldt.c | 1 - lib/libc/i386/sys/i386_set_watch.c | 1 - lib/libc/i386/sys/i386_vm86.c | 1 - lib/libc/iconv/bsd_iconv.c | 1 - lib/libc/iconv/citrus_bcs.c | 1 - lib/libc/iconv/citrus_bcs_strtol.c | 1 - lib/libc/iconv/citrus_bcs_strtoul.c | 1 - lib/libc/iconv/citrus_csmapper.c | 1 - lib/libc/iconv/citrus_db.c | 1 - lib/libc/iconv/citrus_db_factory.c | 1 - lib/libc/iconv/citrus_db_hash.c | 1 - lib/libc/iconv/citrus_esdb.c | 1 - lib/libc/iconv/citrus_hash.c | 1 - lib/libc/iconv/citrus_iconv.c | 1 - lib/libc/iconv/citrus_lookup.c | 1 - lib/libc/iconv/citrus_lookup_factory.c | 1 - lib/libc/iconv/citrus_mapper.c | 1 - lib/libc/iconv/citrus_memstream.c | 1 - lib/libc/iconv/citrus_mmap.c | 1 - lib/libc/iconv/citrus_module.c | 1 - lib/libc/iconv/citrus_none.c | 1 - lib/libc/iconv/citrus_pivot_factory.c | 1 - lib/libc/iconv/citrus_prop.c | 1 - lib/libc/iconv/citrus_stdenc.c | 1 - lib/libc/include/errlst.h | 1 - lib/libc/include/spinlock.h | 1 - lib/libc/inet/inet_addr.c | 1 - lib/libc/inet/inet_cidr_ntop.c | 1 - lib/libc/inet/inet_cidr_pton.c | 1 - lib/libc/inet/inet_lnaof.c | 1 - lib/libc/inet/inet_makeaddr.c | 1 - lib/libc/inet/inet_net_ntop.c | 1 - lib/libc/inet/inet_net_pton.c | 1 - lib/libc/inet/inet_neta.c | 1 - lib/libc/inet/inet_netof.c | 1 - lib/libc/inet/inet_network.c | 1 - lib/libc/inet/inet_ntoa.c | 1 - lib/libc/inet/inet_ntop.c | 1 - lib/libc/inet/inet_pton.c | 1 - lib/libc/inet/nsap_addr.c | 1 - lib/libc/isc/ev_streams.c | 1 - lib/libc/isc/ev_timers.c | 1 - lib/libc/locale/ascii.c | 1 - lib/libc/locale/big5.c | 1 - lib/libc/locale/btowc.c | 1 - lib/libc/locale/c16rtomb.c | 1 - lib/libc/locale/c32rtomb.c | 1 - lib/libc/locale/cXXrtomb_iconv.h | 1 - lib/libc/locale/collate.c | 1 - lib/libc/locale/collate.h | 1 - lib/libc/locale/collcmp.c | 1 - lib/libc/locale/fix_grouping.c | 1 - lib/libc/locale/gbk.c | 1 - lib/libc/locale/isctype.c | 1 - lib/libc/locale/iswctype.c | 1 - lib/libc/locale/ldpart.c | 1 - lib/libc/locale/lmessages.c | 1 - lib/libc/locale/lmonetary.c | 1 - lib/libc/locale/lnumeric.c | 1 - lib/libc/locale/localeconv.c | 1 - lib/libc/locale/mblen.c | 1 - lib/libc/locale/mbrlen.c | 1 - lib/libc/locale/mbrtoc16.c | 1 - lib/libc/locale/mbrtoc32.c | 1 - lib/libc/locale/mbrtocXX_iconv.h | 1 - lib/libc/locale/mbrtowc.c | 1 - lib/libc/locale/mbsinit.c | 1 - lib/libc/locale/mbsnrtowcs.c | 1 - lib/libc/locale/mbsrtowcs.c | 1 - lib/libc/locale/mbstowcs.c | 1 - lib/libc/locale/mbtowc.c | 1 - lib/libc/locale/mskanji.c | 1 - lib/libc/locale/nextwctype.c | 1 - lib/libc/locale/nl_langinfo.c | 1 - lib/libc/locale/nomacros.c | 1 - lib/libc/locale/none.c | 1 - lib/libc/locale/rpmatch.c | 1 - lib/libc/locale/rune.c | 1 - lib/libc/locale/runetype.c | 1 - lib/libc/locale/setlocale.c | 1 - lib/libc/locale/setrunelocale.c | 1 - lib/libc/locale/table.c | 1 - lib/libc/locale/tolower.c | 1 - lib/libc/locale/toupper.c | 1 - lib/libc/locale/wcrtomb.c | 1 - lib/libc/locale/wcsftime.c | 1 - lib/libc/locale/wcsnrtombs.c | 1 - lib/libc/locale/wcsrtombs.c | 1 - lib/libc/locale/wcstod.c | 1 - lib/libc/locale/wcstof.c | 1 - lib/libc/locale/wcstoimax.c | 1 - lib/libc/locale/wcstol.c | 1 - lib/libc/locale/wcstold.c | 1 - lib/libc/locale/wcstoll.c | 1 - lib/libc/locale/wcstombs.c | 1 - lib/libc/locale/wcstoul.c | 1 - lib/libc/locale/wcstoull.c | 1 - lib/libc/locale/wcstoumax.c | 1 - lib/libc/locale/wctob.c | 1 - lib/libc/locale/wctomb.c | 1 - lib/libc/locale/wctrans.c | 1 - lib/libc/locale/wctype.c | 1 - lib/libc/locale/wcwidth.c | 1 - lib/libc/nameser/ns_name.c | 1 - lib/libc/nameser/ns_netint.c | 1 - lib/libc/nameser/ns_parse.c | 1 - lib/libc/nameser/ns_print.c | 1 - lib/libc/nameser/ns_samedomain.c | 1 - lib/libc/nameser/ns_ttl.c | 1 - lib/libc/net/base64.c | 1 - lib/libc/net/ether_addr.c | 1 - lib/libc/net/eui64.c | 1 - lib/libc/net/gai_strerror.c | 1 - lib/libc/net/getaddrinfo.c | 1 - lib/libc/net/gethostbydns.c | 1 - lib/libc/net/gethostbyht.c | 1 - lib/libc/net/gethostbynis.c | 1 - lib/libc/net/gethostnamadr.c | 1 - lib/libc/net/getifaddrs.c | 1 - lib/libc/net/getifmaddrs.c | 1 - lib/libc/net/getnameinfo.c | 1 - lib/libc/net/getnetbydns.c | 1 - lib/libc/net/getnetbyht.c | 1 - lib/libc/net/getnetbynis.c | 1 - lib/libc/net/getnetnamadr.c | 1 - lib/libc/net/getproto.c | 1 - lib/libc/net/getprotoent.c | 1 - lib/libc/net/getprotoname.c | 1 - lib/libc/net/getservent.c | 1 - lib/libc/net/hesiod.c | 2 -- lib/libc/net/if_indextoname.c | 1 - lib/libc/net/if_nameindex.c | 1 - lib/libc/net/if_nametoindex.c | 1 - lib/libc/net/ip6opt.c | 1 - lib/libc/net/linkaddr.c | 1 - lib/libc/net/map_v4v6.c | 1 - lib/libc/net/name6.c | 1 - lib/libc/net/nscache.c | 1 - lib/libc/net/nscachedcli.c | 1 - lib/libc/net/nsdispatch.c | 1 - lib/libc/net/nsparser.y | 1 - lib/libc/net/nss_compat.c | 1 - lib/libc/net/ntoh.c | 1 - lib/libc/net/rcmd.c | 1 - lib/libc/net/rcmdsh.c | 1 - lib/libc/net/recv.c | 1 - lib/libc/net/rthdr.c | 1 - lib/libc/net/sctp_sys_calls.c | 1 - lib/libc/net/send.c | 1 - lib/libc/net/sourcefilter.c | 1 - lib/libc/net/vars.c | 1 - lib/libc/nls/msgcat.c | 1 - lib/libc/posix1e/acl_branding.c | 1 - lib/libc/posix1e/acl_calc_mask.c | 1 - lib/libc/posix1e/acl_cmp_np.c | 1 - lib/libc/posix1e/acl_compat.c | 1 - lib/libc/posix1e/acl_copy.c | 1 - lib/libc/posix1e/acl_delete.c | 1 - lib/libc/posix1e/acl_delete_entry.c | 1 - lib/libc/posix1e/acl_entry.c | 1 - lib/libc/posix1e/acl_equiv_mode_np.c | 1 - lib/libc/posix1e/acl_extended_file_np.c | 1 - lib/libc/posix1e/acl_flag.c | 1 - lib/libc/posix1e/acl_free.c | 1 - lib/libc/posix1e/acl_from_mode_np.c | 1 - lib/libc/posix1e/acl_from_text.c | 1 - lib/libc/posix1e/acl_from_text_nfs4.c | 1 - lib/libc/posix1e/acl_get.c | 1 - lib/libc/posix1e/acl_id_to_name.c | 1 - lib/libc/posix1e/acl_init.c | 1 - lib/libc/posix1e/acl_perm.c | 1 - lib/libc/posix1e/acl_set.c | 1 - lib/libc/posix1e/acl_strip.c | 1 - lib/libc/posix1e/acl_support.c | 1 - lib/libc/posix1e/acl_support_nfs4.c | 1 - lib/libc/posix1e/acl_to_text.c | 1 - lib/libc/posix1e/acl_to_text_nfs4.c | 1 - lib/libc/posix1e/acl_valid.c | 1 - lib/libc/posix1e/extattr.c | 1 - lib/libc/posix1e/mac.c | 1 - lib/libc/posix1e/mac_exec.c | 1 - lib/libc/posix1e/mac_get.c | 1 - lib/libc/posix1e/mac_set.c | 1 - lib/libc/powerpc/gen/flt_rounds.c | 1 - lib/libc/powerpc/gen/fpgetmask.c | 1 - lib/libc/powerpc/gen/fpgetround.c | 1 - lib/libc/powerpc/gen/fpgetsticky.c | 1 - lib/libc/powerpc/gen/fpsetmask.c | 1 - lib/libc/powerpc/gen/fpsetround.c | 1 - lib/libc/powerpc/gen/makecontext.c | 1 - lib/libc/powerpc/gen/signalcontext.c | 1 - lib/libc/powerpc/sys/__vdso_gettc.c | 1 - lib/libc/powerpc64/gen/flt_rounds.c | 1 - lib/libc/powerpc64/gen/fpgetmask.c | 1 - lib/libc/powerpc64/gen/fpgetround.c | 1 - lib/libc/powerpc64/gen/fpgetsticky.c | 1 - lib/libc/powerpc64/gen/fpsetmask.c | 1 - lib/libc/powerpc64/gen/fpsetround.c | 1 - lib/libc/powerpc64/gen/makecontext.c | 1 - lib/libc/powerpc64/gen/signalcontext.c | 1 - lib/libc/powerpc64/string/bcopy_resolver.c | 1 - lib/libc/powerpc64/string/strcpy.c | 1 - lib/libc/powerpc64/string/strcpy_resolver.c | 1 - lib/libc/powerpc64/string/strncpy.c | 1 - lib/libc/powerpc64/string/strncpy_resolver.c | 1 - lib/libc/powerpc64/sys/__vdso_gettc.c | 1 - lib/libc/powerpcspe/gen/flt_rounds.c | 1 - lib/libc/powerpcspe/gen/fpgetmask.c | 1 - lib/libc/powerpcspe/gen/fpgetround.c | 1 - lib/libc/powerpcspe/gen/fpgetsticky.c | 1 - lib/libc/powerpcspe/gen/fpsetmask.c | 1 - lib/libc/powerpcspe/gen/fpsetround.c | 1 - lib/libc/quad/TESTS/divrem.c | 1 - lib/libc/quad/TESTS/mul.c | 1 - lib/libc/quad/adddi3.c | 1 - lib/libc/quad/anddi3.c | 1 - lib/libc/quad/ashldi3.c | 1 - lib/libc/quad/ashrdi3.c | 1 - lib/libc/quad/cmpdi2.c | 1 - lib/libc/quad/divdi3.c | 1 - lib/libc/quad/fixdfdi.c | 1 - lib/libc/quad/fixsfdi.c | 1 - lib/libc/quad/fixunsdfdi.c | 1 - lib/libc/quad/fixunssfdi.c | 1 - lib/libc/quad/floatdidf.c | 1 - lib/libc/quad/floatdisf.c | 1 - lib/libc/quad/floatunsdidf.c | 1 - lib/libc/quad/iordi3.c | 1 - lib/libc/quad/lshldi3.c | 1 - lib/libc/quad/lshrdi3.c | 1 - lib/libc/quad/moddi3.c | 1 - lib/libc/quad/muldi3.c | 1 - lib/libc/quad/negdi2.c | 1 - lib/libc/quad/notdi2.c | 1 - lib/libc/quad/qdivrem.c | 1 - lib/libc/quad/subdi3.c | 1 - lib/libc/quad/ucmpdi2.c | 1 - lib/libc/quad/udivdi3.c | 1 - lib/libc/quad/umoddi3.c | 1 - lib/libc/quad/xordi3.c | 1 - lib/libc/regex/engine.c | 1 - lib/libc/regex/grot/debug.c | 1 - lib/libc/regex/grot/main.c | 1 - lib/libc/regex/grot/split.c | 1 - lib/libc/regex/regcomp.c | 1 - lib/libc/regex/regerror.c | 1 - lib/libc/regex/regexec.c | 1 - lib/libc/regex/regfree.c | 1 - lib/libc/resolv/herror.c | 1 - lib/libc/resolv/mtctxres.c | 1 - lib/libc/resolv/res_comp.c | 1 - lib/libc/resolv/res_data.c | 1 - lib/libc/resolv/res_debug.c | 1 - lib/libc/resolv/res_findzonecut.c | 1 - lib/libc/resolv/res_init.c | 1 - lib/libc/resolv/res_mkquery.c | 1 - lib/libc/resolv/res_mkupdate.c | 1 - lib/libc/resolv/res_query.c | 1 - lib/libc/resolv/res_send.c | 1 - lib/libc/resolv/res_update.c | 1 - lib/libc/riscv/gen/flt_rounds.c | 1 - lib/libc/riscv/gen/fpgetmask.c | 1 - lib/libc/riscv/gen/fpsetmask.c | 1 - lib/libc/riscv/gen/infinity.c | 1 - lib/libc/riscv/gen/makecontext.c | 1 - lib/libc/riscv/sys/__vdso_gettc.c | 1 - lib/libc/rpc/auth_des.c | 2 -- lib/libc/rpc/auth_none.c | 1 - lib/libc/rpc/auth_time.c | 1 - lib/libc/rpc/auth_unix.c | 1 - lib/libc/rpc/authdes_prot.c | 1 - lib/libc/rpc/authunix_prot.c | 1 - lib/libc/rpc/bindresvport.c | 1 - lib/libc/rpc/clnt_bcast.c | 1 - lib/libc/rpc/clnt_dg.c | 1 - lib/libc/rpc/clnt_generic.c | 1 - lib/libc/rpc/clnt_perror.c | 1 - lib/libc/rpc/clnt_raw.c | 1 - lib/libc/rpc/clnt_simple.c | 1 - lib/libc/rpc/clnt_vc.c | 1 - lib/libc/rpc/crypt_client.c | 1 - lib/libc/rpc/des_crypt.c | 1 - lib/libc/rpc/des_soft.c | 1 - lib/libc/rpc/getnetconfig.c | 1 - lib/libc/rpc/getnetpath.c | 1 - lib/libc/rpc/getpublickey.c | 1 - lib/libc/rpc/getrpcent.c | 1 - lib/libc/rpc/getrpcport.c | 1 - lib/libc/rpc/key_call.c | 1 - lib/libc/rpc/key_prot_xdr.c | 1 - lib/libc/rpc/mt_misc.c | 1 - lib/libc/rpc/netname.c | 1 - lib/libc/rpc/netnamer.c | 1 - lib/libc/rpc/pmap_clnt.c | 1 - lib/libc/rpc/pmap_getmaps.c | 1 - lib/libc/rpc/pmap_getport.c | 1 - lib/libc/rpc/pmap_prot.c | 1 - lib/libc/rpc/pmap_prot2.c | 1 - lib/libc/rpc/pmap_rmt.c | 1 - lib/libc/rpc/rpc_callmsg.c | 1 - lib/libc/rpc/rpc_com.h | 1 - lib/libc/rpc/rpc_commondata.c | 1 - lib/libc/rpc/rpc_dtablesize.c | 1 - lib/libc/rpc/rpc_generic.c | 1 - lib/libc/rpc/rpc_prot.c | 1 - lib/libc/rpc/rpc_soc.c | 1 - lib/libc/rpc/rpcb_clnt.c | 1 - lib/libc/rpc/rpcb_prot.c | 1 - lib/libc/rpc/rpcb_st_xdr.c | 1 - lib/libc/rpc/rpcdname.c | 1 - lib/libc/rpc/rtime.c | 1 - lib/libc/rpc/svc.c | 1 - lib/libc/rpc/svc_auth.c | 1 - lib/libc/rpc/svc_auth_des.c | 1 - lib/libc/rpc/svc_auth_unix.c | 1 - lib/libc/rpc/svc_dg.c | 1 - lib/libc/rpc/svc_generic.c | 1 - lib/libc/rpc/svc_raw.c | 1 - lib/libc/rpc/svc_run.c | 1 - lib/libc/rpc/svc_simple.c | 1 - lib/libc/rpc/svc_vc.c | 1 - lib/libc/secure/stack_protector.c | 1 - lib/libc/softfloat/bits32/softfloat.c | 1 - lib/libc/softfloat/bits64/softfloat.c | 1 - lib/libc/softfloat/eqdf2.c | 1 - lib/libc/softfloat/eqsf2.c | 1 - lib/libc/softfloat/eqtf2.c | 1 - lib/libc/softfloat/fpgetmask.c | 1 - lib/libc/softfloat/fpgetround.c | 1 - lib/libc/softfloat/fpgetsticky.c | 1 - lib/libc/softfloat/fpsetmask.c | 1 - lib/libc/softfloat/fpsetround.c | 1 - lib/libc/softfloat/fpsetsticky.c | 1 - lib/libc/softfloat/gedf2.c | 1 - lib/libc/softfloat/gesf2.c | 1 - lib/libc/softfloat/getf2.c | 1 - lib/libc/softfloat/gexf2.c | 1 - lib/libc/softfloat/gtdf2.c | 1 - lib/libc/softfloat/gtsf2.c | 1 - lib/libc/softfloat/gttf2.c | 1 - lib/libc/softfloat/gtxf2.c | 1 - lib/libc/softfloat/ledf2.c | 1 - lib/libc/softfloat/lesf2.c | 1 - lib/libc/softfloat/letf2.c | 1 - lib/libc/softfloat/ltdf2.c | 1 - lib/libc/softfloat/ltsf2.c | 1 - lib/libc/softfloat/lttf2.c | 1 - lib/libc/softfloat/nedf2.c | 1 - lib/libc/softfloat/negdf2.c | 1 - lib/libc/softfloat/negsf2.c | 1 - lib/libc/softfloat/negtf2.c | 1 - lib/libc/softfloat/negxf2.c | 1 - lib/libc/softfloat/nesf2.c | 1 - lib/libc/softfloat/netf2.c | 1 - lib/libc/softfloat/nexf2.c | 1 - lib/libc/softfloat/timesoftfloat.c | 1 - lib/libc/softfloat/unorddf2.c | 1 - lib/libc/softfloat/unordsf2.c | 1 - lib/libc/stdio/_flock_stub.c | 1 - lib/libc/stdio/asprintf.c | 1 - lib/libc/stdio/clrerr.c | 1 - lib/libc/stdio/dprintf.c | 1 - lib/libc/stdio/fclose.c | 1 - lib/libc/stdio/fcloseall.c | 1 - lib/libc/stdio/fdopen.c | 1 - lib/libc/stdio/feof.c | 1 - lib/libc/stdio/ferror.c | 1 - lib/libc/stdio/fflush.c | 1 - lib/libc/stdio/fgetc.c | 1 - lib/libc/stdio/fgetln.c | 1 - lib/libc/stdio/fgetpos.c | 1 - lib/libc/stdio/fgets.c | 1 - lib/libc/stdio/fgetwc.c | 1 - lib/libc/stdio/fgetwln.c | 1 - lib/libc/stdio/fgetws.c | 1 - lib/libc/stdio/fileno.c | 1 - lib/libc/stdio/findfp.c | 1 - lib/libc/stdio/flags.c | 1 - lib/libc/stdio/fmemopen.c | 1 - lib/libc/stdio/fopen.c | 1 - lib/libc/stdio/fopencookie.c | 1 - lib/libc/stdio/fprintf.c | 1 - lib/libc/stdio/fpurge.c | 1 - lib/libc/stdio/fputc.c | 1 - lib/libc/stdio/fputs.c | 1 - lib/libc/stdio/fputwc.c | 1 - lib/libc/stdio/fputws.c | 1 - lib/libc/stdio/fread.c | 1 - lib/libc/stdio/freopen.c | 1 - lib/libc/stdio/fscanf.c | 1 - lib/libc/stdio/fseek.c | 1 - lib/libc/stdio/fsetpos.c | 1 - lib/libc/stdio/ftell.c | 1 - lib/libc/stdio/funopen.c | 1 - lib/libc/stdio/fvwrite.c | 1 - lib/libc/stdio/fwalk.c | 1 - lib/libc/stdio/fwide.c | 1 - lib/libc/stdio/fwprintf.c | 1 - lib/libc/stdio/fwrite.c | 1 - lib/libc/stdio/fwscanf.c | 1 - lib/libc/stdio/getc.c | 1 - lib/libc/stdio/getchar.c | 1 - lib/libc/stdio/getdelim.c | 1 - lib/libc/stdio/getline.c | 1 - lib/libc/stdio/gets.c | 1 - lib/libc/stdio/gets_s.c | 1 - lib/libc/stdio/getw.c | 1 - lib/libc/stdio/getwc.c | 1 - lib/libc/stdio/getwchar.c | 1 - lib/libc/stdio/makebuf.c | 1 - lib/libc/stdio/mktemp.c | 1 - lib/libc/stdio/open_memstream.c | 1 - lib/libc/stdio/open_wmemstream.c | 1 - lib/libc/stdio/perror.c | 1 - lib/libc/stdio/printf-pos.c | 1 - lib/libc/stdio/printf.c | 1 - lib/libc/stdio/putc.c | 1 - lib/libc/stdio/putchar.c | 1 - lib/libc/stdio/puts.c | 1 - lib/libc/stdio/putw.c | 1 - lib/libc/stdio/putwc.c | 1 - lib/libc/stdio/putwchar.c | 1 - lib/libc/stdio/refill.c | 1 - lib/libc/stdio/remove.c | 1 - lib/libc/stdio/rewind.c | 1 - lib/libc/stdio/rget.c | 1 - lib/libc/stdio/scanf.c | 1 - lib/libc/stdio/setbuf.c | 1 - lib/libc/stdio/setbuffer.c | 1 - lib/libc/stdio/setvbuf.c | 1 - lib/libc/stdio/snprintf.c | 1 - lib/libc/stdio/sprintf.c | 1 - lib/libc/stdio/sscanf.c | 1 - lib/libc/stdio/stdio.c | 1 - lib/libc/stdio/swprintf.c | 1 - lib/libc/stdio/swscanf.c | 1 - lib/libc/stdio/tempnam.c | 1 - lib/libc/stdio/tmpfile.c | 1 - lib/libc/stdio/tmpnam.c | 1 - lib/libc/stdio/ungetc.c | 1 - lib/libc/stdio/ungetwc.c | 1 - lib/libc/stdio/vasprintf.c | 1 - lib/libc/stdio/vdprintf.c | 1 - lib/libc/stdio/vfprintf.c | 1 - lib/libc/stdio/vfscanf.c | 1 - lib/libc/stdio/vfwprintf.c | 1 - lib/libc/stdio/vfwscanf.c | 1 - lib/libc/stdio/vprintf.c | 1 - lib/libc/stdio/vscanf.c | 1 - lib/libc/stdio/vsnprintf.c | 1 - lib/libc/stdio/vsprintf.c | 1 - lib/libc/stdio/vsscanf.c | 1 - lib/libc/stdio/vswprintf.c | 1 - lib/libc/stdio/vswscanf.c | 1 - lib/libc/stdio/vwprintf.c | 1 - lib/libc/stdio/vwscanf.c | 1 - lib/libc/stdio/wbuf.c | 1 - lib/libc/stdio/wprintf.c | 1 - lib/libc/stdio/wscanf.c | 1 - lib/libc/stdio/wsetup.c | 1 - lib/libc/stdlib/abort.c | 1 - lib/libc/stdlib/abs.c | 1 - lib/libc/stdlib/atexit.c | 1 - lib/libc/stdlib/atof.c | 1 - lib/libc/stdlib/atoi.c | 1 - lib/libc/stdlib/atol.c | 1 - lib/libc/stdlib/atoll.c | 1 - lib/libc/stdlib/bsearch.c | 1 - lib/libc/stdlib/cxa_thread_atexit.c | 1 - lib/libc/stdlib/cxa_thread_atexit_impl.c | 1 - lib/libc/stdlib/div.c | 1 - lib/libc/stdlib/exit.c | 1 - lib/libc/stdlib/getenv.c | 1 - lib/libc/stdlib/getopt.c | 1 - lib/libc/stdlib/getopt_long.c | 1 - lib/libc/stdlib/getsubopt.c | 1 - lib/libc/stdlib/hcreate.c | 1 - lib/libc/stdlib/hcreate_r.c | 1 - lib/libc/stdlib/hdestroy_r.c | 1 - lib/libc/stdlib/heapsort.c | 1 - lib/libc/stdlib/hsearch_r.c | 1 - lib/libc/stdlib/imaxabs.c | 1 - lib/libc/stdlib/imaxdiv.c | 1 - lib/libc/stdlib/insque.c | 1 - lib/libc/stdlib/labs.c | 1 - lib/libc/stdlib/ldiv.c | 1 - lib/libc/stdlib/llabs.c | 1 - lib/libc/stdlib/lldiv.c | 1 - lib/libc/stdlib/lsearch.c | 1 - lib/libc/stdlib/merge.c | 1 - lib/libc/stdlib/ptsname.c | 1 - lib/libc/stdlib/qsort.c | 1 - lib/libc/stdlib/radixsort.c | 1 - lib/libc/stdlib/rand.c | 1 - lib/libc/stdlib/random.c | 1 - lib/libc/stdlib/reallocarray.c | 1 - lib/libc/stdlib/reallocf.c | 1 - lib/libc/stdlib/realpath.c | 1 - lib/libc/stdlib/remque.c | 1 - lib/libc/stdlib/set_constraint_handler_s.c | 1 - lib/libc/stdlib/strfmon.c | 1 - lib/libc/stdlib/strtoimax.c | 1 - lib/libc/stdlib/strtol.c | 1 - lib/libc/stdlib/strtold.c | 1 - lib/libc/stdlib/strtoll.c | 1 - lib/libc/stdlib/strtonum.c | 1 - lib/libc/stdlib/strtoq.c | 1 - lib/libc/stdlib/strtoul.c | 1 - lib/libc/stdlib/strtoull.c | 1 - lib/libc/stdlib/strtoumax.c | 1 - lib/libc/stdlib/strtouq.c | 1 - lib/libc/stdlib/system.c | 1 - lib/libc/stdlib/tdelete.c | 1 - lib/libc/stdlib/tsearch.c | 1 - lib/libc/stdtime/strftime.c | 1 - lib/libc/stdtime/time32.c | 1 - lib/libc/stdtime/timelocal.c | 1 - lib/libc/string/bcmp.c | 1 - lib/libc/string/bcopy.c | 1 - lib/libc/string/bzero.c | 1 - lib/libc/string/ffs.c | 1 - lib/libc/string/ffsl.c | 1 - lib/libc/string/ffsll.c | 1 - lib/libc/string/fls.c | 1 - lib/libc/string/flsl.c | 1 - lib/libc/string/flsll.c | 1 - lib/libc/string/memccpy.c | 1 - lib/libc/string/memchr.c | 1 - lib/libc/string/memcmp.c | 1 - lib/libc/string/memcpy.c | 1 - lib/libc/string/memmem.c | 1 - lib/libc/string/memmove.c | 1 - lib/libc/string/mempcpy.c | 1 - lib/libc/string/memset.c | 1 - lib/libc/string/memset_s.c | 1 - lib/libc/string/stpcpy.c | 1 - lib/libc/string/stpncpy.c | 1 - lib/libc/string/strcasecmp.c | 1 - lib/libc/string/strcasestr.c | 1 - lib/libc/string/strcat.c | 1 - lib/libc/string/strchr.c | 1 - lib/libc/string/strchrnul.c | 1 - lib/libc/string/strcmp.c | 1 - lib/libc/string/strcoll.c | 1 - lib/libc/string/strcpy.c | 1 - lib/libc/string/strcspn.c | 1 - lib/libc/string/strdup.c | 1 - lib/libc/string/strerror.c | 1 - lib/libc/string/strlcat.c | 1 - lib/libc/string/strlcpy.c | 1 - lib/libc/string/strlen.c | 1 - lib/libc/string/strmode.c | 1 - lib/libc/string/strncat.c | 1 - lib/libc/string/strncmp.c | 1 - lib/libc/string/strncpy.c | 1 - lib/libc/string/strndup.c | 1 - lib/libc/string/strnlen.c | 1 - lib/libc/string/strnstr.c | 1 - lib/libc/string/strpbrk.c | 1 - lib/libc/string/strrchr.c | 1 - lib/libc/string/strsep.c | 1 - lib/libc/string/strsignal.c | 1 - lib/libc/string/strspn.c | 1 - lib/libc/string/strstr.c | 1 - lib/libc/string/strtok.c | 1 - lib/libc/string/strxfrm.c | 1 - lib/libc/string/swab.c | 1 - lib/libc/string/timingsafe_bcmp.c | 1 - lib/libc/string/timingsafe_memcmp.c | 1 - lib/libc/string/wcpcpy.c | 1 - lib/libc/string/wcpncpy.c | 1 - lib/libc/string/wcscasecmp.c | 1 - lib/libc/string/wcschr.c | 1 - lib/libc/string/wcscoll.c | 1 - lib/libc/string/wcsdup.c | 1 - lib/libc/string/wcsncasecmp.c | 1 - lib/libc/string/wcsncpy.c | 1 - lib/libc/string/wcsnlen.c | 1 - lib/libc/string/wcsrchr.c | 1 - lib/libc/string/wcsstr.c | 1 - lib/libc/string/wcstok.c | 1 - lib/libc/string/wcswidth.c | 1 - lib/libc/string/wcsxfrm.c | 1 - lib/libc/string/wmempcpy.c | 1 - lib/libc/sys/POSIX2x_Fork.c | 1 - lib/libc/sys/__error.c | 1 - lib/libc/sys/__vdso_gettimeofday.c | 1 - lib/libc/sys/accept.c | 1 - lib/libc/sys/accept4.c | 1 - lib/libc/sys/aio_suspend.c | 1 - lib/libc/sys/brk.c | 1 - lib/libc/sys/clock_gettime.c | 1 - lib/libc/sys/clock_nanosleep.c | 1 - lib/libc/sys/close.c | 1 - lib/libc/sys/closefrom.c | 1 - lib/libc/sys/compat-stub.c | 1 - lib/libc/sys/connect.c | 1 - lib/libc/sys/fcntl.c | 1 - lib/libc/sys/fdatasync.c | 1 - lib/libc/sys/fork.c | 1 - lib/libc/sys/fsync.c | 1 - lib/libc/sys/getdents.c | 1 - lib/libc/sys/gettimeofday.c | 1 - lib/libc/sys/interposing_table.c | 1 - lib/libc/sys/kevent.c | 1 - lib/libc/sys/lstat.c | 1 - lib/libc/sys/mknod.c | 1 - lib/libc/sys/msync.c | 1 - lib/libc/sys/nanosleep.c | 1 - lib/libc/sys/open.c | 1 - lib/libc/sys/openat.c | 1 - lib/libc/sys/pdfork.c | 1 - lib/libc/sys/pipe.c | 1 - lib/libc/sys/poll.c | 1 - lib/libc/sys/ppoll.c | 1 - lib/libc/sys/pselect.c | 1 - lib/libc/sys/ptrace.c | 1 - lib/libc/sys/read.c | 1 - lib/libc/sys/readv.c | 1 - lib/libc/sys/recvfrom.c | 1 - lib/libc/sys/recvmsg.c | 1 - lib/libc/sys/select.c | 1 - lib/libc/sys/sendmsg.c | 1 - lib/libc/sys/sendto.c | 1 - lib/libc/sys/setcontext.c | 1 - lib/libc/sys/shm_open.c | 1 - lib/libc/sys/sigaction.c | 1 - lib/libc/sys/sigprocmask.c | 1 - lib/libc/sys/sigsuspend.c | 1 - lib/libc/sys/sigtimedwait.c | 1 - lib/libc/sys/sigwait.c | 1 - lib/libc/sys/sigwaitinfo.c | 1 - lib/libc/sys/stat.c | 1 - lib/libc/sys/swapcontext.c | 1 - lib/libc/sys/trivial-vdso_tc.c | 1 - lib/libc/sys/vadvise.c | 1 - lib/libc/sys/wait4.c | 1 - lib/libc/sys/wait6.c | 1 - lib/libc/sys/write.c | 1 - lib/libc/sys/writev.c | 1 - lib/libc/tests/gen/arc4random_test.c | 1 - lib/libc/tests/gen/dir2_test.c | 1 - lib/libc/tests/gen/dlopen_empty_test.c | 1 - lib/libc/tests/gen/fmtcheck_test.c | 1 - lib/libc/tests/gen/fmtmsg_test.c | 1 - lib/libc/tests/gen/fnmatch_test.c | 1 - lib/libc/tests/gen/fnmatch_testcases.h | 1 - lib/libc/tests/gen/ftw_test.c | 1 - lib/libc/tests/gen/getentropy_test.c | 1 - lib/libc/tests/gen/getmntinfo_test.c | 1 - lib/libc/tests/gen/glob2_test.c | 1 - lib/libc/tests/gen/makecontext_test.c | 1 - lib/libc/tests/gen/popen_test.c | 1 - lib/libc/tests/gen/posix_spawn_test.c | 1 - lib/libc/tests/gen/realpath2_test.c | 1 - lib/libc/tests/gen/sigsetops_test.c | 1 - lib/libc/tests/gen/test-fnmatch.c | 1 - lib/libc/tests/gen/wordexp_test.c | 1 - lib/libc/tests/iconv/iconvctl_test.c | 1 - lib/libc/tests/locale/btowc_test.c | 1 - lib/libc/tests/locale/c16rtomb_test.c | 1 - lib/libc/tests/locale/iswctype_test.c | 1 - lib/libc/tests/locale/mblen_test.c | 1 - lib/libc/tests/locale/mbrlen_test.c | 1 - lib/libc/tests/locale/mbrtoc16_test.c | 1 - lib/libc/tests/locale/mbrtowc_test.c | 1 - lib/libc/tests/locale/mbsnrtowcs_test.c | 1 - lib/libc/tests/locale/mbsrtowcs_test.c | 1 - lib/libc/tests/locale/mbstowcs_test.c | 1 - lib/libc/tests/locale/mbtowc_test.c | 1 - lib/libc/tests/locale/towctrans_test.c | 1 - lib/libc/tests/locale/wcrtomb_test.c | 1 - lib/libc/tests/locale/wcsnrtombs_test.c | 1 - lib/libc/tests/locale/wcsrtombs_test.c | 1 - lib/libc/tests/locale/wcstombs_test.c | 1 - lib/libc/tests/locale/wctomb_test.c | 1 - lib/libc/tests/nss/getaddrinfo_test.c | 1 - lib/libc/tests/nss/getgr_test.c | 1 - lib/libc/tests/nss/gethostby_test.c | 1 - lib/libc/tests/nss/getproto_test.c | 1 - lib/libc/tests/nss/getpw_test.c | 1 - lib/libc/tests/nss/getrpc_test.c | 1 - lib/libc/tests/nss/getserv_test.c | 1 - lib/libc/tests/nss/getusershell_test.c | 1 - lib/libc/tests/stdio/fdopen_test.c | 1 - lib/libc/tests/stdio/fmemopen2_test.c | 1 - lib/libc/tests/stdio/fopen_test.c | 1 - lib/libc/tests/stdio/freopen_test.c | 1 - lib/libc/tests/stdio/getdelim_test.c | 1 - lib/libc/tests/stdio/gets_s_test.c | 1 - lib/libc/tests/stdio/mkostemp_test.c | 1 - lib/libc/tests/stdio/open_memstream2_test.c | 1 - lib/libc/tests/stdio/open_wmemstream_test.c | 1 - lib/libc/tests/stdio/perror_test.c | 1 - lib/libc/tests/stdio/print_positional_test.c | 1 - lib/libc/tests/stdio/printbasic_test.c | 1 - lib/libc/tests/stdio/printfloat_test.c | 1 - lib/libc/tests/stdio/scanfloat_test.c | 1 - lib/libc/tests/stdlib/clearenv_test.c | 1 - lib/libc/tests/stdlib/cxa_thread_atexit_nothr_test.cc | 1 - lib/libc/tests/stdlib/cxa_thread_atexit_test.cc | 1 - lib/libc/tests/stdlib/dynthr_mod/dynthr_mod.c | 1 - lib/libc/tests/stdlib/dynthr_test.c | 1 - lib/libc/tests/stdlib/heapsort_test.c | 1 - lib/libc/tests/stdlib/mergesort_test.c | 1 - lib/libc/tests/stdlib/qsort_r_compat_test.c | 1 - lib/libc/tests/stdlib/qsort_r_test.c | 1 - lib/libc/tests/stdlib/qsort_s_test.c | 1 - lib/libc/tests/stdlib/qsort_test.c | 1 - lib/libc/tests/stdlib/set_constraint_handler_s_test.c | 1 - lib/libc/tests/stdlib/strfmon_test.c | 1 - lib/libc/tests/stdlib/tsearch_test.c | 1 - lib/libc/tests/string/ffs_test.c | 1 - lib/libc/tests/string/fls_test.c | 1 - lib/libc/tests/string/memcmp_test.c | 1 - lib/libc/tests/string/memset_s_test.c | 1 - lib/libc/tests/string/stpncpy_test.c | 1 - lib/libc/tests/string/strcspn_test.c | 1 - lib/libc/tests/string/strxfrm_test.c | 1 - lib/libc/tests/string/wcscasecmp_test.c | 1 - lib/libc/tests/string/wcscoll_test.c | 1 - lib/libc/tests/string/wcsnlen_test.c | 1 - lib/libc/tests/sys/brk_test.c | 1 - lib/libc/tests/sys/mlock_helper.c | 1 - lib/libc/tests/sys/queue_test.c | 1 - lib/libc/tests/sys/sendfile_test.c | 1 - lib/libc/uuid/uuid_stream.c | 1 - lib/libc/x86/gen/getcontextx.c | 1 - lib/libc/x86/sys/__vdso_gettc.c | 1 - lib/libc/x86/sys/pkru.c | 1 - lib/libc/xdr/xdr.c | 1 - lib/libc/xdr/xdr_array.c | 1 - lib/libc/xdr/xdr_float.c | 1 - lib/libc/xdr/xdr_mem.c | 1 - lib/libc/xdr/xdr_rec.c | 1 - lib/libc/xdr/xdr_reference.c | 1 - lib/libc/xdr/xdr_sizeof.c | 1 - lib/libc/xdr/xdr_stdio.c | 1 - lib/libc/yp/xdryp.c | 1 - lib/libc/yp/yplib.c | 1 - 931 files changed, 933 deletions(-) diff --git a/lib/libc/aarch64/gen/flt_rounds.c b/lib/libc/aarch64/gen/flt_rounds.c index 7d5259a1a3bc..b62536aafaf8 100644 --- a/lib/libc/aarch64/gen/flt_rounds.c +++ b/lib/libc/aarch64/gen/flt_rounds.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libc/aarch64/gen/fpgetmask.c b/lib/libc/aarch64/gen/fpgetmask.c index 7bc56a9d75be..b6f398d202f5 100644 --- a/lib/libc/aarch64/gen/fpgetmask.c +++ b/lib/libc/aarch64/gen/fpgetmask.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libc/aarch64/gen/fpsetmask.c b/lib/libc/aarch64/gen/fpsetmask.c index 1ad3f49d603d..4bc72913a8b9 100644 --- a/lib/libc/aarch64/gen/fpsetmask.c +++ b/lib/libc/aarch64/gen/fpsetmask.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include *** 11110 LINES SKIPPED *** From nobody Thu Nov 2 04:32: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 4SLWFT0k09z4yvC3; Thu, 2 Nov 2023 04:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLWFT09qHz3Wry; Thu, 2 Nov 2023 04:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698899565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cM/bWj1QT/AEgEzts4qz5qanKrb8sX3IFGnx6PnI45c=; b=AF4bJ7qKtHr9dUXPCPU31wWkW9NPQzPIS6bP/o3v3sty+kq11wGCQuVjBKyDcgjdbtmM00 4Os+/IiR5OoYz6MTM1bqBKUuJ5YlmKISsGbEz60o763dOQhMbGjHFuDpn/Ih2/i8WFXJgO eCp6q/Dp4hj4HhNBo6ifm55m9p1iPhY0gXTQT/E07UXAvIyUTCxIaymFtHveA4iINtDRVJ g71P4q4E319dBa+F7mRAMzs+q7iJYuIXFvuQp3HqnFaDm8vpTizQ0DPARm4HJk80hk5foi xvri9PygB89GLyow63TEneka9mUytJMK1JQ4eq1nDU0YAxt/sZCIQyf4hzqNVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698899565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cM/bWj1QT/AEgEzts4qz5qanKrb8sX3IFGnx6PnI45c=; b=OIbOyqrYDiJGbPVcyTMzOwVJjPcl/RTSO7pCdbU9f8wtYHP98rnBf/uVOFZYCX5gFZlZ2C +cV/XCbTiUwO1J0WfbWOhX4k8T1YDPF2MMh5fqj1QIJYpj5NlxCN0hzzRTb3kXG1PHlfMX +lJ9imdZU1gKfGDWuPRlrDidAtnEFswLO/RAkTmlYioqOSDRHQrLfe2st7ZyM6ols/zlM+ 1oajOfhMrWrdYRxqpdRXEj41ioEwUlvfcDNZLeHySYYyXFyevDzxInwafZE+myfRmRW4d8 hMlQKiFhCRqLEOez7KQ1FVkHJBgLGXvz/4jFtQ1Vp+vD2jHS5KlrMsA44iVExw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698899565; a=rsa-sha256; cv=none; b=buacSyfrl5uKXdiiujLysrcsgeTocVmPRGclJW512xUpBUKtUVI/HuzLm6L9Ok9/9jYErH tKLuXm2Ees2yMmeyX765E8TvZqk6s+4liBLfAy8gD/zTuix4qsq0+blq7zlu57eYlzlprw +hGMk8imtP1sqg2kjn1Wgw5qewhHme7+NtfeR9dvmeaKrMiGZOR8v6F5Ievyd8+yKQXoDQ U0WoslINGZR44U3pcqzTH8InNEg2GJmTNXmXL7ODajEeSKmOJao1mL/2nfbkIqrOxSiPGU PInHd453RpBnZ87gnVgusl87iLQBkf0vc2jSDYgEUGxbFKZiue+xGg8bQnfFAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLWFS6LDzzc4; Thu, 2 Nov 2023 04:32: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 3A24WiD4017390; Thu, 2 Nov 2023 04:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A24WiIu017388; Thu, 2 Nov 2023 04:32:44 GMT (envelope-from git) Date: Thu, 2 Nov 2023 04:32:44 GMT Message-Id: <202311020432.3A24WiIu017388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 326adc0726cf - releng/14.0 - isa: Postpone removal of the non-PNP driver until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 326adc0726cf85625120489330776ba43818061d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=326adc0726cf85625120489330776ba43818061d commit 326adc0726cf85625120489330776ba43818061d Author: Zhenlei Huang AuthorDate: 2023-10-28 20:31:11 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 04:29:52 +0000 isa: Postpone removal of the non-PNP driver until 15 Reviewed by: imp Approved by: re (karels) MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42387 (cherry picked from commit 98a670cdd6720da4988f902192177fa368b9f9e9) (cherry picked from commit 699526792d2fac156d72654dba89a4b94c8a4c67) --- sys/isa/isa_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 3abbff68ea02..b6f99a0922e5 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -570,7 +570,7 @@ isa_probe_children(device_t dev) strcmp(kern_ident, "GENERIC") == 0 && device_is_attached(child)) device_printf(child, - "non-PNP ISA device will be removed from GENERIC in FreeBSD 14.\n"); + "non-PNP ISA device will be removed from GENERIC in FreeBSD 15.\n"); } /* From nobody Thu Nov 2 04:32: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 4SLWFV274Wz4yvC6; Thu, 2 Nov 2023 04:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLWFV1fGgz3Wmw; Thu, 2 Nov 2023 04:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698899566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2fOUcxUUnaeB17Q1HCU7irDI0QpJ4/UUo0bpjdFCdI=; b=mvHjZx3tlH1GkfFN3C579CpYX8/3ZMi/gLcN/+rrjPecIopqezkkcBFiNUEs/fBZEhPBjw hK9CHKfgVxkLznoNFVQbKPt2w7Va/2uo1JWH5UvBYW3F9vzdq01uLQ1E8e6qYDCAcj7Czc LUhk0vei4yr6YDVfqlddt9nPxBhSeW8TNpcKVFbMM2Nh7DCObt9uhxx/U+dGvBIxbB80B4 BbefLnXHuWSx7dah0YVzs1bu/qHipP0CqmN58I4Y+J9tnKm6aDRT/18/VLKsHMi5dc8/dr O2ETlSgE09CArpuCCJ4JVkqKiLgiVsqRO1t73FcVcXXzvf/53v0WxY0T0VB8BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698899566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2fOUcxUUnaeB17Q1HCU7irDI0QpJ4/UUo0bpjdFCdI=; b=hTrtG9qYiBo3jiHgM7hero/xJtLhefRM8CrZj3qOtXsPMLJzu+3bfJ9xmgcW2T2DKcMG0i jqkZRySZ3nWVzVQeL6lfVTBYw1jwWIdB7pNs9rLZurZEXyM8EpKORdd/0mVMDJF6koQUjk H/0YevuP05d3es/Gfveg8woVjQeK1uLuKoyyDdvuPoRK2RH2OMWHjsawvl6UqI6sY+vu6T Y114W3aDeRjPwLQ/MK485ySM+yXLWOcCnAfSXGypJnmc/nNnLIE3Nx5Mn8Kiyb/jDXXQCz Y9hb9LY/R77hcKmSES+szM/hMz1TjYePT1Pzvq6JVCBWdcsTYub54Cqi4mgiBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698899566; a=rsa-sha256; cv=none; b=iC7c0msPd0+6OPcuHpDOX3QDtt0FNSJqIsZWsknj4BfOsl3pwIQwclPSarVg1gpJHjd7q7 8U9gOXCTc+b6elD79LPRmG0yyedHkq9SQNYjSMHSpnjMD0hCInmuNUjfIRr3oF2LSOIQmn vxOg8l1jF2kaw9yKYx4GJjImIcSkSGP/iN4Db1wMeq+Z4OIjac1iC3LG0DVQsqRB2/IAtN jnd8zQ53zjjBVahMvfOZjHz0v0cq7+jWzUnMOJF0+gsURuuH3CpKv0uOebyQbw8T3jNkVP FfGkFdiku7Rnvi5aOflViYcPkLi1GZne+hYgXvk9O6W6xkGlqHLFiFbkUndzbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLWFV0R2szc5; Thu, 2 Nov 2023 04:32: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 3A24Wjwn017441; Thu, 2 Nov 2023 04:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A24WjMj017439; Thu, 2 Nov 2023 04:32:45 GMT (envelope-from git) Date: Thu, 2 Nov 2023 04:32:45 GMT Message-Id: <202311020432.3A24WjMj017439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2dedf41fde95 - releng/14.0 - Giant: Postpone removal of Giant-locked drivers until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 2dedf41fde95b9ac804ee643ff66428c9d2ac723 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2dedf41fde95b9ac804ee643ff66428c9d2ac723 commit 2dedf41fde95b9ac804ee643ff66428c9d2ac723 Author: Zhenlei Huang AuthorDate: 2023-10-31 12:45:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 04:29:54 +0000 Giant: Postpone removal of Giant-locked drivers until 15 Reviewed by: imp Approved by: re (karels) MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42401 (cherry picked from commit a8bd34bfc0db38c1c11e9c36b7dd849d607c17a8) (cherry picked from commit 5019a5acc5b01804e9dccd3796e9e0ea7c82ba90) --- sys/kern/kern_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index d6063696c85b..a0ebd1f690a7 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -663,7 +663,7 @@ prep_cdevsw(struct cdevsw *devsw, int flags) if ((devsw->d_flags & D_GIANTOK) == 0) { printf( "WARNING: Device \"%s\" is Giant locked and may be " - "deleted before FreeBSD 14.0.\n", + "deleted before FreeBSD 15.0.\n", devsw->d_name == NULL ? "???" : devsw->d_name); } if (devsw->d_gianttrick == NULL) { From nobody Thu Nov 2 05:17: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 4SLXFK3c3Jz4yxf7; Thu, 2 Nov 2023 05:17: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 4SLXFK2Lqgz3ZKn; Thu, 2 Nov 2023 05:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698902261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9WoUuSksEf7f9bcPbjUhpFhlQod4XFbK9RXhi1vgUkc=; b=j6AUXqBROcekZ1ksos81tXjXelAHyhwb8WAUtmD9CK4/rCbhpqIbvoBHGQH85wq55H0Opx 41RlLtVT5Rls6YLQ2jcG4jqLz2viSMT5QQnLspmWCHS1Y+zihhPtVIzi4k9NIVo2rjD3Uz /msGEQtjnkF6yn3ng9gpPLNCDBnBF6AqgHdq9IqaAAXHAlXz0VvCztuGYo+foetxuOMxCL tI5m0+eEK04ggkH4Mx4ouuRNBJqGRkHVcistOuH5XhWZQJ9kfHYowvirAiRGTwqswsOtno W8kLiq8NmJHpMxcLx98mGjSWNVQ0nOqohrEAXaWpycoAiv+M6qm0tJd4K874yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698902261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9WoUuSksEf7f9bcPbjUhpFhlQod4XFbK9RXhi1vgUkc=; b=h+jzSPPYla58UIPwsUTOfq7WWrcrLwiWL+ecur7gYgSOZ2O+Sf84fo/CLtv33gdzuqAGoQ iIdubV04Q0beCN/X1By78OmVThoMiBSf6aYnYnDHHmdBNluCioaAvIzYcYZ41zxbJqjIDk kH59Hhd6OiggwIVRAEVbfnjuArvnNCMYHfRWWNUP+22/pwJQ61ksPFi+HZVZQKIglfjTZa YowcWRAPEa66KKB7jD0vCRnTrymvGz3kyMZGdtIRz2yHq0h+lqp9egvx4iv5GLWLk7Kh+D TjDdVyozlzj5A5F7ypMlCZmmubCnGMngY3dRwtNRQCAHZLhUYORGWTyUnt53BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698902261; a=rsa-sha256; cv=none; b=XAbQ4hppyOnmscxCdmFl2CftA9NVLRKvdgPaZ8GLtzG0hFAgg+o4u98+VZsDjhaLisdAc3 nCu/L5wI+OZxnJpccH6IoyhNmBzTCwJpYtrIz/feFB2uT+7IyCDbCsQEpGG1KCm9Yoe+l7 aecww06MGces8t7I4UEfTfXja9Kmlst2muEGYM85IBDoqQwyAdWLEDP902ABPZCEeioZvz aDzhce9S9lJafMU86tmjiijJVspTA31kgnrQ8X9K9FSBl+Mk78BQOcrxGaesjylzY8Q8fJ RRFPRv2ZypUJxIWrits5+EsUBOAFHyLpDsKRKBbmTuR088ESGMKa3KVr3RcfNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLXFK1QK1z2Fm; Thu, 2 Nov 2023 05:17: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 3A25Hfnr085713; Thu, 2 Nov 2023 05:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A25HfjX085710; Thu, 2 Nov 2023 05:17:41 GMT (envelope-from git) Date: Thu, 2 Nov 2023 05:17:41 GMT Message-Id: <202311020517.3A25HfjX085710@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: d24729b2fd66 - main - cam/ata: Postpone removal of two compat sysctls until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d24729b2fd66a87c2b925b0c30e46bb0a9d6446a Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d24729b2fd66a87c2b925b0c30e46bb0a9d6446a commit d24729b2fd66a87c2b925b0c30e46bb0a9d6446a Author: Zhenlei Huang AuthorDate: 2023-11-02 05:14:40 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 05:14:40 +0000 cam/ata: Postpone removal of two compat sysctls until 15 Prefer UNMAPPEDIO and ROTATING from flags sysctl. See 1. aeab0812e68c (Add flags sysctl to ada) 2. cf3ff63e55e4 (Convert unmappedio over to a flag) 3. 96eb32bf0f5a (Convert rotating to a flag bit) Reviewed by: imp, ken, #cam MFC after: immediately (we want this in 14.0) Differential Revision: https://reviews.freebsd.org/D42402 --- sys/cam/ata/ata_da.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index de8563a6c229..d1ef28300666 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1543,11 +1543,11 @@ adasysctlinit(void *context, int pending) SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_UNMAPPEDIO, adabitsysctl, "I", - "Unmapped I/O support *DEPRECATED* gone in FreeBSD 14"); + "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_ROTATING, adabitsysctl, "I", - "Rotating media *DEPRECATED* gone in FreeBSD 14"); + "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); #ifdef CAM_TEST_FAILURE /* From nobody Thu Nov 2 05:21: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 4SLXL85b2Lz4yy3L; Thu, 2 Nov 2023 05: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 4SLXL857p5z3bBQ; Thu, 2 Nov 2023 05: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=1698902512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y83j8syacmUE1pOqxWb2eOSLxfkuViianpsApnKhwwg=; b=NOTHB0CPFruSf13H5zCcnn0QOdzIb8GTKRAg2135y0zvnJDlEyLsoMV/q3QPtIwEvykeW7 7/dYup7EFoOh+kAKKitr+WviYG8Ruk5sXS4JDqgx74EBrxDJSCiTnq7V+ICEjbkGIsAn23 4HntVF10vS4znvJYwD87+VJztff7GlOTcLaH6w/+uOb2qb3T0LHNVmrjAvLZOtoSAtlg6+ 0YmdfbtKgh0gugWUzXEORugVNkVBFubvS0thQ1URs338JZ5HzYXZHasACO+j1YygRyaeBQ YNvllxPiXsbkjBrU7hf/4V/gfmD2lmgoBavb0tIZQgL054NzGzGOUR/XJIPuVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698902512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y83j8syacmUE1pOqxWb2eOSLxfkuViianpsApnKhwwg=; b=uWjqLq3DAD+/kjb9V7xr6ckZIPhba+QberXTYd0MysJir+OUDPFqV//eVzsEs+fDi4+Nnn J5vuAIuiri53no04wjFXK++wJ1DB1Vobil81D7hqKVMzGOgIXewGqRDvQRumgiG9BAOBZK u4gPFvA/oe1mBOyJRTjZ9fNj83f3ZYM/PY34e2TmqSTbdU4IEhSkflG1+OXIQd51AHJZ9i z/Xjy0MC6YLGgqjNkassHJGFdDe4Xy8nLXb0yg5CCbuPz/mc1cpcrmWD6NSWGfE6H5KVc1 61AMTWK2giAQRadtmf0RiyHflcfemKC6XXxACLYUd7MjKsulswNWe43TVDOWBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698902512; a=rsa-sha256; cv=none; b=H0wiuyyi3bkZv9N9ex8ODDmYaKwHF6T/1poqSxqA/pPHQe4ErIig8bnhxlqz9QZSirQLoi 0i1NPzyiGL6iVERKpOmUaWKKrjedhDCIbzGT1YU7W1zv9/eU4S+vpAaHThyrt9foIxomk0 bGUwswZ1xfVuHSe+8Le1oLDOKUZmdOD206F0i12zYzAFL6LEGziUEyEvnnsW0xTi5l0f+c Blc+FoD6umRQmxaittGkHYa/8ll0cKJAWFb/MoauO5LOZbCUFnk2PdhCOGsfKQQWWc6h7s Jeic/9TJvPee5RgiQhZubabELubWfktrnjVptD2FCR1TsAH8SRezeEmHaXptmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLXL84CQHz22V; Thu, 2 Nov 2023 05: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 3A25LqiI000199; Thu, 2 Nov 2023 05: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 3A25Lqwx000196; Thu, 2 Nov 2023 05:21:52 GMT (envelope-from git) Date: Thu, 2 Nov 2023 05:21:52 GMT Message-Id: <202311020521.3A25Lqwx000196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fb288d493989 - stable/14 - cam/ata: Postpone removal of two compat sysctls until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb288d493989d9df4c4f9c8eb3d7e28af61f8302 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fb288d493989d9df4c4f9c8eb3d7e28af61f8302 commit fb288d493989d9df4c4f9c8eb3d7e28af61f8302 Author: Zhenlei Huang AuthorDate: 2023-11-02 05:14:40 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 05:20:39 +0000 cam/ata: Postpone removal of two compat sysctls until 15 Prefer UNMAPPEDIO and ROTATING from flags sysctl. See 1. aeab0812e68c (Add flags sysctl to ada) 2. cf3ff63e55e4 (Convert unmappedio over to a flag) 3. 96eb32bf0f5a (Convert rotating to a flag bit) Reviewed by: imp, ken, #cam MFC after: immediately (we want this in 14.0) Differential Revision: https://reviews.freebsd.org/D42402 (cherry picked from commit d24729b2fd66a87c2b925b0c30e46bb0a9d6446a) --- sys/cam/ata/ata_da.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index de8563a6c229..d1ef28300666 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1543,11 +1543,11 @@ adasysctlinit(void *context, int pending) SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_UNMAPPEDIO, adabitsysctl, "I", - "Unmapped I/O support *DEPRECATED* gone in FreeBSD 14"); + "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_ROTATING, adabitsysctl, "I", - "Rotating media *DEPRECATED* gone in FreeBSD 14"); + "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); #ifdef CAM_TEST_FAILURE /* From nobody Thu Nov 2 05:24: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 4SLXNn2LGDz4yyBM; Thu, 2 Nov 2023 05:24: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 4SLXNn1qrNz3bYf; Thu, 2 Nov 2023 05:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698902649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DqDLV+4m4M54rbqDoX8n7rkwPb8asfBhjHARNvE8xZg=; b=Y08Yie5hRqVMZWqPHe5ckEq/IEPkcyer+Qf++xdcAFaB/85A+yeTeVdCKpwkO2cyfqhDrg 5v8TwvY+X7A2aliissTj9IoUi3tFrkzw4HZSiwpOXFKTeh0LD1hsP2pcr+HrkJk9UKFJLu e4HXO54e91zvuEXQyVNF0eiapjyH/S0j5NKuqZcHRG3Y+3dru5ylwddr5stMvutRZWIK+f YYaRh6w3Snm3WWiemaW/J+MBsgQleo5h6BRgqfV/GwoZBwetQRqQ9mwCNX1w+fQDHajlyW EfdlH2RAC1Tl30WtaAO+Ru2Ia8/gTo7x6opFTyJoyB8lbYS12Bzxg3q2Ztr7kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698902649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DqDLV+4m4M54rbqDoX8n7rkwPb8asfBhjHARNvE8xZg=; b=Q2AoHF94ATkwCHo5jCegpTy4DZlKMbeNnhSkvjgSAkjvL5gtN/jW+33HGASZlRhQxJN4H+ jEYJxeThebNDavdxAjHjqBf5b5e3ds01/OkJfJ1PFrgR/ldoLtoGhP0SB40ulNCcLJW3hB i7Z7IZaFPkVzOahPUFx70DJBSuB1IFsD9A1ERhnB+/xlMVSxdo/H2+ry5tiezhgFpTS6Xd BbUIhietu4UBJoHv0SIzNpmZtiu2xvMB3ETvJMMgumSu4TDLKqWgA6DRSCx8YG45gT3aUs wsUD6iIrv/oZ3jVpr5hgQcOCBn7LtCtXeXQiGy+ivQbsRApqhyaUXEWAZ6O9Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698902649; a=rsa-sha256; cv=none; b=CnRmOE65RdVtI78MNk9pF/RHJrR80XtZW+Xf9JJaOzGnmZVoGhJBulgkcd0Gj/rIvtzXZ5 hX7RaayiSxXuVGg3DOZ6MOrlzbOcywoUcAh9BWM6j20pjHMf6f1ycs/f1//XPKXxI20CEl ZqfDfmCd6DMR1f4kRZ1BMe55R3YlZjsSs6lTTwjpC4eWinWGRp3RJTB249fYbuTsniK3X8 iasM9t07jm/NvT6+zM3j3/3BZm7iXPHUTxg1ZQg0zyfEtsFv55ecMkNgJLzYJlkCS9H2y2 HKSxv7IniGOJmzZB9Cu5nKW22JDEw0/F5Ee1KgSqE5oPxKSkvfBGrbuB7ykpng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLXNn0t2rz230; Thu, 2 Nov 2023 05:24: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 3A25O9A4001650; Thu, 2 Nov 2023 05:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A25O9pp001646; Thu, 2 Nov 2023 05:24:09 GMT (envelope-from git) Date: Thu, 2 Nov 2023 05:24:09 GMT Message-Id: <202311020524.3A25O9pp001646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6c7ddf2c1437 - stable/13 - cam/ata: Postpone removal of two compat sysctls until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6c7ddf2c14374511bf0b092ac0ed3d977f0f6a74 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6c7ddf2c14374511bf0b092ac0ed3d977f0f6a74 commit 6c7ddf2c14374511bf0b092ac0ed3d977f0f6a74 Author: Zhenlei Huang AuthorDate: 2023-11-02 05:14:40 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 05:22:05 +0000 cam/ata: Postpone removal of two compat sysctls until 15 Prefer UNMAPPEDIO and ROTATING from flags sysctl. See 1. aeab0812e68c (Add flags sysctl to ada) 2. cf3ff63e55e4 (Convert unmappedio over to a flag) 3. 96eb32bf0f5a (Convert rotating to a flag bit) Reviewed by: imp, ken, #cam MFC after: immediately (we want this in 14.0) Differential Revision: https://reviews.freebsd.org/D42402 (cherry picked from commit d24729b2fd66a87c2b925b0c30e46bb0a9d6446a) (cherry picked from commit fb288d493989d9df4c4f9c8eb3d7e28af61f8302) --- sys/cam/ata/ata_da.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 6afd1f273178..359ece18960e 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1533,11 +1533,11 @@ adasysctlinit(void *context, int pending) SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_UNMAPPEDIO, adabitsysctl, "I", - "Unmapped I/O support *DEPRECATED* gone in FreeBSD 14"); + "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_ROTATING, adabitsysctl, "I", - "Rotating media *DEPRECATED* gone in FreeBSD 14"); + "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); #ifdef CAM_TEST_FAILURE /* From nobody Thu Nov 2 05:26: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 4SLXQz0Fxmz4yyLd; Thu, 2 Nov 2023 05:26: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 4SLXQy6nXvz3btW; Thu, 2 Nov 2023 05:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698902763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pq1gto3wCRaZpwTwi3oBb4L5YnIbcNEtV3EUoaT66DA=; b=aVCqzhAF890KwE9r9BBl9LZ9Ai/H3oSV1wxWU2niYOvMq91rh7WPjTX9CUBz02iNxWKOdE 7HrPb/Ge187S4tX85m+mDUa7U9/EWjVUGIyvv+wlFDfm6WS154dVsT5sI5TFO+EpvemODr X5XkQ0hdPPkYZ91NIm+adcu4c0zFVSXJToGn46GC5K7KMGS1JDFERBYm2Z6p57MfykooQ9 5/R5i9AkU01l3xV8qS7o2FsimmXcUSOHWd/Jg6AuGYXizM7gaWop1OCOP5gumYo0JkvmYW 226qTJ9nChSYYE0SKDnxytREetuQXG99x/+Swtd00d60FfINClBVpNG/gl2TFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698902762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pq1gto3wCRaZpwTwi3oBb4L5YnIbcNEtV3EUoaT66DA=; b=ZPQJ7D5HQgFYXbctL4TzsgupTPuiCFcNqt5QiKTiRgX5Hun3H1/326VR1aCMZkCGAiZDjj mSyTsLN6XNXhnR4KlYFdxW9rd8BLUGZbuQwOS531sD+KqPp4RB0AyCG6l+2nDYXGt3ldwu SXgo5zV8fN0wTlSszutvE1EH5XdXoJEtx8Ok9WeGLc2W7uj95Tri7QapV+iODHFI/4NW/C zuPtRcwNeDANUQ7K3MGasyV42+y3PEbumnH3oCgfRrLQRES13i2pMyHO2UkNfu8PqB7kim 0jqvL3FC/AmZi7l1HK/i8ON1T2h7M0fj6AJiL+fiRuQ60KgujvelFqKUSnDmcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698902762; a=rsa-sha256; cv=none; b=Uxl6I+3tZgwag4ifNEOO/UBuIaVVXOhjG7BjbXXDDRvM+kvoVOClmrO8O84UGjcu8GTEsn sZwI1RwW6uTsn1fEHhHeP53wsYElpyDY9w8KeoBaW90AcZutJpZmx0Y5xIn5A0j/UHVwwx vjqDz8PzZ4VmWX+4cfsuRlZcmzEbOrkuYFPoe38mKALpPH/iTvi0iAMGKEj7bXGImVC/1X kRC1sDEjmzAP0gmapMDWCebfvKBbAkqwcK4LrGKcEBoojItjeNICa92SRZYWFLtSCpqIbY fnOpuLddZ4Htwi51BTkZX4R3UboHO2Z+YWsSNDbTDTeSPFVgywO/prz9psopRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLXQy5rshz2BL; Thu, 2 Nov 2023 05:26: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 3A25Q2Sj002056; Thu, 2 Nov 2023 05:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A25Q26W002053; Thu, 2 Nov 2023 05:26:02 GMT (envelope-from git) Date: Thu, 2 Nov 2023 05:26:02 GMT Message-Id: <202311020526.3A25Q26W002053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d9e6e99a8525 - releng/14.0 - cam/ata: Postpone removal of two compat sysctls until 15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d9e6e99a8525fdd5a3c53b3e8281a4dc3b0e378b Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d9e6e99a8525fdd5a3c53b3e8281a4dc3b0e378b commit d9e6e99a8525fdd5a3c53b3e8281a4dc3b0e378b Author: Zhenlei Huang AuthorDate: 2023-11-02 05:14:40 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 05:23:47 +0000 cam/ata: Postpone removal of two compat sysctls until 15 Prefer UNMAPPEDIO and ROTATING from flags sysctl. See 1. aeab0812e68c (Add flags sysctl to ada) 2. cf3ff63e55e4 (Convert unmappedio over to a flag) 3. 96eb32bf0f5a (Convert rotating to a flag bit) Reviewed by: imp, ken, #cam Approved by: re (gjb) MFC after: immediately (we want this in 14.0) Differential Revision: https://reviews.freebsd.org/D42402 (cherry picked from commit d24729b2fd66a87c2b925b0c30e46bb0a9d6446a) (cherry picked from commit fb288d493989d9df4c4f9c8eb3d7e28af61f8302) --- sys/cam/ata/ata_da.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index de8563a6c229..d1ef28300666 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1543,11 +1543,11 @@ adasysctlinit(void *context, int pending) SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_UNMAPPEDIO, adabitsysctl, "I", - "Unmapped I/O support *DEPRECATED* gone in FreeBSD 14"); + "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_ROTATING, adabitsysctl, "I", - "Rotating media *DEPRECATED* gone in FreeBSD 14"); + "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); #ifdef CAM_TEST_FAILURE /* From nobody Thu Nov 2 06: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 4SLYgN143tz5049X; Thu, 2 Nov 2023 06: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 4SLYgN0dDSz3gXv; Thu, 2 Nov 2023 06: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=1698906112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M50jCwLl/FBzluKdvvHMnMbqGib5b+S2RWJy0tN9fKU=; b=RO7qLU+YpX51Qh3bcjwGEtb1R6b4EK1d8l19ReRZPra7kj5L0XW6hWyrPWiUvW1QGfytFW cj9zMbVdDsackM3rQx8vwBRK8rFtLdF5OQBqYOxhq61wTHQrD919E0benCtsibbJT7WSz0 yWc4OrB4UIP80jdbAoxA1HAkaKBtsbH64MOXUN20Xuvw55dS8lkh0nLJSnOnhdUgxU+s0n UlhgflLrvCL4QxdKqUPTp298XVloMmqV3337dU/xIYZxew24OtiTSwem7Z5EnHGsHUxGFd ACfKZdZvQ9TVxxyn7ao1ojzG2gr+cfgEbhvHd2pzfIPIlCWbOPKouas0GlXBuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698906112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M50jCwLl/FBzluKdvvHMnMbqGib5b+S2RWJy0tN9fKU=; b=vmW79uKErwysq4vXFjWUp80rvkyXgtyLEUkFkW2BS5sn7AIi+8k3V+v4XABl9hhIMHBDQi y1I9mRM4Yn3YKJPlfDB31ON+ztAaXic7eRX3zI/T/XV2buZ0+46lHYIhKjUwf5ZQqhvRlu x5LE0eySLsVLt8e5aajUoiyvctAzQWxHTXCHFbkyeYAU9YqpEDic+s4MArmMTfj6I34Eti lF0C55Z3zZZd2fzg2LppM/0RC6Lwg1wt2bXmRLZuL7w7AlVAFCIoB3WXOfzvSYnYMHtQaV Vfs3gP8XAgrbjs6mA1Te+TM9mOQIUYkuc5ZUIJxnePsopqphlmRtc3XXCMgaxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698906112; a=rsa-sha256; cv=none; b=jh7PEsghSJit96oYS2gJnsJ8JyFvy0JO6g9Wy9SnjB80iTKfqwwcE1+WPlQcEB7GvN3qOS 43/r8vFNXlNyDDjsO/tBsOyqwnnaSKMXA3PetB8Le1yL3Ouam+K/woW/41uHkAFZ/QE5N2 bPOSo7tCYxe7eYbZILedcyDkGA9pERLx2JVr+t6Csg9gMKyxaA8Xk0QiopgVO49Wri1hLf GN0jqiNVgMIN0CoyGVjxCnuxNl76G3zmhDOkwiWxEg46WyuohkWJB151cDVpn8Y3Ttqna+ 4K9lVtxz66CthWujVvFSd27cN7oitI0kF7vD6WLW4zNQYU59dofgv4XcYYnsew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLYgM6qs0z3bf; Thu, 2 Nov 2023 06:21: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 3A26LpQP001259; Thu, 2 Nov 2023 06:21:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A26Lp8k001256; Thu, 2 Nov 2023 06:21:51 GMT (envelope-from git) Date: Thu, 2 Nov 2023 06:21:51 GMT Message-Id: <202311020621.3A26Lp8k001256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 87a53bef41fe - main - evdev: Sync event codes with Linux kernel 6.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87a53bef41fe769920f925e74fedddafd5187b93 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=87a53bef41fe769920f925e74fedddafd5187b93 commit 87a53bef41fe769920f925e74fedddafd5187b93 Author: Vladimir Kondratyev AuthorDate: 2023-11-02 06:20:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-11-02 06:20:20 +0000 evdev: Sync event codes with Linux kernel 6.5 MFC after: 1 week --- sys/dev/evdev/input-event-codes.h | 43 ++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 4c4365d36611..59eb8e104c87 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -75,9 +75,9 @@ /* * Keys and buttons - */ - -/* + * + * Most of the keys/buttons are modeled after USB HUT 1.12 + * (see http://www.usb.org/developers/hidpage). * Abbreviations in the comments: * AC - Application Control * AL - Application Launch Button @@ -290,7 +290,8 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_DASHBOARD 204 /* AL Dashboard */ +#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 #define KEY_CLOSE 206 /* AC Close */ #define KEY_PLAY 207 @@ -527,6 +528,9 @@ #define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ #define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ #define KEY_IMAGES 0x1ba /* AL Image Browser */ +#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ +#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ +#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -554,6 +558,7 @@ #define KEY_FN_F 0x1e2 #define KEY_FN_S 0x1e3 #define KEY_FN_B 0x1e4 +#define KEY_FN_RIGHT_SHIFT 0x1e5 #define KEY_BRL_DOT1 0x1f1 #define KEY_BRL_DOT2 0x1f2 @@ -619,6 +624,11 @@ #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ +#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ +#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ +#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ +#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ +#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ @@ -667,6 +677,27 @@ /* Select an area of screen to be copied */ #define KEY_SELECTIVE_SCREENSHOT 0x27a +/* Move the focus to the next or previous user controllable element within a UI container */ +#define KEY_NEXT_ELEMENT 0x27b +#define KEY_PREVIOUS_ELEMENT 0x27c + +/* Toggle Autopilot engagement */ +#define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d + +/* Shortcut Keys */ +#define KEY_MARK_WAYPOINT 0x27e +#define KEY_SOS 0x27f +#define KEY_NAV_CHART 0x280 +#define KEY_FISHING_CHART 0x281 +#define KEY_SINGLE_RANGE_RADAR 0x282 +#define KEY_DUAL_RANGE_RADAR 0x283 +#define KEY_RADAR_OVERLAY 0x284 +#define KEY_TRADITIONAL_SONAR 0x285 +#define KEY_CLEARVU_SONAR 0x286 +#define KEY_SIDEVU_SONAR 0x287 +#define KEY_NAV_INFO 0x288 +#define KEY_BRIGHTNESS_MENU 0x289 + /* * Some keyboards have keys which do not have a defined meaning, these keys * are intended to be programmed / bound to macros by the user. For most @@ -846,6 +877,7 @@ #define ABS_TOOL_WIDTH 0x1c #define ABS_VOLUME 0x20 +#define ABS_PROFILE 0x21 #define ABS_MISC 0x28 @@ -899,7 +931,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_MACHINE_COVER 0x10 /* set = cover closed */ +#define SW_MAX 0x10 #define SW_CNT (SW_MAX+1) /* From nobody Thu Nov 2 06:21: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 4SLYgP35wjz5045P; Thu, 2 Nov 2023 06:21: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 4SLYgP20mVz4Bb8; Thu, 2 Nov 2023 06:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698906113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfiqTGFSj9cgBSvL9Kt17KvAw+nFnfPzQsFQ061tMwE=; b=VljAXk4qLJfdIRI/G2k+xkdUhezyiOv0OaS46WB+ApggHd3/sYAapeQx2Vk1gj0YFbh04G TREtgkEvt1yaSokQpQjDDC1eKoQdK0uh+jK0R5nei4lXDHCEo5M0D9Wq+OG+6WMIu9ptR+ l/dHWkVVSHKGC2uVlTUAg2KZYcXaQNpgsYcZRTY7koY+eGLHNWrcekbGAb8OOGHUWJIOGK PMPoVCXD8ExSmw4SwXz3Lj9NF88haF5Ohbg+yhdUmpyx95bmo0x7AWwmLrrK5GHdJqFLl5 KSvanptbWmnXI/0g2WOfFPSunCVb2OING/1+hXNhLFrBLMIivUfD1q1Tyb9M0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698906113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dfiqTGFSj9cgBSvL9Kt17KvAw+nFnfPzQsFQ061tMwE=; b=R73Ax7nc9pVedyibQ1LvLPto1M2Aa3wON3rys3GDqno/qESGWL33ddHQgnjBajxOCY9N/Y Ic5LNjZHqMGTd3L+aOLF2IdjWW6u5VEFBH8WfH3+5uJ0vMeQrPqlj0Z8d6/E5p2UlktIVe n5v+P1Y+/qgaFu7W6DUOLaol5AvEOAbreM9xhjuYYq4LHub1Ylyn3gMFvUDxSPrR61OSi+ 6y3P6rj+oSP0kd8AwL9BtAk+dHoLQqwzRCMbd3c0d2ST59xdQgH8VWVhg/h87csFBZm70F sqS8WBqUK8QDOzu0wKHBF8WuJhcTW94U40nJLa9JJRuvUnXMYeSBe58FP9pE7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698906113; a=rsa-sha256; cv=none; b=jm0j/ZBL2JssD2r9g7BqL1i5iWaFHigy8LClZ/4Dv4NMPNtLQq/twC4W3LAm9GQ2u9eoXO PX1teu2JW8TGgYMbgFKpIwZ+F+4yAmDmBMEBLbJZ3hI+WBNkW/hRnn5c7T7tA6SLYDboPc /ll8cMG8Y1dV3HXlAWFL5IGgVbzcXm5bf+/r4z0u9bZYkmOmsoSQMfkeCZfQAE/pd25iMT 8FYZe0BrtzFtuCrw0fs44mdNgm4qjvaGfaU5Zl0Q4lRVG+QS/+D/6OGN5SArxV48SVOXz7 +4Oa4wUtkxh6waFtjMiRkJ0itlEJ1xbKh7ShkjzKhLrNPKYJ2aM5jLIRcmoF8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLYgP0nvlz3bg; Thu, 2 Nov 2023 06:21: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 3A26LrKk001338; Thu, 2 Nov 2023 06:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A26LrRm001335; Thu, 2 Nov 2023 06:21:53 GMT (envelope-from git) Date: Thu, 2 Nov 2023 06:21:53 GMT Message-Id: <202311020621.3A26LrRm001335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1d46c8e5c270 - main - hmt(4): Do not require input report HID usages to be a member of TLC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d46c8e5c2702c141c6be982b3ca44e74d1cb8f1 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1d46c8e5c2702c141c6be982b3ca44e74d1cb8f1 commit 1d46c8e5c2702c141c6be982b3ca44e74d1cb8f1 Author: Vladimir Kondratyev AuthorDate: 2023-11-02 06:20:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-11-02 06:20:20 +0000 hmt(4): Do not require input report HID usages to be a member of TLC Some touchpads places button usages (in HID report descriptor) in to the 2-nd level collection rather than in to the top level one. That confuses current code. Remove collection level check in HID report descriptor parser to fix device detection. Reported by: Peter Much PR: 267094 MFC after: 1 week --- sys/dev/hid/hmt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/hmt.c b/sys/dev/hid/hmt.c index 199a6a2ff045..f6b593222317 100644 --- a/sys/dev/hid/hmt.c +++ b/sys/dev/hid/hmt.c @@ -744,14 +744,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len, else break; - if (hi.collevel == 1 && left_btn == 2 && + if (left_btn == 2 && hi.usage == HID_USAGE2(HUP_BUTTON, 1)) { has_int_button = true; sc->int_btn_loc = hi.loc; break; } - if (hi.collevel == 1 && - hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) && + if (hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) && hi.usage <= HID_USAGE2(HUP_BUTTON, HMT_BTN_MAX)) { btn = (hi.usage & 0xFFFF) - left_btn; setbit(sc->buttons, btn); @@ -760,13 +759,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len, sc->max_button = btn + 1; break; } - if (hi.collevel == 1 && hi.usage == + if (hi.usage == HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACTCOUNT)) { cont_count_found = true; sc->cont_count_loc = hi.loc; break; } - if (hi.collevel == 1 && hi.usage == + if (hi.usage == HID_USAGE2(HUP_DIGITIZERS, HUD_SCAN_TIME)) { scan_time_found = true; sc->scan_time_loc = hi.loc; From nobody Thu Nov 2 06:51: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 4SLZL36C1Zz5084C; Thu, 2 Nov 2023 06:51: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 4SLZL35jbqz4GcQ; Thu, 2 Nov 2023 06:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698907915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnrfliLar5jTAr3044rCw+dMVM2v5hPWkZtY0wFIvY0=; b=c42V349iVEBynPoAIlxPnw3/M7puanwYFmPfBUCOh87PUpb2PpvNU6iUxC3sGn2a4ioh89 uFfkS8971YSR1FDD0CE7h0hQMnMFXkxiswMAhvVYB7/PuhK7C2vmO4NKtB+jufyc4N0G2W 3M3sol8Nr/JMJGT74r3I3fvGgeegYn6nHKroekx92AeJrOl1fZxOueqfAVFiKGs5sXQqZB EY8E7UMPrQ9phNuP9JO/adCrbJDnCIGiKBvK4w6g2pT1ahyfcfK6R87gKGSXSI8NrFfR1g rxbl5joTnXR9g8JtTF9HBWtxsxslAk/F0erfFXmcvFAL5FqACT0/2UdKDLnIog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698907915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnrfliLar5jTAr3044rCw+dMVM2v5hPWkZtY0wFIvY0=; b=UHQm13UWaYN/+o00wjrbwnHpZ8VD0sWBrIBKdoi6Od/tjF/u190xaCQM1D8lTjKxwOJ2tH c/DaUNl1ASXCU59+1TZXHXbnxKZPNM3gqjiM/yQC7kpKF8RzLtxemAdqPQN+qdMeA1qyw9 pCSHD5csXGYc1IpfEehFMJhF18xL+3Q1j0Tl//fNIYE6+mKTOnTjmZoDilMOcvquUfuDi8 ohx6DIUQfl2C3r8f3eFFdXKPqcenogQIS1UhhXLmLGJtkXePfxV8kxUsxXCFc2Nr2HTsRI EDUs7dnHd2dcvR7WSsBZ7J8sMijamF9lQ7bVbIrUs2dSpyuJpiBlAbESn0KltQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698907915; a=rsa-sha256; cv=none; b=Wh2rF826Rf2Oxfu7KC8Haz+AwnTaMsiMVdx9OBLiUsXBpbWtzXVI4QYMTbXAY13iPBoMZt Yj4Sh29zcebVWhflV2ExOHIpN8XG86Wvf/I9wySx8Q9FtsdqrJ2lHRqsII2ZfH0Qi5+cq6 0eKyATu9/JOELlHoeTrRSW31csyX7yNUeHaXAO4xoHYig1jci1bfAYcBo2P1lNEJaWeeXP UQdNXaz3lMAGfvVA830FX7arsSchgTBPAGMq0mXhPoGORJxc7Vk1/BkpYAHE5eovf6CxHZ VONwR5nbV+MoLYkh6Q6LoExPJoiKPBkJURl4i5FsX23yLfEZ/OCcyHbqUckzgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLZL34mRnz46G; Thu, 2 Nov 2023 06:51: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 3A26pt7t047952; Thu, 2 Nov 2023 06:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A26ptrs047949; Thu, 2 Nov 2023 06:51:55 GMT (envelope-from git) Date: Thu, 2 Nov 2023 06:51:55 GMT Message-Id: <202311020651.3A26ptrs047949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 96831a3ef1de - releng/14.0 - zfs: cherry-pick change from master List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 96831a3ef1dea365fb4104d29daad565ee5f71e5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=96831a3ef1dea365fb4104d29daad565ee5f71e5 commit 96831a3ef1dea365fb4104d29daad565ee5f71e5 Author: Martin Matuska AuthorDate: 2023-10-31 20:49:41 +0000 Commit: Martin Matuska CommitDate: 2023-11-02 06:50:52 +0000 zfs: cherry-pick change from master #15465 763ca47f Fix block cloning between unencrypted and encrypted datasets Fixes a kernel panic when block cloning is enabled and system is trying to read data from a file copied using copy_file_range(2), e.g. with cp(1) from an unencrypted dataset into an encrypted dataset on the same ZFS pool. As the file has not been encrypted, to fix the filesystem inconsistency and to avoid future panics it must be deleted (metadata is readable). Approved by: re (gjb) Obtained from: OpenZFS OpenZFS commit: 763ca47fa81808be62ab5e02357e896233f24abc (cherry picked from commit c5eb93ef57f4905f7aea9566ab45be1a75ada150) --- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/openzfs/module/zfs/zfs_vnops.c b/sys/contrib/openzfs/module/zfs/zfs_vnops.c index 40d6c87a754e..84e6b10ef37c 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_vnops.c +++ b/sys/contrib/openzfs/module/zfs/zfs_vnops.c @@ -1094,6 +1094,15 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp, ASSERT(!outzfsvfs->z_replay); + /* + * Block cloning from an unencrypted dataset into an encrypted + * dataset and vice versa is not supported. + */ + if (inos->os_encrypted != outos->os_encrypted) { + zfs_exit_two(inzfsvfs, outzfsvfs, FTAG); + return (SET_ERROR(EXDEV)); + } + error = zfs_verify_zp(inzp); if (error == 0) error = zfs_verify_zp(outzp); From nobody Thu Nov 2 09: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 4SLdNn24zfz4yYs2; Thu, 2 Nov 2023 09:09: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 4SLdNn1cSnz3CB6; Thu, 2 Nov 2023 09:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8p5zD9w7kS5bZ5PEY+HMJKlWHf2AVzfY52pLmm4IEo=; b=XzAbXNFYqKoWcMgt70YnXT/hkfkbUITT23LMNxxZCtXdYvmAX9N/vKs80/vV4mdA81dQ6F Fhiqz56aM29SSzMj+HakmJhLJ42Nctadx86TfbXQOJC8InCCpva9C4fvHQV1aim6piNsdE mQN+IA8SHavMM+4XcLtpsljU1jvnbTxHkfb1ke6zwWK3rgj28JjPuywGYT3vC66ELpPkdn eJQiJP0t15EfFOKRGDbYqr92AUct02xopyXd/P8kDVkn8x99isTQA0Idwztdt0fPP5utnx s5PgCINITedftEynw8EuI8/Lpk+OVCvh7AyRxUuokYv6vna9iDIbB1o9Q/uPuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8p5zD9w7kS5bZ5PEY+HMJKlWHf2AVzfY52pLmm4IEo=; b=nbCeB2z9n46EQuwj/To8Z7plkB1qAphk1/lzyb84GHY8xFaVBJ0AAfAJZdyaV8S7Tw9Kcd cjrBq4qdDcXlWdrHvPiBlNXCleuLo/WrnswJ4v3fsQ6Ysp7s2AWhZaMvRh4XggbdAny254 577tZY0qqlH041aHdeNhg9px9ix8HCV4VS3sawYcZxY8bOBKAlnT16O08XU6UArhC+FZ/o vYWbqwr3q8SZf/XjEQLN//jnusoNzw8foe0ocOmAxa0EmpN2ep6Lz9Mc0gMc41dLjTPt0m vHP5D0lBfuro1kPndI85W9kplIMKWOQ9B2Ut26Flg1PySJOsjTBzgGzRKi6/wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698916169; a=rsa-sha256; cv=none; b=QAwb0er5Wg9YJ46bGmEyLM6LA03WYAlrju9W6ntfWTbZ8OgrRlRorNpkNEFB0LcOjDgp4V ncS32pMq/2cnEklq6y0gYV5ytonrCkcG/Pg+pvf4uDPXlaUi2ibLtOvbv50HZI8D211nJb HhQEnHlD/cLav5edNVKL+xh8Yy+/FH9LxB69z8Nt5HMrDO3OXI2cB1QuWOZgEB2k+Wz+U1 t+2Y7X3T4wTywE/LN8y6dPlo9uhKTBRxHPd7jbnJGMg61hwYd2ixf0nrY0s6s+xFdr1sA3 7iLoOWZ1X5ggCDjGrV+gyQ74LpfjVF0rKxLDOBGz59ABEHdSnFZ6frymhxYjmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLdNn0gLyz84Y; Thu, 2 Nov 2023 09:09: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 3A299SfQ075868; Thu, 2 Nov 2023 09: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 3A299SXQ075865; Thu, 2 Nov 2023 09:09:28 GMT (envelope-from git) Date: Thu, 2 Nov 2023 09:09:28 GMT Message-Id: <202311020909.3A299SXQ075865@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: 63bf943d4af1 - main - Hyper-V: vmbus: Add NULL check for vmbus_res List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 63bf943d4af17799cef21e2bb78dd28003ce1ce5 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=63bf943d4af17799cef21e2bb78dd28003ce1ce5 commit 63bf943d4af17799cef21e2bb78dd28003ce1ce5 Author: Zhenlei Huang AuthorDate: 2023-11-02 09:07:11 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 09:07:11 +0000 Hyper-V: vmbus: Add NULL check for vmbus_res QEMU emulates Hyper-V [1] but lacks the emulation for vmbus_res, thus no coherence information is available. Add NULL check for it and fallback to no coherence. This will prevent FreeBSD guests from panic on QEMU with the Hyper-V enlightenment hv-synic enabled. For real Hyper-V, both gen1 and gen2 have vmbus_res then they are not affected by this change. 1. https://www.qemu.org/docs/master/system/i386/hyperv.html PR: 274810 Reviewed by: mhorne, emaste, delphij, whu Diagnosed by: mhorne Fixes: e7a9817b8d32 Hyper-V: vmbus: implementat bus_get_dma_tag in vmbus Insta-MFC approved by: re (delphij) for 14.0-RC4 Differential Revision: https://reviews.freebsd.org/D42414 --- sys/dev/hyperv/vmbus/vmbus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index ee412e643b4f..0ea401507b79 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -1393,7 +1393,7 @@ vmbus_doattach(struct vmbus_softc *sc) int ret; device_t dev_res; ACPI_HANDLE handle; - unsigned int coherent; + unsigned int coherent = 0; if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) return (0); @@ -1416,10 +1416,12 @@ vmbus_doattach(struct vmbus_softc *sc) /* Coherency attribute */ dev_res = devclass_get_device(devclass_find("vmbus_res"), 0); - handle = acpi_get_handle(dev_res); + if (dev_res != NULL) { + handle = acpi_get_handle(dev_res); - if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) - coherent = 0; + if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) + coherent = 0; + } if (bootverbose) device_printf(sc->vmbus_dev, "Bus is%s cache-coherent\n", coherent ? "" : " not"); From nobody Thu Nov 2 09:11: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 4SLdR033yxz4yZLV; Thu, 2 Nov 2023 09:11: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 4SLdR02cZ9z3DLP; Thu, 2 Nov 2023 09:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eh/JMoBaB70Y5iN0ovbw93757rNLFjvuKYdstLZILRo=; b=bAjee77l9BWlrEnLB57GyFMZceQruUzEqPTlDXuLy3ZcZWfpaPyHT7BbpYRv665KnOitPN jzjjy9W8W67HKt85BxwWaC+PtLKHO8uP6lXug4jc2FGV59/1HkWAlH+2J0eLKkGUQtoxDI EpSRK/MiQ8eTAXBSm6ED4Z6piwCoI4Ji3A6LMhpItCKfZfO5viOc0R0EPXKzrFJz9dRv7x 4+5pUH/8G3zn8gAyD3Gr1Cgkws43qwROzXqtyl6o4zqsQe8JQhuSopU4Z2srwtsB1gH0zz SOgCuxdM9hDRz5bg0LwS8MtD0/8GsxeY8ERleqshU3WSbXZnRb6/eDMKddtetg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eh/JMoBaB70Y5iN0ovbw93757rNLFjvuKYdstLZILRo=; b=L3S8utkH6x2KRYevOogl84AriqWcJKqCQsgrq8OkRl0wk7OKtk6+chwKuqukfUsJiCiUXP n0E1SvAKQda8rZ1AqTvIzzT177AvoJaVcvCEfjqILFt5WubYFo4R00NBpSLKvy8nvKMJa3 MXAp4cKSqADqyzVDwtegj/zxhHJsqOZ6o0fo16aTQbGFobB6SAV8HCg7LL5qgUGMHtdbz4 og0+oigUo3PoIFA1EBXV9Bn3qAY8vEpuSz6oxrRZAExeeq9JGNtW+nKjWD9jLiCl+5EHek sRmQjtOTJSNUecXiFNXgddgaNGK21M7lu7J6W1kw6ePpIOXB0dQhD+O9syjFZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698916284; a=rsa-sha256; cv=none; b=Iu6OtR1u3bTZiXShrJzecihGc7JdXUm+zRDU0i/ulv8zwkyWby886vRcBB+TJGYahjgYX4 X6+718JyNre13fFHa3mpKsyZcoibwNeOyQtxkhhAZDGZlyBj/S7vI/N8x/NkU1IwCcWrB2 HbHv+7Nfw5j75uNIlMLIvmdbrFdtLNRnvAu+OhS03svTrYC1sEDzbYuuqAvwLC/nh93BMY 9E1vDjXIK1RLiibyRG6ton2GS2KYRYNiPVir1katU+pwuQ7iwF2ZD+UyFx6+mOkJGl3vmr 1VOfr4ajsjJEvu8/FpaY4PMn+md7Mpt+yyrbSFVqp3QEoK66Wa2Oz3k1smLuRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLdR01gw2z8K9; Thu, 2 Nov 2023 09:11: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 3A29BO9h087273; Thu, 2 Nov 2023 09:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A29BOpE087270; Thu, 2 Nov 2023 09:11:24 GMT (envelope-from git) Date: Thu, 2 Nov 2023 09:11:24 GMT Message-Id: <202311020911.3A29BOpE087270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1969d82fcf62 - stable/14 - Hyper-V: vmbus: Add NULL check for vmbus_res List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1969d82fcf62f80c2047a53b42f501680b140b0d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1969d82fcf62f80c2047a53b42f501680b140b0d commit 1969d82fcf62f80c2047a53b42f501680b140b0d Author: Zhenlei Huang AuthorDate: 2023-11-02 09:07:11 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 09:10:03 +0000 Hyper-V: vmbus: Add NULL check for vmbus_res QEMU emulates Hyper-V [1] but lacks the emulation for vmbus_res, thus no coherence information is available. Add NULL check for it and fallback to no coherence. This will prevent FreeBSD guests from panic on QEMU with the Hyper-V enlightenment hv-synic enabled. For real Hyper-V, both gen1 and gen2 have vmbus_res then they are not affected by this change. 1. https://www.qemu.org/docs/master/system/i386/hyperv.html PR: 274810 Reviewed by: mhorne, emaste, delphij, whu Diagnosed by: mhorne Fixes: e7a9817b8d32 Hyper-V: vmbus: implementat bus_get_dma_tag in vmbus Insta-MFC approved by: re (delphij) for 14.0-RC4 Differential Revision: https://reviews.freebsd.org/D42414 (cherry picked from commit 63bf943d4af17799cef21e2bb78dd28003ce1ce5) --- sys/dev/hyperv/vmbus/vmbus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index ee412e643b4f..0ea401507b79 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -1393,7 +1393,7 @@ vmbus_doattach(struct vmbus_softc *sc) int ret; device_t dev_res; ACPI_HANDLE handle; - unsigned int coherent; + unsigned int coherent = 0; if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) return (0); @@ -1416,10 +1416,12 @@ vmbus_doattach(struct vmbus_softc *sc) /* Coherency attribute */ dev_res = devclass_get_device(devclass_find("vmbus_res"), 0); - handle = acpi_get_handle(dev_res); + if (dev_res != NULL) { + handle = acpi_get_handle(dev_res); - if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) - coherent = 0; + if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) + coherent = 0; + } if (bootverbose) device_printf(sc->vmbus_dev, "Bus is%s cache-coherent\n", coherent ? "" : " not"); From nobody Thu Nov 2 09:16: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 4SLdY153D8z4ybH7; Thu, 2 Nov 2023 09:16: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 4SLdY11NwCz3F3l; Thu, 2 Nov 2023 09:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SzUdfYQH1fz8GEJmlKg6KFzu7s+YCGXeOUDAuGTxIu8=; b=YnHoaaaQFbGLW+UdUs/QZKPNFShvwNotfGNds5iLyY5G22G4yJ9A6ZlufN2SK2f/3iE4qi ftuLjuHniny/4QYGKpzdrscpp8FQ7W3DGvZgxMiqyjhD5wkJ0awn7axzVlekT1OwuxB7We QR6sEZ1IixjwkclmcYALPTb/aCCpH+wIU30eJUk3rsZjTqeWBQw5yF+e6f5Bi/9mpA8qW+ w99h4CvQVDxpUAGG2lX8CIbz51yCSlBJXcHt/dniga4EdJa4YteFyXTUgb2/rRPFNE9ILb F9IhqUR72SgURLAx2uD5egttTklcEJILzyx5Vdl6tfR73N8Z2F1K2kY23B3Qtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SzUdfYQH1fz8GEJmlKg6KFzu7s+YCGXeOUDAuGTxIu8=; b=um075x10YRXPz0vRVh0x9Wlm9mnF+GxnN0rB0mYRXPW9VRQQO4yPq9u8bHpjLgolQMUTGM hN77+Crg2Xa+RDCHCAxRXHMedG1bHNJjm4oZ7gakVdiS+85qZLGUhaJoRORp4Be3RHL9Bc K4oPjx/cNkuuukx6owC91pJStIedGGpQ/dzV5Au8k6vCBLwkAlAXol0dhkPG1uSyeB8qWi K6N6U/pmvkFRgm0OeIEBYRGSVDv1r7k4RIsnVrLYhuWQ4E3XlsV7s6zBe6msEDLGaJ82Nb Zry9FS6jl9L4t7MMuWE6xpTl8fP6N0soErPULr1ZpX/xroizLKY/0aoADzAcqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698916597; a=rsa-sha256; cv=none; b=icuxUAUvtPHhCHQSyvtfQL5opYhKzJU+TncWjjZw7gey0rL4Bx8U+tj1rZvQgDbJLFwLzP ZHR1/nBEycFkVzPai43isMcU3lCW+5P6zJVIOmkQ4ArrCiQ5FW7TZf3YcFV6YIs40Uzu58 RCfItrdRJMzKYAN8P4y5vgNaU2Kj1su8YbrWZVJV3iTuGf8v0mBDjgrMHd8CxQQKpNOMWp KOA0WoeWSr4rRm3ghMZaGJtuhedcNah4g903LOovN+vcvZOOySiS8NqyaXMqKEUYidGwCr vwnjQ6S0jvaeQBjlV79J7cuZhyMu2zd88F5h6yO9MAZPSrwYL6I7wzuNKF5jWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLdY10Ly5z8Mr; Thu, 2 Nov 2023 09:16: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 3A29Ga1x092125; Thu, 2 Nov 2023 09:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A29GaKc092122; Thu, 2 Nov 2023 09:16:36 GMT (envelope-from git) Date: Thu, 2 Nov 2023 09:16:36 GMT Message-Id: <202311020916.3A29GaKc092122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 52dbe7401fba - releng/14.0 - Hyper-V: vmbus: Add NULL check for vmbus_res List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 52dbe7401fba923bc18124190029e65b491a756e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=52dbe7401fba923bc18124190029e65b491a756e commit 52dbe7401fba923bc18124190029e65b491a756e Author: Zhenlei Huang AuthorDate: 2023-11-02 09:07:11 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-02 09:13:18 +0000 Hyper-V: vmbus: Add NULL check for vmbus_res QEMU emulates Hyper-V [1] but lacks the emulation for vmbus_res, thus no coherence information is available. Add NULL check for it and fallback to no coherence. This will prevent FreeBSD guests from panic on QEMU with the Hyper-V enlightenment hv-synic enabled. For real Hyper-V, both gen1 and gen2 have vmbus_res then they are not affected by this change. 1. https://www.qemu.org/docs/master/system/i386/hyperv.html PR: 274810 Reviewed by: mhorne, emaste, delphij, whu Approved by: re (gjb) Diagnosed by: mhorne Fixes: e7a9817b8d32 Hyper-V: vmbus: implementat bus_get_dma_tag in vmbus Insta-MFC approved by: re (delphij) for 14.0-RC4 Differential Revision: https://reviews.freebsd.org/D42414 (cherry picked from commit 63bf943d4af17799cef21e2bb78dd28003ce1ce5) (cherry picked from commit 1969d82fcf62f80c2047a53b42f501680b140b0d) --- sys/dev/hyperv/vmbus/vmbus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index ee412e643b4f..0ea401507b79 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -1393,7 +1393,7 @@ vmbus_doattach(struct vmbus_softc *sc) int ret; device_t dev_res; ACPI_HANDLE handle; - unsigned int coherent; + unsigned int coherent = 0; if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) return (0); @@ -1416,10 +1416,12 @@ vmbus_doattach(struct vmbus_softc *sc) /* Coherency attribute */ dev_res = devclass_get_device(devclass_find("vmbus_res"), 0); - handle = acpi_get_handle(dev_res); + if (dev_res != NULL) { + handle = acpi_get_handle(dev_res); - if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) - coherent = 0; + if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) + coherent = 0; + } if (bootverbose) device_printf(sc->vmbus_dev, "Bus is%s cache-coherent\n", coherent ? "" : " not"); From nobody Thu Nov 2 09:22: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 4SLdgW17P0z4ychv; Thu, 2 Nov 2023 09:22:15 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLdgW0frkz3Gwb; Thu, 2 Nov 2023 09:22:15 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916935; 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=y4FXQXS4OEYpNKxqXPlhIP8A/nhUDUjKIX/mIgNrhXw=; b=DrvZL4R/gsqgpXK9YcW+a9PKpgwjtHsgsJtawtu1sliLZcJGRoyzROTMI9t46uJIsztxJT U4jt1TZey3YdPFEXycr8JvtsjGldEc4aqXTtrIIf/z/uRolWIOIE3pvWYAZXdu5Ce+Cr1C 4HNmCcFcqEWSK8SCXAgCCaHTEQnMJZNADc6DYcqBoKEE22WENkPjQKx/QsAhuutqjJPvC9 Edjzqv3fii276TmuCMuXlJFB9ZkQXk6vVBbPss38IIQuR+cfikaNDNeL+SWcV8uFlcOfjA DmICDUMFsybGc5qN8gJp07rGJqJZIkvCmGYZfdWvqPjEFkj50pTl60rd+f+/jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698916935; 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=y4FXQXS4OEYpNKxqXPlhIP8A/nhUDUjKIX/mIgNrhXw=; b=tvR4D8oJ06kRLF8gUj0XItNvsT25sSX3+pcj8bN2MqW5/U8e7sJMNzCx4TPnGG2l6rBPtd XSDz1l1QefhMppekCt+7GnH1u/B5F+uKqxliNIK4UgXRIRa4hYxWkrqb6zQz5R6wi5hX4r y+HmkFIaZSSlLKsvpao3SjRL134LAVI/RIu5TXrzC7mYOLnDIlU1x1ZfI02HzK1ZCmWPFP l6nMrq2RUuua1hG9czVuViWCNLSPc9nnDS3lc+afuNisaMGBfUtYmLYIlwVJ2xXQqtfi4N chQBufS3mThS3gnkkJee53GVfH4dPZCOQ1srzirAZ1Kzu6LnW64u+HAYWluv5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698916935; a=rsa-sha256; cv=none; b=elwejapjJcEvKGgu/qRuDeuGDjsvAPWl1lifUY3XZXmIZX+3OnyOPFCY+1oauF2+wtmBlG kDUCBuNCf/8olOaIiNg8AWXvVr9U6rSVmsK6+VEXtVSOC5uclA80+x/rWOUJTHbUd5Cgcl g5a6TXyJshws/ZEvcT19fM1MymETCfOuiLDe0wIBrhlhwx/du30EUA7dtjx4FfNU5yCeA/ Menx4lAZ/yeXEdWt3ahjBL2BL5Iba+wpPEk09AGt322zHuMjJ5lN8IeCr4+Nw52uZktDWJ sMDibYnxhrmBfMqxEEonir7522y5TxG3FFpsL9RQLh/Ql5LpUk2PTpd3vSg6yA== Received: from smtpclient.apple (unknown [112.66.183.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SLdgT4vgJz1WTg; Thu, 2 Nov 2023 09:22:13 +0000 (UTC) (envelope-from zlei@FreeBSD.org) 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 \(3696.120.41.1.4\)) Subject: Re: git: 63bf943d4af1 - main - Hyper-V: vmbus: Add NULL check for vmbus_res From: Zhenlei Huang In-Reply-To: <202311020909.3A299SXQ075865@gitrepo.freebsd.org> Date: Thu, 2 Nov 2023 17:22:09 +0800 Cc: Souradeep Chakrabarti Content-Transfer-Encoding: quoted-printable Message-Id: <2E6A685B-A8E4-48A2-B21A-422AFBEA4440@FreeBSD.org> References: <202311020909.3A299SXQ075865@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" X-Mailer: Apple Mail (2.3696.120.41.1.4) Sorry I committed too fast. I should give credentials to Souradeep in the commit message. Thank him for the analysis ! > On Nov 2, 2023, at 5:09 PM, Zhenlei Huang wrote: >=20 > The branch main has been updated by zlei: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D63bf943d4af17799cef21e2bb78dd280= 03ce1ce5 >=20 > commit 63bf943d4af17799cef21e2bb78dd28003ce1ce5 > Author: Zhenlei Huang > AuthorDate: 2023-11-02 09:07:11 +0000 > Commit: Zhenlei Huang > CommitDate: 2023-11-02 09:07:11 +0000 >=20 > Hyper-V: vmbus: Add NULL check for vmbus_res >=20 > QEMU emulates Hyper-V [1] but lacks the emulation for vmbus_res, = thus no > coherence information is available. Add NULL check for it and = fallback > to no coherence. This will prevent FreeBSD guests from panic on = QEMU > with the Hyper-V enlightenment hv-synic enabled. >=20 > For real Hyper-V, both gen1 and gen2 have vmbus_res then they are = not > affected by this change. >=20 > 1. https://www.qemu.org/docs/master/system/i386/hyperv.html >=20 > PR: 274810 > Reviewed by: mhorne, emaste, delphij, whu > Diagnosed by: mhorne > Fixes: e7a9817b8d32 Hyper-V: vmbus: implementat = bus_get_dma_tag in vmbus > Insta-MFC approved by: re (delphij) for 14.0-RC4 > Differential Revision: https://reviews.freebsd.org/D42414 > --- > sys/dev/hyperv/vmbus/vmbus.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) >=20 > diff --git a/sys/dev/hyperv/vmbus/vmbus.c = b/sys/dev/hyperv/vmbus/vmbus.c > index ee412e643b4f..0ea401507b79 100644 > --- a/sys/dev/hyperv/vmbus/vmbus.c > +++ b/sys/dev/hyperv/vmbus/vmbus.c > @@ -1393,7 +1393,7 @@ vmbus_doattach(struct vmbus_softc *sc) > int ret; > device_t dev_res; > ACPI_HANDLE handle; > - unsigned int coherent; > + unsigned int coherent =3D 0; >=20 > if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) > return (0); > @@ -1416,10 +1416,12 @@ vmbus_doattach(struct vmbus_softc *sc) >=20 > /* Coherency attribute */ > dev_res =3D devclass_get_device(devclass_find("vmbus_res"), 0); > - handle =3D acpi_get_handle(dev_res); > + if (dev_res !=3D NULL) { > + handle =3D acpi_get_handle(dev_res); >=20 > - if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) > - coherent =3D 0; > + if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", = &coherent))) > + coherent =3D 0; > + } > if (bootverbose) > device_printf(sc->vmbus_dev, "Bus is%s = cache-coherent\n", > coherent ? "" : " not"); From nobody Thu Nov 2 09:30: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 4SLdry6JvFz4ydwF; Thu, 2 Nov 2023 09:30:26 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) (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 4SLdry4dTHz3J3r; Thu, 2 Nov 2023 09:30:26 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-3b2b1af964dso427227b6e.1; Thu, 02 Nov 2023 02:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698917425; x=1699522225; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=qpkPt4fc7NXhlIoj52yFt6HQug/R77RWJUzFY0AeTJg=; b=AYrwF3FWAHEQYaVrZTWexwr43im0YCN8ZDWaonXtzVib5KKsuHnSND0ekPYE0jbCH9 Ze1FQjbWjZ3mhddJ7Md/DKhNSNdx2CATFmoHomn5CD8De7au8pmb4JEJ5eeaoqyArTil 8UFXlUlt4M2g86u+0Wk1mM10EJd2LSn/5P9NitaafDXHd6Z1SWWSTawfuTW5IUvkfsiP KRLLx3zdIh/qaWMA+7ccdP0IF942TdVk+iWvgz3rOn8hBlhF/yV/lNKTa4uhB8ZExIL9 c8QzWTPtMC4gwQebBDbf0hbTftxjtFvaJ1vb+3NbgsMP+CxEpbYNpNyuA7RJSS2Je1QW XyKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698917425; x=1699522225; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qpkPt4fc7NXhlIoj52yFt6HQug/R77RWJUzFY0AeTJg=; b=UmOIzU6IspR1dtx/9XOkLnVw+i7uG2p9fO0RVuCknhbOxwWavlBMdjGlzzvGzlidKI 3piRSJxqJYxwCGvH6ovHi/9UaSXZjYAqblJ8BeQCVy35QDYB4V3nvxqIhpl6bVqAtgmZ pqYIU+xd8vqJdGrIMlHhpV/WP4f1Vxvm0H5UbbjHkJu+48IF8RwHdYG+tRbAgSMyB9IL DLjOdCGCFb4nkXkKQ48bsPiGOg3jNKnydWFtugRcKJuWtPLm2KKNJy1oDDS9DGxSBCFJ nU76k7B19hQ2O7+tpQWWZGIk8qJeEh3wgnSV0GA7sQNzP8vHoMFOMFkLd8yL6BHCCY53 MRMg== X-Gm-Message-State: AOJu0YzJjaCG8/V8LAvlNlNsADby8ySk2A3sUqLdqDhtaOW24EVhbc8e vrGpNV+w6k4FGhzRRqWrCyMWG2NbB3HJ5RSiIqQnoy7m X-Google-Smtp-Source: AGHT+IFpmFcBZNh7STe3DERAy6R3OdR+J8Kbc5mBUmkcnVedaD8jgddgJqTsk3yOBt13l9L8Nt0wgFLZBXDazy5mT2w= X-Received: by 2002:aca:1214:0:b0:3ae:1446:d48b with SMTP id 20-20020aca1214000000b003ae1446d48bmr18533706ois.3.1698917425640; Thu, 02 Nov 2023 02:30:25 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:118c:0:b0:4f0:1250:dd51 with HTTP; Thu, 2 Nov 2023 02:30:25 -0700 (PDT) In-Reply-To: <2E6A685B-A8E4-48A2-B21A-422AFBEA4440@FreeBSD.org> References: <202311020909.3A299SXQ075865@gitrepo.freebsd.org> <2E6A685B-A8E4-48A2-B21A-422AFBEA4440@FreeBSD.org> From: Mateusz Guzik Date: Thu, 2 Nov 2023 10:30:25 +0100 Message-ID: Subject: Re: git: 63bf943d4af1 - main - Hyper-V: vmbus: Add NULL check for vmbus_res To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Souradeep Chakrabarti 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:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4SLdry4dTHz3J3r On 11/2/23, Zhenlei Huang wrote: > Sorry I committed too fast. > > I should give credentials to Souradeep in the commit message. > > Thank him for the analysis ! > again this kind of change you can revert and recommit with proper authorship, as long as it happens fast >> On Nov 2, 2023, at 5:09 PM, Zhenlei Huang wrote: >> >> The branch main has been updated by zlei: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=63bf943d4af17799cef21e2bb78dd28003ce1ce5 >> >> commit 63bf943d4af17799cef21e2bb78dd28003ce1ce5 >> Author: Zhenlei Huang >> AuthorDate: 2023-11-02 09:07:11 +0000 >> Commit: Zhenlei Huang >> CommitDate: 2023-11-02 09:07:11 +0000 >> >> Hyper-V: vmbus: Add NULL check for vmbus_res >> >> QEMU emulates Hyper-V [1] but lacks the emulation for vmbus_res, thus >> no >> coherence information is available. Add NULL check for it and fallback >> to no coherence. This will prevent FreeBSD guests from panic on QEMU >> with the Hyper-V enlightenment hv-synic enabled. >> >> For real Hyper-V, both gen1 and gen2 have vmbus_res then they are not >> affected by this change. >> >> 1. https://www.qemu.org/docs/master/system/i386/hyperv.html >> >> PR: 274810 >> Reviewed by: mhorne, emaste, delphij, whu >> Diagnosed by: mhorne >> Fixes: e7a9817b8d32 Hyper-V: vmbus: implementat >> bus_get_dma_tag in vmbus >> Insta-MFC approved by: re (delphij) for 14.0-RC4 >> Differential Revision: https://reviews.freebsd.org/D42414 >> --- >> sys/dev/hyperv/vmbus/vmbus.c | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c >> index ee412e643b4f..0ea401507b79 100644 >> --- a/sys/dev/hyperv/vmbus/vmbus.c >> +++ b/sys/dev/hyperv/vmbus/vmbus.c >> @@ -1393,7 +1393,7 @@ vmbus_doattach(struct vmbus_softc *sc) >> int ret; >> device_t dev_res; >> ACPI_HANDLE handle; >> - unsigned int coherent; >> + unsigned int coherent = 0; >> >> if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) >> return (0); >> @@ -1416,10 +1416,12 @@ vmbus_doattach(struct vmbus_softc *sc) >> >> /* Coherency attribute */ >> dev_res = devclass_get_device(devclass_find("vmbus_res"), 0); >> - handle = acpi_get_handle(dev_res); >> + if (dev_res != NULL) { >> + handle = acpi_get_handle(dev_res); >> >> - if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) >> - coherent = 0; >> + if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) >> + coherent = 0; >> + } >> if (bootverbose) >> device_printf(sc->vmbus_dev, "Bus is%s cache-coherent\n", >> coherent ? "" : " not"); > > > > -- Mateusz Guzik From nobody Thu Nov 2 09:40: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 4SLf4H1VNhz4yghK; Thu, 2 Nov 2023 09:40:15 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLf4H108Zz3Kvr; Thu, 2 Nov 2023 09:40:15 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698918015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6WJiawtMQgWJpFqp8xepVgR+HUqX29UCjUXfZ64XOjQ=; b=rmUsulqrJ92L7f71vTFxTFSwRYicTX/kD6/Y1C5WWktXjxuA7tz9FTMnTyAMVHaEmJgDSr C/RAiCnHNPpPs0RLPK0e4X4ZDPp+WUh1BAEqyWkEHZLX6WBBJl5a56qm2VDr0rStvSRS+T PcuyX2RYdoZaeJXgadwfSU2mkF57KYfoIT5ruGKOdIMyYlQV6t2sEY3iVi85cAjAe1qd4J 35KYhfIpIgZgzcMkgMmKZFN8p3xXWA/ODLKLez+PmvTLf4JdIy+CMUOebTvczItho/MFtI c/ze7kEjfgorR6PgkXBI90f6QIJqJPNLw4IAGVich4H4WOvW09q6nRblLO8gyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698918015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6WJiawtMQgWJpFqp8xepVgR+HUqX29UCjUXfZ64XOjQ=; b=UTJOBZinYIdwazfxPlOTbspizT8Bl8uAvOFe9nr0ML0ZEgqwOUirxrWQwFHEkK+FPbmNFS QiVdVkLnTh6y8PpNquK/9Gb4rVRABdLVl2zDr3oy2bd/f/uVDPZP8k+s7GP2ItOGxBHXwI 3wWFpaqbpnTjF0hdOVRGlnthvAAvTX0t0V0PbyUlBqcwevibJMutAjpTBT75XrLitv8leR n6e0ZD5EEaICCyaCIlHh9befSxAX9/3iLvE87dHBW0AvCDL2aY2y+zNXfag78XLzNqXVFn RIt4u2RsRiO/S8Cw30JZweoWulx6ihJU2rbqkQdxJLeADpPJCsxpIPV0c7zIeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698918015; a=rsa-sha256; cv=none; b=h/xSG4P13DQbcja62DQcGBzcu70iPjLzAWGsTB9WXE01nXU90y1DHNbgjgbSqQ21BKNVoL QdFmu8xmZFLVfl/oGbQlZpdRw//tEs/dONGY3S7pRZwUTRLfSMVqNcE2omRCgYr79/M/Dz +8L4SX5EwTvzbRxRwKqfdpBFtgD7ThNrnK/nr3CXjk70aZr338HV4z3E+wO95Wxfh6mANE 2fqYltQ7f0AydE58oQPWDYq/SDKPT+80lwijA2JVg+p+GrrvjbCXJm2PCS/eaFlFL2FLwy j0GNJDLkidgzQfhu6LlZEz8aBWmSg92UOpf9XhsGBGSYvHq+j0blxoL48u7wmg== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SLf4F10lzz1WyV; Thu, 2 Nov 2023 09:40:12 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <06D3671F-870E-4E50-A075-4CB4C73D2BDD@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_C99E4D6A-FEDF-4AB4-A2F9-E2F8C3A89B06" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: 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 \(3696.120.41.1.4\)) Subject: Re: git: 63bf943d4af1 - main - Hyper-V: vmbus: Add NULL check for vmbus_res Date: Thu, 2 Nov 2023 17:40:00 +0800 In-Reply-To: Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Souradeep Chakrabarti To: Mateusz Guzik References: <202311020909.3A299SXQ075865@gitrepo.freebsd.org> <2E6A685B-A8E4-48A2-B21A-422AFBEA4440@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) --Apple-Mail=_C99E4D6A-FEDF-4AB4-A2F9-E2F8C3A89B06 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Nov 2, 2023, at 5:30 PM, Mateusz Guzik wrote: >=20 > On 11/2/23, Zhenlei Huang > = wrote: >> Sorry I committed too fast. >>=20 >> I should give credentials to Souradeep in the commit message. >>=20 >> Thank him for the analysis ! >>=20 >=20 > again this kind of change you can revert and recommit with proper > authorship, as long as it happens fast I'm really really sorry for that. I realized that until the commit has been MFCed into stable/14 and = releng/14.0 .=20 >=20 >>> On Nov 2, 2023, at 5:09 PM, Zhenlei Huang wrote: >>>=20 >>> The branch main has been updated by zlei: >>>=20 >>> URL: >>> = https://cgit.FreeBSD.org/src/commit/?id=3D63bf943d4af17799cef21e2bb78dd280= 03ce1ce5 >>>=20 >>> commit 63bf943d4af17799cef21e2bb78dd28003ce1ce5 >>> Author: Zhenlei Huang >>> AuthorDate: 2023-11-02 09:07:11 +0000 >>> Commit: Zhenlei Huang >>> CommitDate: 2023-11-02 09:07:11 +0000 >>>=20 >>> Hyper-V: vmbus: Add NULL check for vmbus_res >>>=20 >>> QEMU emulates Hyper-V [1] but lacks the emulation for vmbus_res, = thus >>> no >>> coherence information is available. Add NULL check for it and = fallback >>> to no coherence. This will prevent FreeBSD guests from panic on = QEMU >>> with the Hyper-V enlightenment hv-synic enabled. >>>=20 >>> For real Hyper-V, both gen1 and gen2 have vmbus_res then they are = not >>> affected by this change. >>>=20 >>> 1. https://www.qemu.org/docs/master/system/i386/hyperv.html >>>=20 >>> PR: 274810 >>> Reviewed by: mhorne, emaste, delphij, whu >>> Diagnosed by: mhorne >>> Fixes: e7a9817b8d32 Hyper-V: vmbus: implementat >>> bus_get_dma_tag in vmbus >>> Insta-MFC approved by: re (delphij) for 14.0-RC4 >>> Differential Revision: https://reviews.freebsd.org/D42414 >>> --- >>> sys/dev/hyperv/vmbus/vmbus.c | 10 ++++++---- >>> 1 file changed, 6 insertions(+), 4 deletions(-) >>>=20 >>> diff --git a/sys/dev/hyperv/vmbus/vmbus.c = b/sys/dev/hyperv/vmbus/vmbus.c >>> index ee412e643b4f..0ea401507b79 100644 >>> --- a/sys/dev/hyperv/vmbus/vmbus.c >>> +++ b/sys/dev/hyperv/vmbus/vmbus.c >>> @@ -1393,7 +1393,7 @@ vmbus_doattach(struct vmbus_softc *sc) >>> int ret; >>> device_t dev_res; >>> ACPI_HANDLE handle; >>> - unsigned int coherent; >>> + unsigned int coherent =3D 0; >>>=20 >>> if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED) >>> return (0); >>> @@ -1416,10 +1416,12 @@ vmbus_doattach(struct vmbus_softc *sc) >>>=20 >>> /* Coherency attribute */ >>> dev_res =3D devclass_get_device(devclass_find("vmbus_res"), 0); >>> - handle =3D acpi_get_handle(dev_res); >>> + if (dev_res !=3D NULL) { >>> + handle =3D acpi_get_handle(dev_res); >>>=20 >>> - if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent))) >>> - coherent =3D 0; >>> + if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", = &coherent))) >>> + coherent =3D 0; >>> + } >>> if (bootverbose) >>> device_printf(sc->vmbus_dev, "Bus is%s = cache-coherent\n", >>> coherent ? "" : " not"); >>=20 >>=20 >>=20 >>=20 >=20 >=20 > --=20 > Mateusz Guzik > --Apple-Mail=_C99E4D6A-FEDF-4AB4-A2F9-E2F8C3A89B06 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Nov 2, 2023, at 5:30 PM, Mateusz Guzik <mjguzik@gmail.com> = wrote:

On 11/2/23, Zhenlei Huang <zlei@freebsd.org> = wrote:
Sorry = I committed too fast.

I should give = credentials to Souradeep in the commit message.

Thank him for the analysis !


again this kind of change you can revert and recommit with = proper
authorship, = as long as it happens fast

I'm really really sorry for = that.
I realized that until the commit has been MFCed into = stable/14 and releng/14.0 . 


On Nov 2, 2023, at 5:09 = PM, Zhenlei Huang <zlei@FreeBSD.org> wrote:

The branch main has been updated by zlei:

URL:
https://cgit.FreeBSD.org/src/commit/?id=3D63bf943d4af17799cef21= e2bb78dd28003ce1ce5

commit = 63bf943d4af17799cef21e2bb78dd28003ce1ce5
Author: =     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-11-02 09:07:11 +0000
Commit: =     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-11-02 09:07:11 +0000

  Hyper-V: vmbus: Add NULL check for vmbus_res

  QEMU emulates Hyper-V [1] but = lacks the emulation for vmbus_res, thus
no
  coherence information is available. Add NULL = check for it and fallback
  to no coherence. = This will prevent FreeBSD guests from panic on QEMU
  with the Hyper-V enlightenment hv-synic = enabled.

  For real Hyper-V, both = gen1 and gen2 have vmbus_res then they are not
  affected by this change.

  1. = https://www.qemu.org/docs/master/system/i386/hyperv.html
  PR: =             27= 4810
  Reviewed by:    mhorne, = emaste, delphij, whu
  Diagnosed by: =   mhorne
  Fixes: =          e7a9817b8d32 = Hyper-V: vmbus: implementat
bus_get_dma_tag in vmbus
  Insta-MFC approved by:  re (delphij) for = 14.0-RC4
  Differential Revision: =  https://reviews.freebsd.org/D42414
---
sys/dev/hyperv/vmbus/vmbus.c | 10 ++++++----
1 = file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys/dev/hyperv/vmbus/vmbus.c = b/sys/dev/hyperv/vmbus/vmbus.c
index = ee412e643b4f..0ea401507b79 100644
--- = a/sys/dev/hyperv/vmbus/vmbus.c
+++ = b/sys/dev/hyperv/vmbus/vmbus.c
@@ -1393,7 +1393,7 @@ = vmbus_doattach(struct vmbus_softc *sc)
int = ret;
device_t dev_res;
= ACPI_HANDLE handle;
- unsigned int coherent;
+ = unsigned int coherent =3D 0;

if = (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
return = (0);
@@ -1416,10 +1416,12 @@ vmbus_doattach(struct = vmbus_softc *sc)

/* = Coherency attribute */
dev_res =3D =  devclass_get_device(devclass_find("vmbus_res"), 0);
- = handle =3D acpi_get_handle(dev_res);
+ if = (dev_res !=3D NULL) {
+ handle =3D = acpi_get_handle(dev_res);

- if = (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent)))
- = = coherent =3D 0;
+ if = (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent)))
+ = = = coherent =3D 0;
+ }
if = (bootverbose)
device_printf(sc->vmbus_dev, = "Bus is%s cache-coherent\n",
coherent ? "" : " not");






-- Mateusz Guzik = <mjguzik gmail.com>



= --Apple-Mail=_C99E4D6A-FEDF-4AB4-A2F9-E2F8C3A89B06-- From nobody Thu Nov 2 13:40: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 4SLlNy20FKz50Ldj; Thu, 2 Nov 2023 13:40: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 4SLlNy1SyJz4Npq; Thu, 2 Nov 2023 13:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3ZiSKxLi9D+w+eZQE/bffTZXg1Aav+uLdSYx5cRwOQ=; b=WFL1nx0iPcJgbWvM5Of+8mxftmT9mMNN+RPC+8GzSfAdRZlW1hdMIfAgGyU5YyYRB51M9b RMr5MuCQKVIbDhZRlRiGLDwCDrKb0GSUC165Zay2kmtB/4LWJ1khmeods2JFUoMWUXWef8 KPTygnIRnVujkvcBcYAsyuFTJu8hK6y/IsPMKP7/ozDrnNCLZwNtDNHYy/0seTM/ipthPm eUYhBvcOU8SQ9sLrPFUatV2G4x6gGA9kVR8VYwSlYFqba9RRi8DM92L1Y1OnkrTwUBNdoE MfaD0OYr/V4me/BpoJG4v6Li2qm+6cW6YJCEtoI47a5+m+UNzBUrbxl+TS813Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3ZiSKxLi9D+w+eZQE/bffTZXg1Aav+uLdSYx5cRwOQ=; b=j0MlCpZNjpye71KowBYnFuHfljS7taOPT9nv04mcrejjr5vO8lwI8QvAH7uvcGqZdsQJkp utXnEnRnzMpMOrSPZnRpb2gUMApD1GH6D6T1RknA/SVNKtlzpstDHC+OgImSwEV1plnIUU tKxxIl6XrELUph1uc7R7BuUo01QElmsA4g7sgOaY7FXSxaAoAbJSihY+xTmS/o6foPs28L Gjra7Sj32sVYsmcUOVj1bxeIIc543QPVuzjVfpp6IqndsZchUgguExssrEI4waEykZifi9 9w1eMGgOQsrWFf1s3WfccDBiL49ylgwOh6yKSuOP8ZxUkrrENK2AfN7qA2BW6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932402; a=rsa-sha256; cv=none; b=uwBR+jWC9042TjwLvLxyWyb62+O+9exZxsiMONDNTrMs+bYbVestF2j2JVb9SZNmnL4lAR x+fz7VcV3eHY/gOxbcHjhdxO/zNmBSOxTgZGbxle5O7HCdqPGSqrn1p5paBb4psSh3ipsw XoR2KAnPaQEJd2wm4glqeQMkZQzw7S8mpNm1eC3H10L+/Y3Id1tC2Vzi67qPM2UHIHeCa0 sdDvLPN6ofJkQT3MBo89jWXF48C/BPTMJuDwZ8x+BFCw7GFhA/hkhpTZrrhERtgpZp0saz 7Vbl9NO5egqiTCVR1hL074KKW1tJRQiT6IsUwVDGIF2rmXOhAk2ExAB/71Hzrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlNy0Q3gzXCC; Thu, 2 Nov 2023 13:40: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 3A2De1RN027087; Thu, 2 Nov 2023 13:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De12X027081; Thu, 2 Nov 2023 13:40:01 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:01 GMT Message-Id: <202311021340.3A2De12X027081@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: 92541c12bc25 - main - Open-code proc_set_cred_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 92541c12bc25c59333d7f3b0721b6b16aaff3644 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=92541c12bc25c59333d7f3b0721b6b16aaff3644 commit 92541c12bc25c59333d7f3b0721b6b16aaff3644 Author: Olivier Certner AuthorDate: 2023-09-25 08:48:49 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:02 +0000 Open-code proc_set_cred_init() This function is to be called only when initializing a new process (so, 'proc0' and at fork), and not in any other circumstances. Setting the process' 'p_ucred' field to the result of crcowget() on the original credentials is the only thing it does, hiding the fact that the process' 'p_ucred' field is crushed by the call. Moreover, most of the code it executes is already encapsulated in crcowget(). To prevent misuse and improve code readability, just remove this function and replace it with a direct assignment to 'p_ucred'. Reviewed by: markj (earlier version), kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42255 --- sys/kern/init_main.c | 2 +- sys/kern/kern_fork.c | 2 +- sys/kern/kern_prot.c | 11 ----------- sys/sys/ucred.h | 1 - 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a8df9f84a29a..f39f5b8955ed 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -562,7 +562,7 @@ proc0_init(void *dummy __unused) curthread->td_ucred = NULL; newcred->cr_prison = &prison0; newcred->cr_users++; /* avoid assertion failure */ - proc_set_cred_init(p, newcred); + p->p_ucred = crcowget(newcred); newcred->cr_users--; crfree(newcred); #ifdef AUDIT diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index aaa46a64ef9f..3080bd11123d 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1056,7 +1056,7 @@ fork1(struct thread *td, struct fork_req *fr) * XXX: This is ugly; when we copy resource usage, we need to bump * per-cred resource counters. */ - proc_set_cred_init(newproc, td->td_ucred); + newproc->p_ucred = crcowget(td->td_ucred); /* * Initialize resource accounting for the child process. diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 00eb2fccdeef..6d4d5ef47926 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -2194,17 +2194,6 @@ cru2xt(struct thread *td, struct xucred *xcr) xcr->cr_pid = td->td_proc->p_pid; } -/* - * Set initial process credentials. - * Callers are responsible for providing the reference for provided credentials. - */ -void -proc_set_cred_init(struct proc *p, struct ucred *newcred) -{ - - p->p_ucred = crcowget(newcred); -} - /* * Change process credentials. * Callers are responsible for providing the reference for passed credentials diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 7c9e46e47774..3f8a70ab9c90 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -146,7 +146,6 @@ void crcopy(struct ucred *dest, struct ucred *src); struct ucred *crcopysafe(struct proc *p, struct ucred *cr); struct ucred *crdup(struct ucred *cr); void crextend(struct ucred *cr, int n); -void proc_set_cred_init(struct proc *p, struct ucred *cr); void proc_set_cred(struct proc *p, struct ucred *cr); void proc_unset_cred(struct proc *p); void crfree(struct ucred *cr); From nobody Thu Nov 2 13:40: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 4SLlNz2YwQz50Lh1; Thu, 2 Nov 2023 13:40: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 4SLlNz1l6cz4P0l; Thu, 2 Nov 2023 13:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Oery43hcQnGl+bM/s7kpQVKbAJ0VsYKllqUHlKe9Ps=; b=R2sQkeMEhgn8u5vLHQgaAWWxSxgHSB2ZXM5/VYrohjUCxGbmqiwHTCtSa1cjiWMhJIrbL8 8V0hQF+wEpCICMqMqfUW384uQldOaO+MqmP5L8MkHKXCPncJpJeQKf5TNorr/4jmyCjTi9 DcS30AfQRH7L9kW2HKTAMj2dntGMw0eEykO+6kEOvV1gSCQUyqO5ACSGQD6wP4bN/IBx9M JlocOKp3khpbuZPoS6tMfPxpqat3vk3srKlfhuHLJDrRUMdnnCQCtzb4I3b5JhcchpBi2g SE4ivd/NpRPaMvR/6xoLdZUsrwBeGzLP7RJ8uuaABMCY85qupZutwdwfR8Ef5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Oery43hcQnGl+bM/s7kpQVKbAJ0VsYKllqUHlKe9Ps=; b=wOkJiY3ViBzxko/k87BB+uOeoNRFDIaIiWXtWHAAb5ZjviSgwDOUc1u5DcTRjwgNo/x3dy HHAgLRQQ2si3pNZPjGQVGxyA7uyLUOF/iJHKWWJnqx57dTSPzSsuDBwkmgIUANWuVFo0mM dYT43WtNFCJuKnFdnelN0n/LkYKHeTMJeSwI9Odgi3wTHzn91LEseVaOymO+GYaIZjLOFD +EWyw6HKNJkWcaKWLXgnIbE5CROG0tKber5nbCynYsbbCsWZ5HieJFR8ba6qvM/uXmUYvO Gh/yM7NO0S7O7O0DjXPiHVGy7xZbDuxmyRp0FOkki6Qvl59yfJ5sY8BMAok8EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932403; a=rsa-sha256; cv=none; b=UR6SHgYFAFF6pHQomMcGHlDETlpGPqJFkHkKM0A2d+YpN65oEoJt9/fjd+0GdHt78zn33B 9E0PaxOfHU6hIdiaYl+aXAjdpAzCz+YhHC9er15A78jnPzMezGgUnbJuq7DypsIgDnWnF2 pErNQF9coOmbIYD2ggjW4tXUb7xyInJRJb/avoeFLH0zkpS+t/jHKneKe/GBFOJ6qgxVej z5ttP/6+DLhoqjtS7BrYDgdD8P0/Hld2b/BDuOdcpEuYyFWyACuRIPUnQ5ISRdzCvTr63C f2KCevvcBfLPnJnF6ibKJYWB2TD0OdpjUf9KcW2orH6p6zmSP83W9+uhdLJJ5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlNz0k4lzXFH; Thu, 2 Nov 2023 13:40: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 3A2De3EV027356; Thu, 2 Nov 2023 13:40:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De3hJ027352; Thu, 2 Nov 2023 13:40:03 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:03 GMT Message-Id: <202311021340.3A2De3hJ027352@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: 56bb3ce09137 - main - pdinit(): Fix comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56bb3ce091371ffd95711c65e1eff306a19435e2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=56bb3ce091371ffd95711c65e1eff306a19435e2 commit 56bb3ce091371ffd95711c65e1eff306a19435e2 Author: Olivier Certner AuthorDate: 2023-09-26 10:26:46 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:02 +0000 pdinit(): Fix comment Reviewed by: markj, kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42256 --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 6ed824e229d6..af0226d49ae3 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2238,7 +2238,7 @@ fdinit(void) * Build a pwddesc structure from another. * Copy the current, root, and jail root vnode references. * - * If pdp is not NULL, return with it shared locked. + * If pdp is not NULL and keeplock is true, return with it (exclusively) locked. */ struct pwddesc * pdinit(struct pwddesc *pdp, bool keeplock) From nobody Thu Nov 2 13:40: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 4SLlP02YVPz50Ldq; Thu, 2 Nov 2023 13:40: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 4SLlP01yJLz4Ny8; Thu, 2 Nov 2023 13:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jz8DVO2nWXgsNUZ6yq0NkCVEixaTbKgGJcem9ntebPA=; b=xXUuZ7yBocLbVXIayzRLF9RbZfuJBfKhAgCmdHXB2O/1HfDcVtAxjUwmB6YuNv4XSokSa8 b7WCCuR3GVzOSiCR71BJe5DByvClTBoBiqbyWbjcnRRoQGXERE9fvL6su6ckH5x/L4MLMi pcVUsTXJCwJHGv5ANDV9LSo4bPjHZTyWtEx8aq9pNTRcOkw3E5zZwapPhLMtYtKiYhh709 F2Vp7oJaQsbKaJWKLCFEBNQE/3vGfpr6jOMyPLSW2H4SeL4oVcGra7KZmNb25DW3ANMxWM 3fuvRP+csToOTE79p8vu/s6rP9+TkgfVZsLSMQ1u6ald7WBrHE1mciMInxut4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jz8DVO2nWXgsNUZ6yq0NkCVEixaTbKgGJcem9ntebPA=; b=krrLfzfjZl7zDRPkTVFk6kURGzq8uaMpHy70CMte9TcGwQ9qMioeNBmvu8phr1cObHwv+z jkv/p4lM1ulg5Z/FuWSBpjx4zibpl2Zy9VuSu8LwYMRAdrT9CoIqejw+AMhoIZYfPh/Vjn kJAjoowSQMwqZYbtbl4GbbcBPDWUkihEVDp8ZWKJ/7P1Q2Bh5WcNfCeqV7VXAKYh1Ji1IA jRR0nNdYA8RS+8GzusdQ/FX4c4hGOiccM+a2SNwD9TFwVD3cbNI5ExgYXSLA226ObcOXLR tJiBxw1f4naC5IjPUtNRE7kLyzpmzkpQOT8qWJIka6rxrXRKfO1rFkUJi9mLcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932404; a=rsa-sha256; cv=none; b=lZ/SZ0qlz4NeT6muT75NyHjHgY2N5zvOV8ungIQFdfB2cZdfN439HZWVa5hJWWIOp35TK6 YtwnltlJ5ezvH/zk4mCHwQ/FHnIcdL37+GbuE910zohb3TVCg/qW08xA7K89roNw0PaK5J z8KqXdO83eat42fvrftGr+qWUxrne0rGZxofpVYVpdNZ5jNFnrZxIThprwHXH3ooNBmaGh wRj05sYbkoB52+8cRhBDVFSrw3ATkEh4Vh0Ue2vyOvchpiosH9CNzLXXTBbmVI+P814nVd LAKtwxjtKxIGpQ9SG5UoaSo6eySravoKETkxDiizo+25S5NF3XYeLB6fvUnHUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP013FHzXCD; Thu, 2 Nov 2023 13:40: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 3A2De4nq027640; Thu, 2 Nov 2023 13:40:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De4ko027635; Thu, 2 Nov 2023 13:40:04 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:04 GMT Message-Id: <202311021340.3A2De4ko027635@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: eac624207ccf - main - Ensure "init" (PID 1) also executes userret() initially List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: eac624207ccf3a16225368d226861b06e3631d0d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eac624207ccf3a16225368d226861b06e3631d0d commit eac624207ccf3a16225368d226861b06e3631d0d Author: Olivier Certner AuthorDate: 2023-10-10 17:36:20 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 Ensure "init" (PID 1) also executes userret() initially Calling userret() from fork_return() misses the first return to userspace of the "init" (PID 1) process. The latter is indeed created by fork1() followed by a call to cpu_fork_kthread_handler() call that replaces fork_return() by start_init() as the function to execute after fork. A new process' initial return to userspace in the end always happens through returning from fork_exit(), so move userret() there instead to fix the omission. This problem was discovered as part of a revamp of scheduling priorities that lead to experimenting with asserting and sometimes resetting priorities in sched_userret(), in the course of which the author stumbled on panics being triggered only in init() or only in other processes, depending on the modifications to sched_userret(). This change currently has no practical effect but will have some in the near future. Reviewed by: markj, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42257 --- sys/kern/kern_fork.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 3080bd11123d..6127b7f05fe0 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1170,8 +1170,14 @@ fork_exit(void (*callout)(void *, struct trapframe *), void *arg, } mtx_assert(&Giant, MA_NOTOWNED); + /* + * Now going to return to userland. + */ + if (p->p_sysent->sv_schedtail != NULL) (p->p_sysent->sv_schedtail)(td); + + userret(td, frame); } /* @@ -1222,8 +1228,6 @@ fork_return(struct thread *td, struct trapframe *frame) if (!prison_isalive(td->td_ucred->cr_prison)) exit1(td, 0, SIGKILL); - userret(td, frame); - #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(td->td_sa.code, 0, 0); From nobody Thu Nov 2 13:40:05 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 4SLlP13Q4qz50Lh5; Thu, 2 Nov 2023 13:40: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 4SLlP12lrnz4Nvr; Thu, 2 Nov 2023 13:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MUTra5XCYRyfKIledLrfjnvQfiwAzEDbv9FH5K62lug=; b=RP9+APHTWiaFUrDKx2nStIsLebhYgwHffXNNRwvnWSROJvOXv8t1Matv0aeJCkQgnnjRC2 EiWU6dUqXgccjjZx2EnXxErtqc8bWY9uh8ZqbryJcsAF3NqQ7dNcAuv8St0YIWLyG9KL7x 9otiP/bL5OSsJThwf3gIjVhOoz2vlNrQQ7ik/rDHsDDJfdtZ9gN3ksdx5SKmgdaO1aM0f2 DqwtPBnmgyLXgnJhhx7rmIoVKtbIFaDQf+ffk7pPJeUBnBP9YPzlLBj5g1YImUHJjZ6BpT GLIWDsavNPJe1VOCe7MEakHawKCKlSqKo7YdF671xjeSsSwz80FWW/ZJKa2XXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MUTra5XCYRyfKIledLrfjnvQfiwAzEDbv9FH5K62lug=; b=FYa8MIpm7PqwigzErpY1DyDZY80dzqQ3ZOGH1x8YZwyghURLGFHe5LNGQXMm4RTGDeQVnC ieKBpX4CNbCIGaoJdzENsjVUtmfaNUhYrfJ+9yMK3OWLXsOGLETpO8sR9PFwFEDb2U7w6g VHelg64gynEb98iAyuzDrS0Vsfrb/8VzBP3vB13X0DvzIaoWUkAgpQtdFXVszOuAKD+RZ9 xdl0fitvyh41cLZcE2bsuhf0TRV6RolJ6QdG8hHUSazIpzHsMESNLQGUmM+0Buvh7DgkK+ zsZaVtVxDqV2dlNtXoV3mvFFVQKGr1EMsFhFW2vA6lqQqerriiciLMkBKC/kBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932405; a=rsa-sha256; cv=none; b=jz32pWAvr3cqwPtg5RxG3B75olxs+rX34y/efFYRdHmBrfPjy+UOaie3kkDU73pvDt1iPN 5EfR+fdpLGYVI7395kbIW+UQpXx7hT+fT+GdUmne05ZhBfGNEDV5ocUoLrCj0zlSHb2pYZ Ml4vjc1Vor5S9LRwrL7GaPGll8HfbvwpkT1jHext/0R2uT+0rmJtNH/L48DfDdKaMMbk+N 1Z3tNN9Tha5vOTMOBtvJHyLh1dSoh3mqNebR4RhK3aZzCtUl5kiR6qdYzGjXa8McZ/t1i1 eanF4vEJwR6EFfz2e4PpeQBFsMdmArlgMDCuKxuKMymhr5lm/0t2gBrNlfktZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP11shTzXFJ; Thu, 2 Nov 2023 13:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2De5VG027915; Thu, 2 Nov 2023 13:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De5cG027911; Thu, 2 Nov 2023 13:40:05 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:05 GMT Message-Id: <202311021340.3A2De5cG027911@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: dc8f7692fd1d - main - uma: Hide 'uma_align_cache'; Create/rename accessors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: dc8f7692fd1de628814f4eaf4a233dccf4c92199 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dc8f7692fd1de628814f4eaf4a233dccf4c92199 commit dc8f7692fd1de628814f4eaf4a233dccf4c92199 Author: Olivier Certner AuthorDate: 2023-10-13 09:52:28 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 uma: Hide 'uma_align_cache'; Create/rename accessors Create the uma_get_cache_align_mask() accessor and put it in a separate private header so as to minimize namespace pollution in header/source files that need only this function and not the whole 'uma.h' header. Make sure the accessors have '_mask' as a suffix, so that callers are aware that the real alignment is the power of two that is the mask plus one. Rename the stem to something more explicit. Rename uma_set_cache_align_mask()'s single parameter to 'mask'. Hide 'uma_align_cache' to ensure that it cannot be set in any other way then by a call to uma_set_cache_align_mask(), which will perform sanity checks in a further commit. While here, rename it to 'uma_cache_align_mask'. This is also in preparation for some further changes, such as improving the sanity checks, eliminating internal resolving of UMA_ALIGN_CACHE and changing the type of the 'uma_cache_align_mask' variable. Reviewed by: markj, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42258 --- sys/arm/arm/cpufunc.c | 2 +- .../linuxkpi/common/include/linux/dma-mapping.h | 4 +-- sys/vm/uma.h | 6 ++-- sys/vm/uma_align_mask.h | 36 ++++++++++++++++++++++ sys/vm/uma_core.c | 18 ++++++++--- 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index 32b3d2f869c9..f2845eb80f3b 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -254,7 +254,7 @@ set_cpufuncs(void) panic("No support for this CPU type (%08x) in kernel", cputype); return(ARCHITECTURE_NOT_PRESENT); out: - uma_set_align(arm_dcache_align_mask); + uma_set_cache_align_mask(arm_dcache_align_mask); return (0); } diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 330babf761f9..53c59bea8ef2 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -350,8 +351,7 @@ dma_max_mapping_size(struct device *dev) #define dma_unmap_len(p, name) ((p)->name) #define dma_unmap_len_set(p, name, v) (((p)->name) = (v)) -extern int uma_align_cache; -#define dma_get_cache_alignment() uma_align_cache +#define dma_get_cache_alignment() uma_get_cache_align_mask() static inline int diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 76f30efc94d1..793f9af3dace 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -470,12 +470,14 @@ void uma_zone_reclaim_domain(uma_zone_t, int req, int domain); * alignment. Should be called by MD boot code prior to starting VM/UMA. * * Arguments: - * align The alignment mask + * mask The alignment mask * * Returns: * Nothing */ -void uma_set_align(int align); +void uma_set_cache_align_mask(int mask); + +#include /* * Set a reserved number of items to hold for M_USE_RESERVE allocations. All diff --git a/sys/vm/uma_align_mask.h b/sys/vm/uma_align_mask.h new file mode 100644 index 000000000000..666633350b9d --- /dev/null +++ b/sys/vm/uma_align_mask.h @@ -0,0 +1,36 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Olivier Certner + * at Kumacom SAS under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _VM_UMA_ALIGN_MASK_H_ +#define _VM_UMA_ALIGN_MASK_H_ + +int uma_get_cache_align_mask(void) __pure; + +#endif /* !_VM_UMA_ALIGN_MASK_H_ */ diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index de0ab48b0f9b..6e83a27bab27 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -150,7 +150,7 @@ static uma_zone_t slabzones[2]; static uma_zone_t hashzone; /* The boot-time adjusted value for cache line alignment. */ -int uma_align_cache = 64 - 1; +static int uma_cache_align_mask = 64 - 1; static MALLOC_DEFINE(M_UMAHASH, "UMAHash", "UMA Hash Buckets"); static MALLOC_DEFINE(M_UMA, "UMA", "UMA Misc"); @@ -3243,7 +3243,7 @@ uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, args.size = size; args.uminit = uminit; args.fini = fini; - args.align = (align == UMA_ALIGN_CACHE) ? uma_align_cache : align; + args.align = (align == UMA_ALIGN_CACHE) ? uma_cache_align_mask : align; args.flags = flags; args.zone = zone; return (zone_alloc_item(kegs, &args, UMA_ANYDOMAIN, M_WAITOK)); @@ -3252,11 +3252,19 @@ uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, /* Public functions */ /* See uma.h */ void -uma_set_align(int align) +uma_set_cache_align_mask(int mask) { - if (align != UMA_ALIGN_CACHE) - uma_align_cache = align; + if (mask >= 0) + /* UMA_ALIGN_CACHE is also not permitted here. */ + uma_cache_align_mask = mask; +} + +/* Returns the alignment mask to use to request cache alignment. */ +int +uma_get_cache_align_mask(void) +{ + return (uma_cache_align_mask); } /* See uma.h */ From nobody Thu Nov 2 13:40: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 4SLlP23zKTz50LxR; Thu, 2 Nov 2023 13:40: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 4SLlP23Slmz4PC7; Thu, 2 Nov 2023 13:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZ4HbVqlcgxF3WRu46b7G6pzMw0MPfArIEXq5amZMUg=; b=StQOQw5xU+40D0i+x2ywGtudUUreV8G4zVOX0dPuTpL7g+7F4xwyjTJXVmB8QurjHzc5KE uN87mbHQOPSi0KMmmX1W/HNUglVhFDKgs/W6BC2gg5jdHCd3dI+/pRNDec68GpZIAuE5mf CjnMTz1cQKgoyIi1ZRwp0aUjzkv6OYECnNsgyxko+r2ZSDr5b++DAdl0oFazGcR/QX9rq4 QhZEMot144+TRmYynPJcLWBsMiR5L/SAopXMpzbUGdrzPIvnK+yJss+y9bWQJLkA7b5Wyf CHyFtf+VsuYoAyro9mlTZ8EFDdRAX+LUwly/GcqwJOO3UeUxAZ0POTJTO0j+Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZ4HbVqlcgxF3WRu46b7G6pzMw0MPfArIEXq5amZMUg=; b=sOelPRXOV7q6zU2rJa9lj7Hp8npZjtdn9G86zJtFSB+F75SZ6aAcUcB8dureLbeHuOGMQ0 nd2mQm4/paZkSd7lq5nHtRCA89XjQwBPX2+I/Kk58eXWHE7md2xgzda+i2VAGyibUDy1u0 pZ+JI+ZHSiJ3u/dSzBQGD6hjJVaw/KzU7xnt/HJZ1tN4CrRlC4Kq0T1WRT65Yom1635rhS w4iq+uDAzi705j1wIiD+Rdmqgy0mtiUAEesdGHKFIJ372w6H2OSoMinLmqoILPHCAv22v7 Ke7ghKGgzV0e3KhjVwz9Eg6ys197+NFAE9YGHaaI2I2C/laRE14wpL63k1nj2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932406; a=rsa-sha256; cv=none; b=H1PTu38EKkAGydmItZXj6gPXYu7mOTdhTJqSo+EKd6Fb7BrepGDQAg7Hxodv6JObnfZPKC w7dGUTIwk4R8JOmyW36CSVRXn7oRAuhnAQcX1K5xcEYA+qxU2HFHNdVJ90iW/rkh0I72o5 ZxgUecZiHyFu6kmFvQF7fI8JMxT9WQ27PeTbiKtOsckiMDu8GxjhpTOsFIzQnzOTzNtDRB hdj3dhiuLYciXSZVDiHW5JGliRaeN9/nuonqoiYn/2sYGde+PUqUuiho3M/HuT+QK0q0Op dQz5sVfvJZbjPLOUMDhrJ+qwTZCchJPJcsYDnEREmnYs/1ZFzCod+cH7FTIEqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP22V0DzX1r; Thu, 2 Nov 2023 13:40: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 3A2De6nj028202; Thu, 2 Nov 2023 13:40:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De6gq028197; Thu, 2 Nov 2023 13:40:06 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:06 GMT Message-Id: <202311021340.3A2De6gq028197@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: e557eafe7233 - main - uma: UMA_ALIGN_CACHE: Resolve the proper value at use point List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: e557eafe7233f8231c1f5f5b098e4bab8e818645 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e557eafe7233f8231c1f5f5b098e4bab8e818645 commit e557eafe7233f8231c1f5f5b098e4bab8e818645 Author: Olivier Certner AuthorDate: 2023-10-13 12:13:30 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 uma: UMA_ALIGN_CACHE: Resolve the proper value at use point Having a special value of -1 that is resolved internally to 'uma_align_cache' provides no significant advantages and prevents changing that variable to an unsigned type, which is natural for an alignment mask. So suppress it and replace its use with a call to uma_get_align_mask(). The small overhead of the added function call is irrelevant since UMA_ALIGN_CACHE is only used when creating new zones, which is not performance critical. Reviewed by: markj, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42259 --- sys/vm/uma.h | 2 +- sys/vm/uma_core.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 793f9af3dace..4bf23534ed27 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -301,7 +301,7 @@ uma_zone_t uma_zcache_create(const char *name, int size, uma_ctor ctor, #define UMA_ALIGN_INT (sizeof(int) - 1) /* "" int */ #define UMA_ALIGN_SHORT (sizeof(short) - 1) /* "" short */ #define UMA_ALIGN_CHAR (sizeof(char) - 1) /* "" char */ -#define UMA_ALIGN_CACHE (0 - 1) /* Cache line size align */ +#define UMA_ALIGN_CACHE (uma_get_cache_align_mask()) /* Cache line size align */ #define UMA_ALIGNOF(type) (_Alignof(type) - 1) /* Alignment fit for 'type' */ #define UMA_ANYDOMAIN -1 /* Special value for domain search. */ diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 6e83a27bab27..b74fbd57e77f 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -3243,7 +3243,7 @@ uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, args.size = size; args.uminit = uminit; args.fini = fini; - args.align = (align == UMA_ALIGN_CACHE) ? uma_cache_align_mask : align; + args.align = align; args.flags = flags; args.zone = zone; return (zone_alloc_item(kegs, &args, UMA_ANYDOMAIN, M_WAITOK)); @@ -3256,7 +3256,6 @@ uma_set_cache_align_mask(int mask) { if (mask >= 0) - /* UMA_ALIGN_CACHE is also not permitted here. */ uma_cache_align_mask = mask; } From nobody Thu Nov 2 13:40: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 4SLlP402Xfz50Lrj; Thu, 2 Nov 2023 13:40: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 4SLlP343Nmz4P6w; Thu, 2 Nov 2023 13:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBH3RDTeuiCSuS+08K+Yed46V37QM2eKCY5243Il8P4=; b=KgVXa9h1Ra+iezwQzJ/BG4YnqUCkpJVT34OhSgozOuOvUUo+q6XGXdGp/NgdYwOK6ilLXY 5rbzuUiaVNc5nXvGincgaRDhPa45jXPwUuhrXuqUbE3/V3LVPzh+Pp/yQz6m0lrETOVozt ajtXKTHPnHVsL9AFKSTJdcKl/aDRoll4cMiXIdasnxto1OSbogPDEn9WXnh56c/Zo5UsZ2 rNXrlKzePwJgNbPxehaITCKzCTyedkyxZ7m7FYPjCyWIijQcg6jnDhk/VzY6z+oXO+dThh HbE1055V9jyE0KRezSalKiONc+ubzjnNZwK/ADxPmK5c603RKTerx4ISZeFDyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBH3RDTeuiCSuS+08K+Yed46V37QM2eKCY5243Il8P4=; b=M+qpulpW0XqXIrCibaQJfmjvJInoWy5mbNvX4VBDizCbbbWleghsFheEnE8lxMd0ja/Z+j ZylX0jEP81zZF5qkfmRxm/1zYiY/4/rCt2hPj/kIfPZ33cJ0ulKw7PaGXjthgrtObTFy0J yRePhFWlmxbuMdjlUr1sqRyZtg2nJ07eXr5U/vzZrRAg8quOv1ihPG2VWVulOzY+O5abZh L9c2Wiw8fWjBoKfOzHxSEKzM9aftwNP/g8c2/fZPU3PW9uZPwScwu9fWlrb5WqwB+4boo9 Y2liXT6+7+Zvqdks+hVPtf75++wjeBaytU6uHusFIb3ucNFxcYJCi2hZOS+7Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932407; a=rsa-sha256; cv=none; b=OP7liYBp4u4yBzAxWW1ducwsdEQyYJ3yTJDE5KlzvmNAeoSMpE42erFs18mzQc7Ce+a0lD 1Yfwd3H0NZ6uJlcZe12zb6+5U23B01/Ga37w5Xjh9/pBli0JP+QRTuLBz/DlCGbFN+jRfq 8xInQCU5t2iWf+5+Rz7qbO80HSRvUZFIHu6bm3cpmhjz3U5t2f4WBzxtzeTeVaBNdeluRR Rob0khm7E4fVw7YiFoFYLi16vJXIPonlDS6XF/Zvxv6kIGiUSiCGMRe9uttdd1Rl8JMP62 IWxyUOXflSW8XloJ44wxyP5JDuQ/QtBltRKoWjOWdLs3CfLXSoa4drKxddbf6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP3380LzWvT; Thu, 2 Nov 2023 13:40: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 3A2De7uC028466; Thu, 2 Nov 2023 13:40:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De7JH028462; Thu, 2 Nov 2023 13:40:07 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:07 GMT Message-Id: <202311021340.3A2De7JH028462@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: 1bce6f951a90 - main - arm: Simplify get_cachetype_cp15() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1bce6f951a902f03bfb354f5b11473a0d12b3d7d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1bce6f951a902f03bfb354f5b11473a0d12b3d7d commit 1bce6f951a902f03bfb354f5b11473a0d12b3d7d Author: Olivier Certner AuthorDate: 2023-10-13 12:22:14 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 arm: Simplify get_cachetype_cp15() There's no point in setting 'arm_dcache_align_mask' before the function's end. Reviewed by: markj, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42261 --- sys/arm/arm/cpufunc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index f2845eb80f3b..42f718b9773e 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -172,7 +172,6 @@ get_cachetype_cp15(void) : "=r" (csize)); arm_dcache_align = 1 << (CPUV7_CT_xSIZE_LEN(csize) + 4); - arm_dcache_align_mask = arm_dcache_align - 1; } if (type == CACHE_ICACHE || type == CACHE_SEP_CACHE) { sel = (i << 1) | 1; @@ -195,10 +194,10 @@ get_cachetype_cp15(void) if (dsize & CPU_CT_xSIZE_M) arm_dcache_align = 0; /* not present */ } - - out: - arm_dcache_align_mask = arm_dcache_align - 1; } + +out: + arm_dcache_align_mask = arm_dcache_align - 1; } /* From nobody Thu Nov 2 13:40: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 4SLlP46BC6z50Lk8; Thu, 2 Nov 2023 13:40: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 4SLlP44TjNz4PQV; Thu, 2 Nov 2023 13:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7u+CG0mk900QbCaHmbJ3+9quG9DrgU5ccYM2GY519A=; b=R3oFqdmLYRDQUtSvFBEZV59WjLVKH/9jwD/4GOnuPXclYa6UCe10T8SwGyTLvIlMAlEkas nEWgkV5SVtuG1sFcnhNw+c7n2lPgT5fiVXXR+ZdRKlQyO4sEowdh5+YqOBk0vV4BaZHi70 qUh0+9cayNOUbZNSfEUwQ0TUilGIP43GhZaPVS2YJNI8hK1e5/88I6bgGOW9mkV2sPxtVD 2rgGclgqXXVjiIFYMQ6OF2rShd3v7dtWWTkyEAFTCkiK4bP4AJ5UgLbpOrcUMyrTHOaD7l jTNU3t8J1fvLowgE7nC8DGZy9jyDJMjV/fN/Q5dEssYst2+KfwVNVE1coCYbvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7u+CG0mk900QbCaHmbJ3+9quG9DrgU5ccYM2GY519A=; b=UrLPU6utUMwmu+hQtmXHitfyMKlaNAdj0UONqSQfpaSIRDgVQFuKvkgg3N8A+LgruK+w0+ IqJEkJUj8dOgh6JyiBk5xwWIcK+1LrUTeew0HFHBR0TiYbpGy8enBRM3xGQubQT03gw4jm mdI3BA6ckbz81dhNdvO8BCPtquYDmqJbsyPypjJiBz73hdYdVCZuuqIzW+mrIUUnN7248N rNFRa02xCiL/yYM5Ye52hEFofKH2u8EZQZQoZSnvz3vCZu4nBqwFPkFCKzfGcqBd304qFz o5NoOXoyOsexbdtUXhYM2fTYXeQYAIFBQ+DEMBifrqRmxFPt5A4dF/HvcUm4Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932408; a=rsa-sha256; cv=none; b=T9TCXfPFrsLg9XjEYzLWvbhpnuAB3CP8rzcECmZMPzHEgF6gs0ts8nfgjHK9uBJrQhxQV0 D2kEXMGVa1c5Ue8PyfjDSpaI8S4DJSyxpbW+YJn+v4LQ6EFquboWIWM7fslQnZZqIS84d5 HluGDwOSc1zB4S4qcYURcy+ce0bZxrDeFFiGf8lrgMJqB+xwyVzNUWcinMPsGMS86PMhmA 4aRi8YVD1rctjPUenSBNLUFLswzZRT48irPmAzcH+DyXaKjHjgWM0kR9OYYkNDW3/iYfNb u5Ruxj3Zv9v62vEOc1S6ZSpStf5HyOJ23NtgZwgp+5xsEgO+OGXLbfbEw/zYpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP43bt5zWvV; Thu, 2 Nov 2023 13:40: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 3A2De8Qj028752; Thu, 2 Nov 2023 13:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De8ZG028747; Thu, 2 Nov 2023 13:40:08 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:08 GMT Message-Id: <202311021340.3A2De8ZG028747@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: 3d8f548b9e57 - main - uma: Make the cache alignment mask unsigned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3d8f548b9e5772ff6890bdc01f7ba7b76203857d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8f548b9e5772ff6890bdc01f7ba7b76203857d commit 3d8f548b9e5772ff6890bdc01f7ba7b76203857d Author: Olivier Certner AuthorDate: 2023-10-13 12:49:11 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 uma: Make the cache alignment mask unsigned In uma_set_align_mask(), ensure that the passed value doesn't have its highest bit set, which would lead to problems since keg/zone alignment is internally stored as signed integers. Such big values do not make sense anyway and indicate some programming error. A future commit will introduce checks for this case and other ones. Reviewed by: kib, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42262 --- sys/arm/arm/cpufunc.c | 6 +++--- sys/vm/uma.h | 2 +- sys/vm/uma_align_mask.h | 2 +- sys/vm/uma_core.c | 15 ++++++++++----- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index 42f718b9773e..e94565cdc61f 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -61,8 +61,8 @@ /* PRIMARY CACHE VARIABLES */ -int arm_dcache_align; -int arm_dcache_align_mask; +unsigned int arm_dcache_align; +unsigned int arm_dcache_align_mask; #ifdef CPU_MV_PJ4B static void pj4bv7_setup(void); @@ -170,7 +170,7 @@ get_cachetype_cp15(void) : : "r" (sel)); __asm __volatile("mrc p15, 1, %0, c0, c0, 0" : "=r" (csize)); - arm_dcache_align = 1 << + arm_dcache_align = 1U << (CPUV7_CT_xSIZE_LEN(csize) + 4); } if (type == CACHE_ICACHE || type == CACHE_SEP_CACHE) { diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 4bf23534ed27..8193df16b904 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -475,7 +475,7 @@ void uma_zone_reclaim_domain(uma_zone_t, int req, int domain); * Returns: * Nothing */ -void uma_set_cache_align_mask(int mask); +void uma_set_cache_align_mask(unsigned int mask); #include diff --git a/sys/vm/uma_align_mask.h b/sys/vm/uma_align_mask.h index 666633350b9d..b4e9ac835d93 100644 --- a/sys/vm/uma_align_mask.h +++ b/sys/vm/uma_align_mask.h @@ -31,6 +31,6 @@ #ifndef _VM_UMA_ALIGN_MASK_H_ #define _VM_UMA_ALIGN_MASK_H_ -int uma_get_cache_align_mask(void) __pure; +unsigned int uma_get_cache_align_mask(void) __pure; #endif /* !_VM_UMA_ALIGN_MASK_H_ */ diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index b74fbd57e77f..a27dba4b01f1 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -150,7 +150,7 @@ static uma_zone_t slabzones[2]; static uma_zone_t hashzone; /* The boot-time adjusted value for cache line alignment. */ -static int uma_cache_align_mask = 64 - 1; +static unsigned int uma_cache_align_mask = 64 - 1; static MALLOC_DEFINE(M_UMAHASH, "UMAHash", "UMA Hash Buckets"); static MALLOC_DEFINE(M_UMA, "UMA", "UMA Misc"); @@ -3252,15 +3252,20 @@ uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, /* Public functions */ /* See uma.h */ void -uma_set_cache_align_mask(int mask) +uma_set_cache_align_mask(unsigned int mask) { - if (mask >= 0) - uma_cache_align_mask = mask; + /* + * Make sure the stored align mask doesn't have its highest bit set, + * which would cause implementation-defined behavior when passing it as + * the 'align' argument of uma_zcreate(). Such very large alignments do + * not make sense anyway. + */ + uma_cache_align_mask = mask & ~(1U << 31); } /* Returns the alignment mask to use to request cache alignment. */ -int +unsigned int uma_get_cache_align_mask(void) { return (uma_cache_align_mask); From nobody Thu Nov 2 13:40: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 4SLlP55PBZz50Lv1; Thu, 2 Nov 2023 13:40: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 4SLlP54xSWz4PFg; Thu, 2 Nov 2023 13:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHX2TjCl6dH09yzM4vSlZG3yHN6xuvwVT0LNXff+8Dk=; b=tDDdP9yfPIffe8HsnD42H8yP1O0nzCn83V2kPf9ajUc2s3ZEAy8cLkF6pkVAp/jUWpqLig k4luO62hAq22EYtGVuj0RUiuKYyMKEhJ2ccydKshoDdTiK0OKhNK8wl3fpgjAuqrCbshI5 Fxl0T1oFnHOVTwKggINJS2lnDKJPeRSN0J0QNKu6QWalZrL2evIQSecKL84Egd3bAA9/ky 3PmvX7pJESGGY9CMAlvXq3ODAFhrQNiCdNNveoLlI4igSDGsf2XKMLyojersZ/7qEHJS1s /FhpECJHSk0C5sKHrochZx0W1cKkLKraFSWVPvBbso30RQrYKjWCEPPwvSxK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHX2TjCl6dH09yzM4vSlZG3yHN6xuvwVT0LNXff+8Dk=; b=RPf7HsVXLqKZR5ArJiIeeWCSedkZmFIGfWzmtcgFPmOM6uPH1bgfu4DkwwiIGNjA0WJDe7 nrB1RfJooMtH3J5p9nfY5CCMzIQPLKem16NO7CdVd8VoEQkV/M5rDb+UwFBQQ8jvGoXBir 6waGpQ5zTBA3ZpDW4e8OzodMoFWdTTOiBWS4S8iv4a9cAf/lWah7LsKQXVzrVddnjvlE0P 7Txi2ir3TFnzwa4ZivE97Ca2FWUjlaGvJ7cbq2w4vtQxPZOos92Oyz7CmMW9cUpy1+Ysjp GBqIpeA3OUV1wvxcM9SgYY8PXUiFWV2Sj1wT9AdzufctUquEH8XX5CJL0ES3ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932409; a=rsa-sha256; cv=none; b=WQqb01nksDheR4q5kHm1kZQmyUO9mZoe9JRx3aQc1eXL7XV5TxDppypN3znGBrzJYz62mv Slc8bZjn1nWr77Ae5dYOZCzG6SXoMzZ6hA4dSWND/mQWQe2tncSlF5ME7gc06Qa1B8X1jS BdGM1PRFL4el0tqsj9TQrHbQL9+eEaQ3XO0aF2nBaeExMqHCFTNm6OpuCod6d4atFqi8eb sIze0qYiLBUBQKyhQazphfiJfwuybyGQ86KRPcdgK8sL8LTaGfES0Km0fRfcgIk9Qsh/f3 v67Cnik82ylAu8+QD9nK2etsza/P1EBTWOdN3WsgDRAH/Sv1/SFjh7DTvE/ZNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP53x75zXFK; Thu, 2 Nov 2023 13:40: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 3A2De9Nr029251; Thu, 2 Nov 2023 13:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De9T8029246; Thu, 2 Nov 2023 13:40:09 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:09 GMT Message-Id: <202311021340.3A2De9T8029246@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: 87090f5e5a7b - main - uma: New check_align_mask(): Validate alignments (INVARIANTS) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 87090f5e5a7b927a2ab30878435f6dcba0705a1d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87090f5e5a7b927a2ab30878435f6dcba0705a1d commit 87090f5e5a7b927a2ab30878435f6dcba0705a1d Author: Olivier Certner AuthorDate: 2023-10-13 14:09:51 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 uma: New check_align_mask(): Validate alignments (INVARIANTS) New function check_align_mask() asserts (under INVARIANTS) that the mask fits in a (signed) integer (see the comment) and that the corresponding alignment is a power of two. Use check_align_mask() in uma_set_align_mask() and also in uma_zcreate() to replace the KASSERT() there (that was checking only for a power of 2). Reviewed by: kib, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42263 --- sys/vm/uma_core.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index a27dba4b01f1..661c98b272da 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -3249,19 +3249,31 @@ uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, return (zone_alloc_item(kegs, &args, UMA_ANYDOMAIN, M_WAITOK)); } -/* Public functions */ -/* See uma.h */ -void -uma_set_cache_align_mask(unsigned int mask) + +static void +check_align_mask(unsigned int mask) { + KASSERT(powerof2(mask + 1), + ("UMA: %s: Not the mask of a power of 2 (%#x)", __func__, mask)); /* * Make sure the stored align mask doesn't have its highest bit set, * which would cause implementation-defined behavior when passing it as * the 'align' argument of uma_zcreate(). Such very large alignments do * not make sense anyway. */ - uma_cache_align_mask = mask & ~(1U << 31); + KASSERT(mask <= INT_MAX, + ("UMA: %s: Mask too big (%#x)", __func__, mask)); +} + +/* Public functions */ +/* See uma.h */ +void +uma_set_cache_align_mask(unsigned int mask) +{ + + check_align_mask(mask); + uma_cache_align_mask = mask; } /* Returns the alignment mask to use to request cache alignment. */ @@ -3280,8 +3292,7 @@ uma_zcreate(const char *name, size_t size, uma_ctor ctor, uma_dtor dtor, struct uma_zctor_args args; uma_zone_t res; - KASSERT(powerof2(align + 1), ("invalid zone alignment %d for \"%s\"", - align, name)); + check_align_mask(align); /* This stuff is essential for the zone ctor */ memset(&args, 0, sizeof(args)); From nobody Thu Nov 2 13:40: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 4SLlP667qFz50Lrr; Thu, 2 Nov 2023 13:40: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 4SLlP65dwsz4Pg7; Thu, 2 Nov 2023 13:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrY77KtrUR+FKxVgEt+bzK96BzcSdw00cmX92OX2fkM=; b=flo8Lgl6NLbNdW3HTdqCmI0SNLeMvyAX0ATSH9HiAXQW5Dv30Bk7q8eMRceBrawkHPAYxj 9j4n9jArWGy3p9ZFEyvC8PJ+exybeaMETxhIjoUJPGnVqQbRMqUlPFO+Xa8FvGjKrXVpNQ u1Ms2ZQLawijPkxIACS0te0AQ9wInmkRm5S2hkt1XcfeSYpPYnwiPPmbxWCRCK6M8irDKV 7owAYQ6I5SekBqFL9Dk39HUbJQcXZKFHQpuOW8PJLEidYfDM+IhW/oSc30VYTxSwEGVd/m 34J8yJAEtxph9Grb99Smg5Ldk6mZwLn9Np4EhW8AExdHxhjBBZEeIrfOYsKjzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zrY77KtrUR+FKxVgEt+bzK96BzcSdw00cmX92OX2fkM=; b=aMw6UaqjaCbjS5um1hrwnZMpgoQgnQRMPGw8M5jeDT4jN1MXSHjNskya7eUdO4ljIvBCh6 I1E9bGNRbWZLFB6wAPN+RyHT2HnBfaYEEGARBH0htgbTpKbmfSRbyOgt3ME49dwoo6MLGi XTODk9FS/t1F4jXhkQcwuKk6IZxmzdE3G27jFMSFMsexgfs9bZV9X+pguUhvggXgEzzyob 0e89nPWyxH/VRqV1YKG1vDP6+Q56b2vNrRxYD/28ev0XVT3I+vUkCSJ5RKVnkXPGi3mWhw cTuPwd/YeXc5zLK9QLXsDiC2oQvmL5nVTs1w59pXINbyMH8A/bYiWVg+hf9s9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932410; a=rsa-sha256; cv=none; b=kVrV60z2hIwttUxfbKRUwo4SlplwEDqxss9LpDFt4u/1GNiNUb2StQxD5A+61ra0qi5HiQ 2PeafZ7YwyiXT0CvgDNlgYBMLYY4o/vtC2LNXB9uC+AfmxtvzouvM8HP3fETmUOl+4dVAY 6GpNPI6g4jP/OiHe0AHbj9M0EHkspMWqS05gDdj7hRiddv5r5KIruS3PcNRQE6550CppV8 j9tAITXGcj6QOxYd3an6y3zyMNQmW3MARhlQRErydKwK9NFrjJjB5n0ktVbmJcZnrgnSNe V2Lv5JuEnSN3bEZ/GLtQSvFA3LFpq7geQ6JROuNx3uepZSa6bxYxkXbtE2m5Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP64jpRzXFL; Thu, 2 Nov 2023 13:40: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 3A2DeAlR029865; Thu, 2 Nov 2023 13:40:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2DeAc2029856; Thu, 2 Nov 2023 13:40:10 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:10 GMT Message-Id: <202311021340.3A2DeAc2029856@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: 2c7dd66d09a1 - main - linuxkpi: dma_get_cache_alignment(): Fix off-by-one result List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2c7dd66d09a1b92a4698232996cded6e5315b3bd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7dd66d09a1b92a4698232996cded6e5315b3bd commit 2c7dd66d09a1b92a4698232996cded6e5315b3bd Author: Olivier Certner AuthorDate: 2023-10-13 15:13:28 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 linuxkpi: dma_get_cache_alignment(): Fix off-by-one result Substituting 'uma_align_cache' by the appropriately named accessor uma_get_cache_align_mask() made apparent that dma_get_cache_alignment() was off by one, since it was defined to be the mask derived from the alignment value. Reviewed by: markj, bz MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42264 --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 53c59bea8ef2..84f0361de765 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -351,7 +351,7 @@ dma_max_mapping_size(struct device *dev) #define dma_unmap_len(p, name) ((p)->name) #define dma_unmap_len_set(p, name, v) (((p)->name) = (v)) -#define dma_get_cache_alignment() uma_get_cache_align_mask() +#define dma_get_cache_alignment() (uma_get_cache_align_mask() + 1) static inline int From nobody Thu Nov 2 13:40: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 4SLlP80ltvz50M0f; Thu, 2 Nov 2023 13:40: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 4SLlP76Kg7z4PXk; Thu, 2 Nov 2023 13:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOUaIiOODv/AU0FT/ecWr4PeWecr6pTmxyjTTC34TqQ=; b=N4a2SMMEPJKcYPMMibm1I9v4xFMqON5NLH//Bqjn2uJvjnGfi3x+ostMeN3pjCiDq4lIjI ws2AgAA7UfWRd3aYT/iVaUuwUPGtrbm9dTAyPuujwP7qxGVkifLWjn0DrNTac1DxQSmtYp 1721ahH9nHGyUDD3YANeNuH92WIWo8b9HbDDPY5nONBbfZ+EC0qF2fsXa0Tx+ORp2HK05p xTBxcQFNhkCIFhE1aQZTBn9eozbdOikJGMFQkjD7VosXB0YCoZi8FBbSsNc1Hw1/TePHrS LQKs2aWiNIljeztSS5JSPmCx7pVFgn17Uu6aOplXhSWkdCZSJqy+ucN01PfaXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOUaIiOODv/AU0FT/ecWr4PeWecr6pTmxyjTTC34TqQ=; b=SiZua4OJcg0moktfWgSpyu28tcJl72zyJUoX+CM7VDwmwj01S3K2ATVzW5kt2YsXrTjVsl PhSf9hVFSz8LTZzE2SbgXlYWYTuMysbsY2uxQgn5SzVMsumn3+4RW5WMRYFI3JjdtH7DjW W7UzMOni2cjDhY0kN82sfI9eLvYN05g3gvEAULlI5SeZHn6OJet1HEIIFQUUqJehQewShG 4Mg0DL47iipIlce4aYUsXuM9zoDkOGRf1m/GbvMgh1HY0+czQNdIZgwwMge7qlM8Y/SWd3 IZiXyZeKa8idS8RmErQu2XuRU4c17qG6ZQgX+gECSkj5wNWrxJttzi+Lovnn7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932411; a=rsa-sha256; cv=none; b=jd3zrdp++pDufMtjr2yc1eXs/gVDEwtVvij3Au3FpBa2y//FBkkz3IdGrP+EiI25TxNxNT 3AP6dk6nG9TgftxjlhhUOlDKzxP+fHUvGetwXO1xOD2bgWjQ0FlGaS9u3m9IOISLu9dP4n /WiKdPs4figHvoeWkVfh38dsjxsb/Qo1irGX71OvhqYMAfIN3dF5dajV6GUqFxJWmHsvIG IypkzPOXmfp10dw8SaXJgKnPp3ZvOJwJnGFzh1zn3CjHvKt/YlYDBY7BlIuJcKv6uFcJcG cT0Q49ylAomWwGq6dGdYoxAmo4WFWMTy8V2LL6nONfxRpRiOc1J7FSr//MciFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP75Ng7zWjk; Thu, 2 Nov 2023 13:40: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 3A2DeBCj030536; Thu, 2 Nov 2023 13:40:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2DeBxu030525; Thu, 2 Nov 2023 13:40:11 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:11 GMT Message-Id: <202311021340.3A2DeBxu030525@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: 733e0abd2897 - main - uma: Permit specifying max of cache line and some custom alignment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 733e0abd2897289e2acf70f7c72e31a5a560394a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=733e0abd2897289e2acf70f7c72e31a5a560394a commit 733e0abd2897289e2acf70f7c72e31a5a560394a Author: Olivier Certner AuthorDate: 2023-10-13 15:05:34 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 uma: Permit specifying max of cache line and some custom alignment To be used for structures for which we want to enforce that pointers to them have some number of lower bits always set to 0, while still ensuring we benefit from cache line alignment to avoid false sharing between structures and fields within the structures (provided they are properly ordered). First candidate consumer that comes to mind is 'struct thread', see next commit. Reviewed by: markj, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42265 --- sys/vm/uma.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 8193df16b904..38865df7ae02 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -302,6 +302,8 @@ uma_zone_t uma_zcache_create(const char *name, int size, uma_ctor ctor, #define UMA_ALIGN_SHORT (sizeof(short) - 1) /* "" short */ #define UMA_ALIGN_CHAR (sizeof(char) - 1) /* "" char */ #define UMA_ALIGN_CACHE (uma_get_cache_align_mask()) /* Cache line size align */ +/* Align both to cache line size and an explicit alignment (through mask). */ +#define UMA_ALIGN_CACHE_AND_MASK(mask) (uma_get_cache_align_mask() | (mask)) #define UMA_ALIGNOF(type) (_Alignof(type) - 1) /* Alignment fit for 'type' */ #define UMA_ANYDOMAIN -1 /* Special value for domain search. */ From nobody Thu Nov 2 13:40: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 4SLlP92y97z50Lq1; Thu, 2 Nov 2023 13:40: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 4SLlP86yqNz4Pdk; Thu, 2 Nov 2023 13:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUqe3flrzxUUwm7S/XCrR6dtN3v84BTEmJurxGAiKl0=; b=yOBmcCKRp3EEXHrO/zFpP0qXCAFHkfAJl/jnIPH8RCyn95sUQ5UW5eo9CdTXUu+XRYit7H 2JYmKMqTuTnqLZlwP4NzjRyZvIxns4HP+D//qi1IqqdzoieqJMxkFXkxqmXmwZRovXotM6 OTyWboWzzLkHT0UomooSomcRZ3doKixjxTz3G9EbIz3dlf4dKze9YOkC8+zBtzZly+JbwS 2VqQ7w0aAKGWrP+aAfg8WByQBUJjZY9qCLfmgG0Pgl8TxEsynoRcskZuGmKCvZcXeClkwR ERzXrD6qJY3dtFMVc8Q8w1Ziz97J6XLvrT8pXHxkB8gFCWFTuZFqDwE+rTcwGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUqe3flrzxUUwm7S/XCrR6dtN3v84BTEmJurxGAiKl0=; b=Ui1Pes7+tpF5wHqtEffi1Tp0jft7ffX4Ykp3Fu0XLYOn9ZMhuskGWAPg4MPL6kfBP73t5H RhqK0TRUqJmoKz612d/Aznr3ystJsG1ads+w06ndkwGDGqgDAlmFRh/c9BLe93OcMX5m7A wGc1u1xXMFRSarULj9lAWdywyQh8zaqPyTMwCQ5Gv6RFiQJI2uGaJ0734LIDTOZRk0wN1l aewazHN2GsAcPZzuVqsUu7f6YgBF7J3Po7tS0VzgtnP2K6SnnwJszX2hSe9XLf+jXvDIwQ qFc8ygQNXysu94PJsRmUOzgaFvnxsesmDJzeziPl6NMCHm6jHpmF3dHvSKvV4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932413; a=rsa-sha256; cv=none; b=X+FElF/xu0Gl7ox7jBKsYg62cf1wM2iggNqJiDEvzMRNWc8zGEuO/OmpRFYfhNUnPbBleg tEi6p/u/7AHaScadZb4ZQjLIXbJ/WAZbDTMxHTSr4/Mm2B2lYRg/Uu5M8JvDjbc2wG+7SW fZ7sMPKl6WG9rHseZmOzCv1TOFeszfbCyCaH/7UMTRPxqv5RHneLji1zsVOLtwUc0MbF2w cs3YMu1cDFczFDpTBewtxT3GumKwYguTkjOl03hD2zRN6hEqDgoDid6q09Xf0fmoujV3yu hscafwSCXrWa8uH7TdPV2LwOsv5f/yB308mXUAxL//KZmixur4jhNeS/yXfw2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLlP862FQzWjl; Thu, 2 Nov 2023 13:40: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 3A2DeCYI031195; Thu, 2 Nov 2023 13:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2DeCcx031188; Thu, 2 Nov 2023 13:40:12 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:12 GMT Message-Id: <202311021340.3A2DeCcx031188@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: 7d1469e555bd - main - Ensure 'struct thread' is aligned to a cache line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7d1469e555bdce32b3dfc898478ae5564d5072b1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d1469e555bdce32b3dfc898478ae5564d5072b1 commit 7d1469e555bdce32b3dfc898478ae5564d5072b1 Author: Olivier Certner AuthorDate: 2023-10-13 08:52:31 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +0000 Ensure 'struct thread' is aligned to a cache line Using the new UMA_ALIGN_CACHE_AND_MASK() facility, which allows to simultaneously guarantee a minimum of 32 bytes of alignment (the 5 lower bits are always 0). For the record, to this day, here's a (possibly non-exhaustive) list of synchronization primitives using lower bits to store flags in pointers to thread structures: - lockmgr, rwlock and sx all use the 5 bits directly. - rmlock indirectly relies on sx, so can use the 5 bits. - mtx (non-spin) relies on the 3 lower bits. Reviewed by: markj, kib MFC after: 2 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42266 --- sys/kern/kern_thread.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 3bc8546db594..d948665392d4 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -568,9 +568,15 @@ threadinit(void) if (tid0 != THREAD0_TID) panic("tid0 %d != %d\n", tid0, THREAD0_TID); + /* + * Thread structures are specially aligned so that (at least) the + * 5 lower bits of a pointer to 'struct thead' must be 0. These bits + * are used by synchronization primitives to store flags in pointers to + * such structures. + */ thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(), thread_ctor, thread_dtor, thread_init, thread_fini, - 32 - 1, UMA_ZONE_NOFREE); + UMA_ALIGN_CACHE_AND_MASK(32 - 1), UMA_ZONE_NOFREE); tidhashtbl = hashinit(maxproc / 2, M_TIDHASH, &tidhash); tidhashlock = (tidhash + 1) / 64; if (tidhashlock > 0) From nobody Thu Nov 2 14:51: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 4SLmz95Xdkz4yWbx; Thu, 2 Nov 2023 14:51: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 4SLmz951NNz4YYT; Thu, 2 Nov 2023 14:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698936677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k1waxX5Qz0UpPw9f8SrxJN72sT+WEFPxozcEj4VNd04=; b=txPOyee9kev+swqe1bBPVZHiR8nhiDLqoV8y0Un7W2W+VsCFngyjCtWmHWjZA480BqYIL/ pcOOoqKsbl0dfLJcKnOakSpEnbJo15OJKW4PWv0OpFQPSPyn2mYONIkexFBNCJHAkGp38l YFiUtD/Oe30GcLplmUlo7j570/cebbRTiDyWq5t5SjSev3Rh0kSWv4rXzNiW9y8H6PJZ9u JBfM7sV3up3DpT6wr5TUV2HlexaOpM+2YoqHvfebvTrYkkZRAyNa/e+AFh5OLWJoZue8ps jPd9eDgiG/4Ifg2Pt48yMZOuVhKxuWOxbcfmSCMLJvi7MRKH4reZa0OBLwG4Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698936677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k1waxX5Qz0UpPw9f8SrxJN72sT+WEFPxozcEj4VNd04=; b=AH0bgxn0hW7DycolG3G8blf7QgBUTGboURKkoAL5RFzt8N4YlvL9KCcjS/YBuQVR7oErVA TJ3IUW5MumlJWO2nydV5F9a6XoVxxACX4/OxxMZV4wE3D0fkABfa6VNetuV9l7eSX98Cs5 FVSRq4if6b0x7Pk3IR/H2RiwPsx+2lVz0hi3NaWzmIuz0KVjysccbNp/U+9PA5fjxUEuSI 4nzYKMyVia17kMUJBzp4UyJRxx0bWkgmeftMnt+/waY//II0D24/t04dF2GaU6MtZAy2aP TbH0ZCKSEA/ydVH7kQ/RqaarFEn6li6mzJMFqmVoFs0g5zkvcwWluglhoGKUsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698936677; a=rsa-sha256; cv=none; b=ZB0QNQ0ZdpGqqaVswzO0xsxmxR8zr8I1qvPF4DZ0OxxYgMrH6b9lqCajY9/z+lHaEx/gMK peKRwD9SmFteFkpNu/wV6rubW0Nj9epgxnatB4WICPZdqP7k/UM89/UNkngxmyA2ulcUjb uoPEMAdu+tugMq/tL5slE20esUDcC5WERaybeH5O45yD7IcrIkVd/S1Cjd0quLgxXbhPBy hL5NgugQcV/i9oue4SxvAmWOgr1B5aXU+rNPUw0feC6qxRJ51d72RRuGcOcvAzd3lKZlJw fXxRVNFYusFgNXAYa1mpyUd+DqGDIuctAk91WgBSvk3FNyK45cNgpjetbObC/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 4SLmz944z1zZFb; Thu, 2 Nov 2023 14:51: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 3A2EpHhL052049; Thu, 2 Nov 2023 14:51:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2EpHOH052046; Thu, 2 Nov 2023 14:51:17 GMT (envelope-from git) Date: Thu, 2 Nov 2023 14:51:17 GMT Message-Id: <202311021451.3A2EpHOH052046@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: d7f9a421dfb2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d7f9a421dfb250e016e3d29b17e2b6a6ae3bc40c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7f9a421dfb250e016e3d29b17e2b6a6ae3bc40c commit d7f9a421dfb250e016e3d29b17e2b6a6ae3bc40c Author: Dan McGregor AuthorDate: 2023-11-02 14:50:10 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 14:50:10 +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 --- 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 3cef95c816f4..0c5d34456b3a 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -572,7 +572,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 Thu Nov 2 15:11: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 4SLnPz53c0z4yb7K; Thu, 2 Nov 2023 15:11: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 4SLnPz4c32z4bY1; Thu, 2 Nov 2023 15:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KH4mgxd1lXASEvz8njEbjJaogCixTDppNBkEDj6EQU=; b=DRAh5GTIM6yCEndyX3v/nDBH56DyaIxkTdj8TobJUE4qUoa/osBx8iEInxk9wHoBgCx+Us iD8X5JwAxmIavuu8NiGLbn1v9Muy6N77ljaVKJP90yvdgQ77Qo8xcBEbVyg9iZLK7fzXGU gyDd932jEwOmx6QjuzgVXYw/P7MIRin5jT9AtrwMGd0W/gaGEvN5XtQ4o9TS20PEk7EVC7 OFqWF3o7bmseV/tbG10SYz5i/tBU2m0ZKIrIxKi6v9Ypd5PZtXSVlCjI6JeWTd4D8j107b 4T6r5ngqSiZF2FbR1AvfQMzj7aomkwfAbdQC3fRQM4gsGsFF+K49hsAlN+6McQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3KH4mgxd1lXASEvz8njEbjJaogCixTDppNBkEDj6EQU=; b=C/JfLshk9SmLgtcxeL/7yX3wlcAn1GWgSY7hW/vI5hp9XwIz94ABX9OJ3B7KptGPdxPZ3/ rEiynQlhG9MPkfiOoj1BepNqwkPJviyTT981/X+0v7NE1XwpH0Ujr18kzzu9oaygBSXCmt oUnwJx9MUMOvOr/+bUnrIbNLAStdktW6SfAf311j+xtHS2XLhmA30Wa8g7WlaVKqV0haj8 U+++QdgjZ5asw88BiAIXwylWNzqurS/zFYUhKutfcoGbr3ioyzXYJ/DhDENYg+I48euuLt nLiSQJzC4FaWxF0la3xI+CZY3RFGyMSn4KZZoiPfJhkdpOl61iSBEMhrOwTGMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698937863; a=rsa-sha256; cv=none; b=c8T0cU0CmAiQbBuLyWT5Xmh62OunY4xEyUEEG5XzkYQeLwbWv6s5FoHmLCUL7dmRNmKsHu /yG0VzFDX7BzB9s7fjtNaXinrpu+6qJrdQFws1wy8vEP9veSW8614fxf1oImaoDtVEVYRj 0Qg6E3HoNMvQfE7Rp5aEdIPU8xk1ANNqbuvuEBlVca6xdfyQ0gbz9wmBqUfpIkei7ZI6Lk 6LwVUUevUoaBoWvNAtCUiA7OwcsOpnXNKuTvO1ZhPn4ZPNJAxvV2r1dmrrsYLtOEMQCMw3 gt2KIbM8klFchSHesDriVUy6Lymw0c+za1dH4wrFCgHCdhefPFbXGLBJ69iwjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLnPz3hrfzZSy; Thu, 2 Nov 2023 15:11: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 3A2FB3Rq086988; Thu, 2 Nov 2023 15:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2FB38f086973; Thu, 2 Nov 2023 15:11:03 GMT (envelope-from git) Date: Thu, 2 Nov 2023 15:11:03 GMT Message-Id: <202311021511.3A2FB38f086973@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: 71ae1f462bb4 - stable/14 - libpfctl: add missing pfctl_status_lcounter() function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 71ae1f462bb4c6f730fc558bca0dbe569c48b003 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=71ae1f462bb4c6f730fc558bca0dbe569c48b003 commit 71ae1f462bb4c6f730fc558bca0dbe569c48b003 Author: Kristof Provost AuthorDate: 2023-10-30 18:02:29 +0000 Commit: Kristof Provost CommitDate: 2023-11-02 15:10:00 +0000 libpfctl: add missing pfctl_status_lcounter() function We already had accessors for the other types of counters, but not this one. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1c824f430a395cdc66e22406e72f20ebd300e47e) --- lib/libpfctl/libpfctl.c | 6 ++++++ lib/libpfctl/libpfctl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 2bdc14e8868a..403dbf809b89 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -272,6 +272,12 @@ pfctl_status_counter(struct pfctl_status *status, int id) return (_pfctl_status_counter(&status->counters, id)); } +uint64_t +pfctl_status_lcounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->lcounters, id)); +} + uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 2559fc9c4843..7fe035f94cee 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -386,6 +386,7 @@ struct pfctl_syncookies { struct pfctl_status* pfctl_get_status(int dev); uint64_t pfctl_status_counter(struct pfctl_status *status, int id); +uint64_t pfctl_status_lcounter(struct pfctl_status *status, int id); uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id); uint64_t pfctl_status_scounter(struct pfctl_status *status, int id); void pfctl_free_status(struct pfctl_status *status); From nobody Thu Nov 2 15:11: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 4SLnQ041wSz4ybJp; Thu, 2 Nov 2023 15:11: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 4SLnQ03PGgz4bvF; Thu, 2 Nov 2023 15:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yzpt58dv9UNw3t+fP7rYcH6gHjk0DlNVXB4Sv48qXzU=; b=Om78amnWWcjkHUAUwjR/7/SNP9AtinDMAkFE7sxHeFXgcQCECJRGE7NGOlQv23rTdeeIEw PWyuOMAQPQJB3ZMwnHmay72Ew1rNvFd/4LSxXEgxtmqjmXNi2E/PfhMwpcLz7po/uUnZYj y8TeQA/yIRGMOH30kazTT7O++NTcEo7ICtxXDfPhvO7BEhz6VRN1fPFt5ykWF7GhO2fEXV tel66C8rtX5jfU7M2lfQnkwagvU0ECUKrpiivfNWE7oLE6j6f/5x3qSDh2XgtLmlszzIG4 fyCWjz3NcL5pwMXf3p7ob1CoJ4y9LLU5B8VGzBJBShFFAeJ1xgsyTIS5+L3BSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yzpt58dv9UNw3t+fP7rYcH6gHjk0DlNVXB4Sv48qXzU=; b=H+po8h0e7JxMZcG2bYOUVz5SBqeYR0oFGotDpjXLOQla69MFlxJ38ujLMWAl7oexhdqH6+ DNoBElyLhNGv1sWyQYNOaTYECsHpKbmOnH3OLGlq55xzdhKkpKyYJV2sdtKoPON+QnpQDk vjWivnCb/J+kOH9lj0ZoI5shz2xmpNPjD5qXV1FdAr2TkhsY+j+7UwjUDzhraFQk+wyR8O niJ3YruJ2Z43jcPNpCeJ3BXzxVTaJj6KvD3Nvju+PSBxLbXEC7/i4Hu43XtrgKKQ3U9vRm BVtOoywaj6uQE/aTxEnrvTUbm85mqKe7WgicD/YMXQ3RogtCWiar5S4xbQII+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698937864; a=rsa-sha256; cv=none; b=w5tsIk0786QCb5uTa0PGuUTzje5TVsu64c+Cvs+jWEz428cbofktyW6b/pvAQrLUlGyN6s 848kIOChSrxSRIfIUNr6Y7EZRiQZjfBMxnLZhz+VkLXFSP9SiiVYK9nJEuR2WF7NIWYy5i xk1+JkMYc7tQunSd74U+pnb3El07x49G28eDwBmwwtAk8yw+Po06pGilJ8CrOgaHf1e2U2 GmUCnKlMyWKKjTyYK1GAD0AEH593anOkXN7sRa5nSd61Aho0gRc7fIOhPN8PjcrIAw3TYx vghT77MdI3GcGQUrXK9pYUqN8Ql17lfutWTQN2pkpSsp4Dgs3VQb4Z9lj3/LZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLnQ02VmjzYkn; Thu, 2 Nov 2023 15:11: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 3A2FB4LW088207; Thu, 2 Nov 2023 15:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2FB4dT088197; Thu, 2 Nov 2023 15:11:04 GMT (envelope-from git) Date: Thu, 2 Nov 2023 15:11:04 GMT Message-Id: <202311021511.3A2FB4dT088197@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: 64ad7cdbbd0d - stable/13 - libpfctl: add missing pfctl_status_lcounter() function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 64ad7cdbbd0dbfb2fd245cb8727e81a49c4e058a Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=64ad7cdbbd0dbfb2fd245cb8727e81a49c4e058a commit 64ad7cdbbd0dbfb2fd245cb8727e81a49c4e058a Author: Kristof Provost AuthorDate: 2023-10-30 18:02:29 +0000 Commit: Kristof Provost CommitDate: 2023-11-02 08:48:38 +0000 libpfctl: add missing pfctl_status_lcounter() function We already had accessors for the other types of counters, but not this one. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1c824f430a395cdc66e22406e72f20ebd300e47e) --- lib/libpfctl/libpfctl.c | 6 ++++++ lib/libpfctl/libpfctl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e0fc90960d7c..2a77aeb0efad 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -271,6 +271,12 @@ pfctl_status_counter(struct pfctl_status *status, int id) return (_pfctl_status_counter(&status->counters, id)); } +uint64_t +pfctl_status_lcounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->lcounters, id)); +} + uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index e500bbf0bddf..c32cee523d05 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -291,6 +291,7 @@ struct pfctl_syncookies { struct pfctl_status* pfctl_get_status(int dev); uint64_t pfctl_status_counter(struct pfctl_status *status, int id); +uint64_t pfctl_status_lcounter(struct pfctl_status *status, int id); uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id); uint64_t pfctl_status_scounter(struct pfctl_status *status, int id); void pfctl_free_status(struct pfctl_status *status); From nobody Thu Nov 2 15:11: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 4SLnQ05pzGz4yZq8; Thu, 2 Nov 2023 15:11: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 4SLnQ05KpRz4c63; Thu, 2 Nov 2023 15:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RBrhvruyHYqz7Peaujm8qb0Mf8emFVMNDQIb6uw3JUQ=; b=w+Y95tm19ccWBNB7SVEiZS0Jr2u2D/LDNn/D/gYVfbIc2w0nuM/GF/uytWZ5oHIlh4Rtj0 NrfgxvCirrN/d3vWni54F9elYQkSwOV4pZSwdvxOggk3rApd/xEOcxWnAyI7+ZL2ENcu4d faY6IGadbU0uQn5QfTgJ8ENRS+/i4wh/20Jwbxx00UBo+mGPXtd8HaQ/NxhAPRAAJiWtzB Yk5XtCVR5yHW3a9T2806tHYpcDXFK+akZ1v19Y1fCsqw3/Gufw5GgTwaG12HQ2IuuqhYh1 kVMagmJh8KCdeSHjP3OKw+oFlOVJO2LE3GZmkswSbknSJMWSZLXIS6woE96L5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RBrhvruyHYqz7Peaujm8qb0Mf8emFVMNDQIb6uw3JUQ=; b=OQ0xF8XWl4Hb7AUZN1UxqsB8OKPl+lmWXetyDL/glyYmIj0JIJ3I2EqgLYtHVuex+snALA NjBsjpoGL+4QtA+sfVrqqWMv4Pdet8KU6DYYG647L5BDdPddWK1WhuVVXxvkYediAjjKnJ pcqN0Y8yuBq3mNu5Dn6QlPnv8hfEwR8bPFFY8hJ1FBq01u3dD0tBYihfrt2lNLWaxffFxf tQFqeeHeQTrCg6a4v2u15pclJqbDiVYW7NfotyH5Tdollfbi7zu0jmM3iMyoFRgaS9SL91 f9f1QeleecqHgBJbwbEtF6iRUO74A6L4/x5xTvq08zhJvf24/LJy1swOhJ5X6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698937864; a=rsa-sha256; cv=none; b=q+z4Mx+b82JWbjQMUP3DhKvhiCKY8vDI41lrquZ5QZK8y7gBbwrtXs6MJkHgU9ViB+TTFh vPSSIJeVE++QUg3dxiAJ6N9lZvBUs3MhNCbiY+6lJq4Ut0UXf1ovS+akYuMvFWIlZjQ+us RcYvETn2nDoppdYs+vU62hhEyBCGr4VOZ+r2970UT7228H4nNhmkSnewLmExF5Nk/joKR5 njvdxPZHC+zhKC6N6j6h/AKDDXNx1cDLtB7NMmloADn43QscFlAKRyM91T13kBAUhRydqv 7FZtv1o1AgeiflbOWon9tqGxhCXCJFVHSRO8/N0AZ1KTlYNWYS0uEzjtT++BAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLnQ04DwfzZf0; Thu, 2 Nov 2023 15:11: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 3A2FB4Px088404; Thu, 2 Nov 2023 15:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2FB4Nm088389; Thu, 2 Nov 2023 15:11:04 GMT (envelope-from git) Date: Thu, 2 Nov 2023 15:11:04 GMT Message-Id: <202311021511.3A2FB4Nm088389@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: e158fa4c54d6 - stable/14 - libpfctl: remove unused field from struct pfctl_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: e158fa4c54d67b4c35d523c959196b2ff2c28cd4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e158fa4c54d67b4c35d523c959196b2ff2c28cd4 commit e158fa4c54d67b4c35d523c959196b2ff2c28cd4 Author: Kristof Provost AuthorDate: 2023-10-30 18:04:12 +0000 Commit: Kristof Provost CommitDate: 2023-11-02 15:10:00 +0000 libpfctl: remove unused field from struct pfctl_states We never populate this, or use it, so remove it. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 87c5032353106764f324e82541662f448e68f38a) --- lib/libpfctl/libpfctl.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 7fe035f94cee..f436e722496f 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -368,7 +368,6 @@ struct pfctl_state { TAILQ_HEAD(pfctl_statelist, pfctl_state); struct pfctl_states { struct pfctl_statelist states; - size_t count; }; enum pfctl_syncookies_mode { From nobody Thu Nov 2 15:11:05 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 4SLnQ15Jcrz4yZv6; Thu, 2 Nov 2023 15:11: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 4SLnQ14Sf6z4c8q; Thu, 2 Nov 2023 15:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/PNXOrNp0XJowhkab6gz5f77xAOPLB8QGxPff0rKXA=; b=Ir9/qqNB+8bp3z0KYgF6CCg/JOFjT8alVMq4X2Oe+eteWvWdmKfaSEAOfJKd3vAWAhHAeV nD5BJo/0Rh5u34Mc3S07ojCeK8XHpLwV5mWEzi/v+uCbtwSZjQBXDRcmbFjINRzY0JBORc BB64X1xG8Lu0nQqDxBKmdoIUhNprydaJoElY7KOoACrEjWw7WNVuofFOZWTqR9By2GSFjl OBNl/ogFkbUZ/TPpql4/2oscFRLHb/fgHJb2qJJR6Pv1IxlaUsT840yJEhHV+xKuXKApOq V3BfDCGB0d2NbGp+/EH2keHqApy0nYnL2I/WxzI0CeTEgBq4ZJp+RZv81xRFIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/PNXOrNp0XJowhkab6gz5f77xAOPLB8QGxPff0rKXA=; b=d1c1fTxgbtA5ryL0HXwF+TaqiXztEwVg/9yeTU6RupOlxVtjtE/6oPx3Bau8ujMisUp3u9 KJtQ+EII6xZlzIa45CDcxLiZCLizsuY7ld31y+XnSMsCB4xH5xq04NbAfMGN7AQ8mUBQUB fercLlNwpdn6VKkdcEZXXZvmaAeFCzNvolkEyqd74XPfQj6HwqCtXpsKISz0i8ZNvXbCrZ 899w0aiZocLrEcwjRfO5mBAx46kYwusT9nubXMoNJDLTa/fQUhoRo97nZ4Vfuat2n8C7Ah g5cXFncfLr0t1imQLMALbMG+jZylTLoZ4phs11rfwe8Xet/qFQbNReB8cdh4PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698937865; a=rsa-sha256; cv=none; b=e0R8QbAFak01fsx9DHrqTNf8MGfDE+/+sP2yFr0QE/cCnhuRzuEharss2uu962u0jT7iRR igqHbfQGOjqQnrHYxQB1MBSJCujeREhR4APVv6hWSxbQHKVgJC3iNH+5189YPQiKvrzCKy QXHffPtJA3EXbiUVy1OS3Vt4uqyHlIfU/SL7dRBLFC5GABbcxfqXYsGtiVEI8w26/cjcqw 7fQf8Qb2Mu/OA0P8mOEmshWdnYzZnnzg4sh70iO+AOyM5A/bRmIFJerOEiFh/8bzP8uLsW pmTUeVAGknWCw77iBPJPjb+iKkgLSRC4Os503rUPaHOvHQ5AMKRqRaFDRrEDSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLnQ13VY7zZhH; Thu, 2 Nov 2023 15:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2FB5e5088543; Thu, 2 Nov 2023 15:11:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2FB5fX088540; Thu, 2 Nov 2023 15:11:05 GMT (envelope-from git) Date: Thu, 2 Nov 2023 15:11:05 GMT Message-Id: <202311021511.3A2FB5fX088540@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: 17d019fba6a3 - stable/13 - libpfctl: remove unused field from struct pfctl_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: 17d019fba6a3ea2243b56341cd40b98f8fa9ff7c Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=17d019fba6a3ea2243b56341cd40b98f8fa9ff7c commit 17d019fba6a3ea2243b56341cd40b98f8fa9ff7c Author: Kristof Provost AuthorDate: 2023-10-30 18:04:12 +0000 Commit: Kristof Provost CommitDate: 2023-11-02 08:48:54 +0000 libpfctl: remove unused field from struct pfctl_states We never populate this, or use it, so remove it. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 87c5032353106764f324e82541662f448e68f38a) --- lib/libpfctl/libpfctl.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index c32cee523d05..32cd408c5919 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -273,7 +273,6 @@ struct pfctl_state { TAILQ_HEAD(pfctl_statelist, pfctl_state); struct pfctl_states { struct pfctl_statelist states; - size_t count; }; enum pfctl_syncookies_mode { From nobody Thu Nov 2 15:11: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 4SLnQ25t7pz4yb5N; Thu, 2 Nov 2023 15:11: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 4SLnQ25Ng4z4cCc; Thu, 2 Nov 2023 15:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYcU4bpX6NQFpCHUozcxDD+h4Y4aatHU8uhmw02cWqY=; b=LuljptR1CPFdlj9XhiNdPPXzytyxIay62mBqorzrHu6+KGwYZOgTqaiPlcj8noZW9LkeDh a60gJr31vPy43sakbn2GMOuL9Em9WQmZ/+tSMe4q9f22Q15EAv5F46jNK8+N78xaVR2gPF tA+Xi045E9JoH0Bf+cjIt/KcJbYDga3MTD7p5dkGQwB14/zaKtEjL9zWq4/BAQOqA8IL13 n98EFxYQdw6nlhDJAs6uL1lqp7lHTVIKDFjVALvJ3zWEL9Bc1qI5tuA0EkA5v71P6XU6LN zH6YaUx+gNcirMb8QAdr/PI+v9p+VO4o6GiEtho7flxDgLr2cr7jzE/caxAhgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698937866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYcU4bpX6NQFpCHUozcxDD+h4Y4aatHU8uhmw02cWqY=; b=xCHUOPPgICtWWRwczAEcZy/BjxEfJjGtolHZaiZuKT+Y3vW+ueUiZSYNHDhpVLq5RGsBOE R4gEBKxsldqb3y1TFlU5EzQ6K+RYvaOLyAsSNCvcTxUDT7Er+cbnCIGGJMTjl/puBqNxRM YygRiD+a6P1hG1MYFohh4OiTyQkiC5EaMVE8LiVD8ORYaR5VscGB7equkxPo9CYgJijDHW k6tNkQjembxuZCy3tU7+Df0VMkDbVbE57lCWQwuFVH0Ze6V71hyEI8AoyqCfmm0AjcLzi4 FyQR3xRBT262bqsfztplFGJ+WFOGnyWdUsvNgtv5olf30JHKkXzXytLs8tsoPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698937866; a=rsa-sha256; cv=none; b=gT4c5cqjCL4SFejMJ2h9DjuE+NFqH32XSL4VJN3OWp/SRrNTtUnYO9a+AvIV7E1pBgCIRm /TBuMSbkD03Tm2p3LiPQ9mQALG2peMoY1XGSgZLFEQ2V4Baq+vYlxBL7au/Qa/uAEKrQ14 uaoz7LaqbtqftwMdm91o0vQ7LhQ+Vw9PFaHBdbA6wZLM0d3K0Zyd/gCOaRmfN9s26CHrwj b4hedAPnpLzWT4bOtbmncyiw/t8CbIi6O/HzUH3iiT+hqb9PJBOXXP/mCYRFJ7WsQNhM49 mppebyihDxSeEk0z3VwaJIUWT6P6gHuKtRBPuDS1wiTPMQH8MAmOk9k9/CFgzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLnQ24SttzZhJ; Thu, 2 Nov 2023 15:11: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 3A2FB6s5088619; Thu, 2 Nov 2023 15:11:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2FB6KO088616; Thu, 2 Nov 2023 15:11:06 GMT (envelope-from git) Date: Thu, 2 Nov 2023 15:11:06 GMT Message-Id: <202311021511.3A2FB6KO088616@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: 23e4f68d25d5 - stable/13 - netlink: fix powerpc 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 23e4f68d25d568132d15fb63d6be5b44e37e4978 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=23e4f68d25d568132d15fb63d6be5b44e37e4978 commit 23e4f68d25d568132d15fb63d6be5b44e37e4978 Author: Alexander V. Chernikov AuthorDate: 2023-04-25 14:59:04 +0000 Commit: Kristof Provost CommitDate: 2023-11-02 09:06:01 +0000 netlink: fix powerpc build. (cherry picked from commit 9e81e2c4520cdc9b68428a9acc695ad091083ebb) --- sys/netlink/route/neigh.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index dcb37313d0db..48c129581c76 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -30,6 +30,7 @@ #include "opt_inet6.h" #include #include +#include #include #include #include From nobody Thu Nov 2 16:25:39 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 4SLq435FS2z4ypGF; Thu, 2 Nov 2023 16:25: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 4SLq434nnBz4mqL; Thu, 2 Nov 2023 16:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698942339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=twnEJ7qm04iBMD2rzRaPZvPJf5lJCC4BOJtC7Wc21cE=; b=VxRcyZpvwVeGvfXza56YkpaAaYYmVVxQ31gmHomEElPLFIH7X9cPM8NzihRutY0Tajh8fy WPlISqeHoUxqAtg5fTKid/gDBCpinyazrYa1dhEpnFZ9oKE7g8tB7wsHV1YbEUrDsM208y KghrFlvhCkL6J8HV1mEORMu1V+VRYOnsbu9AKnv5jHApLxmr8hGCJCzKIueJq3wMTMDu3w bec6hQdNRxk4xFum1E7Uk6CuxU00pC6nFDHwsQRQmO+2YzI1VOd28xb9HAk+Q+e1ugEodX RcyLJk/FTuDnd46kgV45fmZehECmt9yJ0t9Prc9JedkxVMGEkS4EwaQ2k5eLvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698942339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=twnEJ7qm04iBMD2rzRaPZvPJf5lJCC4BOJtC7Wc21cE=; b=MNR/2bHP6H8vHCF3f8h0Ywx5gzKQgqA8muVS/D/h9tcb2U1G1I7keKiWlultLcYnitk3se 9wZWWCc3l1Zyw4NfweHVODHqgzDGxODI+2SIAL+zo/ukAdFo+KQwSrECsLO+AcFE8DMiX5 wEhESr+qf2xs2DZaIhcOPedzv7HYZpSrGa8dAJhyvFf5ziy68Lg9qcCZGe/LcbW1zhpOb0 AuSssgN/GWLYBQJX1flG8C57IpprxWt/xoFFQBWj1PmTTXH7IyrUQM3wankE91ffLEZc27 ELsiBsmatrY+EKk6Tz21Sf4QR2vGxvAeHS3vG6bzB3MPnBKT/r1yEuSdWkBn/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698942339; a=rsa-sha256; cv=none; b=dEj4Gac4ZHMaKd3j3+BhivsLf3T6WQJEyRB/1svhQ6K+IsiPCa3j998Xuy058u/0xtAf7I zZcBrTPQkppZMHrsN5f6nqF76bfZb//Cmav4+vIT8wlifkGiVFbKU05cR730qutPUXTvJt xE+kf7xO27BnNuKMD8C5JSQ+to4HIFL044Pj7OswJz4IUM2vqBRh6BHUWJe15Gl7PsuyAF 5+YrCgIUJgjKE+Z7hB4Q0og2WYBGUAQsXy0PkifWxnfSE2272xsiX6RS3THo8m5+L7fOKl C2dcyF7uRFXRteH21r+kKBi8zIsKOZupGq0gdoWtT2uZfjJe3P99mkdUK+JO7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLq433sLTzcFb; Thu, 2 Nov 2023 16:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2GPdVF009733; Thu, 2 Nov 2023 16:25:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2GPdef009730; Thu, 2 Nov 2023 16:25:39 GMT (envelope-from git) Date: Thu, 2 Nov 2023 16:25:39 GMT Message-Id: <202311021625.3A2GPdef009730@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: 185aa8c9c3d7 - main - arm: Update declarations for arm_dcache_align{,_mask} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 185aa8c9c3d7a01d616cfaafd492f61b37ed2551 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=185aa8c9c3d7a01d616cfaafd492f61b37ed2551 commit 185aa8c9c3d7a01d616cfaafd492f61b37ed2551 Author: Mark Johnston AuthorDate: 2023-11-02 16:23:51 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 16:25:31 +0000 arm: Update declarations for arm_dcache_align{,_mask} Reported by: Jenkins Fixes: 3d8f548b9e57 ("uma: Make the cache alignment mask unsigned") --- sys/arm/include/cpufunc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h index 0b54b59a7711..6562042dac0c 100644 --- a/sys/arm/include/cpufunc.h +++ b/sys/arm/include/cpufunc.h @@ -178,8 +178,8 @@ void cpu_reset (void) __attribute__((__noreturn__)); */ /* PRIMARY CACHE VARIABLES */ -extern int arm_dcache_align; -extern int arm_dcache_align_mask; +extern unsigned int arm_dcache_align; +extern unsigned int arm_dcache_align_mask; #else /* !_KERNEL */ From nobody Thu Nov 2 16:26: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 4SLq512Ftkz4ypGs for ; Thu, 2 Nov 2023 16:26: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 4SLq511cBMz4nGb; Thu, 2 Nov 2023 16:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698942389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asejEnTBWREp416a1VYUBcTQFgu/CeREB5v1AepxJqk=; b=U9oaQ7lDiNhOvHnK9FUgjq26pxWeOrFemqEN7TN9tIldZJGjCOZvBoq2Re8/zO+ZjNq+6Z De2YENtBHDBctYoXJiAya3hWTfKUz71Mdzs4TfvtTlD8Yq01kk8LfVQwL/L4nkuArxWsPi /JhcHdV/+eChVM3lt58O12K77bQYrr2hGwmE+/uPjklOaYVEP5XtcNlXPnO5wkKGXtOgdE j1gzWqLZrCUIIJRsy7sGlP4n6j9XiFhivtKgXLo4QZhMgxWYayEi/8UQJvMOTzyXfXKMYs 1jq3vx9YkjB6x6+/wM4tWMQjQzUw8sDS7WOm3LvDDeeDnBim4CZ7g9tinCGXIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698942389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=asejEnTBWREp416a1VYUBcTQFgu/CeREB5v1AepxJqk=; b=PKsJamzt4vjvpSwD9yFjtxkTjbswYS7D6FpASOkUhL78TxE0jcv6gkYsjJJqXixrl6Oa/u 3u0uX/lgmzYiYdfPWGKomvbE10MU34q33udM0IUcqYD45vpck6RjmT9IQZEJv+X6IC9tEE UQC2M1Mu6O8j5pPf64hqLvp2iKYISNXFwOlkmGv5uHE5oIDdsjMZRSwXf2AmAS7VJ7TFeT H8+MtvuoG33MCO8gQqruu7mbU8bQUukgXv5CzfBSvK6sC+CIecKdP62VIAxsyDOklNHa0s BqyxtD3RkeDK/yjj0snhg1o0VtE5TkfXqMOIT2SkuSBpKs4FFINVyYb9tcLX+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698942389; a=rsa-sha256; cv=none; b=gRyIfNtgLGlHM66BItlrqJG4xIL+q+so0njlGIRrZp8Ya7a8t+DqH18K+3F+IaiARU7vCu opbkYYHe00BxVPjs3vWLnPOELVoUYts6tpgwRhCP2ClwT5fVA9w0ujfhaz7W67yqzz9sO9 henoU+VAY/IpJoWQD/7PDei2cC9A++VnVeCO52WgQ0kwCgLqcEZ9zNdcaZMatEMbFGmg+2 bXrwnxLCWBE0KEikSO19ZPGUyb8cpIpkJTrrtlFo4PJFhLlLYe7QEeCLAy+MXNLU8BVK+I Bse58Uee0d4GOpEDTITGerynPXfdNDjcDSLirKhMVKcjPb6TACGbXRraLgEN3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLq510MyGzccY; Thu, 2 Nov 2023 16:26: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 3A2GQSej010086; Thu, 2 Nov 2023 16:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2GQSgV010085; Thu, 2 Nov 2023 16:26:28 GMT (envelope-from git) Date: Thu, 2 Nov 2023 16:26:28 GMT Message-Id: <202311021626.3A2GQSgV010085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Warner Losh Subject: git: f9002b856130..2e406c584fe4 - vendor/one-true-awk - 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/vendor/one-true-awk X-Git-Reftype: branch X-Git-Commit: 2e406c584fe40d654e4b8042006d2206eed016b3 X-Git-Oldrev: f9002b85613065121199880071419cf6fbda050f X-Git-Newrev: 2e406c584fe40d654e4b8042006d2206eed016b3 Auto-Submitted: auto-generated The branch vendor/one-true-awk has been updated by imp: URL: https://cgit.FreeBSD.org/src/log/?id=f9002b856130..2e406c584fe4 2e406c584fe4 ota: Import One True Awk from 20231102 (254b979f32df) From nobody Thu Nov 2 18:09: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 4SLsMl28BSz4yymJ; Thu, 2 Nov 2023 18:09: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 4SLsMl1YY6z3S7D; Thu, 2 Nov 2023 18:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698948563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1gEGGR5nz7+CwGHkYZvneU7Ud4NmZap0kSeMJd+vSM=; b=eUv9WYECbOYRwc1cXSXsgrY8kJEADmQFKZSTLi1AdVN1aZENstPeYLZVxhvrbqZEmLAG56 lJkSAiAP3v8KOn2N8KpHtzFtCqirEPxCnO87stqGCb00E5vK4MMOBRoIBGg3uoaZPnU5rt M67C3xQo4wuLRgzPix5cpquFIbqo1IKaFbVvwYpcVuPrnO386PAotIWlWdnIaUZUbqDeUh i1EJ6xH8aRzVny7pTgXtBkkiSoV6LbNa3qe+YPLSIy5CkwGIuhgQOoicf0g3L5jcH0elX+ k/5X5cTI0EFMEpb9xZx/NSb3Sv/mlxlvL9C9QUrVQ1gzj9OkrKSEhXoL7ebuug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698948563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1gEGGR5nz7+CwGHkYZvneU7Ud4NmZap0kSeMJd+vSM=; b=j8bIhhp1ihMg8uruo/aY30owBelq/PUlRwcyffjfGJUdUO1xTbVe0qxNbNAHJRMHPRfPHe LSM92hj33y4WyMqTZlWRCqC9u/QBMv1z0v4r2DwqHxXxvVI64vyFPBSL35leUauB8hipAB faTDGhQ3A+RFYxROB3k5fl3AHDqWyiQWIUOPQIv14yLvtz8n6OBqFjHxlQJqv7IGERqIx/ o0UcYXOiL30P01jzyWpUOKLBiZ0JDmrX2VAon563+4rG0OTXgzXONA+ZpZj3ZHiYABsvaI 7VPPYzFMV9iUJqrPlDEig9fEN3v33JCz4YT/VrD7G/XWuMjfylzAizgmxDpYqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698948563; a=rsa-sha256; cv=none; b=bf5OALp/RnLs+bprACVZ7SCWabFalqGalSShYUMWsH5q8N9Yvh5udodSpa7ZKGaeG+oVCk vRdK68IPN7tp3E530ckasieLGPekXCx2m/SNP6XtdtTXzdcDdh96ubydqHrBt6zvbb6a4O ujY91VSqAYFBej8lfNocUATUCQX1edUbdjxy1V/JVmTZqlKHwfhErJz5KPE8CWawsV6jYR HpjZ13UKQfQIK3n+hzu3n/6ezXHf/In8DPh1mqOEwD+QHYc7yDr744MxUV/SgB0C0A5G4w Q8RfsInmRf5la8AttrKLivF+eKqLvn9wRKuaLXb8FngeeCTerx54sfGcnUba5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLsMl0ZPKzfwq; Thu, 2 Nov 2023 18:09: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 3A2I9Nvg078469; Thu, 2 Nov 2023 18:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2I9NJ8078466; Thu, 2 Nov 2023 18:09:23 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:09:23 GMT Message-Id: <202311021809.3A2I9NJ8078466@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: 2d8fabef75db - main - ino64: Fix incremental builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 2d8fabef75dbbc08645aaa9ce40df39562d1211e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2d8fabef75dbbc08645aaa9ce40df39562d1211e commit 2d8fabef75dbbc08645aaa9ce40df39562d1211e Author: Warner Losh AuthorDate: 2023-11-02 18:06:19 +0000 Commit: Warner Losh CommitDate: 2023-11-02 18:07:59 +0000 ino64: Fix incremental builds These files were removed, so we need to fix up depends for WITHOUT_CLEAN builds (the default). Metamode builds aren't affected. Sponsored by: Netflix Feedback from: emaste Tested by: Pierre Pronchery Differential Revision: https://reviews.freebsd.org/D42433 --- tools/build/depend-cleanup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index bed654cfb4bb..4dfe694d5c0a 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -210,3 +210,11 @@ if [ -e "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o ] && \ echo "Removing stale fusefs GoogleTest objects" run rm -rf "$OBJTOP"/tests/sys/fs/fusefs fi + +# 20231031 0527c9bdc718 Remove forward compat ino64 stuff +clean_dep lib/libc fstat c +clean_dep lib/libc fstatat c +clean_dep lib/libc fstatfs c +clean_dep lib/libc getdirentries c +clean_dep lib/libc getfsstat c +clean_dep lib/libc statfs c From nobody Thu Nov 2 18:47: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 4SLtCx6LL5z503nB; Thu, 2 Nov 2023 18:47: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 4SLtCx5ts6z3WNF; Thu, 2 Nov 2023 18:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C+4UYcux8vBwd1wisUW9BNxV0YgVYGBTuNdv5vTatMs=; b=yUAj79nkwVergh4dW7MMcvGyr8gHjQIn+xtmHsanhpRbQ0U/cztAdkmCwe2MyjR6D3aCwY gqNI27MkWz7kMJk+2K/BphL/IevYz6mhMfmDtRejs/J0AclGD1zEMv3kau/G83DkBUyH+L 1f7ummV/j+5pmqNXv9FNExFOKIu56I8oIxgDkxTcez1W0NxT4JW+/gC0ilLr3vX/O73vzB Ot4zN/xLisXi++9Ggst/dH+pzPwjY7gpqVe1IPziTgzdW6QwcGn5REB7J99UUPScKW+w5d 2ArI38Jv1mM0SES5ZzHHONwPH2GFC7TQenHmY5X4yq7ylXW8spf0VDFq9YRmLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C+4UYcux8vBwd1wisUW9BNxV0YgVYGBTuNdv5vTatMs=; b=WgWo6lq95C109Dc6KED11MW+n13ma0FK4+nDppIW3xcVa3kehuyw9MuOi6nBdZzJ6meabQ 5ONz96NM1B2/9z/6jFkvIQ5hiCUqnC4FYlMMZw6AgSdVdmBV6NGNwJrgfAJJ4a4h2vqZSY FhgPnNHbX94w6POfvUOMBChYzgkts9iCpWmzIj6yb6OAi2+I5+FlL4nIVpUcz60cmwLf7i PRFGCmA4LhwqTkz2tnGOng8FMeneDaur1BXCtHV+k7MUewF1Z9CpZ14ATPkG12ZVNQt1oO OTyCbGbrDmMHjVd2pB13U/PnK3It7yYfP/ed/pqe4cfXsExTDpufOWCHN7NAjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698950861; a=rsa-sha256; cv=none; b=OberL3JPE/0M8+oiiul5opWHiNSfAB9ZXhA1NM+yO54+8Vs3e9QKIf2LMhsks250zI13g4 okq+IianJfuvd1b8ThvW2xk+IhNlr/ggR6+ExorzRewnazUe2pEQMspHLP224neizVmkdO c3ymzE9+jvMwLe8D73KAO/M0y6u9NmUbywGYzyTtNx2A1oZMkHmgzallGwS8a1zClr2pmn s4sO8tXBhv+YVFeS20ZXJST5UawEINKhWOVDa49/LVQSotnduCRTK01aploVFae/pBkX20 jb1nsodJ8pHCLC/+IS/NFT9wSjZRDwoh9V5mm3aO2M1wIDNx0z0hsK31uU6eiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtCx4x01zgkS; Thu, 2 Nov 2023 18:47: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 3A2IlfcG044558; Thu, 2 Nov 2023 18:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2IlfxH044554; Thu, 2 Nov 2023 18:47:41 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:47:41 GMT Message-Id: <202311021847.3A2IlfxH044554@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: 2b084923824e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2b084923824e0d5133fe5aff580b4e562fe7dd19 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2b084923824e0d5133fe5aff580b4e562fe7dd19 commit 2b084923824e0d5133fe5aff580b4e562fe7dd19 Author: Mark Johnston AuthorDate: 2023-11-02 18:30:10 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 18:30:10 +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 --- 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 cc463832babf..3b009385aaab 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) { @@ -3980,7 +3970,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; @@ -4006,7 +3996,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 2 18:47:42 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 4SLtCz0g9Fz503Tx; Thu, 2 Nov 2023 18:47: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 4SLtCy74Bvz3WZ9; Thu, 2 Nov 2023 18:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olXCYyo6l+CWdAyTU0CxXcgYDhDU1evwjn1IymmLOeA=; b=RKVhnzHHFcYZlKE2Q9hjOTRjOEXHZVYhQqRPzVNTsZjwClMUkOV4fOrv9dhJ2HqdqHuBvJ F1pKf8rDcoqNrT/JGDIXDLC3lrzlNcjYx/USWo4e8DJT3QIRCOqXBrf3Kd2ObC5fw+Z69s 78Z6bx4Xt9iGf4GSLZy/yBqZoe9E8HfgdmNCHWpESPr1bTkejkEZ/w14ZJDREp4rSLRW2h /ZcMb7f3FzB+a5UPqg92Xj5/24Ou03usdBmYZyD5g/TKFP9/Y8Wp/L8cmRr80vis9cSFV/ lS/mWdBCCUCmGC+xW8l7X2ecK8UQbWHdI57w+DGXCSLTHDUB7ZJCO/XAo8MV8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=olXCYyo6l+CWdAyTU0CxXcgYDhDU1evwjn1IymmLOeA=; b=UKQve5N0CMBHvDDRKoUtYeAy11fhHvZMVWGv22NhS0tNDDgNOfnobiyMmoLf5C5vcFKkPb yyJW7UEEPQaV/DljBy1vvEubEhjT+xRKOnMwMIo6XcDgD9bYTocSty3ftaf8AuButRlw28 VO1v7F5EWAjKGK9Q926fXCXFIcyg7u8ST+PB9UompoToIcdp3tDpyLywEoFY4277c9Hp1A 6Svz8VmSEEH5hQ9vcE0V3FK8Xmfmht/zRVkHgj9tb+Ddn9YTDHFDyqHVNuDHiRYUo3OPQ7 QFQKFa1i8q7+CATLLOSbvPciWyGt6Rc+2OzagC5X1wFNsESho3aADTawQi0x2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698950863; a=rsa-sha256; cv=none; b=oDGJAey1wlH+UmEk8jC2UOQEIZY7S291CbUlTM3vtGAGoEyoTrxAGb7aAh/kO9Eejd1Jy8 zAODq76p/2fZa5m20qk7OUdXo96ECDZ/yMI7S984u05NpJkCT7M/rQ8sYOwKeKNj8AwNVh e/uICWZKFDB/1usMPLsWI2QklJ+YyY0/rD18lmHy6JNVeWJW0FLSDhyngcsoOXrVsbMOIc qqP1i2hM9MdUSExex1In40BzEVZ2PumLofN1ka6wFft2IHkfnsfMrD5CkAC2lB+o8FEcF0 b+uBOPje9jI/TKoFOqj5TgOdatSLQTD8jEKIeX0yxzQdiKRtsoFmc7XRChufkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtCy60cyzgdp; Thu, 2 Nov 2023 18:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2Ilghd044601; Thu, 2 Nov 2023 18:47:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2Ilgri044598; Thu, 2 Nov 2023 18:47:42 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:47:42 GMT Message-Id: <202311021847.3A2Ilgri044598@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: 953345922398 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 953345922398ae6c029713087c8494a346d90c85 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=953345922398ae6c029713087c8494a346d90c85 commit 953345922398ae6c029713087c8494a346d90c85 Author: Mark Johnston AuthorDate: 2023-11-02 18:33:20 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 18:33:20 +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 --- 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 66054898b281..5747f04b7e0b 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 @@ -1060,7 +1050,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 2 18:47: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 4SLtD01hrCz503l0; Thu, 2 Nov 2023 18:47: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 4SLtD010jnz3WRL; Thu, 2 Nov 2023 18:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaZiA964YdS4JXnqcB2nhxBosPcapNk6hd2CIBLN9UE=; b=LoZj2cmkHUX9H/sNqPKNS2b34O3zJgj35rYrmCrEy+KdAx51qyEjMdDRjrCQb/SQ5bZEkI brNG5aDXjCtcbv+njCgF90RH51Y9gv6KmX8DPf5VLQCkRerkt9thGwRCywR3PE4bTiUEmY OpZgiXxtdURx6lrWger+XQ0r1Dx7RP5vrdJxjHiJE5KeYgK5Bz05wFtdI8BrUEU02DTuyB iKChgUH24eqHJmxgXhan0CKCB64etZqmeyikE9tlRJ4etzhnPK++haHj/PpgpC8pdFqUts OyPSMe1THhtcJmciqb6oBaa2B7572LsYzmrZYckp7b9HlvraKGduGW55E2jtLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaZiA964YdS4JXnqcB2nhxBosPcapNk6hd2CIBLN9UE=; b=EKRT1ENHVt0MY1ESiKW3vfxubU+KkexWjhakTYMFlrpxQO9zEAVMF0T8FdbNbGzDUF0hR4 rku1nXWSrMW/KMhUcOTupLxiQUx3yX1NkwyvtGY0ZdzAseVZOT4TezjpJQEjqB427v9VHo h/+rI6J1UxlY2SNXBmcXPxyym9osmb0YnvP0JiyrMNQK14o2rVWWkUYa74Ky4tsBeYYYdm wFQ20slLffDzTfNULxbPk6gQDTI4dPsKT8/zUpSfmm9CaUYiZLo/Y9I1u+86ZdyezcoW55 OMpz0LRcjFO5PlmUUBt7SobduL4SsTBwDruMqcAgL60c7JqwzPOxkiy4Sg3EHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698950864; a=rsa-sha256; cv=none; b=ie6zkoB+YOEf3Uz7yte4/sQV5eWO2rOx9TZysy575TJv+C/96ZEVf509WJR4apjb7O+yQB JPY/4Fl4JRnwPkDumbXAPeBu0kXsaA1A/RuYG62ee9UcqY7HPjIIVTFY7/4B6OLl77mWxC T16q374mb/ogIh1B0cWqnjw746zjD2s4yadLG2JuSyIEsM4Ca85Eq3KE+7BomAO23sPfo2 sh1iZwbcECkYB+w7Y2umw39dmHCVlBYoCvTJvF35QsO6zw6qauC7m4D5zADOPJgVvIJJMw cHypjf0N8KGaQC11C3rDTyph3JF11RFdmSHumnqaabeNZmU6aLkxtJmEHyqrCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtCz72lJzh56; Thu, 2 Nov 2023 18:47: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 3A2IlhWS044652; Thu, 2 Nov 2023 18:47:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2Ilhks044649; Thu, 2 Nov 2023 18:47:43 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:47:43 GMT Message-Id: <202311021847.3A2Ilhks044649@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: 7703ac2e983b - main - riscv: Port improvements from arm64/amd64 pmaps, part 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7703ac2e983bcd44ba93878f52eb30355cbc4821 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7703ac2e983bcd44ba93878f52eb30355cbc4821 commit 7703ac2e983bcd44ba93878f52eb30355cbc4821 Author: Mark Johnston AuthorDate: 2023-11-02 18:33:37 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 18:33:37 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 1 - When promoting, do not require that all PTEs all have PTE_A set. Instead, record whether they did and store this information in the PTP's valid bits. - Synchronize some comments in pmap_promote_l2(). - Make pmap_promote_l2() scan starting from the end of the 2MB range instead of the beginning. See the commit log for 9d1b7fa31f510 for justification of this, which I believe applies here as well. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42288 --- sys/riscv/include/pte.h | 2 +- sys/riscv/riscv/pmap.c | 66 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/sys/riscv/include/pte.h b/sys/riscv/include/pte.h index 2cede135ebae..da7bd051e122 100644 --- a/sys/riscv/include/pte.h +++ b/sys/riscv/include/pte.h @@ -80,7 +80,7 @@ typedef uint64_t pn_t; /* page number */ #define PTE_RWX (PTE_R | PTE_W | PTE_X) #define PTE_RX (PTE_R | PTE_X) #define PTE_KERN (PTE_V | PTE_R | PTE_W | PTE_A | PTE_D) -#define PTE_PROMOTE (PTE_V | PTE_RWX | PTE_D | PTE_A | PTE_G | PTE_U | \ +#define PTE_PROMOTE (PTE_V | PTE_RWX | PTE_D | PTE_G | PTE_U | \ PTE_SW_MANAGED | PTE_SW_WIRED) /* Bits 63 - 54 are reserved for future use. */ diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 5747f04b7e0b..30bcf113628c 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -1194,14 +1194,26 @@ pmap_add_delayed_free_list(vm_page_t m, struct spglist *free, * for mapping a distinct range of virtual addresses. The pmap's collection is * ordered by this virtual address range. * - * If "promoted" is false, then the page table page "ml3" must be zero filled. + * If "promoted" is false, then the page table page "mpte" must be zero filled; + * "mpte"'s valid field will be set to 0. + * + * If "promoted" is true and "all_l3e_PTE_A_set" is false, then "mpte" must + * contain valid mappings with identical attributes except for PTE_A; + * "mpte"'s valid field will be set to 1. + * + * If "promoted" and "all_l3e_PTE_A_set" are both true, then "mpte" must contain + * valid mappings with identical attributes including PTE_A; "mpte"'s valid + * field will be set to VM_PAGE_BITS_ALL. */ static __inline int -pmap_insert_pt_page(pmap_t pmap, vm_page_t ml3, bool promoted) +pmap_insert_pt_page(pmap_t pmap, vm_page_t ml3, bool promoted, + bool all_l3e_PTE_A_set) { PMAP_LOCK_ASSERT(pmap, MA_OWNED); - ml3->valid = promoted ? VM_PAGE_BITS_ALL : 0; + KASSERT(promoted || !all_l3e_PTE_A_set, + ("a zero-filled PTP can't have PTE_A set in every PTE")); + ml3->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; return (vm_radix_insert(&pmap->pm_root, ml3)); } @@ -2169,7 +2181,7 @@ pmap_remove_kernel_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t va) * If this page table page was unmapped by a promotion, then it * contains valid mappings. Zero it to invalidate those mappings. */ - if (ml3->valid != 0) + if (vm_page_any_valid(ml3)) pagezero((void *)PHYS_TO_DMAP(ml3pa)); /* @@ -2230,7 +2242,7 @@ pmap_remove_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t sva, } else { ml3 = pmap_remove_pt_page(pmap, sva); if (ml3 != NULL) { - KASSERT(ml3->valid == VM_PAGE_BITS_ALL, + KASSERT(vm_page_any_valid(ml3), ("pmap_remove_l2: l3 page not promoted")); pmap_resident_count_dec(pmap, 1); KASSERT(ml3->ref_count == Ln_ENTRIES, @@ -2703,7 +2715,7 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, * If the page table page is not leftover from an earlier promotion, * initialize it. */ - if (mpte->valid == 0) { + if (!vm_page_all_valid(mpte)) { for (i = 0; i < Ln_ENTRIES; i++) pmap_store(firstl3 + i, newl3 + (i << PTE_PPN0_S)); } @@ -2712,8 +2724,7 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, "addresses")); /* - * If the mapping has changed attributes, update the page table - * entries. + * If the mapping has changed attributes, update the PTEs. */ if ((pmap_load(firstl3) & PTE_PROMOTE) != (newl3 & PTE_PROMOTE)) for (i = 0; i < Ln_ENTRIES; i++) @@ -2752,7 +2763,7 @@ static void pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, struct rwlock **lockp) { - pt_entry_t *firstl3, firstl3e, *l3, l3e; + pt_entry_t all_l3e_PTE_A, *firstl3, firstl3e, *l3, l3e; vm_paddr_t pa; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -2760,6 +2771,11 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, KASSERT((pmap_load(l2) & PTE_RWX) == 0, ("pmap_promote_l2: invalid l2 entry %p", l2)); + /* + * Examine the first L3E in the specified PTP. Abort if this L3E is + * ineligible for promotion or does not map the first 4KB physical page + * within a 2MB page. + */ firstl3 = (pt_entry_t *)PHYS_TO_DMAP(PTE_TO_PHYS(pmap_load(l2))); firstl3e = pmap_load(firstl3); pa = PTE_TO_PHYS(firstl3e); @@ -2787,8 +2803,14 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, } } - pa += PAGE_SIZE; - for (l3 = firstl3 + 1; l3 < firstl3 + Ln_ENTRIES; l3++) { + /* + * Examine each of the other PTEs in the specified PTP. Abort if this + * PTE maps an unexpected 4KB physical page or does not have identical + * characteristics to the first PTE. + */ + all_l3e_PTE_A = firstl3e & PTE_A; + pa += L2_SIZE - PAGE_SIZE; + for (l3 = firstl3 + Ln_ENTRIES - 1; l3 > firstl3; l3--) { l3e = pmap_load(l3); if (PTE_TO_PHYS(l3e) != pa) { CTR2(KTR_PMAP, @@ -2810,14 +2832,28 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, atomic_add_long(&pmap_l2_p_failures, 1); return; } - pa += PAGE_SIZE; + all_l3e_PTE_A &= l3e; + pa -= PAGE_SIZE; } + /* + * Unless all PTEs have PTE_A set, clear it from the superpage + * mapping, so that promotions triggered by speculative mappings, + * such as pmap_enter_quick(), don't automatically mark the + * underlying pages as referenced. + */ + firstl3e &= ~PTE_A | all_l3e_PTE_A; + + /* + * Save the page table page in its current state until the L2 + * mapping the superpage is demoted by pmap_demote_l2() or + * destroyed by pmap_remove_l3(). + */ if (ml3 == NULL) ml3 = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l2))); KASSERT(ml3->pindex == pmap_l2_pindex(va), ("pmap_promote_l2: page table page's pindex is wrong")); - if (pmap_insert_pt_page(pmap, ml3, true)) { + if (pmap_insert_pt_page(pmap, ml3, true, all_l3e_PTE_A != 0)) { CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); @@ -3229,7 +3265,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, * leave the kernel page table page zero filled. */ mt = PHYS_TO_VM_PAGE(PTE_TO_PHYS(pmap_load(l2))); - if (pmap_insert_pt_page(pmap, mt, false)) + if (pmap_insert_pt_page(pmap, mt, false, false)) panic("pmap_enter_l2: trie insert failed"); } else KASSERT(pmap_load(l2) == 0, @@ -3847,7 +3883,7 @@ pmap_remove_pages_pv(pmap_t pmap, vm_page_t m, pv_entry_t pv, } mpte = pmap_remove_pt_page(pmap, pv->pv_va); if (mpte != NULL) { - KASSERT(mpte->valid == VM_PAGE_BITS_ALL, + KASSERT(vm_page_any_valid(mpte), ("pmap_remove_pages: pte page not promoted")); pmap_resident_count_dec(pmap, 1); KASSERT(mpte->ref_count == Ln_ENTRIES, From nobody Thu Nov 2 18:47: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 4SLtD12C3Jz503nN; Thu, 2 Nov 2023 18:47: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 4SLtD11kSVz3Wnl; Thu, 2 Nov 2023 18:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZY7irm36bn52JRM5Qn/Ts4/jK+sIo/Z2eULztnQfn8=; b=v8fXk7WIraKtR0PcMQB7lOoh/JPAf3BOfZ50XnK+Yizfj2OSrhvGnxKaNxHy5QNt2rUr0u 3W/4OtLTOlm7srDdscuOiLImFGwsNifg36YdDftcgi83BWDNSrGj6wyL9fsPDZuCrHspn3 vWF1SAfQkxrREyocEOhgabEAp2LfUDuV4xoDSu4QXVZd0TWD7jsKafzB3kgi4nQOmBy3KT WR+daqlq+afN6SIZFzohLV7ngJvWzfFjcouFARY74+zlG+kEfqDBxzQp4JRTs/PU3DFfdu zJDDG789cXC9HfMFkgHUb0Dn8B/KnvNIICkBpb0rcmc/FCG/ZemLwyZRvh+hnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LZY7irm36bn52JRM5Qn/Ts4/jK+sIo/Z2eULztnQfn8=; b=Ol2LZHd1iuThoGVi3lQ8oR3En1/U52Zk2GlWoQlpTodQMqP5TJ4FwR4y3IN9YF1Y1ig/so rCbF7B8mRYXEKBZGHXxXuhGUEkLK7HrnMK2wbxsGaBsPvISyiJg4I1t9NmCpviqO8/Ns6q 5jLeKoFXBWiH+ulwI0FIu7/osXEIgRUZyem2J+LPUqHnCeHd96PzCnVNaey+hcG8LnpoO8 gXOquQK2dXVYq8T3KkOU88uG7ZL/RMvtAq7Z4iFxB8GWbarW1LFk5bA2BpNGdgQTVwTCmR RZ+9GSP08Ue7JL24GexVC36Be5IAHJhxIDAq0pBw8AxVeqgsm9u1gIw8SS2GrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698950865; a=rsa-sha256; cv=none; b=GTHhqyPuQuzcZDoVGuWXhFslzb4m6U43XxowIYCUBygOx+nNtIxKjivyZQvi0XiVdHKG2c Mr7WCgDlQC/NwnHg+wj99WKXLgkUjx3TsMTaOXLuDXQfqtGejX1Ins5WwvhkRJYgcu+nUy oi1i6OuEx1b2Yw3ANRExXP1Ee8+swPfafU89LCJ9UDumINIfVZx9qKdY+Pn5PLvlWv5uKx kNwMqT8CuXTRCYbkGhH6uIpuzoQZ5VtUDZdYBto5VVbJKw1wdtsRNKe2sMB3pkZbbV0/vH MQFX16Dca5WdSskdZyrFZGuHYsX8kpY96OCJFCpxcOSv0RQ25bsFdIFTDimpKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtD10nTFzgh9; Thu, 2 Nov 2023 18:47: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 3A2IljuW044709; Thu, 2 Nov 2023 18:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2IljII044706; Thu, 2 Nov 2023 18:47:45 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:47:45 GMT Message-Id: <202311021847.3A2IljII044706@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: 3c4f46b0d57b - main - riscv: Port improvements from arm64/amd64 pmaps, part 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c4f46b0d57b76d304f8a94862c6ba9be0273565 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3c4f46b0d57b76d304f8a94862c6ba9be0273565 commit 3c4f46b0d57b76d304f8a94862c6ba9be0273565 Author: Mark Johnston AuthorDate: 2023-11-02 18:33:55 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 18:33:55 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 2 - Give pmap_promote_l2() a return value indicating whether or not promotion succeeded. - Check pmap_ps_enabled() in pmap_promote_l2() rather than making callers do it. - Annotate superpages_enabled with __read_frequently. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42289 --- sys/riscv/riscv/pmap.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 30bcf113628c..9b2866d7dd4d 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -256,7 +256,7 @@ CTASSERT(VM_EARLY_DTB_ADDRESS < (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE) static struct rwlock_padalign pvh_global_lock; static struct mtx_padalign allpmaps_lock; -static int superpages_enabled = 1; +static int __read_frequently superpages_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled, CTLFLAG_RDTUN, &superpages_enabled, 0, "Enable support for transparent superpages"); @@ -2759,7 +2759,7 @@ pmap_demote_l2_locked(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, } #if VM_NRESERVLEVEL > 0 -static void +static bool pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, struct rwlock **lockp) { @@ -2767,6 +2767,8 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, vm_paddr_t pa; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (!pmap_ps_enabled(pmap)) + return (false); KASSERT((pmap_load(l2) & PTE_RWX) == 0, ("pmap_promote_l2: invalid l2 entry %p", l2)); @@ -2783,7 +2785,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } /* @@ -2817,7 +2819,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } while ((l3e & (PTE_W | PTE_D)) == PTE_W) { if (atomic_fcmpset_64(l3, &l3e, l3e & ~PTE_W)) { @@ -2830,7 +2832,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } all_l3e_PTE_A &= l3e; pa -= PAGE_SIZE; @@ -2857,7 +2859,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, CTR2(KTR_PMAP, "pmap_promote_l2: failure for va %#lx pmap %p", va, pmap); atomic_add_long(&pmap_l2_p_failures, 1); - return; + return (false); } if ((firstl3e & PTE_SW_MANAGED) != 0) @@ -2868,6 +2870,7 @@ pmap_promote_l2(pmap_t pmap, pd_entry_t *l2, vm_offset_t va, vm_page_t ml3, atomic_add_long(&pmap_l2_promotions, 1); CTR2(KTR_PMAP, "pmap_promote_l2: success for va %#lx in pmap %p", va, pmap); + return (true); } #endif @@ -3133,10 +3136,9 @@ validate: #if VM_NRESERVLEVEL > 0 if (mpte != NULL && mpte->ref_count == Ln_ENTRIES && - pmap_ps_enabled(pmap) && (m->flags & PG_FICTITIOUS) == 0 && vm_reserv_level_iffullpop(m) == 0) - pmap_promote_l2(pmap, l2, va, mpte, &lock); + (void)pmap_promote_l2(pmap, l2, va, mpte, &lock); #endif rv = KERN_SUCCESS; From nobody Thu Nov 2 18:47: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 4SLtD23VtTz503l3; Thu, 2 Nov 2023 18:47: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 4SLtD22wrsz3Wgy; Thu, 2 Nov 2023 18:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xZmR45Js+h7M3SCmYgMpGDi4JFM/bloQ03X5FkQ624o=; b=H6ri2stbHm8RI1ZdwKrQ23K3p+z1azRhaVGdtsDp7u11yhhEqEvl5mLDLWtQJbhjtxKOv+ qm/OOpZF0UAM7lSycAkGBQtmneVfbe4te+E8vnpTHogREEIOdpzqnmyJJkMULP+Gnr8eeo 1fKf0KAtCb4V4aX9yBdsPPsOMa2nzr9T5pkRydvsPUS+f4cfzRea2cRLw1jrsiw/PPb/+Y zaCCPArIxExtLgq259lYaQ34/qt+zmgnNf9Tv45F7MKZexVs0G1H2mHEG2Zv7yXOvqw3lw OqWD2Yh4L3mfrll0OrBMOwBAS1cRNQutaPoVVNKLclpUGWFrZqGRDj7JxhVT4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xZmR45Js+h7M3SCmYgMpGDi4JFM/bloQ03X5FkQ624o=; b=c3ksOYw51+yfdtw0ZMWtbJ6MG6j7H+yLnFxzY9Lupt8JR4q5Z0xGElizsExicLxGN+sZzO Fg0Pk0iy5zac6zAHL8oOJgN9Yr1c0nbJtoOzu0FDjXuSoboj+COCrf1VzZS9uERZGRu8fa YYIU5OtxvFUbJZk/qf7krDuDFhFGl0EG5Kn7Gung00FGTwDIyEJ8aRCpdZIiTIjqBXFuDD Wlo48NmqAyS2D1zB+i+M7kDB4Rx+Zx48OjRoJj2u3zvWwG0i41gzHgj0lgxnErKbAejb+R ip5Y2GUqOYsO7E00LIjm0/HrYA9K+jvpJXOK5a+Taq1FBv24yr3fGanzKtlihg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698950866; a=rsa-sha256; cv=none; b=CGt69fPyGzjk3mdLTcsv/AUQ6OBlpU/5ylUb2QHnl+xczaSnOQ5CsCRlrpfDHR6/NwuXRM eBtmXDrlySbjpsoGjje3o6i9AW1XP/wE4G2mzpow0xfvPC0sbiZ2bBUjoDuR+/72Gd1Um+ a7qJnEu8S08KqegPGCp2G3dt+d7aTSGuFo2s575eZLtsSZybPw3eQ4Sg5j9ypah9GaHzy0 vOIEwL8yOCFWzkBA8IRpJOVKw6Iy6MXcnAZVDmF4wGrdoaOIJh6CH1TLO4U4nJsVfqDP6Y 6I0mjRLiCjM1oAIct6MtXKQzg53q+KdJxag6yTnyK/p4TrN2YUPXDKh9n3miUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtD21xkXzh6b; Thu, 2 Nov 2023 18:47: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 3A2IlkXT044762; Thu, 2 Nov 2023 18:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2IlkTr044759; Thu, 2 Nov 2023 18:47:46 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:47:46 GMT Message-Id: <202311021847.3A2IlkTr044759@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: 0b8372b707a5 - main - riscv: Port improvements from arm64/amd64 pmaps, part 3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b8372b707a50c2deeaf66d4c55fec51007cec44 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0b8372b707a50c2deeaf66d4c55fec51007cec44 commit 0b8372b707a50c2deeaf66d4c55fec51007cec44 Author: Mark Johnston AuthorDate: 2023-11-02 18:34:07 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 18:34:07 +0000 riscv: Port improvements from arm64/amd64 pmaps, part 3 - Let pmap_enter_quick_locked() trigger superpage promotions. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42290 --- sys/riscv/riscv/pmap.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 9b2866d7dd4d..ebb0f069b4ab 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3405,6 +3405,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, ("pmap_enter_quick_locked: managed mapping within the clean submap")); rw_assert(&pvh_global_lock, RA_LOCKED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); + l2 = NULL; CTR2(KTR_PMAP, "pmap_enter_quick_locked: %p %lx", pmap, va); /* @@ -3503,6 +3504,26 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, pmap_store(l3, newl3); +#if VM_NRESERVLEVEL > 0 + /* + * If both the PTP and the reservation are fully populated, then attempt + * promotion. + */ + if ((mpte == NULL || mpte->ref_count == Ln_ENTRIES) && + (m->flags & PG_FICTITIOUS) == 0 && + vm_reserv_level_iffullpop(m) == 0) { + if (l2 == NULL) + l2 = pmap_l2(pmap, va); + + /* + * If promotion succeeds, then the next call to this function + * should not be given the unmapped PTP as a hint. + */ + if (pmap_promote_l2(pmap, l2, va, mpte, lockp)) + mpte = NULL; + } +#endif + pmap_invalidate_page(pmap, va); return (mpte); } From nobody Thu Nov 2 18:47: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 4SLtD35TPGz503cm; Thu, 2 Nov 2023 18:47: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 4SLtD33csRz3X5L; Thu, 2 Nov 2023 18:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxdvcrrYn1HlzsY1uaG4eoF0+F1g0sqf/EXUauVhhlY=; b=FjUcf955evzhrlNd39DmRhzTQdEXfpf0r1agHC6/+YM8EXZmHX12xeF8oXrhUt8G2Qm3RR nsqW1IGs88HEA6Xc4GLhpD6XsUXKSksTIusUFmPNU/GYhX5DfAb3mEG4xbEe7+FxdVebzu aJSIv7boNMpGkruIzVtFb56VOwe7U/h6fhWWcA7eEJolsgYqVQpXeq3hyWkpF2lTCUrKTy pP4C715ZPm+n/0D1vyYhAIA6UXM9Y3AKplpuszfAMO6lfFz5cAUtU+5ryzS2fm4OApSBhP kBB6sv0U8tsn0MLRdXJFgtx8nWNGV3OImG+qQ4CvhdVFTF3UfH8WQuJP4jyJIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxdvcrrYn1HlzsY1uaG4eoF0+F1g0sqf/EXUauVhhlY=; b=AcVdrcPqiyck/ky0y3QPqfG4AHDNS2EHU49oeLLS8uxETl85O5kz6QQ6gkxRQcu+HEVyFi 2JXFrcoANZlNWvBsCfiTnm2CMpfpsXay5MJuRzwvl4L3DZZSLt9XtUnRqVtffBvvh3/58Y FX+cKWAiIPxU6XDzNAY8J7TA8oTozc5UuelVu6YS2gBIGaB6M/P/HrYbDcSK8sRDYSFkTx RC/gSm8/8oCmaHFoAyFz+aLN8EzXs8FZ8tSy/RGr87kMMG5dBFN7RFXtrozbmzyEWhJ4uz PGCV13J9kBcSS0tKpWl2wYmQoEbwG0xOqX0g0/M2v+Y4TpGyjOK1u0XplTwtLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698950867; a=rsa-sha256; cv=none; b=EAlBpd+tsNVm5b/lSFhW3amJdQtvRNQ1lCUPmfB0ODyxl6dJsnp2Shl1f+n00dHylipqJl teyohS2/aiklZIZk6DE7ONdNx4OQCNy3jhuoXpDPv88pQ08UrDeRke3nyO7M/b/qA0aY/f F3RcGsJ9HeU5a6qbak4ImtG7e9GJQIoZ5OjtH6GCCbmBGi5Y2GUCveg3QPsRkJjVjExOEZ nsGreeoN1WNnokmEm2a/T7EPKz5HxviyN42/aLVkvQ5c/TThQONW/LS2D6FQY6zUaJhIYI Ss7owwkL26HSXjZiVHhTexIwW6fmTgMGPKztPtlNswjS63XBBmCvjhbA2jv2dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtD32kpQzgdq; Thu, 2 Nov 2023 18:47: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 3A2IllPs044807; Thu, 2 Nov 2023 18:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2IllTH044804; Thu, 2 Nov 2023 18:47:47 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:47:47 GMT Message-Id: <202311021847.3A2IllTH044804@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: 71b77a7172c2 - main - riscv: Remove unnecessary invalidations in pmap_enter_quick_locked() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 71b77a7172c26783a9d2181d3bed27cf62974200 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71b77a7172c26783a9d2181d3bed27cf62974200 commit 71b77a7172c26783a9d2181d3bed27cf62974200 Author: Mark Johnston AuthorDate: 2023-11-02 18:34:26 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 18:34:26 +0000 riscv: Remove unnecessary invalidations in pmap_enter_quick_locked() This function always overwrites an invalid PTE, so if pmap_try_insert_pv_entry() fails it is certainly not necessary to invalidate anything, because the PTE has not yet been written by that point. It should also not be necessary to invalidate TLBs after overwriting an invalid entry. In principle the TLB could cache negative entries, but then the worst case scenario is a spurious fault. Since pmap_enter() does not bother issuing an sfence.vma, pmap_enter_quick_locked() should behave similarly. Reviewed by: kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42291 --- sys/riscv/riscv/pmap.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index ebb0f069b4ab..f0108b611937 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3458,11 +3458,9 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, if (l3 == NULL) panic("pmap_enter_quick_locked: No l3"); if (pmap_load(l3) != 0) { - if (mpte != NULL) { + if (mpte != NULL) mpte->ref_count--; - mpte = NULL; - } - return (mpte); + return (NULL); } /* @@ -3472,13 +3470,10 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, !pmap_try_insert_pv_entry(pmap, va, m, lockp)) { if (mpte != NULL) { SLIST_INIT(&free); - if (pmap_unwire_ptp(pmap, va, mpte, &free)) { - pmap_invalidate_page(pmap, va); + if (pmap_unwire_ptp(pmap, va, mpte, &free)) vm_page_free_pages_toq(&free, false); - } - mpte = NULL; } - return (mpte); + return (NULL); } /* @@ -3524,7 +3519,6 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, } #endif - pmap_invalidate_page(pmap, va); return (mpte); } From nobody Thu Nov 2 18:47: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 4SLtD46Ghlz503XQ; Thu, 2 Nov 2023 18:47: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 4SLtD44xY0z3WkB; Thu, 2 Nov 2023 18:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xuWCiG+G33oQU7DWsgEi0YILkVFYee+L/Src5bzYZdw=; b=pjRSnUFUpY+jjPBQorioYIpvx64wrq6/AWd3s2BNCE89kz31mhp/oDKyJGmD0Ai8l3gxtF fpxR3ccLyEkpyQMBIyRTi2c/ukTHnBwNOFhvB1zcVaD5frY4uky4mIN0FA7LJIla1fFCmp 8n/Av64pjDqHto04kVCs0ZS4MCnXOuz7hJK1qpQ+G8b+ltfiAvGu8qCyGibw4GpJBeRcmV rp/vC35hjEdr9zbnCDh1KTINyXTwLga7AOZ5hQoQMMO6ONwtfRCL+tNTM1iEI4XB/l1/vB Q7blv1h6uLxH/G5JlaAGRNCtgjD4kidgLNYLQHvAbg7/vcWnHmAMJBcHI7go1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698950868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xuWCiG+G33oQU7DWsgEi0YILkVFYee+L/Src5bzYZdw=; b=hlgc2Y1TmUdvp59QhsrOG8BqEDhktIa/gz/Q+iEFpbB9lFSwrh3d8fKkeLhp5g+J8nf/tD 2a6NB9Wswi6c2zaX0wm69/QpGiZX03+nAEDZVsecb1Dxfwnv0UIJe0XAQv12gTM+hrnYKs JRirn9THSHicTOZAYjiP4tm3Z0bGMoVxJsqWAWRN/zRSxNqI1LGzR+eUWhxA/+xDrngLK7 m+sr/aNao5MHt38ypHNqlUeS3rOVeDXXzC2aNuWVBBLM6IDBq/CswYbaFYh4CEHJvX5U40 eLNcblndCppApZ+b2DhCKcdzm0Jlf0VtbDQ5GixPu0/OuqzG6ImzaCUIN1eulA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698950868; a=rsa-sha256; cv=none; b=nF99qnXYtH9Dnmu9ChpI2vZMmaQ2t/yi+xy4vlNSUVOK2JwhuOU7nBhnMqulL9fB9D9x3e p0kZ1NzA40I9RSef1DfjBcQx+oa43TpJIWmLiUwhW/mht6q+rUR3dpijevnBXh+xUXs2oy 9jLdUdKQuQ5yHm87TwLpjEc3q3rC28jbKwPt0JKvEZgO9OuStdCPhtPpbm0RtTgZ9QHiXm W/jJeUHC0fNjDWaVKiJslzvPGZ9H8ZJJQi8qKf8tBp+UnjK82QfGXzYT4qRWf7vIx3xlQ5 WWusGx50GCpFgwuxeTNWptdFJJRcanyC3UXJRxhi57Qcj1ljeYPvUYUPx37iUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtD43lXnzghB; Thu, 2 Nov 2023 18:47: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 3A2Ilmsd044864; Thu, 2 Nov 2023 18:47:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2IlmJL044861; Thu, 2 Nov 2023 18:47:48 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:47:48 GMT Message-Id: <202311021847.3A2IlmJL044861@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: 33cb9b3c3a22 - main - graid3: Fix teardown races List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 33cb9b3c3a2260cc273713b0adcd95016ff8b675 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=33cb9b3c3a2260cc273713b0adcd95016ff8b675 commit 33cb9b3c3a2260cc273713b0adcd95016ff8b675 Author: Mark Johnston AuthorDate: 2023-11-02 18:35:37 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 18:35:37 +0000 graid3: Fix teardown races Port commit dc399583ba09 from g_mirror, which has an effectively identical startup sequence. This fixes a race that was occasionally causing panics during GEOM test suite runs on riscv. MFC after: 1 month --- sys/geom/raid3/g_raid3.c | 80 ++++++++++++++++++++++++++---------------------- sys/geom/raid3/g_raid3.h | 1 + 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 79bfd690a35e..0d4ecb704aa5 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -104,6 +104,7 @@ static int g_raid3_destroy_geom(struct gctl_req *req, struct g_class *mp, static g_taste_t g_raid3_taste; static void g_raid3_init(struct g_class *mp); static void g_raid3_fini(struct g_class *mp); +static void g_raid3_providergone(struct g_provider *pp); struct g_class g_raid3_class = { .name = G_RAID3_CLASS_NAME, @@ -112,7 +113,8 @@ struct g_class g_raid3_class = { .taste = g_raid3_taste, .destroy_geom = g_raid3_destroy_geom, .init = g_raid3_init, - .fini = g_raid3_fini + .fini = g_raid3_fini, + .providergone = g_raid3_providergone, }; static void g_raid3_destroy_provider(struct g_raid3_softc *sc); @@ -605,6 +607,34 @@ g_raid3_destroy_disk(struct g_raid3_disk *disk) disk->d_state = G_RAID3_DISK_STATE_NODISK; } +static void +g_raid3_free_device(struct g_raid3_softc *sc) +{ + KASSERT(sc->sc_refcnt == 0, + ("%s: non-zero refcount %u", __func__, sc->sc_refcnt)); + + if (!g_raid3_use_malloc) { + uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_64K].sz_zone); + uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_16K].sz_zone); + uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_4K].sz_zone); + } + mtx_destroy(&sc->sc_queue_mtx); + mtx_destroy(&sc->sc_events_mtx); + sx_xunlock(&sc->sc_lock); + sx_destroy(&sc->sc_lock); + free(sc->sc_disks, M_RAID3); + free(sc, M_RAID3); +} + +static void +g_raid3_providergone(struct g_provider *pp) +{ + struct g_raid3_softc *sc = pp->private; + + if (--sc->sc_refcnt == 0) + g_raid3_free_device(sc); +} + static void g_raid3_destroy_device(struct g_raid3_softc *sc) { @@ -649,16 +679,9 @@ g_raid3_destroy_device(struct g_raid3_softc *sc) g_wither_geom(sc->sc_sync.ds_geom, ENXIO); G_RAID3_DEBUG(0, "Device %s destroyed.", gp->name); g_wither_geom(gp, ENXIO); + if (--sc->sc_refcnt == 0) + g_raid3_free_device(sc); g_topology_unlock(); - if (!g_raid3_use_malloc) { - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_64K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_16K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_4K].sz_zone); - } - mtx_destroy(&sc->sc_queue_mtx); - mtx_destroy(&sc->sc_events_mtx); - sx_xunlock(&sc->sc_lock); - sx_destroy(&sc->sc_lock); } static void @@ -1049,7 +1072,7 @@ g_raid3_scatter(struct bio *pbp) off_t atom, cadd, padd, left; int first; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; bp = NULL; if ((pbp->bio_pflags & G_RAID3_BIO_PFLAG_NOPARITY) == 0) { /* @@ -1118,7 +1141,7 @@ g_raid3_gather(struct bio *pbp) struct bio *xbp, *fbp, *cbp; off_t atom, cadd, padd, left; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; /* * Find bio for which we have to calculate data. * While going through this path, check if all requests @@ -1284,7 +1307,7 @@ g_raid3_regular_request(struct bio *cbp) g_topology_assert_not(); pbp = cbp->bio_parent; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; cbp->bio_from->index--; if (cbp->bio_cmd == BIO_WRITE) sc->sc_writes--; @@ -1431,7 +1454,7 @@ g_raid3_start(struct bio *bp) { struct g_raid3_softc *sc; - sc = bp->bio_to->geom->softc; + sc = bp->bio_to->private; /* * If sc == NULL or there are no valid disks, provider's error * should be set and g_raid3_start() should not be called at all. @@ -1780,7 +1803,7 @@ g_raid3_register_request(struct bio *pbp) int round_robin, verify; ndisks = 0; - sc = pbp->bio_to->geom->softc; + sc = pbp->bio_to->private; if ((pbp->bio_cflags & G_RAID3_BIO_CFLAG_REGSYNC) != 0 && sc->sc_syncdisk == NULL) { g_io_deliver(pbp, EIO); @@ -2008,9 +2031,7 @@ g_raid3_try_destroy(struct g_raid3_softc *sc) sc->sc_worker = NULL; } else { g_topology_unlock(); - g_raid3_destroy_device(sc); - free(sc->sc_disks, M_RAID3); - free(sc, M_RAID3); + g_raid3_free_device(sc); } return (1); } @@ -2344,6 +2365,8 @@ g_raid3_launch_provider(struct g_raid3_softc *sc) } pp->stripesize *= sc->sc_ndisks - 1; pp->stripeoffset *= sc->sc_ndisks - 1; + pp->private = sc; + sc->sc_refcnt++; sc->sc_provider = pp; g_error_provider(pp, 0); g_topology_unlock(); @@ -3089,9 +3112,7 @@ g_raid3_access(struct g_provider *pp, int acr, int acw, int ace) G_RAID3_DEBUG(2, "Access request for %s: r%dw%de%d.", pp->name, acr, acw, ace); - sc = pp->geom->softc; - if (sc == NULL && acr <= 0 && acw <= 0 && ace <= 0) - return (0); + sc = pp->private; KASSERT(sc != NULL, ("NULL softc (provider=%s).", pp->name)); dcr = pp->acr + acr; @@ -3160,6 +3181,7 @@ g_raid3_create(struct g_class *mp, const struct g_raid3_metadata *md) sc->sc_idle = 1; sc->sc_last_write = time_uptime; sc->sc_writes = 0; + sc->sc_refcnt = 1; for (n = 0; n < sc->sc_ndisks; n++) { sc->sc_disks[n].d_softc = sc; sc->sc_disks[n].d_no = n; @@ -3215,18 +3237,8 @@ g_raid3_create(struct g_class *mp, const struct g_raid3_metadata *md) if (error != 0) { G_RAID3_DEBUG(1, "Cannot create kernel thread for %s.", sc->sc_name); - if (!g_raid3_use_malloc) { - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_64K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_16K].sz_zone); - uma_zdestroy(sc->sc_zones[G_RAID3_ZONE_4K].sz_zone); - } - g_destroy_geom(sc->sc_sync.ds_geom); - mtx_destroy(&sc->sc_events_mtx); - mtx_destroy(&sc->sc_queue_mtx); - sx_destroy(&sc->sc_lock); g_destroy_geom(sc->sc_geom); - free(sc->sc_disks, M_RAID3); - free(sc, M_RAID3); + g_raid3_free_device(sc); return (NULL); } @@ -3252,8 +3264,6 @@ g_raid3_destroy(struct g_raid3_softc *sc, int how) struct g_provider *pp; g_topology_assert_not(); - if (sc == NULL) - return (ENXIO); sx_assert(&sc->sc_lock, SX_XLOCKED); pp = sc->sc_provider; @@ -3302,8 +3312,6 @@ g_raid3_destroy(struct g_raid3_softc *sc, int how) G_RAID3_DEBUG(4, "%s: Woken up %p.", __func__, &sc->sc_worker); sx_xlock(&sc->sc_lock); g_raid3_destroy_device(sc); - free(sc->sc_disks, M_RAID3); - free(sc, M_RAID3); return (0); } diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h index 2b5c897867fd..3eecc02798a9 100644 --- a/sys/geom/raid3/g_raid3.h +++ b/sys/geom/raid3/g_raid3.h @@ -219,6 +219,7 @@ struct g_raid3_softc { int sc_idle; /* DIRTY flags removed. */ time_t sc_last_write; u_int sc_writes; + u_int sc_refcnt; /* Number of softc references. */ TAILQ_HEAD(, g_raid3_event) sc_events; struct mtx sc_events_mtx; From nobody Thu Nov 2 18: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 4SLtL460Z7z504t1; Thu, 2 Nov 2023 18: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 4SLtL45WKRz3bk0; Thu, 2 Nov 2023 18: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=1698951180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syEOswIeUrSKj+qxfbyN+vWcx3oTAnFRBfR7rKVb3Q8=; b=JxOPtOeuGClGgGXITXH1W37Q2/DJwAuFncLB8gsMjcLPyDeKlnQTniIyXrDSvtq7lET4+D iAn0IDnGUjvT6Qj1lioGsmmX1lHk7yzxKnfzqEi4Ua177lInfikGOibHCKFbEkrSHjFGrG uySNZQ2Hwy7P0IxBsRr3ABlD0DUT47XT3fuK69qEp5fM2wXDmlHKvn0VOtjd7ym1A5L84l 0B7+MgX/CFbWOwByBhchEbYb7mnI4IoMlNWsbphc0YG/0Gkee4PdSqx3P5KFRXXD99JD0c T6AhyZ0PtufTYfhm91cFGC0/3z76mcyKpPjK3sIOoECXhdKqjDJjFlBkYQcdrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698951180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syEOswIeUrSKj+qxfbyN+vWcx3oTAnFRBfR7rKVb3Q8=; b=gAUQPnsb7BGAzWZIQ0SXQ51OddBf08gjKdtrKwF7t4tDi5h/tOGcWXnkhxx+YRFmb/GBRJ xiu9vrnvmZXydka2cmW5Xk40rVry4aelMl91a0J5sqV0pV2J4VU/qkSfbxMTNVKp3EG2dr A2q9XA4jBGAZVkLgVNPAxn4gCCDZYMNrbouARZQp6+oqrL4n9pwikhgmv0B9yQgMwV3pgO XSeZd0PRUo1ioHXxLpsfi6v/nICca8l2FmcrrJU6XIptALGSw3UTp+6TnJXeOzKlTA+jLo 2MKXv0SirurMPKCY2/NSZjAFGDdRi6HRT8cCK3Q3fuj37j1UwjKVG5RGRoTelg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698951180; a=rsa-sha256; cv=none; b=jghhZrLe7i5GnjP2QX5xfEMjuuwqhCcYU9fcIl4ZuZowi6XMW3rFqMdoBGnQlW+2M+buQy eQaL2HWuqmqbCeNBHVnPIfaIgtmE13i4NC8g04HMzZN7P70BBLROCexNbk40bDwtEvvHGl j+YGoZDOM+UgloYtI5zQjapIF44p2G5iYht3WWGq1P/vXoWPZvs7zhTXU4jjNkwpgUjnQO eHbzpAlpPYN/FmHPBf8qpuQbp/bLgdIFPV65A+J0/NGb2u4EUuCocvDSaiPBWmgFr8zTYl anVd1zLTX1W1r2vpTcd2vBzmStaZa7lEj0PThjUHx0L3Jl7PAdRDgRcv6ZhW6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLtL44YKlzhCq; Thu, 2 Nov 2023 18: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 3A2Ir09J060940; Thu, 2 Nov 2023 18: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 3A2Ir0V3060937; Thu, 2 Nov 2023 18:53:00 GMT (envelope-from git) Date: Thu, 2 Nov 2023 18:53:00 GMT Message-Id: <202311021853.3A2Ir0V3060937@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: b73612a34259 - main - blacklistd: Handle fds that are pointing to routing 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b73612a34259a478c53eab408362d7bf879fefa6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b73612a34259a478c53eab408362d7bf879fefa6 commit b73612a34259a478c53eab408362d7bf879fefa6 Author: Jose Luis Duran AuthorDate: 2022-10-12 16:14:44 +0000 Commit: Ed Maste CommitDate: 2023-11-02 18:52:40 +0000 blacklistd: Handle fds that are pointing to routing sockets If the fd has access to make changes via the routing socket, grant full permission to make filter changes. Obtained from: https://github.com/zoulasc/blocklist/commit/1b9475b2c8e0be2b9adc4d88e521ed488ac3c43c --- contrib/blacklist/bin/conf.c | 113 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 95 insertions(+), 18 deletions(-) diff --git a/contrib/blacklist/bin/conf.c b/contrib/blacklist/bin/conf.c index 6eadf6b2ac8c..8f7e75a56be1 100644 --- a/contrib/blacklist/bin/conf.c +++ b/contrib/blacklist/bin/conf.c @@ -46,6 +46,7 @@ __RCSID("$NetBSD: conf.c,v 1.24 2016/04/04 15:52:56 christos Exp $"); #include #include #include +#include #include #include #include @@ -55,6 +56,7 @@ __RCSID("$NetBSD: conf.c,v 1.24 2016/04/04 15:52:56 christos Exp $"); #include #include #include +#include #include #include "bl.h" @@ -1000,32 +1002,72 @@ confset_match(const struct confset *cs, struct conf *c, return i; } -const struct conf * -conf_find(int fd, uid_t uid, const struct sockaddr_storage *rss, - struct conf *cr) +#ifdef AF_ROUTE +static int +conf_route_perm(int fd) { +#if defined(RTM_IFANNOUNCE) && defined(SA_SIZE) + /* + * Send a routing message that is not supported to check for access + * We expect EOPNOTSUPP for having access, since we are sending a + * request the system does not understand and EACCES if we don't have + * access. + */ + static struct sockaddr_in sin = { +#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN + .sin_len = sizeof(sin), +#endif + .sin_family = AF_INET, + }; + char buf[4096]; + struct rt_msghdr *rtm = (void *)buf; + char *cp = (char *)(rtm + 1); + size_t l; + +#define NEXTADDR(s) \ + l = SA_SIZE(sizeof(*s)); memmove(cp, s, l); cp += l; + memset(buf, 0, sizeof(buf)); + rtm->rtm_type = RTM_IFANNOUNCE; + rtm->rtm_flags = 0; + rtm->rtm_addrs = RTA_DST|RTA_GATEWAY; + rtm->rtm_version = RTM_VERSION; + rtm->rtm_seq = 666; + NEXTADDR(&sin); + NEXTADDR(&sin); + rtm->rtm_msglen = (u_short)((char *)cp - (char *)rtm); + if (write(fd, rtm, rtm->rtm_msglen) != -1) { + (*lfun)(LOG_ERR, "Writing to routing socket succeeded!"); + return 0; + } + switch (errno) { + case EACCES: + return 0; + case EOPNOTSUPP: + return 1; + default: + (*lfun)(LOG_ERR, + "Unexpected error writing to routing socket (%m)"); + return 0; + } +#else + return 0; +#endif +} +#endif + +static int +conf_handle_inet(int fd, const void *lss, struct conf *cr) { - int proto; - socklen_t slen; - struct sockaddr_storage lss; - size_t i; char buf[BUFSIZ]; + int proto; + socklen_t slen = sizeof(proto); - memset(cr, 0, sizeof(*cr)); - slen = sizeof(lss); - memset(&lss, 0, slen); - if (getsockname(fd, (void *)&lss, &slen) == -1) { - (*lfun)(LOG_ERR, "getsockname failed (%m)"); - return NULL; - } - - slen = sizeof(proto); if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &proto, &slen) == -1) { (*lfun)(LOG_ERR, "getsockopt failed (%m)"); - return NULL; + return -1; } if (debug) { - sockaddr_snprintf(buf, sizeof(buf), "%a:%p", (void *)&lss); + sockaddr_snprintf(buf, sizeof(buf), "%a:%p", lss); (*lfun)(LOG_DEBUG, "listening socket: %s", buf); } @@ -1038,16 +1080,51 @@ conf_find(int fd, uid_t uid, const struct sockaddr_storage *rss, break; default: (*lfun)(LOG_ERR, "unsupported protocol %d", proto); + return -1; + } + return 0; +} + +const struct conf * +conf_find(int fd, uid_t uid, const struct sockaddr_storage *rss, + struct conf *cr) +{ + socklen_t slen; + struct sockaddr_storage lss; + size_t i; + char buf[BUFSIZ]; + + memset(cr, 0, sizeof(*cr)); + slen = sizeof(lss); + memset(&lss, 0, slen); + if (getsockname(fd, (void *)&lss, &slen) == -1) { + (*lfun)(LOG_ERR, "getsockname failed (%m)"); return NULL; } switch (lss.ss_family) { case AF_INET: cr->c_port = ntohs(((struct sockaddr_in *)&lss)->sin_port); + if (conf_handle_inet(fd, &lss, cr) == -1) + return NULL; break; case AF_INET6: cr->c_port = ntohs(((struct sockaddr_in6 *)&lss)->sin6_port); + if (conf_handle_inet(fd, &lss, cr) == -1) + return NULL; break; +#ifdef AF_ROUTE + case AF_ROUTE: + if (!conf_route_perm(fd)) { + (*lfun)(LOG_ERR, + "permission denied to routing socket (%m)"); + return NULL; + } + cr->c_proto = FSTAR; + cr->c_port = FSTAR; + memcpy(&lss, rss, sizeof(lss)); + break; +#endif default: (*lfun)(LOG_ERR, "unsupported family %d", lss.ss_family); return NULL; From nobody Thu Nov 2 21:08: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 4SLxL64bb5z50WXF; Thu, 2 Nov 2023 21:08: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 4SLxL645tpz4QS9; Thu, 2 Nov 2023 21:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698959294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWSY5PO6THc6cZKxsiSuS+3PNk2r3e0qQmA2GfhulFY=; b=esBYq8DZRzScYs4F0T1olduw4wi69RADcpU+IByxGOMCCaM2LUw4hBhZYocUqnLf8r/RlE 9B2kI3szvh1xJDowXzbAtAM4Y80Z5XyFM1vsLruK+gzCZTwlcZ6VD6NlSKpMQDKSccDbnL WAbdjRiWwdyi7Mjk4MlEufc0MCn+SgbRmNdKr+1SCO1UQZyENG0FY/rwAY/gpCmqktkCBJ UldOMk/lgsxxmW/4tDFyFclUbXKviBhu2la5APnGmcQ7hX86IjlMtkXTGDFfC8jx4mem4N k6r7EY76xPeZfLBKRF2Xc2QbvUM7dIS9CO0Qx8XIPXQHspMMUAXp777AWncDAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698959294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWSY5PO6THc6cZKxsiSuS+3PNk2r3e0qQmA2GfhulFY=; b=kEFizkL52OM9PmIPIvuyR2seF2pVU79BoLG5NAh9hwo/70e1FJbLSmNCoHx4pQG7r4dEbo XAXJi9LNIlfZXLP23Y/EAoGl0XBABkWdx1MTt2bOYJfjGZ+fLvZ9At3sK3MtBhjhATb0rv 5pqob7YumFuq+RQPym+0MHIlOpDmNZi/opM4vqVNpbEIGex9ZXQCUC+Tc0UybrvswLX9Zx il/xUpASXmGLWJjiHjFkj7KncmeGkX2TUVU07hymkyAUgkfm3ErnyMGah/+gQ9DPWR9pAj kRGZu2fIBhAWWyc9wKst5j5PPabw7cQKFfk77xMecpzZ7vqe54chWiZOIO+QMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698959294; a=rsa-sha256; cv=none; b=hmJD3NJamQoTdkhvpcnHO2e6Q7yP9zey8Qi7PT4UI1aNtLd8ZGTKjTftNC6ktONFKFeD8t vDJDzjCRp+nzwayF70rLAjSYVQsmrS/ohnKRX2nskKfhdHrJ2D2F3uDJRVaykqd2Y/qqRh SQgp6Nb2SJfeS4dev7qA73OH0rOvddqT47JRFrEqyQxakBllr7JRPnbqAR0yr2rYUsMhgv 5uP218CvOfV0fYK9bVfvJZquLNIZApeFj/6uLWRmVblWMBW77yzj9yi/kGBZaxZRwmpy9y TfFNyt3gmHB2SirlhZ+Jz5fGqDFyvPk4WeZUex/ETbNWE5NV5OLyH8agoMrihw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLxL638kCzlMJ; Thu, 2 Nov 2023 21:08: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 3A2L8EgK079379; Thu, 2 Nov 2023 21:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2L8EJ9079376; Thu, 2 Nov 2023 21:08:14 GMT (envelope-from git) Date: Thu, 2 Nov 2023 21:08:14 GMT Message-Id: <202311022108.3A2L8EJ9079376@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: 1a878807006c - main - krpc: Display stats of TLS usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 1a878807006cc10a5698cbca9e24a38b3412d7ed Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1a878807006cc10a5698cbca9e24a38b3412d7ed commit 1a878807006cc10a5698cbca9e24a38b3412d7ed Author: Rick Macklem AuthorDate: 2023-11-02 21:07:01 +0000 Commit: Rick Macklem CommitDate: 2023-11-02 21:07:01 +0000 krpc: Display stats of TLS usage This patch adds some sysctls: kern.rpc.unenc.tx_msgcnt kern.rpc.unenc.tx_msgbytes kern.rpc.unenc.rx_msgcnt kern.rpc.unenc.rx_msgbytes kern.rpc.tls.tx_msgcnt kern.rpc.tls.tx_msgbytes kern.rpc.tls.rx_msgcnt kern.rpc.tls.rx_msgbytes kern.rpc.tls.handshake_success kern.rpc.tls.handshake_failed kern.rpc.tls.alerts which allow a NFS server sysadmin to determine how much NFS-over-TLS is being used. A large number of failed handshakes might also indicate an NFS confirguration problem. This patch moves the definition of "kern.rpc" from the kgssapi module to the krpc module. As such, both modules need to be rebuilt from sources. Since __FreeBSD_version was bumped yesterday, I will not bump it again. Suggested by: gwollman Discussed on: freebsd-current MFC after: 1 month --- sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | 3 +- sys/rpc/rpcsec_tls.h | 4 ++ sys/rpc/rpcsec_tls/rpctls_impl.c | 21 ++++++++-- sys/rpc/svc_vc.c | 81 +++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 5 deletions(-) diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c index 90aa9e0d7d4f..89526544639a 100644 --- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c @@ -174,8 +174,7 @@ struct svc_rpc_gss_cookedcred { u_int svc_rpc_gss_client_max = CLIENT_MAX; u_int svc_rpc_gss_client_hash_size = CLIENT_HASH_SIZE; -SYSCTL_NODE(_kern, OID_AUTO, rpc, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, - "RPC"); +SYSCTL_DECL(_kern_rpc); SYSCTL_NODE(_kern_rpc, OID_AUTO, gss, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "GSS"); diff --git a/sys/rpc/rpcsec_tls.h b/sys/rpc/rpcsec_tls.h index 1445c5c35f19..e3eed64863a1 100644 --- a/sys/rpc/rpcsec_tls.h +++ b/sys/rpc/rpcsec_tls.h @@ -86,10 +86,14 @@ bool rpctls_getinfo(u_int *maxlen, bool rpctlscd_run, /* Macros for VIMAGE. */ /* Just define the KRPC_VNETxxx() macros as VNETxxx() macros. */ +#define KRPC_VNET_NAME(n) VNET_NAME(n) +#define KRPC_VNET_DECLARE(t, n) VNET_DECLARE(t, n) #define KRPC_VNET_DEFINE(t, n) VNET_DEFINE(t, n) #define KRPC_VNET_DEFINE_STATIC(t, n) VNET_DEFINE_STATIC(t, n) #define KRPC_VNET(n) VNET(n) +#define CTLFLAG_KRPC_VNET CTLFLAG_VNET + #define KRPC_CURVNET_SET(n) CURVNET_SET(n) #define KRPC_CURVNET_SET_QUIET(n) CURVNET_SET_QUIET(n) #define KRPC_CURVNET_RESTORE() CURVNET_RESTORE() diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c index c0e269e55932..64111eed62c0 100644 --- a/sys/rpc/rpcsec_tls/rpctls_impl.c +++ b/sys/rpc/rpcsec_tls/rpctls_impl.c @@ -78,6 +78,9 @@ static CLIENT *rpctls_connect_cl = NULL; static struct mtx rpctls_server_lock; static struct opaque_auth rpctls_null_verf; +KRPC_VNET_DECLARE(uint64_t, svc_vc_tls_handshake_success); +KRPC_VNET_DECLARE(uint64_t, svc_vc_tls_handshake_failed); + KRPC_VNET_DEFINE_STATIC(CLIENT **, rpctls_server_handle); KRPC_VNET_DEFINE_STATIC(struct socket *, rpctls_server_so) = NULL; KRPC_VNET_DEFINE_STATIC(SVCXPRT *, rpctls_server_xprt) = NULL; @@ -748,25 +751,33 @@ _svcauth_rpcsec_tls(struct svc_req *rqst, struct rpc_msg *msg) u_int maxlen; #endif + KRPC_CURVNET_SET_QUIET(KRPC_TD_TO_VNET(curthread)); + KRPC_VNET(svc_vc_tls_handshake_failed)++; /* Initialize reply. */ rqst->rq_verf = rpctls_null_verf; /* Check client credentials. */ if (rqst->rq_cred.oa_length != 0 || msg->rm_call.cb_verf.oa_length != 0 || - msg->rm_call.cb_verf.oa_flavor != AUTH_NULL) + msg->rm_call.cb_verf.oa_flavor != AUTH_NULL) { + KRPC_CURVNET_RESTORE(); return (AUTH_BADCRED); + } - if (rqst->rq_proc != NULLPROC) + if (rqst->rq_proc != NULLPROC) { + KRPC_CURVNET_RESTORE(); return (AUTH_REJECTEDCRED); + } call_stat = FALSE; #ifdef KERN_TLS if (rpctls_getinfo(&maxlen, false, true)) call_stat = TRUE; #endif - if (!call_stat) + if (!call_stat) { + KRPC_CURVNET_RESTORE(); return (AUTH_REJECTEDCRED); + } /* * Disable reception for the krpc so that the TLS handshake can @@ -787,6 +798,7 @@ _svcauth_rpcsec_tls(struct svc_req *rqst, struct rpc_msg *msg) xprt->xp_dontrcv = FALSE; sx_xunlock(&xprt->xp_lock); xprt_active(xprt); /* Harmless if already active. */ + KRPC_CURVNET_RESTORE(); return (AUTH_REJECTEDCRED); } @@ -809,9 +821,12 @@ _svcauth_rpcsec_tls(struct svc_req *rqst, struct rpc_msg *msg) xprt->xp_uid = uid; xprt->xp_gidp = gidp; } + KRPC_VNET(svc_vc_tls_handshake_failed)--; + KRPC_VNET(svc_vc_tls_handshake_success)++; } sx_xunlock(&xprt->xp_lock); xprt_active(xprt); /* Harmless if already active. */ + KRPC_CURVNET_RESTORE(); return (RPCSEC_GSS_NODISPATCH); } diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index e98e28de6982..69960079883b 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -74,6 +74,66 @@ static char *sccsid = "@(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC"; #include +SYSCTL_NODE(_kern, OID_AUTO, rpc, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "RPC"); +SYSCTL_NODE(_kern_rpc, OID_AUTO, tls, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "TLS"); +SYSCTL_NODE(_kern_rpc, OID_AUTO, unenc, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "unencrypted"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_rx_msgbytes) = 0; +SYSCTL_U64(_kern_rpc_unenc, OID_AUTO, rx_msgbytes, CTLFLAG_KRPC_VNET | CTLFLAG_RW, + &KRPC_VNET_NAME(svc_vc_rx_msgbytes), 0, "Count of non-TLS rx bytes"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_rx_msgcnt) = 0; +SYSCTL_U64(_kern_rpc_unenc, OID_AUTO, rx_msgcnt, CTLFLAG_KRPC_VNET | CTLFLAG_RW, + &KRPC_VNET_NAME(svc_vc_rx_msgcnt), 0, "Count of non-TLS rx messages"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_tx_msgbytes) = 0; +SYSCTL_U64(_kern_rpc_unenc, OID_AUTO, tx_msgbytes, CTLFLAG_KRPC_VNET | CTLFLAG_RW, + &KRPC_VNET_NAME(svc_vc_tx_msgbytes), 0, "Count of non-TLS tx bytes"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_tx_msgcnt) = 0; +SYSCTL_U64(_kern_rpc_unenc, OID_AUTO, tx_msgcnt, CTLFLAG_KRPC_VNET | CTLFLAG_RW, + &KRPC_VNET_NAME(svc_vc_tx_msgcnt), 0, "Count of non-TLS tx messages"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_tls_alerts) = 0; +SYSCTL_U64(_kern_rpc_tls, OID_AUTO, alerts, + CTLFLAG_KRPC_VNET | CTLFLAG_RW, &KRPC_VNET_NAME(svc_vc_tls_alerts), 0, + "Count of TLS alert messages"); + +KRPC_VNET_DEFINE(uint64_t, svc_vc_tls_handshake_failed) = 0; +SYSCTL_U64(_kern_rpc_tls, OID_AUTO, handshake_failed, + CTLFLAG_KRPC_VNET | CTLFLAG_RW, + &KRPC_VNET_NAME(svc_vc_tls_handshake_failed), 0, + "Count of TLS failed handshakes"); + +KRPC_VNET_DEFINE(uint64_t, svc_vc_tls_handshake_success) = 0; +SYSCTL_U64(_kern_rpc_tls, OID_AUTO, handshake_success, + CTLFLAG_KRPC_VNET | CTLFLAG_RW, + &KRPC_VNET_NAME(svc_vc_tls_handshake_success), 0, + "Count of TLS successful handshakes"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_tls_rx_msgbytes) = 0; +SYSCTL_U64(_kern_rpc_tls, OID_AUTO, rx_msgbytes, + CTLFLAG_KRPC_VNET | CTLFLAG_RW, &KRPC_VNET_NAME(svc_vc_tls_rx_msgbytes), 0, + "Count of TLS rx bytes"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_tls_rx_msgcnt) = 0; +SYSCTL_U64(_kern_rpc_tls, OID_AUTO, rx_msgcnt, + CTLFLAG_KRPC_VNET | CTLFLAG_RW, &KRPC_VNET_NAME(svc_vc_tls_rx_msgcnt), 0, + "Count of TLS rx messages"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_tls_tx_msgbytes) = 0; +SYSCTL_U64(_kern_rpc_tls, OID_AUTO, tx_msgbytes, + CTLFLAG_KRPC_VNET | CTLFLAG_RW, &KRPC_VNET_NAME(svc_vc_tls_tx_msgbytes), 0, + "Count of TLS tx bytes"); + +KRPC_VNET_DEFINE_STATIC(uint64_t, svc_vc_tls_tx_msgcnt) = 0; +SYSCTL_U64(_kern_rpc_tls, OID_AUTO, tx_msgcnt, + CTLFLAG_KRPC_VNET | CTLFLAG_RW, &KRPC_VNET_NAME(svc_vc_tls_tx_msgcnt), 0, + "Count of TLS tx messages"); + static bool_t svc_vc_rendezvous_recv(SVCXPRT *, struct rpc_msg *, struct sockaddr **, struct mbuf **); static enum xprt_stat svc_vc_rendezvous_stat(SVCXPRT *); @@ -808,8 +868,11 @@ tryagain: * This record needs to be handled in userland * via an SSL_read() call, so do an upcall to the daemon. */ + KRPC_CURVNET_SET(so->so_vnet); if ((xprt->xp_tls & RPCTLS_FLAGS_HANDSHAKE) != 0 && error == ENXIO) { + KRPC_VNET(svc_vc_tls_alerts)++; + KRPC_CURVNET_RESTORE(); /* Disable reception. */ xprt->xp_dontrcv = TRUE; sx_xunlock(&xprt->xp_lock); @@ -832,6 +895,7 @@ tryagain: } if (error) { + KRPC_CURVNET_RESTORE(); SOCKBUF_LOCK(&so->so_rcv); if (xprt->xp_upcallset) { xprt->xp_upcallset = 0; @@ -845,6 +909,7 @@ tryagain: } if (!m) { + KRPC_CURVNET_RESTORE(); /* * EOF - the other end has closed the socket. */ @@ -870,11 +935,20 @@ tryagain: m_freem(m); m_free(ctrl); rcvflag = MSG_DONTWAIT | MSG_TLSAPPDATA; + KRPC_CURVNET_RESTORE(); goto tryagain; } + KRPC_VNET(svc_vc_tls_rx_msgcnt)++; + KRPC_VNET(svc_vc_tls_rx_msgbytes) += + 1000000000 - uio.uio_resid; } m_free(ctrl); + } else { + KRPC_VNET(svc_vc_rx_msgcnt)++; + KRPC_VNET(svc_vc_rx_msgbytes) += 1000000000 - + uio.uio_resid; } + KRPC_CURVNET_RESTORE(); if (cd->mpending) m_last(cd->mpending)->m_next = m; @@ -963,6 +1037,7 @@ svc_vc_reply(SVCXPRT *xprt, struct rpc_msg *msg, htonl(0x80000000 | (len - sizeof(uint32_t))); /* For RPC-over-TLS, copy mrep to a chain of ext_pgs. */ + KRPC_CURVNET_SET(xprt->xp_socket->so_vnet); if ((xprt->xp_tls & RPCTLS_FLAGS_HANDSHAKE) != 0) { /* * Copy the mbuf chain to a chain of @@ -974,7 +1049,13 @@ svc_vc_reply(SVCXPRT *xprt, struct rpc_msg *msg, maxextsiz = min(maxextsiz, maxlen); #endif mrep = _rpc_copym_into_ext_pgs(mrep, maxextsiz); + KRPC_VNET(svc_vc_tls_tx_msgcnt)++; + KRPC_VNET(svc_vc_tls_tx_msgbytes) += len; + } else { + KRPC_VNET(svc_vc_tx_msgcnt)++; + KRPC_VNET(svc_vc_tx_msgbytes) += len; } + KRPC_CURVNET_RESTORE(); atomic_add_32(&xprt->xp_snd_cnt, len); /* * sosend consumes mreq. From nobody Thu Nov 2 22:02: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 4SLyXG5SPYz4yT1r; Thu, 2 Nov 2023 22:02: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 4SLyXG52bJz4YGs; Thu, 2 Nov 2023 22:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698962526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUAWEzg+dQZJ3Jf40BxEYI7Qc4T3aN8bJR8oL/+3nRM=; b=tfOeqAhMgyvkmdN/u/iDiF7Tpk8DdizTfZP5UJR6QPoxHposnKkkhN8ChJzv1ElBOUwM8x 32HJnZxF9eikVduwBrfTIilduVCgYN/oM1SlfFAiJ5MN9A9RuNDny3FKQCYGTE4m/JiZgZ N87gLVGDLlkVL5HQXEO9z6Ywel240f71fM1EBZ/oTqAwXF7QjuDLim7xtJ6o2LqJWDUjWK NDaOGbJcs2EQIiIYT7kmMig9kfV5qa4WgHUC2T/nWH2U9JTbX2wIT1V8nviOImrYWJ5ZXe Q4WscHd5FGzDK5mHaOiaXlGrF+d5I58eJ84savGnEhyfRmW6RqFiV/lIUPZx0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698962526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zUAWEzg+dQZJ3Jf40BxEYI7Qc4T3aN8bJR8oL/+3nRM=; b=x2MuXh8PCqnBSrZQRTqp5MRzl4gA6anJrKj7DKCEu3ur0baQUpgF86Yda95bkV0UTwateV uX3iqSmFElV17Eyiy0Y4QeVn3hOUAMIQaJSMyW6GSHzN6qdSuCzdID42/rDANONHCqM6y8 xzmlC1qT/s/ZAqqZ2R191/m1I6yuQStF6VWSuJ4sULkNaeztmvGar8HMW5Y/omniWlNp/2 /HQB541iSRLLsCwKgw56xuNAWI9Fit3TfoJEea6G/FGVrddIwCVKaJsfaxLXqT3ahXE3oN wVP2yU8sLITSJ8sEgEk/bYTjazcQfzvo2WCMIsfPwbBgpn2PtzFYRUhAPBspKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698962526; a=rsa-sha256; cv=none; b=i2/UcFtRtIUmUmhJiLNMMVquQkoqIehcOCGNZ2jLUCXcY0VoXJkd+7YQIWLxY5p8D22rrS zW6eQ/gXFqO8YqnSApVR2f+3v8dRr4Ut/BB71GbDJG5sOHyAN8O9avYAeYexfIlv36QFzO XHpTIdMgthcttuO07Fd87/yDSoyAA1kM201MUZeeZMAFfySx5w8zXdk9FvT9T10S+tgXzN cfFogBWAFm10DuaIcAJ5oe4nrfsadn3cHqSi1AX2p85nlBM9JQ9w5ZjCc4tf/ABFiaHS7Z 4T0hEftfYtOF6kAjf3p/5sWAcbGkNJWCyVKFcpQdL29Qumonu29YhPWBkchu4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLyXG45XkzmGr; Thu, 2 Nov 2023 22:02: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 3A2M26g4077370; Thu, 2 Nov 2023 22:02:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2M26YA077367; Thu, 2 Nov 2023 22:02:06 GMT (envelope-from git) Date: Thu, 2 Nov 2023 22:02:06 GMT Message-Id: <202311022202.3A2M26YA077367@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: d9e28d5d40c9 - stable/14 - nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9e28d5d40c9888f996e895d4bde51b49e7b0946 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d9e28d5d40c9888f996e895d4bde51b49e7b0946 commit d9e28d5d40c9888f996e895d4bde51b49e7b0946 Author: Rick Macklem AuthorDate: 2023-10-19 19:35:35 +0000 Commit: Rick Macklem CommitDate: 2023-11-02 22:00:48 +0000 nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH When I implemented a test patch using Open Claim_Deleg_Cur_FH I discovered that the NFSv4.1/4.2 server was broken for this Open option. Fortunately it is never used by the FreeBSD client and never used by other clients unless delegations are enabled. (The FreeBSD NFSv4 server does not have delegations enabled by default.) Claim_Deleg_Cur_FH was broken because the code mistakenly assumed a stateID argument, which is not the case. This patch fixes the bug by changing the XDR parser to not expect a stateID and to fill most of the stateID in from the clientID. The clientID is the first two elements of the "other" array for the stateID and is sufficient to identify which client the delegation is issued to. Since there is only one delegation issued to a client per file, this is sufficient to locate the correct delegation. If you are running non-FreeBSD NFSv4.1/4.2 mounts against the FreeBSD server, you need this patch if you have delegations enabled. PR: 274574 (cherry picked from commit f300335d9aebf2e99862bf783978bd44ede23550) --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++++++++-- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 7d3ebc683d16..3daee65ab83a 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3000,12 +3000,18 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == - NFSV4OPEN_CLAIMDELEGATECURFH) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; + } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { + /* Fill in most of the stateid from the clientid. */ + stateid.seqid = 0; + stateid.other[0] = clientid.lval[0]; + stateid.other[1] = clientid.lval[1]; + stateid.other[2] = 0; + stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index c73840277022..da57ebde7a52 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2568,6 +2568,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2578,8 +2582,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2830,6 +2834,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2840,8 +2848,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Thu Nov 2 22:03: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 4SLyZ23G87z4yTQw; Thu, 2 Nov 2023 22:03: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 4SLyZ22rp8z4Yg3; Thu, 2 Nov 2023 22:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698962618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilrO4OEdhIUyRhv9+/5aIZ/eZGz1KSejNG/XUj5l/lY=; b=HB0igTtdpkhResH2QbKQGKAWEwQF1kkpJwM0y9vs1pUJ25bK79JV5j3coILoTGhumNYt1G fNJolaYCU8Gj1aDL4n/NeXgfRWgnqUkReijbBfoKh3pwiviCp3fSeBf3SjkV5pxQN0LXPz stGe1CqxH8G6ZW/yFkDRHlfR3Nn8U0iStC7gDD+46qS3dqDHpZojuKoiDRXUHsuXCpSy/X OYQzVblzH394LFZuTgFl+xYWDDtY31u4zmekIIdBrctwkygYgU7FQdZxSDSXaJrv4izZp8 1VTqjFcu3wsZuxCdboEKtzuT9SleIoj3vNm8ELBRAFx0Nm4/jwHMlo0xstKAYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698962618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilrO4OEdhIUyRhv9+/5aIZ/eZGz1KSejNG/XUj5l/lY=; b=gF1I0vvCi0cA1sYNganAXE+euIGmnS2vkdz3BUAsHPtksjMiS90IZfbeKS5U7wxvfPNNG4 jEIJAsK9sO7RjaOXylI3MxoAgdpIcZEMl5vBCihN+0YBygIelGQ0titZdBKmbr88LF06it l5/21aKdUZqtEJFeR25JjHsR5EZbKo1pXVC14dWKp/fw3g87+bMGvX5zXywjXSFGUzRvYM TBhB75TAWFWwl2ZZNJ/TKXC6X7cM6boX4eeYpCD2pvCcJa41Pogghgc6EA6LMg0hrP2rpt wJN3t77n61ZWgtERZKE5MvJO8qUDN8n2z1A/ZKU0IufqiDb37MWm5LFU9dSvBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698962618; a=rsa-sha256; cv=none; b=Sfu3IJrie6xLwvgtvksSEmMr4pCfCWvLvydG2rhi0oVOMi5F665YxqN2wIF/nNFfFVTo7L f8A/X/RYnb1hLUb5SLkmuS1idqZTWCmQDc4e9eiRLCSDu7/LoM7N7NE/s/l2OTSyxju+Ha DLoHo0IIWaGy7/XeUh9GfolfyF8tfZ6qB+H/ANGFbFXAqPCN3tz2OKqP23fjDYE7zxqalV 14rkV1TzPon8AAMtqBdF9LGbLcIVYxSDH2EMbOBXKwL279vKgpcISXCq9jD3diNSwsmUPf lMh9PYj+nfHoFE4Io1AtB9pI+pMIdFfEBII88ctU5d1Qm1+KzC+rzxYtiA190A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SLyZ21whSzmN2; Thu, 2 Nov 2023 22:03: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 3A2M3ctP078547; Thu, 2 Nov 2023 22:03:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2M3cmZ078544; Thu, 2 Nov 2023 22:03:38 GMT (envelope-from git) Date: Thu, 2 Nov 2023 22:03:38 GMT Message-Id: <202311022203.3A2M3cmZ078544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 098273e649c6 - stable/14 - nfsd: Fix a server crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 098273e649c647d5472d518c5023477ad15b7c3f Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=098273e649c647d5472d518c5023477ad15b7c3f commit 098273e649c647d5472d518c5023477ad15b7c3f Author: Rick Macklem AuthorDate: 2023-10-18 02:40:23 +0000 Commit: Rick Macklem CommitDate: 2023-11-02 22:02:22 +0000 nfsd: Fix a server crash PR#274346 reports a crash which appears to be caused by a NULL default session being destroyed. This patch should avoid the crash. PR: 274346 (cherry picked from commit db7257ef972ed75e33929d39fd791d3699b53c63) --- sys/fs/nfs/nfs_commonkrpc.c | 9 +++++++++ sys/fs/nfs/nfs_commonsubs.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 936373c79366..29c7cdbd671c 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1208,6 +1208,14 @@ tryagain: NFSCL_DEBUG(1, "Got badsession\n"); NFSLOCKCLSTATE(); NFSLOCKMNT(nmp); + if (TAILQ_EMPTY(&nmp->nm_sess)) { + NFSUNLOCKMNT(nmp); + NFSUNLOCKCLSTATE(); + printf("If server has not rebooted, " + "check NFS clients for unique " + "/etc/hostid's\n"); + goto out; + } sep = NFSMNT_MDSSESSION(nmp); if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, NFSX_V4SESSIONID) == 0) { @@ -1388,6 +1396,7 @@ tryagain: nd->nd_repstat = NFSERR_STALEDONTRECOVER; } } +out: #ifdef KDTRACE_HOOKS if (nmp != NULL && dtrace_nfscl_nfs234_done_probe != NULL) { diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index ffe1ec542492..f2305795e53e 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -5141,11 +5141,13 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, struct nfsrv_descript *nd = &nfsd; int error; + if (tsep == NULL) + tsep = nfsmnt_mdssession(nmp); + if (tsep == NULL) + return (0); nfscl_reqstart(nd, NFSPROC_DESTROYSESSION, nmp, NULL, 0, NULL, NULL, 0, 0, NULL); NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); - if (tsep == NULL) - tsep = nfsmnt_mdssession(nmp); bcopy(tsep->nfsess_sessionid, tl, NFSX_V4SESSIONID); nd->nd_flag |= ND_USEGSSNAME; error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, From nobody Thu Nov 2 23:35: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 4SM0bZ4Bfkz4yq7v; Thu, 2 Nov 2023 23:35: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 4SM0bZ3LHxz3HXd; Thu, 2 Nov 2023 23:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJM+L4u0o3HoT1K+eCjD/SyzbFQtitR7bsAShIBHBDE=; b=r5oftC0t7Q3AKNSsUbu5EJdT7drco6XxzwETxSyVru87AZy0lnMhvRQ+jXtAGvurBMTq7Z YOvbvUkA7LPYW69zPeqlAHXCabKVC/w38vc4YHmNI4ClOSxHBT+zLBSJPoxWo2GeK/HI4U KiPi1CVM6dJD4KpbIa6anjuAdu1gD2pM5jwC1hX0dSlYd6o9h+MNfKfrRtCsyEmJo6Oqx9 bNwdFwgUy10Fh7EwOr0wJd4YbjP+qjY4cjHhpeyXX+xSgLPs2ooaxDsXA/knaaJIM4Jyj1 7LNpv2ut7GbaXWCi2td6xUb48BbP+YLRPJc6W27RIcbE+iNOPk0gHuy0J3Zb8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJM+L4u0o3HoT1K+eCjD/SyzbFQtitR7bsAShIBHBDE=; b=UCKsI1LXquyK3FD32CUOQ092Qer+nS9c+YfkG5IxwRN3NeurPh82UqRuH5F0bBMxHI+L87 fzhwMWMsDSh6TfI3Tke7TmAdLGCXKd6pVwmj+uOCUJigCzatNqwRV36ZulPEFHslFlRf2Q LUn97QzCO9VNTnUqmTE+hraJsIOIODD4EQaZ27lEF2CocQJJgDIDLB/zW2mbaNX+84Z95e zmiJ5K+Ph9rN3wJ6vhvTYLGOixaj0XWdZXQgVvR2zVmVQYl9Fci5Mtpm6ZHbmHwqqlQ+77 BLv2NQMb68WfKkl5uxqCYZ7jpHlJbSvJTIHeSnjtRa2ORPDpRMw29QOFPiTMSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698968106; a=rsa-sha256; cv=none; b=lzvexcNY2N2zbQbkafyUFDdUZqdW5Gy6etb89BRV0AagLeciRWA3lA9DHEg6RzZlt1yl/+ IdNaskLgOtAyikDYZAmOd97/Q3Gqk7pNv1jWnDBosVxZGtP44OajiVV+pYDn8+qX0FG8c0 X7pbWRj6RyePdXhQZAOq6tdaydhOh1CIBvzG+leWT0hduhI7j/yk9gbY4Uel5l3YK0S1jN 1YGYINgYq9Y3qblB/OMzMO9iFz27slDLWI3epzd/T0MKbinusfl/rg7qCX6e1WWMmHcFj/ yaz30gsQVacItg65nlt+CNwGqDY6d+N8EWIrHhvS3ZoZcCngzQJ0k0ksQhmk2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SM0bZ2Q0WzpXj; Thu, 2 Nov 2023 23:35: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 3A2NZ6Ts028778; Thu, 2 Nov 2023 23:35:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2NZ6j1028775; Thu, 2 Nov 2023 23:35:06 GMT (envelope-from git) Date: Thu, 2 Nov 2023 23:35:06 GMT Message-Id: <202311022335.3A2NZ6j1028775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: f33609bc7799 - stable/13 - nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f33609bc7799bd1ebefa2f7cad02be646bcf21e9 Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f33609bc7799bd1ebefa2f7cad02be646bcf21e9 commit f33609bc7799bd1ebefa2f7cad02be646bcf21e9 Author: Rick Macklem AuthorDate: 2023-10-19 19:35:35 +0000 Commit: Rick Macklem CommitDate: 2023-11-02 23:33:48 +0000 nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH When I implemented a test patch using Open Claim_Deleg_Cur_FH I discovered that the NFSv4.1/4.2 server was broken for this Open option. Fortunately it is never used by the FreeBSD client and never used by other clients unless delegations are enabled. (The FreeBSD NFSv4 server does not have delegations enabled by default.) Claim_Deleg_Cur_FH was broken because the code mistakenly assumed a stateID argument, which is not the case. This patch fixes the bug by changing the XDR parser to not expect a stateID and to fill most of the stateID in from the clientID. The clientID is the first two elements of the "other" array for the stateID and is sufficient to identify which client the delegation is issued to. Since there is only one delegation issued to a client per file, this is sufficient to locate the correct delegation. If you are running non-FreeBSD NFSv4.1/4.2 mounts against the FreeBSD server, you need this patch if you have delegations enabled. PR: 274574 (cherry picked from commit f300335d9aebf2e99862bf783978bd44ede23550) --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++++++++-- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 24d290c4cf5d..7020053be330 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3003,12 +3003,18 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == - NFSV4OPEN_CLAIMDELEGATECURFH) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; + } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { + /* Fill in most of the stateid from the clientid. */ + stateid.seqid = 0; + stateid.other[0] = clientid.lval[0]; + stateid.other[1] = clientid.lval[1]; + stateid.other[2] = 0; + stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 06d0b79f10d5..f54459947f44 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2555,6 +2555,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2565,8 +2569,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2817,6 +2821,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2827,8 +2835,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Thu Nov 2 23:36: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 4SM0cz17zpz4yqHg; Thu, 2 Nov 2023 23:36: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 4SM0cz0jkPz3HnH; Thu, 2 Nov 2023 23:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9m7x9ss2tE73a3NwDGCit7OAjQfu3oTlM9JLrfCK8q8=; b=A5xORFAGDfdtLx1rlRzekpUU0YOMBBPm1k0nAbIVTe+ZdF57DzvjDZlwObIPxS/8OGz0M4 XO3yO4WRSY0XnC3KY1IoLDMOTF1DPbYTFvwNriOtNAEzKxWtz1hivI1dNYpZrX+RtMarpL ZEeQrV0EzOiHJmKYbUfnWXwdjTFb13prHZ9wyxX25AHMIhlQeeYJzijkQTfCa8ETgB+fX/ dAPH5fWHt63zQjG1BI0XKZpZZR9P8PHz1xce3jZAb8+GvycNWLK8GLhfh8m9J5p06EQ7Tn J674n9KERTNiPl7By5EpAYjfeqnetpkkatDF2WMwZ1xSUSRWXqebVBXUCQzbSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9m7x9ss2tE73a3NwDGCit7OAjQfu3oTlM9JLrfCK8q8=; b=Jk1oFU0iqyB+ZKeDwtYPsXvT39oIn0b/MrEePzy3idFkhUyI/ylPFC7+9GXw3Va9+dQD9o 7ZI7vanWIMwQFek1kFdZjz79ebHdoMXoKI1IvIBTJ/P6E/lWpqegdy0jCw+HuMxZe9zt6Y cBhPKKjilMZ7LaHnp9QtVk8xkUouM7GF8DPo3ZR+zGOT98nqtiQPeQOriiN8CuWExxayn7 +6MnGp9l2OtfXcwjPBDDeMKXVTZJQ/Q5YuwSu5AYfaRXt5zXuqLTelntkj37SslJ8yZiql GHsKVrI56Nnp92cji+yOsOH84GJI3q2bVgRarwKF3chstGkOnsD7OGbGocTmXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698968179; a=rsa-sha256; cv=none; b=U5gen7zQCR3iPJgc5KPXVx4oKQYTSbIoThuYSZ0ncZBfo0mQ2HREuWkcGAzKuXsWN5uLDV Elm2yf/+MkZ9ygAKJjK2sLF1zXPcYjJ3RYofm5ifNg6RKYLbJdJ8+NSg106Fos3rt/YXDM hj4QqHQOFh/2Kdb29pw0bzj6wdwWBzPWgDc3XEAZkA3tEqjT8YqcPoD4tcPn/BvyizJ1ZV hAtzHoK9IP9qVW7xuxYjpIG8Nvqmrb8KwUEjhi1A/dMnEqBUjsYmWcs0SrWM4F/cfl+6ZE 0A/7lhGK0nEgMBjbeuIQtukB+sPNmx5YLI9DZzR2BgdPpYABnvpaxH8yLDygNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SM0cy6w4tzpXk; Thu, 2 Nov 2023 23:36: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 3A2NaIS3029073; Thu, 2 Nov 2023 23:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2NaIID029070; Thu, 2 Nov 2023 23:36:18 GMT (envelope-from git) Date: Thu, 2 Nov 2023 23:36:18 GMT Message-Id: <202311022336.3A2NaIID029070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 18d51c3c305f - stable/13 - nfsd: Fix a server crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18d51c3c305f233a75fc64f8e5711306dd05a8fc Auto-Submitted: auto-generated The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=18d51c3c305f233a75fc64f8e5711306dd05a8fc commit 18d51c3c305f233a75fc64f8e5711306dd05a8fc Author: Rick Macklem AuthorDate: 2023-10-18 02:40:23 +0000 Commit: Rick Macklem CommitDate: 2023-11-02 23:35:25 +0000 nfsd: Fix a server crash PR#274346 reports a crash which appears to be caused by a NULL default session being destroyed. This patch should avoid the crash. PR: 274346 (cherry picked from commit db7257ef972ed75e33929d39fd791d3699b53c63) --- sys/fs/nfs/nfs_commonkrpc.c | 9 +++++++++ sys/fs/nfs/nfs_commonsubs.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 936373c79366..29c7cdbd671c 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1208,6 +1208,14 @@ tryagain: NFSCL_DEBUG(1, "Got badsession\n"); NFSLOCKCLSTATE(); NFSLOCKMNT(nmp); + if (TAILQ_EMPTY(&nmp->nm_sess)) { + NFSUNLOCKMNT(nmp); + NFSUNLOCKCLSTATE(); + printf("If server has not rebooted, " + "check NFS clients for unique " + "/etc/hostid's\n"); + goto out; + } sep = NFSMNT_MDSSESSION(nmp); if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, NFSX_V4SESSIONID) == 0) { @@ -1388,6 +1396,7 @@ tryagain: nd->nd_repstat = NFSERR_STALEDONTRECOVER; } } +out: #ifdef KDTRACE_HOOKS if (nmp != NULL && dtrace_nfscl_nfs234_done_probe != NULL) { diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 44cddc6d5b34..a9659079ed5f 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -5083,11 +5083,13 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, struct nfsrv_descript *nd = &nfsd; int error; + if (tsep == NULL) + tsep = nfsmnt_mdssession(nmp); + if (tsep == NULL) + return (0); nfscl_reqstart(nd, NFSPROC_DESTROYSESSION, nmp, NULL, 0, NULL, NULL, 0, 0, NULL); NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); - if (tsep == NULL) - tsep = nfsmnt_mdssession(nmp); bcopy(tsep->nfsess_sessionid, tl, NFSX_V4SESSIONID); nd->nd_flag |= ND_USEGSSNAME; error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, From nobody Thu Nov 2 23:38: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 4SM0h024BQz4yqYT; Thu, 2 Nov 2023 23:38: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 4SM0h01LNFz3Jg2; Thu, 2 Nov 2023 23:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNXM9JILMLVWR+aqLCxlj8KP8uB4SA3MHZe+C32O8pg=; b=gD7ik+gxz9fYNlmIRQ7j1U9aDlwAk/Y8AZx8pXk3H9CDFj+EH0T1EksZWwzPHFxM/pdtO7 rG8xKdkcGxLLwu1l37pcR0/D4tP0h6UqO9/go0Z31eKNinDR+JqEShrTCPrMo/dXl0hzLb VL8FPt2qTpXHOCFQJhB0dElnrRdCvbA3YyPN3ifErBTeeD1PWV2O9lhYV7KhV2kTKEXFLs awcs4W1PDAvW8Puzs17XDnC/mmof7+zFgnjadqgcY1IS+MEAFVz1xSkxladOx4hlflfV+R eBhhEEpy7SFot3PYPlhIUL45NvoYlR1A23/0i+XMYXiwBB8TnzpB8r148vthhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNXM9JILMLVWR+aqLCxlj8KP8uB4SA3MHZe+C32O8pg=; b=nALnZ0QvRpYjQ5tqXYLpch7agVUZ7LqEJ65FRKNo3cnTHTDvLu+lfLUTBFAfgnpPUaEQIT qpPBMlN/RNXF9Ps+a5G6jKI2Wh8vNvEi30O/eI2yn2mZSp/0EFTPiq/Gf2ReSMhgAUFySG rlUo5yGPjT7/SIp6Pc1RHPHP7Xm5dJdjOXJ5OSNaV34LqvsrRLTUxpPA6cGxnrquWvZN/N 7k+8HT5v2hN5LjawRFOuPBmfget/cKxS9yaArzh+o2heP3y0NzPI3X0ENi25lECREYzEm1 I7tSGYzK9VaY7qaMr3fC+wwqaMtlW47k8DuANxfqGEcdf6hO7ttjI/nso72ZGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698968336; a=rsa-sha256; cv=none; b=V5v8xves1OmhhqVse0cAl26G5lbfysXoT9IO2o3gbcdOGCk8mIOMtsIBw8kz3dG+dx3phR OJSrCb6zF4Z4udW05DWOmiL2cGwQAqfGVpJ/vIa8V4BfhRrGSvgTsrtPewoXHj/VZsWfVm ck4eaehl9M/il59z6ZsfJnco196zBEk0gupgzf+NWa5S86fY1W7Ny5skaq3M5RS/rCs7uC iSIQMEitZi8KtnTyTt/3dqUKh2MjfmS4B64TSA6PKkbibGqZNBraqQ5IGnNWacDaRvHVPF MERLN1Dd0WCsWMDsBCwl1JZkH+P2ueiUFJjmmxSe8cWGy8Zv7s0re/I3WuyuzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SM0h00PsPzpmq; Thu, 2 Nov 2023 23:38: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 3A2NctAO029558; Thu, 2 Nov 2023 23:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2Nctfx029555; Thu, 2 Nov 2023 23:38:55 GMT (envelope-from git) Date: Thu, 2 Nov 2023 23:38:55 GMT Message-Id: <202311022338.3A2Nctfx029555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 2008043f3867 - main - loader: add target for dirdeps 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2008043f386721d58158e37e0d7e50df8095942d Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=2008043f386721d58158e37e0d7e50df8095942d commit 2008043f386721d58158e37e0d7e50df8095942d Author: Stephen J. Kiernan AuthorDate: 2023-11-02 23:33:45 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-11-02 23:35:08 +0000 loader: add target for dirdeps build Update dependencies for the loader variations used for each architecture. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D39741 --- share/mk/local.dirdeps-options.mk | 2 ++ share/mk/local.dirdeps.mk | 4 ++++ stand/efi/fdt/Makefile.depend | 3 +-- stand/efi/libefi/Makefile.depend | 1 + stand/efi/loader/Makefile.depend | 3 ++- stand/efi/loader/Makefile.depend.arm | 1 - stand/efi/loader/Makefile.depend.arm64 | 1 - stand/efi/loader/Makefile.depend.options | 7 +++++++ stand/efi/loader/Makefile.depend.riscv | 16 ++++++++++++++++ stand/fdt/Makefile.depend | 3 +-- stand/ficl/Makefile.depend | 1 + stand/i386/libi386/Makefile.depend | 3 ++- stand/i386/loader/Makefile.depend | 1 - stand/i386/loader/Makefile.depend.options | 10 ++++++++++ stand/i386/loader_lua/Makefile.depend | 11 +++++++++++ stand/lua/Makefile.depend | 10 ++++++++++ stand/powerpc/ofw/Makefile.depend | 12 ++++++++++++ stand/uboot/Makefile.depend.options | 9 +++++++++ targets/pseudo/loader/Makefile | 1 + targets/pseudo/loader/Makefile.depend.amd64 | 7 +++++++ targets/pseudo/loader/Makefile.depend.arm | 8 ++++++++ targets/pseudo/loader/Makefile.depend.arm64 | 7 +++++++ targets/pseudo/loader/Makefile.depend.i386 | 7 +++++++ targets/pseudo/loader/Makefile.depend.powerpc | 7 +++++++ targets/pseudo/loader/Makefile.depend.riscv | 7 +++++++ 25 files changed, 133 insertions(+), 9 deletions(-) diff --git a/share/mk/local.dirdeps-options.mk b/share/mk/local.dirdeps-options.mk index 9e7f7bbd963c..4eef5311375e 100644 --- a/share/mk/local.dirdeps-options.mk +++ b/share/mk/local.dirdeps-options.mk @@ -24,4 +24,6 @@ DIRDEPS.OPENSSL.no+= lib/libmd DIRDEPS.PAM_SUPPORT.yes+= lib/libpam/libpam DIRDEPS.TCP_WRAPPERS.yes+= lib/libwrap +MK_FDT.${DEP_MACHINE} ?= yes + .-include diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 99782b856d41..2a92eea7455e 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -5,6 +5,10 @@ .include "${SRCTOP}/share/mk/src.opts.mk" .endif +# Machine-specific MK settings needed for Makefile.dirdeps.options usage +MK_FDT.i386 = no +MK_FDT.amd64 = no + # making universe is special .if defined(UNIVERSE_GUARD) # these should be done by now diff --git a/stand/efi/fdt/Makefile.depend b/stand/efi/fdt/Makefile.depend index 15a1f9c07f7c..18537add9fe3 100644 --- a/stand/efi/fdt/Makefile.depend +++ b/stand/efi/fdt/Makefile.depend @@ -1,8 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - include \ - include/xlocale \ + stand/libsa \ .include diff --git a/stand/efi/libefi/Makefile.depend b/stand/efi/libefi/Makefile.depend index 18537add9fe3..8a29d17bb768 100644 --- a/stand/efi/libefi/Makefile.depend +++ b/stand/efi/libefi/Makefile.depend @@ -2,6 +2,7 @@ DIRDEPS = \ stand/libsa \ + usr.bin/awk.host \ .include diff --git a/stand/efi/loader/Makefile.depend b/stand/efi/loader/Makefile.depend index 96a148bee2d7..ae9e6b6efaa4 100644 --- a/stand/efi/loader/Makefile.depend +++ b/stand/efi/loader/Makefile.depend @@ -1,9 +1,10 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + bin/sh.host \ stand/efi/libefi \ - stand/ficl \ stand/libsa \ + usr.bin/awk.host \ .include diff --git a/stand/efi/loader/Makefile.depend.arm b/stand/efi/loader/Makefile.depend.arm index 8eb92e94c6e0..4ba1445d8a5f 100644 --- a/stand/efi/loader/Makefile.depend.arm +++ b/stand/efi/loader/Makefile.depend.arm @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/stand/efi/loader/Makefile.depend.arm64 b/stand/efi/loader/Makefile.depend.arm64 index 8eb92e94c6e0..4ba1445d8a5f 100644 --- a/stand/efi/loader/Makefile.depend.arm64 +++ b/stand/efi/loader/Makefile.depend.arm64 @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/stand/efi/loader/Makefile.depend.options b/stand/efi/loader/Makefile.depend.options new file mode 100644 index 000000000000..20292bab9bcd --- /dev/null +++ b/stand/efi/loader/Makefile.depend.options @@ -0,0 +1,7 @@ +# options that impact our dependencies +DIRDEPS_OPTIONS = LOADER_LUA + +DIRDEPS.LOADER_LUA.yes += \ + stand/liblua \ + +.include diff --git a/stand/efi/loader/Makefile.depend.riscv b/stand/efi/loader/Makefile.depend.riscv new file mode 100644 index 000000000000..4ba1445d8a5f --- /dev/null +++ b/stand/efi/loader/Makefile.depend.riscv @@ -0,0 +1,16 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + bin/sh.host \ + stand/efi/fdt \ + stand/efi/libefi \ + stand/fdt \ + stand/libsa \ + usr.bin/awk.host \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/fdt/Makefile.depend b/stand/fdt/Makefile.depend index 15a1f9c07f7c..18537add9fe3 100644 --- a/stand/fdt/Makefile.depend +++ b/stand/fdt/Makefile.depend @@ -1,8 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - include \ - include/xlocale \ + stand/libsa \ .include diff --git a/stand/ficl/Makefile.depend b/stand/ficl/Makefile.depend index 18537add9fe3..8a29d17bb768 100644 --- a/stand/ficl/Makefile.depend +++ b/stand/ficl/Makefile.depend @@ -2,6 +2,7 @@ DIRDEPS = \ stand/libsa \ + usr.bin/awk.host \ .include diff --git a/stand/i386/libi386/Makefile.depend b/stand/i386/libi386/Makefile.depend index 18537add9fe3..15a1f9c07f7c 100644 --- a/stand/i386/libi386/Makefile.depend +++ b/stand/i386/libi386/Makefile.depend @@ -1,7 +1,8 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - stand/libsa \ + include \ + include/xlocale \ .include diff --git a/stand/i386/loader/Makefile.depend b/stand/i386/loader/Makefile.depend index 9262a05207b6..c687ef93d84e 100644 --- a/stand/i386/loader/Makefile.depend +++ b/stand/i386/loader/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - stand/ficl \ stand/i386/btx/btx \ stand/i386/btx/btxldr \ stand/i386/btx/lib \ diff --git a/stand/i386/loader/Makefile.depend.options b/stand/i386/loader/Makefile.depend.options new file mode 100644 index 000000000000..7527fa4bda17 --- /dev/null +++ b/stand/i386/loader/Makefile.depend.options @@ -0,0 +1,10 @@ +DIRDEPS_OPTIONS = FORTH LOADER_LUA + +DIRDEPS.FORTH.yes += \ + stand/ficl \ + +DIRDEPS.LOADER_LUA.yes += \ + stand/liblua \ + stand/lua \ + +.include diff --git a/stand/i386/loader_lua/Makefile.depend b/stand/i386/loader_lua/Makefile.depend new file mode 100644 index 000000000000..993ab0638f4a --- /dev/null +++ b/stand/i386/loader_lua/Makefile.depend @@ -0,0 +1,11 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/lua/Makefile.depend b/stand/lua/Makefile.depend new file mode 100644 index 000000000000..11aba52f82cf --- /dev/null +++ b/stand/lua/Makefile.depend @@ -0,0 +1,10 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/powerpc/ofw/Makefile.depend b/stand/powerpc/ofw/Makefile.depend new file mode 100644 index 000000000000..15a1f9c07f7c --- /dev/null +++ b/stand/powerpc/ofw/Makefile.depend @@ -0,0 +1,12 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/stand/uboot/Makefile.depend.options b/stand/uboot/Makefile.depend.options new file mode 100644 index 000000000000..d70bc7edd168 --- /dev/null +++ b/stand/uboot/Makefile.depend.options @@ -0,0 +1,9 @@ +DIRDEPS_OPTIONS = FORTH LOADER_LUA + +DIRDEPS.FORTH.yes += \ + stand/ficl \ + +DIRDEPS.LOADER_LUA.yes += \ + stand/lua \ + +.include diff --git a/targets/pseudo/loader/Makefile b/targets/pseudo/loader/Makefile new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/targets/pseudo/loader/Makefile @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/targets/pseudo/loader/Makefile.depend.amd64 b/targets/pseudo/loader/Makefile.depend.amd64 new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.amd64 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include diff --git a/targets/pseudo/loader/Makefile.depend.arm b/targets/pseudo/loader/Makefile.depend.arm new file mode 100644 index 000000000000..d23148b537fe --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.arm @@ -0,0 +1,8 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + stand/uboot \ + + +.include diff --git a/targets/pseudo/loader/Makefile.depend.arm64 b/targets/pseudo/loader/Makefile.depend.arm64 new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.arm64 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include diff --git a/targets/pseudo/loader/Makefile.depend.i386 b/targets/pseudo/loader/Makefile.depend.i386 new file mode 100644 index 000000000000..29a2092b8203 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.i386 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/i386/loader \ + + +.include diff --git a/targets/pseudo/loader/Makefile.depend.powerpc b/targets/pseudo/loader/Makefile.depend.powerpc new file mode 100644 index 000000000000..6c481c73d253 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.powerpc @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/uboot \ + + +.include diff --git a/targets/pseudo/loader/Makefile.depend.riscv b/targets/pseudo/loader/Makefile.depend.riscv new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.riscv @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include From nobody Thu Nov 2 23:45:40 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 4SM0qn1Mgwz4yrvt; Thu, 2 Nov 2023 23:45: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 4SM0qn0rBFz3KZV; Thu, 2 Nov 2023 23:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8PsR/UoMlX8AQxA70jLvzCsgxLT5T0Mhjv0tB2/GP0=; b=GFw/ENf6nc6HfO3KNr2CXoZxVnpMWRJZ+XOCUGmroX18xtXqh9FsgnymwZK5FdPa/PWy4j C27JsyegscTmn1FEf2fl45vayLR5Q/I8WGbvqCzy3Dc1+4Vwr5DygJPr0j8i+eVl79Hypz VOFEPiI/GLGicskSgGg3WtuHfrU4uY4AivluEFdUZOsFGpCtnk0vx+nuXGQGAoS7jsKcB6 hU2e9k8aCw2aTmexqldI3P2zH3bAvqG76YtFKdbeF1cyZWA4Ejheax+rfa2IH8CvWjP0tb NhUH4LC1SuiRumVJgcuzakj9S0yu7NBnT7UskTn1W+DgVfHnGgTZLaAk784P0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698968741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8PsR/UoMlX8AQxA70jLvzCsgxLT5T0Mhjv0tB2/GP0=; b=KimE9c5zAOqJP7hjs5UMpuguMklO9LCL4AAXV4g4i2DiYPjQZPc80f2di8KvEu+aflg4hK t1pNV0MKdnWlaq8BuXeRs21p0pqFJxi+KnMBl8Ic0n5q2aYntsW93oVOEKThQBGinFP+uq KEWdp+t1ib75WlJJawixu7HNPBtrDw1Dsdplrfo2qg3FZ6qOYqHRCSd6frBLWXBsfFtVv/ HtP/bcNQuThwE+Se5TQ4AA5hYimMtkAgGOXyBCfsU4SAJGfoQFh93lP4H9qas0c0MpSZQO hdKH4mxdYFvW1ExjhFwrwD2caeD6rfU9qD6iSwRt2deCX415pfEnwxVEjYEQrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698968741; a=rsa-sha256; cv=none; b=eIlRFpyU2f0sC3e3x8CfBD6b1dyH/zPyAiIgBOBbPQzgA23Y+N7EmBGRl1gjAz732uhels 1wB/fBq9phpI4WCTg7aY17yA8ELdAGIkSRLe1Xjo1DahCxzSse3lmzWzebJUS0qsQtCI9K QQKfI8zUsZgHIExphjNcW/y4+Z2UoPlF+hrRitVBMWI60NAFxWqepS4HfZnqrd7WSEThGe UaT5PahHYNQDGQr/6arRnXqLUZJabbMLB+at9V7abI+7L6VsciB1QsYV2OS2NlG3KCX+l4 aFq+GzLMBDkVK9jWm7ABSM/YNwqDR4Iw477/gQWloxsRksCyDj6em0IsCxj+Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SM0qm72BBzqPF; Thu, 2 Nov 2023 23:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A2NjepZ045654; Thu, 2 Nov 2023 23:45:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2NjedQ045651; Thu, 2 Nov 2023 23:45:40 GMT (envelope-from git) Date: Thu, 2 Nov 2023 23:45:40 GMT Message-Id: <202311022345.3A2NjedQ045651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: f383f4ad30a6 - stable/12 - nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f383f4ad30a61fd0cd5104bb5c730aff139b993d Auto-Submitted: auto-generated The branch stable/12 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f383f4ad30a61fd0cd5104bb5c730aff139b993d commit f383f4ad30a61fd0cd5104bb5c730aff139b993d Author: Rick Macklem AuthorDate: 2023-10-19 19:35:35 +0000 Commit: Rick Macklem CommitDate: 2023-11-02 23:44:27 +0000 nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH When I implemented a test patch using Open Claim_Deleg_Cur_FH I discovered that the NFSv4.1/4.2 server was broken for this Open option. Fortunately it is never used by the FreeBSD client and never used by other clients unless delegations are enabled. (The FreeBSD NFSv4 server does not have delegations enabled by default.) Claim_Deleg_Cur_FH was broken because the code mistakenly assumed a stateID argument, which is not the case. This patch fixes the bug by changing the XDR parser to not expect a stateID and to fill most of the stateID in from the clientID. The clientID is the first two elements of the "other" array for the stateID and is sufficient to identify which client the delegation is issued to. Since there is only one delegation issued to a client per file, this is sufficient to locate the correct delegation. If you are running non-FreeBSD NFSv4.1/4.2 mounts against the FreeBSD server, you need this patch if you have delegations enabled. PR: 274574 (cherry picked from commit f300335d9aebf2e99862bf783978bd44ede23550) --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++++++++-- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index e283e8611944..e5eced9c8a69 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -2913,12 +2913,18 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == - NFSV4OPEN_CLAIMDELEGATECURFH) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; + } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { + /* Fill in most of the stateid from the clientid. */ + stateid.seqid = 0; + stateid.other[0] = clientid.lval[0]; + stateid.other[1] = clientid.lval[1]; + stateid.other[2] = 0; + stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index cb4597ec1575..f5f498f61b6b 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2529,6 +2529,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2539,8 +2543,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2791,6 +2795,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2801,8 +2809,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Fri Nov 3 00:00: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 4SM18w3r1Tz4yvPX; Fri, 3 Nov 2023 00:00: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 4SM18w2FD4z3Mh1; Fri, 3 Nov 2023 00:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698969632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lV0ru86zJ2wtV3eycN/ZFjMOCwdjMCHOUdTSLiU2pmc=; b=PJ8dpwBJN6woWX8BOkvveWTYL5uakx3ptSWp0jyrve7vFMGzeev91AYZz13efKthXFySz2 CAsf5Am6/Yt4YZBfBw8djtp+gSd6sxg1KWVOAyxS9ZkhrSyqn12WPysoB+4PCt1OKIkoHh bnzk27x17KWgQpITdRnXwaTP17t/EhlYlFwm6Yp+fyiJflBtlwUPbrF6SQbLcaQAhmBa+4 w+db+ZKtAQNzCY7TUXRkTXgK6vW7CWTQQIjeBbGSE4PdvPfUXCwaWnI62J248C2xhEnVNQ 3YYkOAK1X2PT5TdeIuVI+6XfqXwZ9DcTr8OqXZ4yR7j5lyMHmUjYu4Ac8T42SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698969632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lV0ru86zJ2wtV3eycN/ZFjMOCwdjMCHOUdTSLiU2pmc=; b=vGPinP+eReRC7GJW37BsCrV5SvTxd1t97ox2b3fbPuHpo2+7NVDCSk4Ewq9ZKhqBiNgDrP lYLP2Y4EjU+DWUsGNZ9G1lcxaR3trI79SMuaHEIyxVcqJlHzNiM3coGAXz61ChM6wlOAKW fLuYtLmBYrxlSjmMQIVLenO4Ep081WUOf82FG+3LP+bU2MvxZuQnsfO9HMuZCoIUpbq/+v 76beaxd9ek+YVaYjoY33f6ML9PCGqQZMptqsTZCkfgz4tJlzPNZgQYrKmKLxB0iGElEUW5 NdxY8Xlxs2rt1Pi0kklLo5IZ8GKjrhoP0TmRCXDvt3BXl798h5qwfhXqLCwufg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698969632; a=rsa-sha256; cv=none; b=CaJJ1Qt7YV7NA9HrSE8FX6x1paPlUTu0jfxta9aLbMW/brDAvdZCMcA0+FejLXmTxmwuX+ jmwFmcYCbX2bh1U4USV136UgadkBBlCVYtvH1gx/9oxK/NWyZoVb8hcBq0uYspy+X5PadP Yse2E62r0PtD24sVZLTCh18THXIGajusl1sBut1AheXTYIfue6GF0xb0FY9/9dCdq1mKbp DVT16sLyYTKiLZIk8pXS0YJlgh4Zvmr9J4YejozEVDHVu5FkGswyMTtV9orOfZhDsEB9Ok 2FU4uFoMbIcis5w5ek7RDwL55AO5hEWr+/WYLEyoh8RNEz779KyF3Zl6BpwJuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SM18w1HTgzqSG; Fri, 3 Nov 2023 00:00: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 3A300WeY072561; Fri, 3 Nov 2023 00:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A300WNx072558; Fri, 3 Nov 2023 00:00:32 GMT (envelope-from git) Date: Fri, 3 Nov 2023 00:00:32 GMT Message-Id: <202311030000.3A300WNx072558@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: d59533eaf942 - releng/14.0 - release: update releng/14.0 to RC4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: d59533eaf942ddbfc443452f5dbcd13374893146 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=d59533eaf942ddbfc443452f5dbcd13374893146 commit d59533eaf942ddbfc443452f5dbcd13374893146 Author: Glen Barber AuthorDate: 2023-11-02 23:59:13 +0000 Commit: Glen Barber CommitDate: 2023-11-03 00:00:18 +0000 release: update releng/14.0 to RC4 Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 26ed02969303..7b9891253fe7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RC3" +BRANCH="RC4" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Nov 3 04:09: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 4SM6hX4n3Pz4ymWV; Fri, 3 Nov 2023 04:09: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 4SM6hX4Kplz4Ryd; Fri, 3 Nov 2023 04:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698984588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/b1wu9MAWUeqTdUqrr2nRAvqgrwzWdYESGT8dj0jJRU=; b=NppP0+UFaQFTPVt8fBkUP90ahpCWSWLM2M0y25KgU+X5Wr9so0cgW2nKNYbR/TAIENeslT bM5aTbf6jAZrxpRSYL9+76OvDRUGfqo9bbxOBWkZXUgrHbQ80PABjwFjHdRN3wAVvCt/4V J1j425jt/TuNkS4yoBQPd+3+kgdEIbfGvot2nHgTEc8p0fUfGhqkbYxmHfkp6BQqlUHYOx 9bZkJ9UcvuTV2yYj0c25nIv9LdvAq4GTbQOfgnlv8ntqov/r/8GGYj0PBUrCLZlnWhIUDn rAVFEi+JUShbvIPH5RgJmKUsWJvtWwG3KNqh00CoBGOfwF08nOeSOyOFd4xbCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698984588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/b1wu9MAWUeqTdUqrr2nRAvqgrwzWdYESGT8dj0jJRU=; b=xuMzer8IxEdBAXdVc20OMTVuYu2P6Qm90HbKNJS3NFKtpufKTrDr9dO8greSKfpIa58DT1 QDbWO2UcUD9GARbKVa6yY3zli2/rQC44nT9U5lolxDWnFau4bQbtKi3cIJ7hzQeeywSy2Z bSb1EQDsDk0MvRatc+aUP8O4+hUps04SBV6VgwGxvTizLuJI39+obsPiC3ht1DxwP5Zl5M qlrscckFioDJNTkj9GtXsCXhicRZMvmEjsef5FCUbikldmWnp0nXwaIzRSUytHLb6dG3IR 4O3ZtKZuTp/x1XZUvETGFsO4DLf0C99NMp7NEVlBv/4mfHJaLtgX+YxV1No9Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698984588; a=rsa-sha256; cv=none; b=wSzkkN1jVa0vZwUOHvEUuU+PwiebnANS4BezZ5oIkE/66TbSg2AQ7yScMYuhJpy3fP6rYB gzXjxRiYnKLIt70TnKPVtbBUxVfvlHYyAaKTDAYbUjfyA4EzRegKpSM4Y24JpvHQmN0x3Z fWISkg0b304z/HxNeXKnIhg/uuEwSmYmYyt0p0J8fgiiZovWEw/fOSoiypKH+/UrV5Si1G mHtRXUxj7s1AGnrc9YlBO3unUoaQ91gAsz3cf0doycxuyTQLy7Oj5QLbybTPjJtq4WX0JP 7LfCFBR1xHSM+TuDGm3cXn3xYuoq4qKFLXVpIvPs0Rbcj3T97RFsRSsxZHz/ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SM6hX3GvYzxZ5; Fri, 3 Nov 2023 04:09: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 3A349mqk080947; Fri, 3 Nov 2023 04:09:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A349mEg080944; Fri, 3 Nov 2023 04:09:48 GMT (envelope-from git) Date: Fri, 3 Nov 2023 04:09:48 GMT Message-Id: <202311030409.3A349mEg080944@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: bb8d4411e0c6 - main - veriexec: Simplify the initialization of loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: bb8d4411e0c668415538f66fb25e6b38bb910cdd Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8d4411e0c668415538f66fb25e6b38bb910cdd commit bb8d4411e0c668415538f66fb25e6b38bb910cdd Author: Zhenlei Huang AuthorDate: 2023-11-03 04:08:27 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-03 04:08:27 +0000 veriexec: Simplify the initialization of loader tunable The loader tunable 'security.mac.veriexec.block_unlink' has been already flagged with CTLFLAG_RDTUN, no need to re-fetch it with TUNABLE_INT_FETCH. While here move the definition of sysctl knob out of function body, which is more common in FreeBSD. No functional change intended. Reviewed by: stevek MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42132 --- sys/security/mac_veriexec/mac_veriexec.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/security/mac_veriexec/mac_veriexec.c b/sys/security/mac_veriexec/mac_veriexec.c index 57f3b6c307fa..7ac09e2acf0f 100644 --- a/sys/security/mac_veriexec/mac_veriexec.c +++ b/sys/security/mac_veriexec/mac_veriexec.c @@ -105,6 +105,8 @@ SYSCTL_PROC(_security_mac_veriexec, OID_AUTO, db, static int mac_veriexec_slot; static int mac_veriexec_block_unlink; +SYSCTL_INT(_security_mac_veriexec, OID_AUTO, block_unlink, CTLFLAG_RDTUN, + &mac_veriexec_block_unlink, 0, "Veriexec unlink protection"); MALLOC_DEFINE(M_VERIEXEC, "veriexec", "Verified execution data"); @@ -797,12 +799,6 @@ mac_veriexec_init(struct mac_policy_conf *mpc __unused) EVENTHANDLER_REGISTER(vfs_unmounted, mac_veriexec_vfs_unmounted, NULL, EVENTHANDLER_PRI_LAST); - /* Fetch tunable value in kernel env and define a corresponding read-only sysctl */ - mac_veriexec_block_unlink = 0; - TUNABLE_INT_FETCH("security.mac.veriexec.block_unlink", &mac_veriexec_block_unlink); - SYSCTL_INT(_security_mac_veriexec, OID_AUTO, block_unlink, - CTLFLAG_RDTUN, &mac_veriexec_block_unlink, 0, "Veriexec unlink protection"); - /* Check if unlink control is activated via tunable value */ if (!mac_veriexec_block_unlink) mac_veriexec_ops.mpo_vnode_check_unlink = NULL; From nobody Fri Nov 3 04:50: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 4SM7c20mQkz4yvRM; Fri, 3 Nov 2023 04:50: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 4SM7c20GwXz4YDV; Fri, 3 Nov 2023 04:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698987058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Df4X3t8I65b/NYF2XdhW/RcsoC5fJIyBTnsZ2OuSkaA=; b=VOItdPoyM+rMWLKHd9Gr8y1RMS/r6vePFCukP45U5nFCYujBzSdh7qJTa1eHfA2gCfWUSL qEBauA7Ceews608YUhgi4rnIkAgdkxH3dy58O7o7DAb5wzxu4MsLoBnsiwK8w+puUor5bQ 9w7xED74nL+9E9eNdrKdl6dQXbBfq3mJdB0H0Xq52HdknZpZOlvrP3ygcv46/X8DnYbbcU KpBfLQd9DqCseUfPTivt9wp4cwnh25YERGN2m3FGnjNXDfXP8mFEF0cMlWvrhJ8bEOIa+E ZunM2QDzW69pmkNLBYspAc7jgANYIPyyOAb4KV+vPU0OSm5B+T2ey4tJKIVDyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698987058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Df4X3t8I65b/NYF2XdhW/RcsoC5fJIyBTnsZ2OuSkaA=; b=GINqn3e+Yt3LpJxUhtnuOWQa99XmASoBtHRDn9ZK3b2a2gsKg4xGb6HqNeZVnpoVKEeWOh GzjKiJbAVtBUi5GVc3x6toarGrB8+QXnq+cSiLHQXW2bp4tw4YLwfQwc07I11c3MyQxAt5 QJopGZipP8prA9Gi60r5AwTeoEVIT49lhJVBHdb+yB1YOMTFohJTdZLBSOEYmqMt7vtLbR UcMN3b/cHRWwcdpoVyDTsGZnnur+ZvWnrMQPTdX/dOT+ZbK3ihzldHGFVIYy4eIJGtit+g 4mTs7M4OhouUQZmAk+BgOhV7FndX8DczzP2pV0ARwptxUnk9mQayk2UHRmi3rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698987058; a=rsa-sha256; cv=none; b=kOtFon/q/2a+XvmaiRVPKiOjmzA+HdQ0UycI5/JF2MXQ0njFt37M5HlufdZgObzVA0bQ9r y76ErmjDsKty0FpxTyfZvqNGWP9sUOV8p8/B7uBbJQgZzukLqUxWsC3soA8woXdVLnM5GX ywMXJEEJKskYp/655BjfVbL9XjoKa3lLTlwKNbAqColsLFufle47Tr+vC0vT7rVJYFoZ+D JNxPWcvA2dCNwvZcR9HlMLdSyVvp1q4dC1RNZveVV6NpJ8sbXnIZ/6kyzvgkzOijlVjVzN 1EQoOdbU2j2CGr5q8MLxJw9B7+J18oAy7UJ0+dU7qxR/krr4n4YhwTHBLC5a0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SM7c16RQ3zyFw; Fri, 3 Nov 2023 04:50: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 3A34ovAW057093; Fri, 3 Nov 2023 04:50:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A34ovm8057090; Fri, 3 Nov 2023 04:50:57 GMT (envelope-from git) Date: Fri, 3 Nov 2023 04:50:57 GMT Message-Id: <202311030450.3A34ovm8057090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ee4bdd4b0db5 - stable/12 - libbe: bail out early if the zfs kmod isn't loaded List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: ee4bdd4b0db5b9d64e64490fc84a395344862aed Auto-Submitted: auto-generated The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ee4bdd4b0db5b9d64e64490fc84a395344862aed commit ee4bdd4b0db5b9d64e64490fc84a395344862aed Author: Kyle Evans AuthorDate: 2023-07-07 00:41:14 +0000 Commit: Kyle Evans CommitDate: 2023-11-03 04:50:46 +0000 libbe: bail out early if the zfs kmod isn't loaded As noted in the comment, we already know the rest of libbe_init() will fail because there's no pool imported. Avoid the side effect by checking beforehand and bailing out early. With this, freebsd-update(8) should no longer trigger a load of the zfs kmod just because it runs `bectl check`. Reviewed by: jwmaag_gmail.com, rew (cherry picked from commit 2f700ca965a04c4a03b6f760da6a210b6ca4df4b) --- lib/libbe/be.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 6c7bf1b2ae45..e86ceccee74e 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -115,6 +116,16 @@ libbe_init(const char *root) lbh = NULL; poolname = pos = NULL; + /* + * If the zfs kmod's not loaded then the later libzfs_init() will load + * the module for us, but that's not desirable for a couple reasons. If + * the module's not loaded, there's no pool imported and we're going to + * fail anyways. We also don't really want libbe consumers to have that + * kind of side-effect (module loading) in the general case. + */ + if (modfind("zfs") < 0) + goto err; + if ((lbh = calloc(1, sizeof(libbe_handle_t))) == NULL) goto err; From nobody Fri Nov 3 07: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 4SMBdh0PGlz50CqQ; Fri, 3 Nov 2023 07: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 4SMBdg6ldBz3GrJ; Fri, 3 Nov 2023 07: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=1698995255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fCqJNPlYJpCSedoYeWYzX2XgMoMXlmrcX9vDKQno78=; b=H5q4XjPLWq+37aOHONv4TEYhoibp8qyEKRMDmdRx7SksTaTYnzZpiLxttJBtELxso8HFYq 5hO7zPjZxxLbDudIHt370jl36KkyyuD1jY0mPoLbF1SnJh4Vk52oNT/z97xS3REWC9QVzd RlCODtR4G8kprWLkDgofGTssYHxMJVbPnD20mCq8YPydSy+K05CgmrZsuJn2/xVwc3Mlof 1V3TO+V5hrjCpbrjWTRUB6oiBMujPStancIzcEe1+u4Itrqi0KoNSoIamqSnK+vZ4SX8KY KDpFow4VglHfsT3U3KKUmWDMDwyox81hZV+EFblrqEpew47yKfZr58f/9Rq6qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698995255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fCqJNPlYJpCSedoYeWYzX2XgMoMXlmrcX9vDKQno78=; b=ptkAyJ6l2Z+6JZBcfvidz9T4tXOLRepB2A61O2D9fSFBlaC9AjUmxzYdYF7Bh7khcIyg0b ag2ULX+Cf8WVmH9AM9eHeSSs/Ihd3hnYYtHAK8jaManwzL9WQHIovpJIWfYKmhHHqMtt5g MFdsfiF9mAo0y4MyDraavgYFkqEdtzCfUIVPz2ro1k7EQgP10acWa8KivEkCs5djgg4vuK HvA228v6sV6igp9YF7nW+P71nf1n8sUIM3dysW/0Pp22cQr9VMuzELJvRRRoOFaDfNkLId JwuERJ11M1/hP4Rg5FIFz8Y5GAbA+d3byAAomV+j65SUB9S9ziGe4XWMAZjhKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698995255; a=rsa-sha256; cv=none; b=h7BgXxDxF0JVLa9Le+A7ARkxx7NT1gyAHJ3HgoTuTb3W8OOpyIB4lIiDqApzbwNz/Jg4XT DN7uH5P1Zyary+oQSvyX3OznZR0EtEfwJ+8LvipoCEVICWSdZL39ar5O1wSL06YBTXbcom hZE74hOq76C9JWFywvpJRDOH7eDO7bypVWlNbi42Nt3E9inRw5IqWTfxJGPezEaqz7oZdW s9Kpibp3iYSDqe5zTUL1Uhtt/Fkwl8xmjcoxhsSIXXlovCuRV5fWM5Hkx1Y3cUaoqNsRT5 gCtdrdl1IfkJuFKu59eREcBpWnth30gca5mqibB7LkjkzORagToU/9reMCRQFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMBdg5q7jz12Q9; Fri, 3 Nov 2023 07: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 3A377ZAL079908; Fri, 3 Nov 2023 07: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 3A377ZWD079903; Fri, 3 Nov 2023 07:07:35 GMT (envelope-from git) Date: Fri, 3 Nov 2023 07:07:35 GMT Message-Id: <202311030707.3A377ZWD079903@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: 5c783a0b2826 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5c783a0b2826d1c6bbaa7d4b01a46d1dcdb39e8c Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=5c783a0b2826d1c6bbaa7d4b01a46d1dcdb39e8c commit 5c783a0b2826d1c6bbaa7d4b01a46d1dcdb39e8c Author: SHENG-YI HONG AuthorDate: 2023-11-03 07:02:26 +0000 Commit: Li-Wen Hsu CommitDate: 2023-11-03 07:02:26 +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 --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6bdb933c813e..075bca234630 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2995,6 +2995,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 Fri Nov 3 08: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 4SMDBh4cvZz50MGx; Fri, 3 Nov 2023 08: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 4SMDBh48Vyz3Qw9; Fri, 3 Nov 2023 08: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=1698999468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0m/KaemOtcUQOrYTdXZi3xicTdkEBGFqgnybIHVOHE=; b=AVCha6H/818UYawaCQVdmlw7FpICNC012Su6KrsJVPxDaeI69iSaawSiHctaDYDnwZ7H0G YfgM90neRBYhGzsIryj8tEQFhaRB5ljjKGApThcY0w1yWmH0UD1GsDZkUOi38hi3AplO8a +1AsBzdfJSgTlzYl1hWS949FWyY+wFIT8PFjyLfdfdkU5gLSSLA9qYdFAeH9e9GWEh9ym6 hWgf+UfPJ60FswMudfvtjZ+onR0HqSIoVEhlGDWASzTec427OPOaBYhlYz8wslHmuyc5HA d4K2DDPxYvYwtksbnjLaY8NX3BEOie07as7qw6Ne1AwGKuvkB+xpl5LxgwGqzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698999468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0m/KaemOtcUQOrYTdXZi3xicTdkEBGFqgnybIHVOHE=; b=hNU8dQQmFd/NUXeMYzVBOSLiu/Bp001A0aY60EQ3BOD3s4eh5Nwgg8uJFrSfNu/0jk1m1g I6uHIHjx9fsjRZlBaPnn1y+WSUZsWYqTTsqZ9B9xKtj28WnHsX9GFV1JFI7CcLMe10XXdS BvpDlns9dyiKe9Zozz29iEVIxlzPyjNvzUUnaNxnz0qfP3d29hCNjjrAvhx70u25aOMuVb OMe//MiJh7VFUrQ/LsDlQG/dvu0kxI4/Zl2C/oO3P7xuRSzf2NjApBri+hKOMZ2gCdsgUK +PSlUa3XGr0IRewzROXCmGEJ9mZtIk2XAzC+OCLxDzkyyNkaWt+5cHRIjDSRnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698999468; a=rsa-sha256; cv=none; b=mJYiopXYGDkdbAijmpaFkOpyhbyXatLjzw61XLj6b1C2UqQpLnsw8gxzKq1B31XbdkCbpB 8T8tsCK4mDSUDc7svipYpx5CAV6kawJ10EyQNZrMW0mAR1mtT8DmpS43zSC/8VVvE0Y9ng ZgO+FpbfzxTh1AVwrrbnX+9klsnjuYJHr0/fTRZlPU8U6rze9U2EOQbklLRzVVkxpDXbC0 d+RUUv+usFEXY1o+qpJu1/PvwKx8HWMYLKIOBemmDaJVylFd8fRjr2dT6xweaDeqBaSkKQ FwbaDPYTKQOhMgntEITuZ7dOPgy48DCQqnv+PolRg93YUpdw3CUrlsPiTKKPhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMDBh31cNz14gY; Fri, 3 Nov 2023 08: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 3A38HmTc097371; Fri, 3 Nov 2023 08: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 3A38HmYF097368; Fri, 3 Nov 2023 08:17:48 GMT (envelope-from git) Date: Fri, 3 Nov 2023 08:17:48 GMT Message-Id: <202311030817.3A38HmYF097368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: df6e7e11c5f6 - main - pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df6e7e11c5f660cbd5381819718e3c947325fa2e Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=df6e7e11c5f660cbd5381819718e3c947325fa2e commit df6e7e11c5f660cbd5381819718e3c947325fa2e Author: Baptiste Daroussin AuthorDate: 2023-11-02 13:20:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-11-03 08:17:30 +0000 pkgbase: set a default set of kernel for when PACKAGE_BUILDING=1 PACKAGE_BUILDING is already known in the ports tree as a variable use to defined when the packages is being actually built in an automation process, reuse that variable to define the default set of kernel we plan to build for the default pkgbase. Reviewed by: manu, jrtc27 Accepted by: manu MFC After: 1 week Differential Revision: https://reviews.freebsd.org/D42444 --- Makefile.inc1 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 075bca234630..a49903a30903 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1677,15 +1677,10 @@ NO_KERNELOBJ= t KERNCONF=${KERNFAST} .endif .endif -.if ${TARGET_ARCH} == "powerpc64" -KERNCONF?= GENERIC64 -.elif ${TARGET_ARCH} == "powerpc64le" -KERNCONF?= GENERIC64LE -.elif ${TARGET_ARCH} == "powerpcspe" -KERNCONF?= MPC85XXSPE -.else -KERNCONF?= GENERIC -.endif +GENERIC_KERNCONF_SUFX_powerpc64= 64 +GENERIC_KERNCONF_SUFX_powerpc64le= 64LE +GENERIC_KERNCONF_powerpcspe= MPC85XXSPE +GENERIC_KERNCONF?= ${GENERIC_KERNCONF_${TARGET_ARCH}:UGENERIC${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}}} INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys @@ -1693,6 +1688,23 @@ KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,} KERNCONFDIR?= ${KRNLCONFDIR} +.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM +.if exists(${KERNCONFDIR}/${_k}) +PKG_KERNCONF+= ${_k} +.for _dbg in NODEBUG DEBUG +.if exists(${KERNCONFDIR}/${_k}-${_dbg}) +PKG_KERNCONF+= ${_k}-${_dbg} +.endif +.endfor +.endif +.endfor + +.if defined(PACKAGE_BUILDING) +KERNCONF?= ${PKG_KERNCONF} +.else +KERNCONF?= ${GENERIC_KERNCONF} +.endif + BUILDKERNELS= INSTALLKERNEL= .if defined(NO_INSTALLKERNEL) From nobody Fri Nov 3 08:30: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 4SMDTN1qjjz50Nk6; Fri, 3 Nov 2023 08:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SMDTN1Q7yz3S8n; Fri, 3 Nov 2023 08:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699000232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qswtH9xOFp3dn5FuK86GyFJ2eJCYxPB/nQLC6bkQ4SQ=; b=GHUWjN9twqahqqBWCd+OKDmwr/nAAwwa+xmpgoXDRxBpdNyy8cpbPn46VG25iIR5HR/NiW mKsDulvnBT1rHQHTYUyWu4vSyBGCgmGeiNkF5Dxm9bA62tjqZVnlBEelBD/xYWQbr3QyV+ KMFvDCvqZIWyh17r/gUXBcQizFR+p+QKdrDhHBdB0t4PLmWdfQ9+UtNlGFXnbxkOOtXiOI rDLvoxE3N9HU8NUxnYN+y25CNWQlWQptFe20InrjjaITnzQhh+Rn+ChHxuUvsLocnme58k 6r/T26KuRA1e4GVEevYWWLVnx0cjdHNmLWOkku/ICXbGORp7jd5J0r/BiDDeVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699000232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qswtH9xOFp3dn5FuK86GyFJ2eJCYxPB/nQLC6bkQ4SQ=; b=V6ksSTQZw8Xf4o7zNN3OdSPwK0HZEaWDmuRkVFmVLRFNB2i7Vygh5wbgBFu/mSBOPF6LgR qQpxrkwXpaKSBTpD4BafeqW3SC2ADHD6XVYWTu+GpbsJlY86lqpGCkkqCtHUmqtk7OiZDB vYJyGTj0U+NQfJDXbH3Et99DSptiprOPGj8xszvZrkTQQMUPTqsQqY2HVqIP/fj46tbU89 9qJUHrVcXs9AipIkignpXBhQTdS5bdzF3k2V/O+ATzVOwlHIP0IFuXdj/TKvKeZGbQ1pcU 7+Si9bAi0ohgeasj9P4WljcINbHQ5gm5ghFUI3z5Hdj6bs8RrQJesAuDo3gzqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699000232; a=rsa-sha256; cv=none; b=vYgx8XX/70JJkN5AoKq1mNbnRRaNQsATwAnEL9oDizx2NuGz1ZCx1QG9+Oo8zzz8KBMF1u sRS0SPR4tIx3D35vZSwVRo4x65SBGgD9C8HjkHuEDEvI+ASZn7wz2Y4WUlayGUI8ejyv6h SKDZO3ZuRLl07DhOB2i7CBdaOe4yj5ySSEvCOqTgiRQTcq7bWHHe3WBiGappfV0f76uxOL pbONvWThX/JqCRwA3u0Es13lZfsivBr4qrD0qC3I1P/egYh6XxYbg537iN9FiY6sdy0Upp uIOF0Snv+8gj8jy/TVroytifzmnXEOOyoDcOeGgdkQiQ/qrbFwPJ+ffLNtxBSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMDTN0Ss3z14xL; Fri, 3 Nov 2023 08:30: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 3A38UV99022631; Fri, 3 Nov 2023 08:30:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A38UVpr022628; Fri, 3 Nov 2023 08:30:31 GMT (envelope-from git) Date: Fri, 3 Nov 2023 08:30:31 GMT Message-Id: <202311030830.3A38UVpr022628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 188fe88ec50e - main - pkgbase: force OSVERSION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 188fe88ec50eac7c10e1d8350bf1180f8c16e463 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=188fe88ec50eac7c10e1d8350bf1180f8c16e463 commit 188fe88ec50eac7c10e1d8350bf1180f8c16e463 Author: Baptiste Daroussin AuthorDate: 2023-11-03 08:29:23 +0000 Commit: Baptiste Daroussin CommitDate: 2023-11-03 08:29:23 +0000 pkgbase: force OSVERSION This is used to the package annotation helping pkg to know about backward compatibility is set to the version of the packages not the version of the host building the packages --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index a49903a30903..c1c0b56efd1b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2192,6 +2192,7 @@ sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \ unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \ ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \ + -o OSVERSION="${OSRELDATE}" \ -m ${WSTAGEDIR}/meta \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \ From nobody Fri Nov 3 13:31: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 4SMM8G14kLz509F2; Fri, 3 Nov 2023 13:31: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 4SMM8G0ZNVz4cyL; Fri, 3 Nov 2023 13:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699018270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dCftJa9EXb/rvkaKzcPfSVh3t9Bu4rj4kktwTrXr4c4=; b=jjPQR2qaAIZi/gry0sJ8Oat95LPVCfbNoO71tIxL8ErXXOkCFh88/N/N8GT98AHPEXg+dM Pv8tFf4wDQanZFhyxWfU6V2RXm1C5kho3eZcfWrJk+CJPjLJkz6WSY17PD2nh51Y1BZMGu iTRvf8yAQlzQhEE7TDPa6uoJgnzH5qbTRN/SJ23luqCivc0MQTkeGSvkhrQ+VQ8/agL3IE HHMsuNsOyqWj/gWvCgRJe2KAASJxz6hOQ9ibjnmgWUUpslNz80tEdbUB4pPKy2ea/X+HFN V9O7gbNPPdor9mL2ebtpVYLByXU4h3hmj52BOoWa1C3g8uREDrUYcT17C8GfJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699018270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dCftJa9EXb/rvkaKzcPfSVh3t9Bu4rj4kktwTrXr4c4=; b=XEXcd5GMuDFsrfJzSSbkA4UzmSrgwXhojygF7wmmVbEw8wM6xlQycLsogboMMOtT3EvvcV hXNigbSfbuseXixNIQxY240u5Wn8D7LBt1V3TPnsTC1ySq87BkYkOJzEQJKgNGuedQ5Nsf V/idBZ1k1D5BBwjBGiOjopyn7fFgO+A0D1swHFO7/geXK3tUv9bXvR/ythTqYk5d1JtExg qteOdOSBWYQzR9822BkEYIKbWxdo9ReqbgxqpiTamLvHQVAoopH89cg1K1xdHRgyn42p6g 4B2UV4dTM/wrRxILBRXYSeV+1T0vXNBNM7H1/69qQMmOJu6cFtLK/HxkkMAxqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699018270; a=rsa-sha256; cv=none; b=mH21pEup1TZE4NbdbYKKnXYhCEnWg/UA1mgs+3Q19eekKMD73kW1pU/4h8IOdyhAGcLluM Ntg6vQnqFFQjsN4+P4iB91pAwBl9xmnyekEdQX+32ojO8rno+aRCk2a8oZ20iB5XmHFyuf nrqBNz6wGLHQxXjFfJZkLJCytBybFnpr0UksAgqwRH0oXQYYPZxlfJQed6awL4Kz3Ld2Wv BsYuZAk25eIpjNGZOyE8i4P5fmIHeIrDHuDlgZotZWz4ZipX4mssHFa2h/oZ+xZ+UDnaxZ I/pXmjG0wqdCp9CTriqVEf+eiMH8/KEBdgqInB+EsJz7VXHp7dvTr71D+6CMLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMM8F6lWZz5p; Fri, 3 Nov 2023 13:31: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 3A3DV9FI025240; Fri, 3 Nov 2023 13:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3DV9TT025237; Fri, 3 Nov 2023 13:31:09 GMT (envelope-from git) Date: Fri, 3 Nov 2023 13:31:09 GMT Message-Id: <202311031331.3A3DV9TT025237@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: f790f2809202 - stable/14 - ping tests: Fix test on i386 platforms List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f790f2809202389eee7750eb160491d44449d3ef Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f790f2809202389eee7750eb160491d44449d3ef commit f790f2809202389eee7750eb160491d44449d3ef Author: Jose Luis Duran AuthorDate: 2023-10-17 11:35:38 +0000 Commit: Mark Johnston CommitDate: 2023-11-03 13:30:58 +0000 ping tests: Fix test on i386 platforms Actually use INT_MAX (0x7fffffff), not UINT_MAX (0xffffffff) to avoid overflowing time_t and missing the test. Reported by: Jenkins Reviewed by: markj Fixes: 5b8af90fe332 ("ping: Add ATF-Python tests") Pull Request: https://github.com/freebsd/freebsd-src/pull/874 Differential Revision: https://reviews.freebsd.org/D42268 (cherry picked from commit 24fe0cb84d71a0e9d648c43f92b5c3a730c3855a) --- sbin/ping/tests/test_ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 26a69b62f8fb..b501b8a606bf 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -51,7 +51,7 @@ def build_response_packet(echo, ip, icmp, oip_ihl, special): # Build a package with a timestamp of INT_MAX # (time-warped package) payload_no_timestamp = sc.bytes_hex(load)[16:] - load = (b"\xff" * 8) + sc.hex_bytes(payload_no_timestamp) + load = b"\x7f" + (b"\xff" * 7) + sc.hex_bytes(payload_no_timestamp) if special == "wrong": # Build a package with a wrong last byte payload_no_last_byte = sc.bytes_hex(load)[:-2] From nobody Fri Nov 3 13:39: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 4SMMLR2Xwmz50BHH; Fri, 3 Nov 2023 13:39: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 4SMMLR26Ghz4fGc; Fri, 3 Nov 2023 13:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699018799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUtqZKwPnbrtRHD8nTpJ3mHjxjIqHeHHs1RcPUel97Q=; b=StYblGuXHRDcwNFskaPEF1iMZm1O7vgFLmNfcTx7LsWGlW26f5HUK4fuv+l4r1kGq2efYB D1c/nTMrqMUtVN2MbnzrJJ6Lr810IUo7wlcP9ReQnYt7oBbYiXNGgqY61I1qfu3Qcr+zrc FET2LFidZ8hkdAkiEJy3zse3hyBC327eKinbD1/ybdIkBtCnLHXmIcnaE114srrkxGSlwF 2AQeHAKwti+wQc/8YBn8z0wpRkEqYdTt58DmMN72GgnGj88cS1UElHBU76+ht/Qa7OCL03 hNQcxoyR6anm6WM0aFjpvcVpRSh92dR54pooASE9id0w/wAd7aSiN9MOtZPr5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699018799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUtqZKwPnbrtRHD8nTpJ3mHjxjIqHeHHs1RcPUel97Q=; b=Ey4mFj73P4E4NZlpNycgv5EP6imvvVG3oXUKeyQTBGN9JZQVOX/P7rz9l7aKciLkpHRhRc K4eN4hOtAPymQQl4zFbxGojLJbS2A+ROxrVRa9JnRl+/3dmFNNVc5SrekJkkZMXuxkUVkK giUqhqrHOloayr0mKkhMGuSvmxuI3aJx+pCQiE0HZxIOti2UL6T2jHXCxLzcL17IN7bESX oqCmBM8sfvIboAw9hJiLsLWQzqFfen1tn5UIc+LITL1dOBPh/StSpcrreP5bchxTka2hGP sac0ae2MLR5qyH22ZzNlFSqDQkbnGkaBXOtCqKO9oCuhp12cm5PeCYk1vR59lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699018799; a=rsa-sha256; cv=none; b=Thcxt04prM8FHBprhHfFsw8gm2EQzPjs5YGqtbYqGEFbETlLnD+Ktk82mEZNLNEeeYNsIF 2zsOP5edlJ6HGox0HBXMlYcKgSi0/H1IM4fXRIzmZghrMbkRFgbAO17c1Rfv031glQBlUH sQ1aDSzQzSEAll9kEUXiGiZcPmd/gTUnR5bMsMu7Os7ECNrt7U1x63Vw41NZB8BpGimMtN mmWRNLl3pLBr1N4tHVG95vD4kl5wuCFLN2lP06q27CxAM1ZiAhFGQ7MptomG6a0hp7s+Io FWmh3SIiBTI6dgvsOqOMzC9w7b+f5MhEVIIoEMe5u4tUC1BP8AVgZ1T77rYpbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMMLR19FmzLT; Fri, 3 Nov 2023 13:39: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 3A3DdxV5029447; Fri, 3 Nov 2023 13:39:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3Ddx23029444; Fri, 3 Nov 2023 13:39:59 GMT (envelope-from git) Date: Fri, 3 Nov 2023 13:39:59 GMT Message-Id: <202311031339.3A3Ddx23029444@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: 368b97361a03 - main - riscv: Update a variable name to match a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 368b97361a0379acaec4a385c5c9d83ba6edc5a2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=368b97361a0379acaec4a385c5c9d83ba6edc5a2 commit 368b97361a0379acaec4a385c5c9d83ba6edc5a2 Author: Mark Johnston AuthorDate: 2023-11-03 13:34:11 +0000 Commit: Mark Johnston CommitDate: 2023-11-03 13:38:56 +0000 riscv: Update a variable name to match a comment This makes pmap_insert_pt_page() consistent with arm64 and amd64. No functional change intended. Reported by: alc Fixes: 7703ac2e983b ("riscv: Port improvements from arm64/amd64 pmaps, part 1") --- sys/riscv/riscv/pmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index f0108b611937..f6923363c484 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -1206,15 +1206,15 @@ pmap_add_delayed_free_list(vm_page_t m, struct spglist *free, * field will be set to VM_PAGE_BITS_ALL. */ static __inline int -pmap_insert_pt_page(pmap_t pmap, vm_page_t ml3, bool promoted, +pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte, bool promoted, bool all_l3e_PTE_A_set) { PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT(promoted || !all_l3e_PTE_A_set, ("a zero-filled PTP can't have PTE_A set in every PTE")); - ml3->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; - return (vm_radix_insert(&pmap->pm_root, ml3)); + mpte->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; + return (vm_radix_insert(&pmap->pm_root, mpte)); } /* From nobody Fri Nov 3 15:52: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 4SMQGr1ZV3z4ybgV; Fri, 3 Nov 2023 15:52: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 4SMQGr18VKz4FQY; Fri, 3 Nov 2023 15:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699026724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BEb0xwurbVl+5BFXUMZ5Wvl0YGMzGXkvyor0jJBvZyE=; b=N53OIrT7uyo5WHrWTbxm3WwM7gJ0s4h7R88rO4g8ErzmLcVkVcHyWmLeDzouLLgNcS1G76 8qtXTD/ifOpV0in+APfYxWYWfE98FKoNPSqtGCDUD10AYGTLo41uWvo12R1pra98KZ8ppF s5XjJUXMSakTelxSZmATiH2+b27PATs+ONboIay9o4h0QCzJRuhYZx8F+NexbUy71gNOLi 5hGGbzGv34WsqsTyQCeIuNwxnKL4x3d8+4EXrVMq9t51xUgBFxh+rH+pcgINIcWulOb7Lc 8SSmuyTIvRW97u7BRL3F4CCH50ck/94clNr/bc4ALpIxH/4O2z3RjoSBQrQtRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699026724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BEb0xwurbVl+5BFXUMZ5Wvl0YGMzGXkvyor0jJBvZyE=; b=Mqkz8fttyWafSvvG12Wzvv36MfrT5N8BxL4iuUQufGHn1T+t8dYjZQhSrZdDb5HIBJMLIh 7sOHBQQI1l/x9L/Z6Go7ZYdI+VvaANLloqlYd3ITHsea1RKNBVFxCPVTzfvlvgky1GZe4i KPlltO+otDN863HN5jgjo54miOX8Jrl99+TgMhDE/CYIILrKJZjtQMXvyWtOJpWuLlntja UzhMgFTtmpiwZsyyZOzHJ/FQjSiRAIKly8KYo+AI/hzl2/I1ZRf1Fspul4yvOaMxYSdjgC lqI0nVgnuxrB4J/X4jfAe6haX4Geu1hrptNzVvhoT0RTTWF/K5xFrcMULZqaLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699026724; a=rsa-sha256; cv=none; b=nRZp8OBq8udJr1J8Fj0Bsi5hNNXz7t+mnu87IcZFt3zuqvs6XKF41NExiDXSmJue110JYp /VpbAtadUyHbhMwvKUHCwroAgTE6D8URvex3ad3D8If/bCEbpB6RObpBGawFRCbL660SAg F//+4TaMG5T54zwa9gSt5dBBsLEusqtQSZWNsZffU4yqxAW87cQKDjoR/Y43if5tG3y7MJ +arNwXXmqGsw1J8GrHaEyVkNjA/YiiyEVGXerAzoB1rDWyxWsZZ6hHUrjlrAN0pfgMaHxH BgwoR6Z4Hg0CT5pQlov0+wHZafcpfREhD5fbGmkXSmtpMscbT3WhgcFFzqyCyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMQGr0DwDz4rd; Fri, 3 Nov 2023 15:52: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 3A3Fq3d9058972; Fri, 3 Nov 2023 15:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3Fq3tA058969; Fri, 3 Nov 2023 15:52:03 GMT (envelope-from git) Date: Fri, 3 Nov 2023 15:52:03 GMT Message-Id: <202311031552.3A3Fq3tA058969@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: 7bca09e2bb7f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7bca09e2bb7f812913249a1e5883742d6d6ac6b2 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=7bca09e2bb7f812913249a1e5883742d6d6ac6b2 commit 7bca09e2bb7f812913249a1e5883742d6d6ac6b2 Author: Alexander Motin AuthorDate: 2023-11-03 15:49:59 +0000 Commit: Alexander Motin CommitDate: 2023-11-03 15:49:59 +0000 mpsutil: Add higher PCIe speeds. There are already PCIe Gen4 HBAs, reported improperly. MFC after: 1 week --- 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 3 16:18: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 4SMQrn5Hytz4ygjv; Fri, 3 Nov 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SMQrn33Dcz4JLH; Fri, 3 Nov 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699028281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVeBG87DKBXilPNX1+Emg8KIVrelX8kmtg+34X4rZ0Q=; b=uWkpV4PJkUjxa47cViLtACNr0muQOtOR8JoaC6qtAtZ8QApvEmAkdH0VYgypeVvqFizuLk mK3EA5cZ/71mYaMaeMwrjHzVZ+BJrt9wNuVmx+/cf8X3cB5klZqXAjhA7G/i4EcUJY+QYH hiTlTtGhXdB300XHW40S6pySyKpwj+YIrY/J5LAJSo57amhGQ0L2qd11GD2vc8XAC5t3FJ xXwowX02IrTIJayfNlQrnzo7ZE+UcTutV1PxVwvUXcxKtENZReIpvKK4ueGP6UbgON0R7t ISWVygMiFgljtTnWsL4HVg0ftoiCp6iXUa+gQToym2LIfvZAy/cIu0Niyb5AYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699028281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVeBG87DKBXilPNX1+Emg8KIVrelX8kmtg+34X4rZ0Q=; b=wW+oTjIQbmtazeI4s4OYUsKDXXfLjPoALBLVv16E+9wgonZDS1Sw0UXkd4xKaH8MLXCaNp H0m7HWVkS54xJeET/5ssg/dGStPCuJGa+wWxJoOxS/AKJyThSLMnGpmWlmLI2wDxYwJqav Zt8XpygAtQBDc2V+PvWKw0z/4WTbnk8UCDkatEsPGk1ffhY8osKf/rezNoIZZzss4m/7A5 ieNYsNltF2b+X+EypQMdinkwe7qI5yCDC3GvTwpV4hfW0Ik6NdUAiXULZ5Fu1KflgtaCGc L9yn9PnIjXT7qc9cII4ntKl8nQ7vIditouEmYnk4q8hvM3+x0wWvVxZ1OzqzdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699028281; a=rsa-sha256; cv=none; b=ewe8EWB6uMOszaWO9PRpEiptxSlezwWriUH2Itw7qWOVU0wTFnoYRsiv1e5RfV5Shr+jiq pUq7S4VGMoy9gypsk/vFFHRbGUo0kNZJouSLQzi0BeIz8X+p9PDnPmqxBum4F9IqAh1fjg xyu36ZVyUfll+hIAlM8xJNi5rO+8/psBedp8lSxhyt0l86Gbypez3IbOVMYUW/NZOgHfYK 49biMBooNMw+UEfklGDe0YsUw+hPJdJewc/UH96OFL2Fh/RD9UdSuf3HhgLYQm/nCdPepm OH9YJDDujXTfV5AxVZcj7RKDt6Dd03JXOxi8dt4uknJI1QJDxad/XjcPklrqkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMQrn21cmz58s; Fri, 3 Nov 2023 16:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A3GI1Fi097563; Fri, 3 Nov 2023 16:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3GI1Zc097560; Fri, 3 Nov 2023 16:18:01 GMT (envelope-from git) Date: Fri, 3 Nov 2023 16:18:01 GMT Message-Id: <202311031618.3A3GI1Zc097560@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: 70f2356d364f - main - cam: Make cam_debug macros atomic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 70f2356d364fdb7e2ff5487ae03125a338defd54 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=70f2356d364fdb7e2ff5487ae03125a338defd54 commit 70f2356d364fdb7e2ff5487ae03125a338defd54 Author: Warner Losh AuthorDate: 2023-11-02 20:41:09 +0000 Commit: Warner Losh CommitDate: 2023-11-03 16:15:38 +0000 cam: Make cam_debug macros atomic The CAM_DEBUG* macros use multiple printfs to dump the data. This is suboptimal when tracing things that produce even a moderate amount since it gets intertwingled. I can't even turn on tracing with a 24-disk HBA on boot without it getting messed up. Add helper routines to work around clang's over-use of the stack: that way we only pay the stack penalty when a trace hits. Sponsored by: Netflix Reviewed by: ken, mav Differential Revision: https://reviews.freebsd.org/D42411 --- sys/cam/cam_debug.h | 67 ++++++++++++++++++++--------------------------- sys/cam/cam_xpt.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++------- sys/cam/cam_xpt.h | 4 +-- 3 files changed, 95 insertions(+), 51 deletions(-) diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h index 1526f11f4c0d..8c04b1fd7ce9 100644 --- a/sys/cam/cam_debug.h +++ b/sys/cam/cam_debug.h @@ -81,57 +81,46 @@ extern uint32_t cam_dflags; /* Printf delay value (to prevent scrolling) */ extern uint32_t cam_debug_delay; -/* Debugging macros. */ -#define CAM_DEBUGGED(path, flag) \ - (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags) \ - && (cam_dpath != NULL) \ - && (xpt_path_comp(cam_dpath, path) >= 0) \ - && (xpt_path_comp(cam_dpath, path) < 2)) - -#define CAM_DEBUG(path, flag, printfargs) \ - if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags) \ - && (cam_dpath != NULL) \ - && (xpt_path_comp(cam_dpath, path) >= 0) \ - && (xpt_path_comp(cam_dpath, path) < 2)) { \ - xpt_print_path(path); \ - printf printfargs; \ - if (cam_debug_delay != 0) \ - DELAY(cam_debug_delay); \ - } +/* Helper routines -- helps conserve stack */ +struct cam_ed; +void xpt_cam_path_debug(struct cam_path *path, const char *fmt, ...); +void xpt_cam_dev_debug(struct cam_ed *dev, const char *fmt, ...); +void xpt_cam_debug(const char *fmt, ...); -#define CAM_DEBUG_DEV(dev, flag, printfargs) \ - if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags) \ - && (cam_dpath != NULL) \ - && (xpt_path_comp_dev(cam_dpath, dev) >= 0) \ - && (xpt_path_comp_dev(cam_dpath, dev) < 2)) { \ - xpt_print_device(dev); \ - printf printfargs; \ - if (cam_debug_delay != 0) \ - DELAY(cam_debug_delay); \ +/* Stupid macro to remove a layer of parens */ +#define _CAM_X(...) __VA_ARGS__ + +/* Debugging macros. */ +#define CAM_DEBUGGED(path, flag) \ + (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags) \ + && (cam_dpath != NULL) \ + && (xpt_path_comp(cam_dpath, (path)) >= 0) \ + && (xpt_path_comp(cam_dpath, (path)) < 2)) + +#define CAM_DEBUG(path, flag, printfargs) \ + if (CAM_DEBUGGED(path, flag)) { \ + xpt_cam_path_debug(path, _CAM_X printfargs); \ } -#define CAM_DEBUG_PRINT(flag, printfargs) \ - if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)) { \ - printf("cam_debug: "); \ - printf printfargs; \ - if (cam_debug_delay != 0) \ - DELAY(cam_debug_delay); \ +#define CAM_DEBUG_DEV(dev, flag, printfargs) \ + if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags) \ + && (cam_dpath != NULL) \ + && (xpt_path_comp_dev(cam_dpath, (dev)) >= 0) \ + && (xpt_path_comp_dev(cam_dpath, (dev)) < 2)) { \ + xpt_cam_dev_debug(dev, _CAM_X printfargs); \ } -#define CAM_DEBUG_PATH_PRINT(flag, path, printfargs) \ - if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)) { \ - xpt_print(path, "cam_debug: "); \ - printf printfargs; \ - if (cam_debug_delay != 0) \ - DELAY(cam_debug_delay); \ +#define CAM_DEBUG_PRINT(flag, printfargs) \ + if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)) { \ + xpt_cam_debug(_CAM_X printfargs); \ } #else /* !_KERNEL */ #define CAM_DEBUGGED(A, B) 0 #define CAM_DEBUG(A, B, C) +#define CAM_DEBUG_DEV(A, B, C) #define CAM_DEBUG_PRINT(A, B) -#define CAM_DEBUG_PATH_PRINT(A, B, C) #endif /* _KERNEL */ diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index c32cad2433b1..a1dec7a8a674 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -3712,18 +3712,18 @@ xpt_print_path(struct cam_path *path) sbuf_delete(&sb); } -void -xpt_print_device(struct cam_ed *device) +static void +xpt_device_sbuf(struct cam_ed *device, struct sbuf *sb) { - if (device == NULL) - printf("(nopath): "); + sbuf_printf(sb, "(nopath): "); else { - printf("(noperiph:%s%d:%d:%d:%jx): ", device->sim->sim_name, - device->sim->unit_number, - device->sim->bus_id, - device->target->target_id, - (uintmax_t)device->lun_id); + sbuf_printf(sb, "(noperiph:%s%d:%d:%d:%jx): ", + device->sim->sim_name, + device->sim->unit_number, + device->sim->bus_id, + device->target->target_id, + (uintmax_t)device->lun_id); } } @@ -5543,3 +5543,60 @@ xpt_action_name(uint32_t action) snprintf(buffer, sizeof(buffer), "%#x", action); return (buffer); } + +void +xpt_cam_path_debug(struct cam_path *path, const char *fmt, ...) +{ + struct sbuf sbuf; + char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + va_list ap; + + sbuf_set_drain(sb, sbuf_printf_drain, NULL); + xpt_path_sbuf(path, sb); + va_start(ap, fmt); + sbuf_vprintf(sb, fmt, ap); + va_end(ap); + sbuf_finish(sb); + sbuf_delete(sb); + if (cam_debug_delay != 0) + DELAY(cam_debug_delay); +} + +void +xpt_cam_dev_debug(struct cam_ed *dev, const char *fmt, ...) +{ + struct sbuf sbuf; + char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + va_list ap; + + sbuf_set_drain(sb, sbuf_printf_drain, NULL); + xpt_device_sbuf(dev, sb); + va_start(ap, fmt); + sbuf_vprintf(sb, fmt, ap); + va_end(ap); + sbuf_finish(sb); + sbuf_delete(sb); + if (cam_debug_delay != 0) + DELAY(cam_debug_delay); +} + +void +xpt_cam_debug(const char *fmt, ...) +{ + struct sbuf sbuf; + char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + va_list ap; + + sbuf_set_drain(sb, sbuf_printf_drain, NULL); + sbuf_printf(sb, "cam_debug: "); + va_start(ap, fmt); + sbuf_vprintf(sb, fmt, ap); + va_end(ap); + sbuf_finish(sb); + sbuf_delete(sb); + if (cam_debug_delay != 0) + DELAY(cam_debug_delay); +} diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h index 1276dd7b9b2e..3c8d385fe33b 100644 --- a/sys/cam/cam_xpt.h +++ b/sys/cam/cam_xpt.h @@ -33,16 +33,15 @@ #define _CAM_CAM_XPT_H 1 #ifdef _KERNEL -#include #include #endif +#include /* Forward Declarations */ union ccb; struct cam_periph; struct cam_ed; struct cam_sim; -struct sbuf; /* * Definition of a CAM path. Paths are created from bus, target, and lun ids @@ -113,7 +112,6 @@ struct cam_sim *xpt_path_sim(struct cam_path *path); struct cam_periph *xpt_path_periph(struct cam_path *path); device_t xpt_path_sim_device(const struct cam_path *path); void xpt_print_path(struct cam_path *path); -void xpt_print_device(struct cam_ed *device); void xpt_print(struct cam_path *path, const char *fmt, ...); void xpt_async(uint32_t async_code, struct cam_path *path, void *async_arg); From nobody Fri Nov 3 16:18: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 4SMQrq0SLNz4ygsh; Fri, 3 Nov 2023 16:18: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 4SMQrp3fBCz4JW7; Fri, 3 Nov 2023 16:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699028282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1jz4l08IFu7rQCzR8bEE8pZ9hRZo+s8VyIJbUc9zXno=; b=Y3RkbyW2TewQmaA8kPJtzAYyBKs1dn1FXpYr8YvyiDCC2xjYFz4fCgGT1YGkm8/R2EcTnG Z2AkF0ztJN8AMBfqmTZHAA/csLfHLk46UVfEKm3Abtyi8deF+gajaHbtegTsZT+WdEQTa6 TAjpCurv2E61eHW/qb40dQKd0jvuiJ4R7QeCHQ+5N2C20jxZx5B+rvfRQHg6mJ2RAMe7cL z007IGW5bkC0vT3qYKvEigu0ISj+Wi/EuxwT/9hbKnsKjovAUUU+v3/qdGu18UHgspP/xv n3SdzABxegikI+6ZBJDuPx/YOtpqb1o3TY6EkJF9OS7OHvghsEJLWgK9BA7ZDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699028282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1jz4l08IFu7rQCzR8bEE8pZ9hRZo+s8VyIJbUc9zXno=; b=S///ACi4jbaSpn3ukFIi/19OKnG/ZkSJXNjwYidkzY40V5KAQRHL51+LH64qoXhxglyx71 B6FVuLjRwgNodX5r5MVye3W0A9B0rXpimJ21sge7B113+8EpfJrCWCXi4lkqa1pzizuVB1 8JDtZrNOLOfstjQuni3ivsEK9sEc4dzy4RdTvn2tpGiZpI6M4JyCHLoDGMT8cqSFdpcRX2 eJnEm57xful6GNjSjjH0C3Y+sNyPxPD40jtMZEyH/qGeu45zahK42ZUtgfVb/77zRfnJpM JJbkiKrqGWbmRUmmrP7UIeTCErSPBrF7G07vRH96a3VHe3qRDu9SHvfAWqMuxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699028282; a=rsa-sha256; cv=none; b=PtM/PyaEFbMhJ6S/BfNE3B9DQQwJMzJB5srO5ScEnuypQ1OA14YkcL98vpVYUjk9CP/GWL UQ5kGhQxP4kGpTVJvd+aWosPuxpv/OZbCbw8n0DO0vAgz3baLpKuOTgh6TGLN/9ZhUhKl2 Qt26FTb+AUyGYy8wUx/mCloQjDX0ydy232vdRp65+QpsFAe/49cd1o4GJM+zy/7Yc8VWPy mu44XkTEgylfFfYqCZawSL7QXCyRqftmQC8lnDYteU4q7Wv8gNQYzUG/FzW9nmsUe7K8j+ eHr2fLlwoewAwn96etvKT9xzOUNeNAboHIRfGzzLfeGMpoolLvmcK4aUbSYDdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMQrp2lwfz57j; Fri, 3 Nov 2023 16:18: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 3A3GI2qk097614; Fri, 3 Nov 2023 16:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3GI2Mg097611; Fri, 3 Nov 2023 16:18:02 GMT (envelope-from git) Date: Fri, 3 Nov 2023 16:18:02 GMT Message-Id: <202311031618.3A3GI2Mg097611@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: 03e2fc4c4446 - main - cam: Minor tidying up the cam module Makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 03e2fc4c44465d29a8208eaa0bd65198efbd572b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=03e2fc4c44465d29a8208eaa0bd65198efbd572b commit 03e2fc4c44465d29a8208eaa0bd65198efbd572b Author: Warner Losh AuthorDate: 2023-11-02 20:41:17 +0000 Commit: Warner Losh CommitDate: 2023-11-03 16:15:39 +0000 cam: Minor tidying up the cam module Makefile One src per line + sorting. Sponsored by: Netflix --- sys/modules/cam/Makefile | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile index 79551349be3c..566b245dca2c 100644 --- a/sys/modules/cam/Makefile +++ b/sys/modules/cam/Makefile @@ -16,30 +16,39 @@ SRCS+= opt_sa.h SRCS+= opt_ses.h SRCS+= opt_ddb.h SRCS+= opt_printf.h -SRCS+= device_if.h bus_if.h vnode_if.h +SRCS+= bus_if.h +SRCS+= device_if.h +SRCS+= vnode_if.h +SRCS+= ata_all.c +SRCS+= ata_da.c +SRCS+= ata_pmp.c +SRCS+= ata_xpt.c SRCS+= cam.c SRCS+= cam_compat.c -SRCS+= cam_iosched.c cam_periph.c cam_queue.c cam_sim.c cam_xpt.c -SRCS+= scsi_all.c scsi_cd.c scsi_ch.c +SRCS+= cam_iosched.c +SRCS+= cam_periph.c +SRCS+= cam_queue.c +SRCS+= cam_sim.c +SRCS+= cam_xpt.c +SRCS+= nvme_all.c +SRCS+= nvme_da.c +SRCS+= nvme_util.c +SRCS+= nvme_xpt.c +SRCS+= scsi_all.c +SRCS+= scsi_cd.c +SRCS+= scsi_ch.c SRCS+= scsi_da.c +SRCS+= scsi_enc.c +SRCS+= scsi_enc_safte.c +SRCS+= scsi_enc_ses.c SRCS+= scsi_pass.c SRCS+= scsi_pt.c SRCS+= scsi_sa.c -SRCS+= scsi_enc.c -SRCS+= scsi_enc_ses.c -SRCS+= scsi_enc_safte.c SRCS+= scsi_sg.c -SRCS+= scsi_targ_bh.c scsi_target.c +SRCS+= scsi_targ_bh.c +SRCS+= scsi_target.c SRCS+= scsi_xpt.c SRCS+= smp_all.c -SRCS+= ata_all.c -SRCS+= ata_xpt.c -SRCS+= ata_da.c -SRCS+= ata_pmp.c -SRCS+= nvme_all.c -SRCS+= nvme_xpt.c -SRCS+= nvme_da.c -SRCS+= nvme_util.c EXPORT_SYMS= YES # XXX evaluate From nobody Fri Nov 3 16:32: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 4SMR9w2hLmz4yklk; Fri, 3 Nov 2023 16:32: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 4SMR9w2Stxz4R6p; Fri, 3 Nov 2023 16:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699029172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTTjMqcsQbk0rkvmhRlitPqj1xam58OChjUoADHjM1M=; b=eFMx4EwgGXaamLDL/77+foCkMrSc2oX9nThYLC0gCFQUJ//kNkWTOQIWt1rue3TTDYgNKQ r/iey/Sqm7tWpkUnqeefqYGsTyH4eUXVjZnDmqlTS8h1iWTV3ca6ME3/jpAoPoQVALPYJe aLYuyIIOQQqMmRjL0DfU5gqBDBpnHOG4+7EeyW1nq5HM4InXPrz2m6bBCcVVe9a+9bu1rD B02BygqqCfSWn7EhrM9E68yx5ce9UZJoxZH1LtZrRsuw8TIcf+9RTCN+I9wFLWBhz1WD4+ 8lvgB2PE7gGqUVNinTZzuV8WLqfg4inf6geWDYaxH2CBPbqNvO8Qe/NPumWAIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699029172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTTjMqcsQbk0rkvmhRlitPqj1xam58OChjUoADHjM1M=; b=h/3IL5t7M5/5SoLWEHIheKYe86CWIxq184kNzuby7dbtrQjnl9fESsXNO+o8SVHTsAE1gE 3PyJ+wCZT138Y0933IFlzKkep76vfSPgh6FLN2xnR6t9j78u/m60jFUIPuxql/iB+Jl7aq +NGL2X0iZ3LodeykeEOol1ENl5NvuX1pi4bSeT+8scLLPmkxT/qRy7zyNZtzPesVgR9ekR fc3fyb0PGxDavV1a5GBprk/o/vR8IXyqjNIxYbB97hM8q45IRTNZdXU/0xoJOJT4P2Yb3n ybjDhWYeX3zVfSW3LzEhKMVcXwnPDvo+8hyBwdmaEIYoX7ls5m3bNTvTmrGU+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699029172; a=rsa-sha256; cv=none; b=argvgUYgK9E474rjod4PCU+XRs8F71YL04yLVsbndndGtnSt6YFg9INtB2rPgTsF6h/bKy tieNmAXztUt/3ywGnuU23ZVQ+VYYHjBXOaj8P2SKcMJAxwAXke82zxnpjejAktrJejngPr kGKIrl9Y0Y5BDzYjRvQO++VRI9FsDj8jxcPbtDh+Zz/XNey0TT1+bffnVpwkHFGeUd+rMq +bprEzI5pZ34vBVrxAbXbILrmV43vrohBn2aeByn8OmmRzwOvSXbJT3WGCWBwUSQPwpZ8V lMTw7yv2ga3akpCDlkUT+4xnWlYfXLESk+SGis+Xf4WjD1ysdzi3uVUbnsbscg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMR9w1X8kz642; Fri, 3 Nov 2023 16:32: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 3A3GWqHi029312; Fri, 3 Nov 2023 16:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3GWq5c029309; Fri, 3 Nov 2023 16:32:52 GMT (envelope-from git) Date: Fri, 3 Nov 2023 16:32:52 GMT Message-Id: <202311031632.3A3GWq5c029309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: dbffadd8c28e - main - pci_vendors: update to 2023-09-22 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbffadd8c28e3ab7dc8b5d38e3c5d7f96a5ad62d Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=dbffadd8c28e3ab7dc8b5d38e3c5d7f96a5ad62d commit dbffadd8c28e3ab7dc8b5d38e3c5d7f96a5ad62d Author: Baptiste Daroussin AuthorDate: 2023-11-03 16:32:35 +0000 Commit: Baptiste Daroussin CommitDate: 2023-11-03 16:32:45 +0000 pci_vendors: update to 2023-09-22 --- share/misc/pci_vendors | 390 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 318 insertions(+), 72 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index d3988731c30a..50115d979327 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.08.12 -# Date: 2023-08-12 03:15:02 +# Version: 2023.09.22 +# Date: 2023-09-22 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -773,7 +773,6 @@ 1028 2142 HBA465e Adapter 1028 2209 HBA465i Adapter 1028 220a HBA465i Front - 1028 228a HBA465e-s Adapter 15d9 1d03 AOC-S4116L-H16IR (16DD/96DD) RAID Adapter 15d9 1d07 AOC-S4016L-L16IT Storage Adapter 15d9 1d08 AOC-S4016L-L16IR Storage Adapter @@ -803,6 +802,20 @@ 1d49 0204 ThinkSystem 430-8i SAS/SATA 12Gb Dense HBA 00b2 PCIe Switch management endpoint 1d49 0003 ThinkSystem 1611-8P PCIe Gen4 NVMe Switch Adapter +# 24G SAS/PCIe storage adapter chip + 00b3 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx +# 9760W 32 internal port RAID controller + 1000 5000 MegaRAID 9760W-32i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal port RAID controller + 1000 5001 MegaRAID 9760W-16i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal and 16 external port RAID controller + 1000 5010 MegaRAID 9760W-16i16e 24G SAS/PCIe Storage Adapter +# 9700W 32 internal port Storage controller + 1000 5020 eHBA 9700W-32i 24G SAS/PCIe Storage Adapter +# 9700W 16 internal port Storage controller + 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter +# 9700 16 external port Storage controller + 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1039,8 +1052,9 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit + 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit + 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1152,6 +1166,7 @@ 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] + 145a Dummy Function (absent graphics controller) 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch 1506 Mendocino @@ -3932,6 +3947,7 @@ 1462 5022 RX 6600 MECH 2X 148c 2412 PowerColor Red Devil RX 6600 XT 1849 5218 Radeon RX 6600 Challenger ITX 8GB + 1da2 448e Radeon RX 6600 XT Pulse 7408 Aldebaran/MI200 [Instinct MI250X] 740c Aldebaran/MI200 [Instinct MI250X/MI250] 740f Aldebaran/MI200 [Instinct MI210] @@ -3948,6 +3964,7 @@ 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] + 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] @@ -4981,6 +4998,8 @@ 1455 Zeppelin/Renoir PCIe Dummy Function 1456 Family 17h (Models 00h-0fh) Platform Security Processor (PSP) 3.0 Device 1457 Family 17h (Models 00h-0fh) HD Audio Controller + 1458 XGMAC 10GbE Controller + 1459 XGMAC 10GbE Controller 145a Zeppelin/Raven/Raven2 PCIe Dummy Function 145b Zeppelin Non-Transparent Bridge 145c Family 17h (Models 00h-0fh) USB 3.0 Host Controller @@ -5037,6 +5056,7 @@ 14b5 Family 17h-19h PCIe Root Complex 14b6 Family 17h-19h IOMMU 14b7 Family 17h-19h PCIe Dummy Host Bridge + 14b8 Family 17h-19h PCIe GPP Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge # Server device @@ -5044,6 +5064,7 @@ 14cd Family 19h USB4/Thunderbolt PCIe tunnel 14de Phoenix PCIe Dummy Function 14ef Family 19h USB4/Thunderbolt PCIe tunnel + 1502 AMD IPU Device 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -12492,7 +12513,7 @@ 1c2d GP106M 1c30 GP106GL [Quadro P2000] 1c31 GP106GL [Quadro P2200] - 1c35 GP106M [Quadro P2000 Mobile] + 1c35 GP106M [Quadro P2000 Mobile / DRIVE PX 2 AutoChauffeur] 1c36 GP106 [P106M] 1c60 GP106BM [GeForce GTX 1060 Mobile 6GB] 103c 8390 GeForce GTX 1060 Max-Q 6GB @@ -12548,6 +12569,8 @@ 1d52 GP108BM [GeForce MX250] 1d56 GP108BM [GeForce MX330] 1d81 GV100 [TITAN V] + 1d83 GV100 [CMP 100-200] + 1d84 GV100 [CMP 100-210] 1db1 GV100GL [Tesla V100 SXM2 16GB] 1db2 GV100GL [Tesla V100 DGXS 16GB] 1db3 GV100GL [Tesla V100 FHHL 16GB] @@ -12560,6 +12583,7 @@ 1dba GV100GL [Quadro GV100] 10de 12eb TITAN V CEO Edition 1dbe GV100 Engineering Sample + 1dc1 GV100 [CMP 100-200] 1df0 GV100GL [Tesla PG500-216] 1df2 GV100GL [Tesla PG503-216] 1df5 GV100GL [Tesla V100 SXM2 16GB] @@ -12649,7 +12673,7 @@ 1f96 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f97 TU117M [GeForce MX450] 1f98 TU117M [GeForce MX450] - 1f99 TU117M + 1f99 TU117M [GeForce GTX 1650 Mobile / Max-Q] 1f9c TU117M [GeForce MX450] 1f9d TU117M [GeForce GTX 1650 Mobile / Max-Q] # via Lenovo 496.90 @@ -12688,9 +12712,10 @@ 20b8 GA100 [A100X] 20b9 GA100 [A30X] 20bb GA100 [DRIVE A100 PROD] + 20bd GA100 [A800 SXM4 40GB] 20be GA100 [GRID A100A] 20bf GA100 [GRID A100B] - 20c0 GA100 + 20c0 GA100 [Initial DevID] 20c2 GA100 [CMP 170HX] 20f0 GA100 [A100-PG506-207] 20f1 GA100 [A100 PCIe 40GB] @@ -12699,7 +12724,7 @@ 20f5 GA100 [A800 80GB PCIe] 20f6 GA100 [A800 40GB PCIe] 20fd GA100 [AX800 Converged Accelerator] - 20fe GA100 + 20fe GA100 [INT SKU] 20ff GA100 2182 TU116 [GeForce GTX 1660 Ti] 2183 TU116 @@ -12742,6 +12767,7 @@ 228b GA104 High Definition Audio Controller 228e GA106 High Definition Audio Controller 2296 Tegra PCIe Endpoint Virtual Network + 22a3 GH100 [H100 NVSwitch] 22ba AD102 High Definition Audio Controller 2302 GH100 2313 GH100 [H100 CNX] @@ -12859,6 +12885,7 @@ 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 + 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] @@ -12870,17 +12897,21 @@ 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] + 27fa AD104GLM [RTX 4000 Ada Generation Embedded GPU] + 27fb AD104GLM [RTX 3500 Ada Generation Embedded GPU] 2803 AD106 [GeForce RTX 4060 Ti] 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2878 AD106GLM [RTX 3000 Ada Generation Embedded GPU] 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] 28e0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28e1 AD107M [GeForce RTX 4050 Max-Q / Mobile] + 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -13126,7 +13157,7 @@ 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop 5760 RTS5763DL x2 NVMe SSD Controller - 5762 RTS5763DL NVMe SSD Controller + 5762 RTS5762 NVMe SSD Controller 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) @@ -14093,6 +14124,7 @@ 5409 VX855/VX875 APIC and Central Traffic Control 5410 VX900 Series APIC and Central Traffic Control 6100 VT85C100A [Rhine II] + 6122 VN1000 Graphics [Chrome 520 IGP] 6287 SATA RAID Controller 6290 K8M890CE Host Bridge 6327 P4M890 Security Device @@ -17094,7 +17126,7 @@ 12a2 Newgen Systems Corporation 12a3 Lucent Technologies 8105 T8105 H100 Digital Switch -12a4 NTT Electronics Corporation +12a4 NTT Innovative Devices Corporation 12a5 Vision Dynamics Ltd. 12a6 Scalable Networks, Inc. 12a7 AMO GmbH @@ -19948,6 +19980,8 @@ 103c 3383 Ethernet 1Gb 4-port 331T Adapter 14e4 1904 4-port 1Gb Ethernet Adapter 14e4 1909 Broadcom NetXtreme 5719 Quad Port Gigabit NIC + 14e4 d146 BCM95719-P41 4x1GBT Ethernet NIC + 14e4 d346 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard @@ -20251,6 +20285,8 @@ 117c 00ce FastFrame N4T2 Dual-port 10GBASE-T Ethernet Adapter 14e4 4163 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 2.0 Adapter (BCM957416M4163C) 14e4 4166 NetXtreme-E Dual-port 10GBASE-T Ethernet OCP 3.0 Adapter (BCM957416N4160C) + 14e4 d140 BCM957416-P410 4x10GBT Ethernet NIC + 14e4 d340 BCM957416-N410 4x10GBT Ethernet NIC 1590 020c Ethernet 10Gb 2-port 535T Adapter 1590 0212 Ethernet 10Gb 2-port 535FLR-T Adapter 16d9 BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller @@ -20303,15 +20339,19 @@ 117c 00cf FastFrame N412 Dual-port 100Gb Ethernet Adapter 14e4 2100 NetXtreme-E Dual-port 100G QSFP56 Ethernet PCIe4.0 x16 Adapter (BCM957508-P2100G) 14e4 5208 NetXtreme-E Dual-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957508-N2100G) + 14e4 520a NetXtreme-E Dual-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957508-N2100GD) 14e4 d124 NetXtreme-E P2100D BCM57508 2x100G QSFP PCIE + 14e4 d324 NetXtreme-E N2100D BCM57508 2x100G QSFP OCP3.0 Ethernet 14e4 df24 NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz Ethernet 1751 BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet 1028 09d4 PowerEdge XR11/XR12 LOM 1028 0b1b PowerEdge XR5610 LOM + 14e4 4250 NetXtreme-E Quad-port 25G SFP28 Ethernet PCIe4.0 x16 Adapter (BCM957504-P425G) 14e4 5045 NetXtreme-E BCM57504 4x25G OCP3.0 14e4 5100 NetXtreme-E Single-port 100G QSFP56 Ethernet OCP 3.0 Adapter (BCM957504-N1100G) 14e4 5105 NetXtreme-E Single-port 100G DSFP Ethernet OCP 3.0 Adapter (BCM957504-N1100GD) 14e4 5250 NetXtreme-E BCM57504 4x25G KR Mezz + 14e4 5425 NetXtreme-E Quad-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957504-N425G) 14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE 1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet 1800 BCM57502 NetXtreme-E Ethernet Partition @@ -21447,8 +21487,11 @@ 193d 1051 NIC-IB1040i-Mb-2P 1018 MT27800 Family [ConnectX-5 Virtual Function] 1019 MT28800 Family [ConnectX-5 Ex] + 1014 0617 PCIe4 x16 2-Port EDR IB-only ConnectX-5 CAPI Capable Adapter [IBM EC64] + 1014 0635 PCIe4 2-port 100 GbE RoCE x16 adapter [IBM EC66] 15b3 0008 ConnectX-5 Ex EN network interface card, 100GbE dual-port QSFP28, PCIe4.0 x16, tall bracket; MCX516A-CDAT 15b3 0125 Tencent ConnectX-5 EN Ex network interface card for OCP 3.0, with host management, 50GbE Dual-port QSFP28, PCIe4.0 x16, Thumbscrew (pull-tab) bracket + 15b3 0126 PCIe4 x16 2-port EDR 100GbE ConnectX-5 CAPI Capable adapter [IBM AJP1] 101a MT28800 Family [ConnectX-5 Ex Virtual Function] 101b MT28908 Family [ConnectX-6] 101c MT28908 Family [ConnectX-6 Virtual Function] @@ -21583,14 +21626,14 @@ 15b7 Sandisk Corp 2001 Skyhawk Series NVME SSD 5001 WD Black NVMe SSD - 5002 WD Black 2018/SN750 / PC SN720 NVMe SSD + 5002 SanDisk Extreme Pro / WD Black 2018/SN750/PC SN720 NVMe SSD 5003 WD Blue SN500 / PC SN520 NVMe SSD 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD - 5006 WD Black SN750 / PC SN730 NVMe SSD + 5006 WD Black SN750 / PC SN730 / Red SN700 NVMe SSD 5007 IX SN530 NVMe SSD (DRAM-less) 5008 PC SN530 NVMe SSD (DRAM-less) - 5009 WD Blue SN550 NVMe SSD + 5009 SanDisk Ultra 3D / WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X @@ -21601,13 +21644,14 @@ 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) - 501a WD Blue SN570 NVMe SSD 1TB + 501a WD Blue SN570 NVMe SSD 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) 501e PC SN735 NVMe SSD (DRAM-less) 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) - 5030 Western Digital WD Black SN850X NVMe SSD + 5030 WD Black SN850X NVMe SSD + 5041 WD Blue SN580 NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -22781,7 +22825,8 @@ 188a ARC-1886 series PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1217 ARC-1217 4-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller 17d3 1227 ARC-1227 8-Port PCIe 4.0 to SAS/SATA 12/6Gb RAID Controller - 17d3 1686 ARC-1686 PCIe 4.0 to SAS/SATA 12/6Gb Tape drive Controller + 17d3 1686 ARC-1686 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller + 17d3 1688 ARC-1688 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller 17d3 1886 ARC-1886 PCIe 4.0 to NVMe/SAS/SATA 16/12/6Gb RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. @@ -23865,6 +23910,14 @@ 1a0d SEAKR Engineering 1a0e DekTec Digital Video B.V. 083f DTA-2111 VHF/UHF Modulator + 0860 DTA-2144(B) Quad ASI/SDI in+out + 0861 DTA-2145 ASI/SDI in+out with bypass relay + 087c DTA-2172 Dual 3G-SDI/ASI ports + 087e DTA-2174 Quad 3G-SDI/ASI in+out + 087f DTA-2175 3G-SDI/ASI input+output with bypass relay + 0882 DTA-2178 Octal 12G-SDI/ASI ports with genlock + a882 DTA-2178-ASI Octal ASI Ports + b87e DTA-2174B Quad 3G-SDI/ASI ports (1x12G) with genlock 1a17 Force10 Networks, Inc. 8002 PB-10GE-2P 10GbE Security Card 1a1d GFaI e.V. @@ -23974,6 +24027,8 @@ 0017 SEL-3350 GPIO Expansion Board 0018 SEL-3390E4 Ethernet Adapter 001c SEL-3390E4 Ethernet Adapter +1aab Silver Creations AG + 7750 Sceye 10L 1aae Global Velocity, Inc. 1ab4 Distributed Management Task Force, Inc. (DMTF) 1ab6 CalDigit, Inc. @@ -24158,6 +24213,7 @@ 2142 ASM2142/ASM3142 USB 3.1 Host Controller 1462 7a72 H270 PC MATE 2824 ASM2824 PCIe Gen3 Packet Switch + 3042 ASM3042 USB 3.2 Gen 1 xHCI Controller 3242 ASM3242 USB 3.2 Host Controller 1b26 Netcope Technologies, a.s. c132 COMBO-LXT155 @@ -24237,6 +24293,9 @@ 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit + 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 + 2b44 NXP 88W9098 Wi-Fi 6 (ax) MAC #2 + 2b45 NXP 88W9098 Bluetooth 5.3 9120 88SE9120 SATA 6Gb/s Controller 9123 88SE9123 PCIe SATA 6.0 Gb/s controller dc93 600e DC-6xxe series SATA 6G controller @@ -24321,6 +24380,7 @@ 2404 Ultrastar DC SN640 NVMe SSD 2500 Ultrastar DC SN840 NVMe SSD 2600 Ultrastar DC ZN540 ZNS NVMe SSD + 3001 RapidFlex C2000 NVMe Initiator 3714 PC SN730 NVMe SSD 3734 PC SN730 NVMe SSD 1b9a XAVi Technologies Corp. @@ -24438,7 +24498,7 @@ 1bb1 01a1 Nytro XP7102 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) - 5016 FireCuda 520 SSD + 5016 FireCuda 520/IronWolf 525 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder @@ -24505,6 +24565,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bf5 Greenliant 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. @@ -24703,6 +24764,12 @@ 1c5f 4b51 NVMe SSD PBlaze6 6936 12800GB 2.5" U.3 1c5f 4b61 NVMe SSD PBlaze6 6936 25600GB 2.5" U.3 003f PBlaze7 7940/7946 NVMe SSD + 1c5f 1431 NVMe SSD PBlaze7 7940 3840G 2.5" U.2 + 1c5f 1441 NVMe SSD PBlaze7 7940 7680G 2.5" U.2 + 1c5f 1451 NVMe SSD PBlaze7 7940 15360G 2.5" U.2 + 1c5f 5431 NVMe SSD PBlaze7 7946 3200G 2.5" U.2 + 1c5f 5441 NVMe SSD PBlaze7 7946 6400G 2.5" U.2 + 1c5f 5451 NVMe SSD PBlaze7 7946 12800G 2.5" U.2 0540 PBlaze4 NVMe SSD 0550 PBlaze5 700/900 0555 PBlaze5 510/516 @@ -24853,47 +24920,55 @@ 0714 ZX-100/ZX-200 PCI Express Root Port 0715 ZX-100/ZX-200 PCI Express Root Port 0716 ZX-D PCI Express Root Port - 0717 KX-5000/KX-6000/KX-6000G Express Root Port - 0718 KX-5000/KX-6000/KX-6000G Express Root Port - 0719 KX-5000/KX-6000/KX-6000G Express Root Port - 071a KX-5000/KX-6000/KX-6000G Express Root Port - 071b KX-5000/KX-6000/KX-6000G Express Root Port - 071c KX-5000/KX-6000/KX-6000G Express Root Port - 071d KX-5000/KX-6000/KX-6000G Express Root Port - 071e KX-5000/KX-6000/KX-6000G Express Root Port + 0717 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0718 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 0719 KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071a KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071b KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071c KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071d KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port + 071e KX-5000/KX-6000/KX-6000G/KH-40000 Express Root Port 071f ZX-200 Upstream Port of PCI Express Switch 0720 ZX-200 PCIE RC6 controller 0721 ZX-200 Downstream Port of PCI Express Switch 0722 ZX-200 PCIE P2C bridge + 0731 KH-40000 Express Root Port + 0732 KH-40000 Express Root Port 1000 ZX-D Standard Host Bridge - 1001 ZX-D/ZX-E Miscellaneous Bus + 1001 ZX-D/ZX-E/KH-40000 Miscellaneous Bus 1003 ZX-E Standard Host Bridge + 1005 KH-40000 Standard Host Bridge 1006 KX-6000G Standard Host Bridge 3001 ZX-100 Standard Host Bridge 300a ZX-100 Miscellaneous Bus - 3038 ZX-100/ZX-200/KX-6000/KX-6000G Standard Universal PCI to USB Host Controller - 3104 ZX-100/ZX-200/KX-6000/KX-6000G Standard Enhanced PCI to USB Host Controller - 31b0 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b1 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge - 31b2 ZX-100/KX-5000/KX-6000/KX-6000G DRAM Controller - 31b3 ZX-100/KX-5000/KX-6000/KX-6000G Power Management Controller - 31b4 ZX-100/KX-5000/KX-6000/KX-6000G I/O APIC - 31b5 ZX-100/KX-5000/KX-6000/KX-6000G Scratch Device - 31b7 ZX-100/KX-5000/KX-6000/KX-6000G Standard Host Bridge + 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Universal PCI to USB Host Controller + 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Enhanced PCI to USB Host Controller + 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 DRAM Controller + 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Power Management Controller + 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 I/O APIC + 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Scratch Device + 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge 31b8 ZX-100/ZX-D PCI to PCI Bridge - 3288 ZX-100/KX-5000/KX-6000/KX-6000G High Definition Audio Controller - 345b ZX-100/KX-5000/KX-6000/KX-6000G Miscellaneous Bus + 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 High Definition Audio Controller + 345b ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Miscellaneous Bus 3a02 ZX-100 C-320 GPU 3a03 ZX-D C-860 GPU 3a04 ZX-E C-960 GPU + 3b01 KH-40000 OPI Controller + 3b02 KH-40000 OPI Controller + 3b03 KH-40000 OPI Controller + 3b04 KH-40000 OPI Controller + 3c00 KH-40000 DRAM Controller 3c02 KX-6000G DRAM Controller 3d01 KX-6000G C-1080 GPU - 9002 ZX-100/ZX-200 EIDE Controller + 9002 ZX-100/ZX-200/KH-40000 EIDE Controller 9003 ZX-100/KX-6000/KX-6000G EIDE Controller - 9043 KX-6000G RAID Controller + 9043 KX-6000G/KH-40000 RAID Controller 9045 ZX-100/ZX-D/ZX-E RAID Accelerator 0 9046 ZX-D/ZX-E RAID Accelerator 1 - 9083 ZX-100/ZX-200/KX-6000/KX-6000G StorX AHCI Controller + 9083 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 StorX AHCI Controller 9084 ZX-100 StorX AHCI Controller 9100 ZX-200 Cross bus 9101 ZX-200 Traffic Controller @@ -24902,11 +24977,14 @@ 9144 ZX-E High Definition Audio Controller 9145 KX-6000G High Definition Audio Controller 9180 ZX-200 Networking Gigabit Ethernet Adapter + 91c1 KH-40000 ZPI Controller + 91c2 KH-40000 ZPI Controller 9202 ZX-100 USB eXtensible Host Controller 9203 ZX-200 USB eXtensible Host Controller 9204 KX-6000/KX-6000G USB eXtensible Host Controller + 9205 KH-40000 USB eXtensible Host Controller 9286 ZX-D eMMC Host Controller - 9300 ZX-100/KX-5000/KX-6000/KX-6000G eSPI Host Controller + 9300 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 eSPI Host Controller 95d0 ZX-100 Universal SD Host Controller f410 ZX-100/KX-5000/KX-6000/KX-6000G PCI Com Port 1d18 RME @@ -24944,6 +25022,7 @@ 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo + 0522 ThinkSystem RAID 5350-8i PCIe 12Gb Internal Adapter 1d4c Diamanti, Inc. 1d5c Fantasia Trading LLC 1d61 Technobox, Inc. @@ -25075,8 +25154,9 @@ 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. 2262 NVMe PCIe SSD 220S - 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2263 NVMe PCIe SSD 110S/112S/120S/MTE652T2 (DRAM-less) 2264 NVMe PCIe SSD 250H + 2267 NVMe PCIe SSD 240S/MTE710T 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. @@ -25207,10 +25287,17 @@ 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1000 DSC Capri Upstream Port 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB @@ -25223,6 +25310,7 @@ 1dd8 400e DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1001 DSC Virtual Downstream Port + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25235,9 +25323,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1002 DSC Ethernet Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25250,9 +25345,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1003 DSC Ethernet Controller VF + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25265,9 +25367,16 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1004 DSC Management Controller + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25280,19 +25389,40 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1005 DSC NVMe Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1006 DSC NVMe Controller VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1007 DSC Storage Accelerator + 1dd8 100e Distributed Services Card 1dd8 4000 Naples 100Gb 2-port QSFP28 x16 8GB 1dd8 4001 Naples 100Gb 2-port QSFP28 x16 4GB 1dd8 4002 Naples 25Gb 2-port SFP28 x8 4GB @@ -25305,33 +25435,74 @@ 1dd8 4014 DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1009 DSC Ethernet Controller UPT + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100a DSC Serial Port Controller + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100b DSC vDPA Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100c DSC PDS Core Management + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 100d DSC Virtio Network Device VF + 1dd8 100e Distributed Services Card 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card 1dd8 5003 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card + 1dd8 5008 DSC25v2 10/25G 2p 32GB Spl Card + 1dd8 5009 DSC2-25 10/25G 2p SFP56 DPU 1dd8 500a DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R2 1dd8 500b DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU + 1dd8 500c DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R3 + 1dd8 500d DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4 + 1dd8 500e DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5 + 1dd8 500f DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T 1ddd Thorlabs 1de0 Groq 0000 TSP [GroqChip] @@ -25495,26 +25666,6 @@ 1028 2193 NVMe CD7 E3.S 1.92TB 1028 2194 NVMe CD7 E3.S 3.84TB 1028 2195 NVMe CD7 E3.S 7.68TB - 0013 NVMe SSD Controller CM7 2.5" - 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB - 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB - 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB - 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB - 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB - 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB - 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB - 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB - 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB - 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB - 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB - 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB - 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB - 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB - 1028 223b Ent NVMe CM7 U.2 MU 12.8TB - 1028 223c Ent NVMe CM7 U.2 MU 6.4TB - 1028 223d Ent NVMe CM7 U.2 MU 3.2TB - 1028 223e Ent NVMe CM7 U.2 MU 1.6TB - 1028 228c Ent NVMe CM7 U.2 MU 6.4TB 0014 NVMe SSD Controller CM7 EDSFF 1028 223f Ent NVMe CM7 FIPS E3.S RI 15.36TB 1028 2240 Ent NVMe CM7 FIPS E3.S RI 7.68TB @@ -25527,6 +25678,10 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 1028 22b7 Ent NVMe CM7 FIPS E3.S MU 1.6TB + 1028 22b8 Ent NVMe CM7 FIPS E3.S MU 3.2TB + 1028 22b9 Ent NVMe CM7 FIPS E3.S MU 6.4TB + 1028 22ba Ent NVMe CM7 FIPS E3.S MU 12.8TB 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB @@ -25539,6 +25694,25 @@ 1028 222a DC NVMe CD8 U.2 3.84TB 1028 222b DC NVMe CD8 U.2 1.92TB 1028 222c DC NVMe CD8 U.2 960GB + 0025 NVMe SSD Controller CM7 2.5" + 1028 222d Ent NVMe CM7 FIPS U.2 RI 30.72TB + 1028 222e Ent NVMe CM7 FIPS U.2 RI 15.36TB + 1028 222f Ent NVMe CM7 FIPS U.2 RI 7.68TB + 1028 2230 Ent NVMe CM7 FIPS U.2 RI 3.84TB + 1028 2231 Ent NVMe CM7 FIPS U.2 RI 1.92TB + 1028 2232 Ent NVMe CM7 U.2 RI 30.72TB + 1028 2233 Ent NVMe CM7 U.2 RI 15.36TB + 1028 2234 Ent NVMe CM7 U.2 RI 7.68TB + 1028 2235 Ent NVMe CM7 U.2 RI 3.84TB + 1028 2236 Ent NVMe CM7 U.2 RI 1.92TB + 1028 2237 Ent NVMe CM7 FIPS U.2 MU 12.8TB + 1028 2238 Ent NVMe CM7 FIPS U.2 MU 6.4TB + 1028 2239 Ent NVMe CM7 FIPS U.2 MU 3.2TB + 1028 223a Ent NVMe CM7 FIPS U.2 MU 1.6TB + 1028 223b Ent NVMe CM7 U.2 MU 12.8TB + 1028 223c Ent NVMe CM7 U.2 MU 6.4TB + 1028 223d Ent NVMe CM7 U.2 MU 3.2TB + 1028 223e Ent NVMe CM7 U.2 MU 1.6TB 1e17 Arnold & Richter Cine Technik GmbH & Co. Betriebs KG 1e18 Beijing GuangRunTong Technology Development Co.,Ltd 1e24 Squirrels Research Labs @@ -25570,10 +25744,10 @@ 8032 S6 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame c031 S30 [Enflame] -# HHHL PCIe card, dual slot, 3rd generation from Enflame - c032 S60 [Enflame] # FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory - c033 S30 [Enflame] + c032 S90 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S60 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25657,6 +25831,10 @@ 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc +1e43 MaxLinear Inc + 8904 MxL8904 + 8906 MxL8906 + 8908 MxL8908 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd 0001 ZHITAI PC005 NVMe SSD @@ -25957,6 +26135,7 @@ 1f60 Accelecom 0001 XELE-NIC 25K5 0054 XELE-NIC 25K5 +1f67 Yunsilicon Technology Co,. Ltd. 1faa Hexaflake (Shanghai) Information Technology Co., Ltd. 0c10 Compass C10 PF 0c11 Compass C10 VF @@ -26065,6 +26244,14 @@ 2000 AWM 2 2010 AWM 2-M 1fe4 HippStor Technology + 1600 HP600 Series NVMe SSD + 1fe4 0075 Enterprise NVMe SSD U.2 3.84TB(HP610) + 1fe4 0076 Enterprise NVMe SSD U.2 7.68TB(HP610) + 1fe4 0077 Enterprise NVMe SSD U.2 6.40TB(HP630) + 1fe4 0078 Enterprise NVMe SSD U.2 3.20TB(HP630) +1ff4 DEEPX Co., Ltd. + 0000 DX_M1 + 0001 DX_M1A 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -26088,6 +26275,7 @@ 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500a DC1000B NVMe SSD 500b DC1000M NVMe SSD 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD @@ -26533,6 +26721,8 @@ 5053 Voyetra Technologies 2010 Daytona Audio Adapter 50b2 TerraTec Electronic GmbH +50ce System-on-Chip Engineering S.L. + 0001 RELY-MIL-XMC-TSN-SWITCH 5136 S S Technologies 5143 Qualcomm Inc 5145 Ensoniq (Old) @@ -26696,6 +26886,17 @@ 544d 6905 TBS6905 DVB-S2 Quad Tuner PCIe Card 6205 0001 TBS6205 DVB-T2/T/C Quad TV Tuner PCIe Card 6209 0001 TBS6209 DVB-T2/C2/T/C/ISDB-T OctaTV Tuner + 6590 0001 TBS6590 DVB-S/S2/S2X/T/T2/C/C2/ISDB-T + 2xCI + 6590 0002 TBS6590SE DVB-S/S2/S2X/T/T2/C/C2 + 2xCI + 6704 ffff TBS6704 (Quad ATSC/QAMB) + 6903 0020 TBS6903x (Dual DVB-S/S2/S2X) + 6903 0021 TBS6903x (Dual DVB-S/S2/S2X) + 6903 8888 TBS6903x (Dual DVB-S/S2/S2X) + 6909 0009 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0010 TBS6909x (Octa DVB-S/S2/S2X) + 6909 0019 TBS6909x (Octa DVB-S/S2/S2X) + 6910 0001 TBS6910 DVB-S/S2 + 2xCI + 6910 0002 TBS6910SE DVB-S/S2/S2x + 2xCI 5452 SCANLAB AG 3443 RTC4 5455 Technische Universitaet Berlin @@ -26737,6 +26938,7 @@ 6409 Logitec Corp. 6549 Teradici Corp. 1200 TERA1200 PC-over-IP Host +6590 TBS Technologies (wrong ID) 6666 Decision Computer International Co. 0001 PCCOM4 0002 PCCOM8 @@ -26754,16 +26956,24 @@ 1400 CooVOX TDM GSM Module 1600 CooVOX TDM E1/T1 Module 1800 CooVOX TDM BRI Module +6704 TBS Technologies (wrong ID) 6766 Glenfly Tech Co., Ltd. 3d00 Arise-GT-10C0 3d02 Arise1020 3d03 Arise-GT-1040 3d04 Arise1010 - 3d40 Arise-GT-10C0 High Definition Audio Controller - 3d41 Arise1020 High Definition Audio Controller + 3d06 Arise-GT-10C0t + 3d07 Arise2030 + 3d08 Arise2020 + 3d40 GLF HDMI/DP Audio + 3d41 GLF HDMI/DP Audio + 3d43 GLF HDMI/DP Audio 6899 ZT Systems # nee Qumranet 6900 Red Hat, Inc. +6903 TBS Technologies (wrong ID) +6909 TBS Technologies (wrong ID) +6910 TBS Technologies (wrong ID) 7063 pcHDTV 2000 HD-2000 3000 HD-3000 @@ -29010,6 +29220,7 @@ 1bd4 0058 Ethernet Network Adapter E810-XXVAM2 for OCP 3.0 1bd4 006e Ethernet Network Adapter E810-XXVAM2 for BD 1bd4 0083 Ethernet Network Adapter E810-XXVAM2 for lldp + 1bd4 00a0 S252IE810 1eec 0102 VSE-225-41E Dual-port 10Gb/25Gb Etherent PCIe 8086 0001 Ethernet 25G 2P E810-XXV OCP 8086 0002 Ethernet 25G 2P E810-XXV Adapter @@ -29181,8 +29392,10 @@ 188b Ethernet Connection E823-C for QSFP 188c Ethernet Connection E823-C for SFP 1028 0abd Ethernet Connection 25G 4P E823-C LOM + 17aa 405e E823 25G/10G Ethernet LOM Controller 188d Ethernet Connection E823-C/X557-AT 10GBASE-T 188e Ethernet Connection E823-C 1GbE + 17aa 405f E823 1G Ethernet LOM Controller 1890 Ethernet Connection E822-C for backplane 1891 Ethernet Connection E822-C for QSFP 1892 Ethernet Connection E822-C for SFP @@ -33629,7 +33842,7 @@ 46a0 AlderLake-P GT2 46a1 UHD Graphics 46a3 Alder Lake-P GT1 [UHD Graphics] - 46a6 Alder Lake-P Integrated Graphics Controller + 46a6 Alder Lake-P GT2 [Iris Xe Graphics] 46a8 Alder Lake-UP3 GT2 [Iris Xe Graphics] 46aa Alder Lake-UP4 GT2 [Iris Xe Graphics] 46b0 AlderLake-P [Iris Xe Graphics] @@ -33750,7 +33963,9 @@ 51a9 Alder Lake PCH UART #1 51aa Alder Lake SPI Controller 51ab Alder Lake SPI Controller + 51b0 Alder Lake PCI Express Root Port #9 51b1 Alder Lake PCI Express x1 Root Port #10 + 51bb Alder Lake-P PCH PCIe Root Port #4 51bf Alder Lake PCH-P PCI Express Root Port #9 51c5 Alder Lake-P Serial IO I2C Controller #0 51c6 Alder Lake-P Serial IO I2C Controller #1 @@ -34229,7 +34444,7 @@ 7d0b Volume Management Device NVMe RAID Controller Intel Corporation 7d40 Meteor Lake-M [Intel Graphics] 7d45 Meteor Lake-P [Intel Graphics] - 7d55 Meteor Lake-P [Intel Graphics] + 7d55 Meteor Lake-P [Intel Arc Graphics] 7d60 Meteor Lake-M [Intel Graphics] 7dd5 Meteor Lake-P [Intel Graphics] 7e01 Meteor Lake-P LPC/eSPI Controller @@ -35294,12 +35509,18 @@ a3eb Comet Lake PCI Express Root Port #21 a3f0 Comet Lake PCH-V cAVS a620 6400/6402 Advanced Memory Buffer (AMB) + a707 Raptor Lake-P/U 4p+8e cores Host Bridge/DRAM Controller a708 Raptor Lake-P/U 2p+8e cores Host Bridge/DRAM Controller a71d Raptor Lake Dynamic Platform and Thermal Framework Processor Participant + a71e Raptor Lake-P Thunderbolt 4 USB Controller a720 Raptor Lake-P [UHD Graphics] a721 Raptor Lake-P [UHD Graphics] + a72f Raptor Lake-P Thunderbolt 4 PCI Express Root Port #2 + a73e Raptor Lake-P Thunderbolt 4 NHI #0 a74d Raptor Lake PCIe 4.0 Graphics Port a74f GNA Scoring Accelerator module + a76d Raptor Lake-P Thunderbolt 4 NHI #1 + a76e Raptor Lake-P Thunderbolt 4 PCI Express Root Port #0 a77d Raptor Lake Crashlog and Telemetry a77f Volume Management Device NVMe RAID Controller Intel Corporation a780 Raptor Lake-S GT1 [UHD Graphics 770] @@ -35314,6 +35535,10 @@ a7a1 Raptor Lake-P [Iris Xe Graphics] a7a8 Raptor Lake-P [UHD Graphics] a7a9 Raptor Lake-P [UHD Graphics] + a7aa Raptor Lake-P [Intel Graphics] + a7ab Raptor Lake-P [Intel Graphics] + a7ac Raptor Lake-U [Intel Graphics] + a7ad Raptor Lake-U [Intel Graphics] abc0 Omni-Path Fabric Switch Silicon 100 Series ad0b Volume Management Device NVMe RAID Controller Intel Corporation b152 21152 PCI-to-PCI Bridge @@ -35439,12 +35664,16 @@ # Wuxi Micro Innovation Integrated Circuit Design Co.,Ltd. 8848 MUCSE 1000 Ethernet Controller N10 Series for 10GbE or 40GbE (Dual-port) + 8848 8410 Ethernet Network Adapter N10G-X2-DC for 10GbE SFP+ 2-port 1001 Ethernet Controller N400 Series for 1GbE (Dual-port) *** 39 LINES SKIPPED *** From nobody Fri Nov 3 17:38: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 4SMSdk0gl8z4ywSw; Fri, 3 Nov 2023 17:38: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 4SMSdj74ymz4cWs; Fri, 3 Nov 2023 17:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699033114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wRbrdPno7b9gXkHrPJWgHlGc6MJE9/XJC+wtjOEwdHk=; b=cHUHmSAb3NEYLZsN8A8rLHPOYrA0KCt6U4qNXJqq9mSZpr+Ncf3ZoKrZkA9FB7U4F/0mCK x+m9fl12WgCCw8NQikVw5GUwSrYp3QzJeVq1/K5Gc4t2H3WuNCK6CXBUTO61C9DOyBwrBi oKNWfeQVRm3legWTPIzejSze5PXm8+VAkfDuudhfJv0hRKIVcyfFWuIai6752GAbWVCb4G eLm0RRpQzn2bf6cDSMuTpAqaPjQn8CyfOtDKTep/izfovKBPBjLRuKgKopYiVehiDHlVax Sqtr5PelOecEgAJEha+Jb7fihqaHKYmZLF0kIbYIIDQ/zF7jiwzSxRguQ1k9iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699033114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wRbrdPno7b9gXkHrPJWgHlGc6MJE9/XJC+wtjOEwdHk=; b=gdlVZiyEdJsCRlPk1y9GaLtEBI9mXNn3xGQV4g7e79kiXtyE5GjhebcQ6SSX16zfnjs2od Jh9znAEvKgf6LcWc9x8ZpA2FKT8aqiN3q31Jukiy596GGzOgsAn97wYRAfMnTNbxQngjM4 dFkb/lav3dYyJLGyBDoW5u0hYH6OLaxcPwTss91ZNwNsJOp9Iia18TQlny1fwG7rzKlGQ/ W5Q70diNX+Okzlk7hapKW4+x8JNusWbhjtUG/wiNYC8izWt3GnRnSIoHde8sItgfEfmh61 OruUXC3euYX/j9Dri3b/WgiKAkc5bjnS7pTirCQjobm2Qb6XY/ouNPAUi90z5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699033114; a=rsa-sha256; cv=none; b=Uu3VTbE6hItuXBHpm6B7YEHIp1ZfTPTfdhLpd+njqCYuJCLxm8vvDVL4fXnlkme/AAJLyp 3HqCxClb7VV4JVuRQS19BQ/oajlK3qY/J+6jwAhwjv3llGmtkYOUVtFe0wq+XUQTnoiBU/ hzKGYjaa62iynLCVm1z0tiwjv+6qn839kFlxIkkbLgWI7MKsfYQdC8Cjv8GjHasZFIMjwT KhI+Y8+cznrsOtT2S6yBwFnm0mvxx7tGRozb0evp4TswOF0rOWSYljvTme4yZ+xNtRhJPv /TTVwpT6GU4uoTjFZl/LHjdK+424jlh7gVg5B9GBBau4tQjAUwxITzeCBe1pJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMSdj6B7Sz82y; Fri, 3 Nov 2023 17:38: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 3A3HcX5I030464; Fri, 3 Nov 2023 17:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3HcXIV030461; Fri, 3 Nov 2023 17:38:33 GMT (envelope-from git) Date: Fri, 3 Nov 2023 17:38:33 GMT Message-Id: <202311031738.3A3HcXIV030461@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: 1f90b4edffe8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1f90b4edffe815aebb35e74b79e10593b31f6b75 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1f90b4edffe815aebb35e74b79e10593b31f6b75 commit 1f90b4edffe815aebb35e74b79e10593b31f6b75 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-03 15:08:03 +0000 Commit: Ed Maste CommitDate: 2023-11-03 17:38:12 +0000 fflush: Split a temporary variable in two. It is clearer to avoid reusing temporary variables for different purposes. Sponsored by: Klara, Inc. --- 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 30bbd1371ff9..c658fbec697d 100644 --- a/lib/libc/stdio/fflush.c +++ b/lib/libc/stdio/fflush.c @@ -103,10 +103,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) @@ -121,7 +121,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 Fri Nov 3 17:55: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 4SMT1b3y02z4yyNj; Fri, 3 Nov 2023 17:55: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 4SMT1b1L5fz4g3M; Fri, 3 Nov 2023 17:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699034147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgUVmiRf9aCPc5a2kxBTofLk0VcZIwFH4wNUpktog2M=; b=pS/6z8a/h0FDtN6hXGGvJyyh3aHhvaNWYoeqzl9jJn/yCoouvEMsACdtEIQ+GIzaKabkry woZC/8WTh5KuZC63Ozpg0x2f73Ob/z5fX51yYcS3GO1UAPgUMzFPD/Y8H0Zn2g9XuH5NX+ x/OcY+glrhuKODEXT7D2VSZH2Ra/bygKvQHthZQewWATzc3nBoCQf4Lz11YaAMfSi3XeUZ h1FMsx4kCyq1jfxJTy39FkLUKGwC1UEbrcvL0HumTAWNnNZU9Jx+uLvWZ+i+I63dlO5ShB VqduI2tntoW4KYWGPDNDD/pTls5IOUUA2uC57OR4QSm5HOVR+8bGravzRu2e+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699034147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgUVmiRf9aCPc5a2kxBTofLk0VcZIwFH4wNUpktog2M=; b=oxyJewnB5xtpn17hPyzejNUk6QaV0X+BoqgP0SRDK9KvdC+8DssigyFl0fA/kF92zsWv9c ds0yXu1nGhaJopNczAJhkqgMDaS4f7nwDk8ipVUvTa2Ij6tyrlTKdycFy61mtivM6Ade6U cqmJ7IlwXEG9v7HrTTqZAaxvgS65vtyOZICPWWZBaNQgh5wPhCrQ/L3FAqq3M1IUpGnIkM YeE1q2kzqramKNir8lVJzhxXJDdAlK0il7nVuRJZqr/ILW60evnPeNlCQYSVpAitgobgQz LRXCxA9K/hZ4HfujwOjTKeGZ4yC7bfwE2QlnslyGUBXjWwphwQy+SBQZT7ASmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699034147; a=rsa-sha256; cv=none; b=xaONrYoHdmMczLLYAQpn9VaPBB54FvQ4wT0WTHPCK7gHJzVBGUhTXqiEwS4HG286nzlHs4 Jg7qXCMbupnpKWecFSJ6QKtTQyitbTQ3OsS99wiR5tYf6kjb78KpruRYkiBvugp8GFgA6u 2AJTbpP6IXo2+i98bl+zcVFCmD2+/to/P0rfHX4aZUdlQ8lB2yW8s24VC9TRjOEaxUs2Tk PeeL4VsXLWPtdbxikeFAYUGf2mnFyeOEF5LhAXPna5U2MEU4qjTEfQgTGQoijlLszNsd/p PlYD2doxHCigfXgnO9khLEnd2Wsr56fIxKotEo5EvKIN2dYc8xVwW85OSOmfLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMT1b0PC9z8B9; Fri, 3 Nov 2023 17:55: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 3A3HtksO063179; Fri, 3 Nov 2023 17:55:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3HtkIa063176; Fri, 3 Nov 2023 17:55:46 GMT (envelope-from git) Date: Fri, 3 Nov 2023 17:55:46 GMT Message-Id: <202311031755.3A3HtkIa063176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: 270f75cf3433 - main - powerpc: Fix inconsistent Altivec handling in set_mcontext List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 270f75cf3433807d124cdf1f0072ab801532f425 Auto-Submitted: auto-generated The branch main has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=270f75cf3433807d124cdf1f0072ab801532f425 commit 270f75cf3433807d124cdf1f0072ab801532f425 Author: Shawn Anastasio AuthorDate: 2023-11-03 17:40:18 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2023-11-03 17:55:04 +0000 powerpc: Fix inconsistent Altivec handling in set_mcontext When support for fpu_kern_enter/fpu_kern_leave was added to powerpc, set_mcontext was updated to handle Altivec state restoration in the same way that the FPU state by lazily restoring the context on the first trap. However the function was not correctly updated to unconditionally clear the PCB_VEC and PSL_VEC bits from the pcb's flags and srr1 respectively which can sometimes result in a mismatch between a process's MSR[VEC] state and its pcb_flags. Fix this by simply clearing the VEC flags unconditionally in set_mcontext, which is already done for FPU/VSX. Fixes: a6662c37b6ffe ("powerpc: Implement fpu_kern_enter/fpu_kern_leave") Reviewed by: alfredo MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42417 --- sys/powerpc/powerpc/exec_machdep.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 05d3a3cf79ba..0b1751a76454 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -528,8 +528,8 @@ set_mcontext(struct thread *td, mcontext_t *mcp) * Additionally, ensure VSX is disabled as well, as it is illegal * to leave it turned on when FP or VEC are off. */ - tf->srr1 &= ~(PSL_FP | PSL_VSX); - pcb->pcb_flags &= ~(PCB_FPU | PCB_VSX); + tf->srr1 &= ~(PSL_FP | PSL_VSX | PSL_VEC); + pcb->pcb_flags &= ~(PCB_FPU | PCB_VSX | PCB_VEC); if (mcp->mc_flags & _MC_FP_VALID) { /* enable_fpu() will happen lazily on a fault */ @@ -550,9 +550,6 @@ set_mcontext(struct thread *td, mcontext_t *mcp) pcb->pcb_vec.vscr = mcp->mc_vscr; pcb->pcb_vec.vrsave = mcp->mc_vrsave; memcpy(pcb->pcb_vec.vr, mcp->mc_avec, sizeof(mcp->mc_avec)); - } else { - tf->srr1 &= ~PSL_VEC; - pcb->pcb_flags &= ~PCB_VEC; } return (0); From nobody Fri Nov 3 20:17: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 4SMX9P3W6lz50Dn1 for ; Fri, 3 Nov 2023 20:17: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 4SMX9P2gg1z3GSn; Fri, 3 Nov 2023 20:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699042665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJBP0G4ctH2E+zzyA0V2iNtP9jaRPehWcVRS92i2HDc=; b=TG0tAk6brz2VOlHKNUXPDqVKzu80ScnTcfw6zMoiMgx7JrMLxPLpqxHBLbymu9WmWSoFbZ V4ln9fbBQp2UmhX2CvnDmxjgpEKR6yDUNRZSWOESfrKuc/379q4skuJihlOc74qfnZbZib wzpZjcdVVMHwBxPz6ENkn1mR2iI9GmEdR4TigQKC0YITq9O9QqjHwiIFvcsuBbwt0RGpoC ahA7x3550YGlyfGjlv2c+GpT5MwkahOmrSxNac7R4ccP7BNeN7+SZeMxx/ceu2RWrNSkrA FX0eYjSPiwJTOm5Ed2oxz3wXmJO790XPH9AKWhaIEEL3IfCXS0HuWPOSk1C/oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699042665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJBP0G4ctH2E+zzyA0V2iNtP9jaRPehWcVRS92i2HDc=; b=j6gVlud/cKg9/B8YA0ahMZVokf2oQ6VRIsfLhLQ/67tN69f6a4SzdzH8RaNeOxxO6kuJCG NJuuahb7PmqhZ5jTUSw4M5+n0f/4qQKL1EOkTk5rqrLZj3uRABWCsI1o89XSOAWMCDe0Mr 9w+am9Kse4tIlYjQISDZ+8SLMmL2j6Q6onycfXshpPte6KZlZ9SPQcoIozfbKfgLnldCrb xKE9mvfVmpiHtLW3qBOGfzxujGdAHa3ZCwbIZN5sEUzNFVPqYAbaqidrfPPh0t+zLClC2w ZjrZWQegHAGdTrnr0w9HM744JFcbym183tc2Hi2SU202mRCPiNiO9WezTdqaKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699042665; a=rsa-sha256; cv=none; b=VtR9yufbmg/xqaX7ba29JHi9zLaPNGP9eRf/4mGcYpPVs763UNWu0e6CHBssDHPU1pzyuX BhMjy+Ps9KdT7jUvaqJYTZFCu1adoKq7c9TJhVgD5qXddwuD+rMfr1/9+IL8QeDalw6EwV MF+8q7CyUiWM3DuHFdVt7ZFkQrUv98CA98Cu5Jf+zJP478IBtf0BB5ZaT8+aldRq4BwzM/ Lu0BxiSPEYA906l7Wo/TFsWTivd8CwOc5VGK0UYLT/fh2wc2298wlyxIIJ1eOGJq5S61fr XN9Yu8P8WXAI1ukLsnmeqpzmfpPuu0N5n5OyLxqcCOWnQsIjO3alHP9i9doKJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMX9P1LRczTT2; Fri, 3 Nov 2023 20:17: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 3A3KHjYR096835; Fri, 3 Nov 2023 20:17:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3KHj5w096834; Fri, 3 Nov 2023 20:17:45 GMT (envelope-from git) Date: Fri, 3 Nov 2023 20:17:45 GMT Message-Id: <202311032017.3A3KHj5w096834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Gordon Tetlow Subject: git: 00d65bdc4b6c..e4fe068d29c9 - vendor/pam_modules - 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/vendor/pam_modules X-Git-Reftype: branch X-Git-Commit: e4fe068d29c902225fa3733db09af214cbfb3c02 X-Git-Oldrev: 00d65bdc4b6c36b0692588d71ca18ff080826a75 X-Git-Newrev: e4fe068d29c902225fa3733db09af214cbfb3c02 Auto-Submitted: auto-generated The branch vendor/pam_modules has been updated by gordon: URL: https://cgit.FreeBSD.org/src/log/?id=00d65bdc4b6c..e4fe068d29c9 e4fe068d29c9 Vendor import of pam_passwdqc v2.0.3. From nobody Fri Nov 3 20:54: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 4SMXzm751Dz50LBm; Fri, 3 Nov 2023 20:54: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 4SMXzm6tRpz3LQd; Fri, 3 Nov 2023 20:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699044868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7zOj/Y2hP/Cjn58aQ6dcJRxpKg8G+ckbfZecwj38/rM=; b=DYsZOWAlzw6/qj5oTEHnXsRny+xKWX0zU4CIjENNNvkOSU3LCVfpYOJADqoO1b9gP4kyjL FSfozeeXntis/IGKdbRPNOo1gQnfRwWB/n+Y5H99NX8vgAUGo5EnExbD39mPgWs3nCvR70 ZUbtvJ0OTSjB2Ec+TwL477cGMWN17Wjo2tpyHgexnmnoB8Kft7XQH7JMoDh5mm+2T1u3fd +1l09i+Vjm168Ybhl3YuFRA+vP7ibjhNdkVf4BTOrgM0sZAx5jZYQpCqRKK2NaQ9zUlHnx 7+s2Efhb6r85kP7TFDglGtZLKA59vYzaYkt+LhpyjjjkFVJ7zPp4TrYQWgZ5zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699044868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7zOj/Y2hP/Cjn58aQ6dcJRxpKg8G+ckbfZecwj38/rM=; b=fNt7OaxsoRRuE/iIBd9l8kCG/MocpJQOlJrWU7lTCEHhcGNeag2HA1FE/OuYAlMjrMeBGh KfEMAmtReszRmnqiwvrb9YaiyJfrC2bc6q8lXe4U2XHtBizXdfdiQ+F7Jun5rkmJd/IibU vpCuPPY6p/hLTXVh0069kRKc4aLklff5hZ0oEber3Qtc1jbh0iB8ApDuK+AHfEAH+QizfB kt5LO9KTjajnVlTsRueTDf3L7taL0WsA2iByn72Wx8LLG4VH1UtnDEeMsHFaw+Tle2zNrw A6sz+6j+WXa8svq6hqTC6ZY6W5a0NGt9VZ7FuLAZKjfjOca6/M/2QNstRP6nUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699044868; a=rsa-sha256; cv=none; b=VTGFiEgvDTSDiwUI0RYwVdidqFyQDR+qhUiFmxwPZT0CDFhLWSw3GA5fj1GhksgIdCXjjN T/WVa/QuE73t3AmoB05ruc3PztqZOlAwvpWTWU5zpj5n1iBKeIaoejueqfxnw9wxQU7MHU DF9AS9UqGaP7Q2GLupLmMz9VAEVhCnWBxYCWpvSxnDJgfqifw42DGdZNGbLh2AN7VDTgrA BAzltwnRLVxQvq6tbtOsvoKsKsx1ZrsDYPDeS9KDTxp8uLT6tYqP5RClns3IcCJpTA8lBU KB0tz/0yKCJL6Pd38/vyj0gP9Qj+kdPvg04DS7/lZHIrkwAA5il44gF/Don1lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMXzm5wq3zVYs; Fri, 3 Nov 2023 20:54: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 3A3KsSSE062360; Fri, 3 Nov 2023 20:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3KsSCu062357; Fri, 3 Nov 2023 20:54:28 GMT (envelope-from git) Date: Fri, 3 Nov 2023 20:54:28 GMT Message-Id: <202311032054.3A3KsSCu062357@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: 5f4c09dd85bf - main - Track upstream project rename in contrib/blocklistd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 5f4c09dd85bff675e0ca63c55ea3c517e0fddfcc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f4c09dd85bff675e0ca63c55ea3c517e0fddfcc commit 5f4c09dd85bff675e0ca63c55ea3c517e0fddfcc Author: Ed Maste AuthorDate: 2022-10-11 19:27:51 +0000 Commit: Ed Maste CommitDate: 2023-11-03 20:53:04 +0000 Track upstream project rename in contrib/blocklistd Upstream is now https://github.com/zoulasc/blocklist/. Rename the contrib directory and update Makefiles to match, in advance of the next vendor branch update. Sponsored by: The FreeBSD Foundation --- contrib/{blacklist => blocklist}/Makefile | 0 contrib/{blacklist => blocklist}/Makefile.inc | 0 contrib/{blacklist => blocklist}/README | 0 contrib/{blacklist => blocklist}/TODO | 0 contrib/{blacklist => blocklist}/bin/Makefile | 0 contrib/{blacklist => blocklist}/bin/blacklistctl.8 | 0 contrib/{blacklist => blocklist}/bin/blacklistctl.c | 0 contrib/{blacklist => blocklist}/bin/blacklistd.8 | 0 contrib/{blacklist => blocklist}/bin/blacklistd.c | 0 contrib/{blacklist => blocklist}/bin/blacklistd.conf.5 | 0 contrib/{blacklist => blocklist}/bin/conf.c | 0 contrib/{blacklist => blocklist}/bin/conf.h | 0 contrib/{blacklist => blocklist}/bin/internal.c | 0 contrib/{blacklist => blocklist}/bin/internal.h | 0 contrib/{blacklist => blocklist}/bin/run.c | 0 contrib/{blacklist => blocklist}/bin/run.h | 0 contrib/{blacklist => blocklist}/bin/state.c | 0 contrib/{blacklist => blocklist}/bin/state.h | 0 contrib/{blacklist => blocklist}/bin/support.c | 0 contrib/{blacklist => blocklist}/bin/support.h | 0 contrib/{blacklist => blocklist}/diff/ftpd.diff | 0 contrib/{blacklist => blocklist}/diff/named.diff | 0 contrib/{blacklist => blocklist}/diff/proftpd.diff | 0 contrib/{blacklist => blocklist}/diff/ssh.diff | 0 contrib/{blacklist => blocklist}/etc/Makefile | 0 contrib/{blacklist => blocklist}/etc/blacklistd.conf | 0 contrib/{blacklist => blocklist}/etc/npf.conf | 0 contrib/{blacklist => blocklist}/etc/rc.d/Makefile | 0 contrib/{blacklist => blocklist}/etc/rc.d/blacklistd | 0 contrib/{blacklist => blocklist}/include/Makefile | 0 contrib/{blacklist => blocklist}/include/bl.h | 0 contrib/{blacklist => blocklist}/include/blacklist.h | 0 contrib/{blacklist => blocklist}/lib/Makefile | 0 contrib/{blacklist => blocklist}/lib/bl.c | 0 contrib/{blacklist => blocklist}/lib/blacklist.c | 0 contrib/{blacklist => blocklist}/lib/libblacklist.3 | 0 contrib/{blacklist => blocklist}/lib/shlib_version | 0 contrib/{blacklist => blocklist}/libexec/Makefile | 0 contrib/{blacklist => blocklist}/libexec/blacklistd-helper | 0 contrib/{blacklist => blocklist}/port/Makefile.am | 0 contrib/{blacklist => blocklist}/port/_strtoi.h | 0 contrib/{blacklist => blocklist}/port/clock_gettime.c | 0 contrib/{blacklist => blocklist}/port/config.h | 0 contrib/{blacklist => blocklist}/port/configure.ac | 0 contrib/{blacklist => blocklist}/port/fgetln.c | 0 contrib/{blacklist => blocklist}/port/fparseln.c | 0 contrib/{blacklist => blocklist}/port/getprogname.c | 0 contrib/{blacklist => blocklist}/port/m4/.cvsignore | 0 contrib/{blacklist => blocklist}/port/pidfile.c | 0 contrib/{blacklist => blocklist}/port/popenve.c | 0 contrib/{blacklist => blocklist}/port/port.h | 0 contrib/{blacklist => blocklist}/port/sockaddr_snprintf.c | 0 contrib/{blacklist => blocklist}/port/strlcat.c | 0 contrib/{blacklist => blocklist}/port/strlcpy.c | 0 contrib/{blacklist => blocklist}/port/strtoi.c | 0 contrib/{blacklist => blocklist}/test/Makefile | 0 contrib/{blacklist => blocklist}/test/cltest.c | 0 contrib/{blacklist => blocklist}/test/srvtest.c | 0 lib/libblacklist/Makefile | 6 +++--- libexec/blacklistd-helper/Makefile | 4 ++-- libexec/fingerd/Makefile | 2 +- libexec/ftpd/Makefile | 2 +- secure/usr.sbin/sshd/Makefile | 2 +- usr.sbin/blacklistctl/Makefile | 6 +++--- usr.sbin/blacklistd/Makefile | 6 +++--- 65 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/blacklist/Makefile b/contrib/blocklist/Makefile similarity index 100% rename from contrib/blacklist/Makefile rename to contrib/blocklist/Makefile diff --git a/contrib/blacklist/Makefile.inc b/contrib/blocklist/Makefile.inc similarity index 100% rename from contrib/blacklist/Makefile.inc rename to contrib/blocklist/Makefile.inc diff --git a/contrib/blacklist/README b/contrib/blocklist/README similarity index 100% rename from contrib/blacklist/README rename to contrib/blocklist/README diff --git a/contrib/blacklist/TODO b/contrib/blocklist/TODO similarity index 100% rename from contrib/blacklist/TODO rename to contrib/blocklist/TODO diff --git a/contrib/blacklist/bin/Makefile b/contrib/blocklist/bin/Makefile similarity index 100% rename from contrib/blacklist/bin/Makefile rename to contrib/blocklist/bin/Makefile diff --git a/contrib/blacklist/bin/blacklistctl.8 b/contrib/blocklist/bin/blacklistctl.8 similarity index 100% rename from contrib/blacklist/bin/blacklistctl.8 rename to contrib/blocklist/bin/blacklistctl.8 diff --git a/contrib/blacklist/bin/blacklistctl.c b/contrib/blocklist/bin/blacklistctl.c similarity index 100% rename from contrib/blacklist/bin/blacklistctl.c rename to contrib/blocklist/bin/blacklistctl.c diff --git a/contrib/blacklist/bin/blacklistd.8 b/contrib/blocklist/bin/blacklistd.8 similarity index 100% rename from contrib/blacklist/bin/blacklistd.8 rename to contrib/blocklist/bin/blacklistd.8 diff --git a/contrib/blacklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c similarity index 100% rename from contrib/blacklist/bin/blacklistd.c rename to contrib/blocklist/bin/blacklistd.c diff --git a/contrib/blacklist/bin/blacklistd.conf.5 b/contrib/blocklist/bin/blacklistd.conf.5 similarity index 100% rename from contrib/blacklist/bin/blacklistd.conf.5 rename to contrib/blocklist/bin/blacklistd.conf.5 diff --git a/contrib/blacklist/bin/conf.c b/contrib/blocklist/bin/conf.c similarity index 100% rename from contrib/blacklist/bin/conf.c rename to contrib/blocklist/bin/conf.c diff --git a/contrib/blacklist/bin/conf.h b/contrib/blocklist/bin/conf.h similarity index 100% rename from contrib/blacklist/bin/conf.h rename to contrib/blocklist/bin/conf.h diff --git a/contrib/blacklist/bin/internal.c b/contrib/blocklist/bin/internal.c similarity index 100% rename from contrib/blacklist/bin/internal.c rename to contrib/blocklist/bin/internal.c diff --git a/contrib/blacklist/bin/internal.h b/contrib/blocklist/bin/internal.h similarity index 100% rename from contrib/blacklist/bin/internal.h rename to contrib/blocklist/bin/internal.h diff --git a/contrib/blacklist/bin/run.c b/contrib/blocklist/bin/run.c similarity index 100% rename from contrib/blacklist/bin/run.c rename to contrib/blocklist/bin/run.c diff --git a/contrib/blacklist/bin/run.h b/contrib/blocklist/bin/run.h similarity index 100% rename from contrib/blacklist/bin/run.h rename to contrib/blocklist/bin/run.h diff --git a/contrib/blacklist/bin/state.c b/contrib/blocklist/bin/state.c similarity index 100% rename from contrib/blacklist/bin/state.c rename to contrib/blocklist/bin/state.c diff --git a/contrib/blacklist/bin/state.h b/contrib/blocklist/bin/state.h similarity index 100% rename from contrib/blacklist/bin/state.h rename to contrib/blocklist/bin/state.h diff --git a/contrib/blacklist/bin/support.c b/contrib/blocklist/bin/support.c similarity index 100% rename from contrib/blacklist/bin/support.c rename to contrib/blocklist/bin/support.c diff --git a/contrib/blacklist/bin/support.h b/contrib/blocklist/bin/support.h similarity index 100% rename from contrib/blacklist/bin/support.h rename to contrib/blocklist/bin/support.h diff --git a/contrib/blacklist/diff/ftpd.diff b/contrib/blocklist/diff/ftpd.diff similarity index 100% rename from contrib/blacklist/diff/ftpd.diff rename to contrib/blocklist/diff/ftpd.diff diff --git a/contrib/blacklist/diff/named.diff b/contrib/blocklist/diff/named.diff similarity index 100% rename from contrib/blacklist/diff/named.diff rename to contrib/blocklist/diff/named.diff diff --git a/contrib/blacklist/diff/proftpd.diff b/contrib/blocklist/diff/proftpd.diff similarity index 100% rename from contrib/blacklist/diff/proftpd.diff rename to contrib/blocklist/diff/proftpd.diff diff --git a/contrib/blacklist/diff/ssh.diff b/contrib/blocklist/diff/ssh.diff similarity index 100% rename from contrib/blacklist/diff/ssh.diff rename to contrib/blocklist/diff/ssh.diff diff --git a/contrib/blacklist/etc/Makefile b/contrib/blocklist/etc/Makefile similarity index 100% rename from contrib/blacklist/etc/Makefile rename to contrib/blocklist/etc/Makefile diff --git a/contrib/blacklist/etc/blacklistd.conf b/contrib/blocklist/etc/blacklistd.conf similarity index 100% rename from contrib/blacklist/etc/blacklistd.conf rename to contrib/blocklist/etc/blacklistd.conf diff --git a/contrib/blacklist/etc/npf.conf b/contrib/blocklist/etc/npf.conf similarity index 100% rename from contrib/blacklist/etc/npf.conf rename to contrib/blocklist/etc/npf.conf diff --git a/contrib/blacklist/etc/rc.d/Makefile b/contrib/blocklist/etc/rc.d/Makefile similarity index 100% rename from contrib/blacklist/etc/rc.d/Makefile rename to contrib/blocklist/etc/rc.d/Makefile diff --git a/contrib/blacklist/etc/rc.d/blacklistd b/contrib/blocklist/etc/rc.d/blacklistd similarity index 100% rename from contrib/blacklist/etc/rc.d/blacklistd rename to contrib/blocklist/etc/rc.d/blacklistd diff --git a/contrib/blacklist/include/Makefile b/contrib/blocklist/include/Makefile similarity index 100% rename from contrib/blacklist/include/Makefile rename to contrib/blocklist/include/Makefile diff --git a/contrib/blacklist/include/bl.h b/contrib/blocklist/include/bl.h similarity index 100% rename from contrib/blacklist/include/bl.h rename to contrib/blocklist/include/bl.h diff --git a/contrib/blacklist/include/blacklist.h b/contrib/blocklist/include/blacklist.h similarity index 100% rename from contrib/blacklist/include/blacklist.h rename to contrib/blocklist/include/blacklist.h diff --git a/contrib/blacklist/lib/Makefile b/contrib/blocklist/lib/Makefile similarity index 100% rename from contrib/blacklist/lib/Makefile rename to contrib/blocklist/lib/Makefile diff --git a/contrib/blacklist/lib/bl.c b/contrib/blocklist/lib/bl.c similarity index 100% rename from contrib/blacklist/lib/bl.c rename to contrib/blocklist/lib/bl.c diff --git a/contrib/blacklist/lib/blacklist.c b/contrib/blocklist/lib/blacklist.c similarity index 100% rename from contrib/blacklist/lib/blacklist.c rename to contrib/blocklist/lib/blacklist.c diff --git a/contrib/blacklist/lib/libblacklist.3 b/contrib/blocklist/lib/libblacklist.3 similarity index 100% rename from contrib/blacklist/lib/libblacklist.3 rename to contrib/blocklist/lib/libblacklist.3 diff --git a/contrib/blacklist/lib/shlib_version b/contrib/blocklist/lib/shlib_version similarity index 100% rename from contrib/blacklist/lib/shlib_version rename to contrib/blocklist/lib/shlib_version diff --git a/contrib/blacklist/libexec/Makefile b/contrib/blocklist/libexec/Makefile similarity index 100% rename from contrib/blacklist/libexec/Makefile rename to contrib/blocklist/libexec/Makefile diff --git a/contrib/blacklist/libexec/blacklistd-helper b/contrib/blocklist/libexec/blacklistd-helper similarity index 100% rename from contrib/blacklist/libexec/blacklistd-helper rename to contrib/blocklist/libexec/blacklistd-helper diff --git a/contrib/blacklist/port/Makefile.am b/contrib/blocklist/port/Makefile.am similarity index 100% rename from contrib/blacklist/port/Makefile.am rename to contrib/blocklist/port/Makefile.am diff --git a/contrib/blacklist/port/_strtoi.h b/contrib/blocklist/port/_strtoi.h similarity index 100% rename from contrib/blacklist/port/_strtoi.h rename to contrib/blocklist/port/_strtoi.h diff --git a/contrib/blacklist/port/clock_gettime.c b/contrib/blocklist/port/clock_gettime.c similarity index 100% rename from contrib/blacklist/port/clock_gettime.c rename to contrib/blocklist/port/clock_gettime.c diff --git a/contrib/blacklist/port/config.h b/contrib/blocklist/port/config.h similarity index 100% rename from contrib/blacklist/port/config.h rename to contrib/blocklist/port/config.h diff --git a/contrib/blacklist/port/configure.ac b/contrib/blocklist/port/configure.ac similarity index 100% rename from contrib/blacklist/port/configure.ac rename to contrib/blocklist/port/configure.ac diff --git a/contrib/blacklist/port/fgetln.c b/contrib/blocklist/port/fgetln.c similarity index 100% rename from contrib/blacklist/port/fgetln.c rename to contrib/blocklist/port/fgetln.c diff --git a/contrib/blacklist/port/fparseln.c b/contrib/blocklist/port/fparseln.c similarity index 100% rename from contrib/blacklist/port/fparseln.c rename to contrib/blocklist/port/fparseln.c diff --git a/contrib/blacklist/port/getprogname.c b/contrib/blocklist/port/getprogname.c similarity index 100% rename from contrib/blacklist/port/getprogname.c rename to contrib/blocklist/port/getprogname.c diff --git a/contrib/blacklist/port/m4/.cvsignore b/contrib/blocklist/port/m4/.cvsignore similarity index 100% rename from contrib/blacklist/port/m4/.cvsignore rename to contrib/blocklist/port/m4/.cvsignore diff --git a/contrib/blacklist/port/pidfile.c b/contrib/blocklist/port/pidfile.c similarity index 100% rename from contrib/blacklist/port/pidfile.c rename to contrib/blocklist/port/pidfile.c diff --git a/contrib/blacklist/port/popenve.c b/contrib/blocklist/port/popenve.c similarity index 100% rename from contrib/blacklist/port/popenve.c rename to contrib/blocklist/port/popenve.c diff --git a/contrib/blacklist/port/port.h b/contrib/blocklist/port/port.h similarity index 100% rename from contrib/blacklist/port/port.h rename to contrib/blocklist/port/port.h diff --git a/contrib/blacklist/port/sockaddr_snprintf.c b/contrib/blocklist/port/sockaddr_snprintf.c similarity index 100% rename from contrib/blacklist/port/sockaddr_snprintf.c rename to contrib/blocklist/port/sockaddr_snprintf.c diff --git a/contrib/blacklist/port/strlcat.c b/contrib/blocklist/port/strlcat.c similarity index 100% rename from contrib/blacklist/port/strlcat.c rename to contrib/blocklist/port/strlcat.c diff --git a/contrib/blacklist/port/strlcpy.c b/contrib/blocklist/port/strlcpy.c similarity index 100% rename from contrib/blacklist/port/strlcpy.c rename to contrib/blocklist/port/strlcpy.c diff --git a/contrib/blacklist/port/strtoi.c b/contrib/blocklist/port/strtoi.c similarity index 100% rename from contrib/blacklist/port/strtoi.c rename to contrib/blocklist/port/strtoi.c diff --git a/contrib/blacklist/test/Makefile b/contrib/blocklist/test/Makefile similarity index 100% rename from contrib/blacklist/test/Makefile rename to contrib/blocklist/test/Makefile diff --git a/contrib/blacklist/test/cltest.c b/contrib/blocklist/test/cltest.c similarity index 100% rename from contrib/blacklist/test/cltest.c rename to contrib/blocklist/test/cltest.c diff --git a/contrib/blacklist/test/srvtest.c b/contrib/blocklist/test/srvtest.c similarity index 100% rename from contrib/blacklist/test/srvtest.c rename to contrib/blocklist/test/srvtest.c diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile index 932e186e3172..9d85d1eff82c 100644 --- a/lib/libblacklist/Makefile +++ b/lib/libblacklist/Makefile @@ -1,7 +1,7 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist -.PATH: ${BLACKLIST_DIR}/lib ${BLACKLIST_DIR}/include +.PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include PACKAGE= blocklist LIB= blacklist @@ -11,7 +11,7 @@ LIBADD+= pthread CFLAGS.clang+=-Wno-thread-safety-analysis -CFLAGS+=-I${BLACKLIST_DIR}/include -I${BLACKLIST_DIR}/port \ +CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \ -D_REENTRANT -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \ -DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_GETPROGNAME \ -DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRUCT_SOCKADDR_SA_LEN diff --git a/libexec/blacklistd-helper/Makefile b/libexec/blacklistd-helper/Makefile index a22ba37fc764..c0eb25489052 100644 --- a/libexec/blacklistd-helper/Makefile +++ b/libexec/blacklistd-helper/Makefile @@ -1,6 +1,6 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist -SCRIPTS= ${BLACKLIST_DIR}/libexec/blacklistd-helper +SCRIPTS= ${BLOCKLIST_DIR}/libexec/blacklistd-helper .include diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile index f0f797ad02db..c5b780c4e225 100644 --- a/libexec/fingerd/Makefile +++ b/libexec/fingerd/Makefile @@ -10,7 +10,7 @@ WARNS?= 2 WFORMAT=0 .if ${MK_BLACKLIST_SUPPORT} != "no" -CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include +CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blocklist/include LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} .endif diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index aa02c545d81b..f58b675cf8e7 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -23,7 +23,7 @@ CFLAGS+=-Dmain=ls_main -I${SRCTOP}/bin/ls LIBADD+= m .if ${MK_BLACKLIST_SUPPORT} != "no" -CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include +CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blocklist/include SRCS+= blacklist.c LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index fd9eacebe68d..c15bd773c77a 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -44,7 +44,7 @@ LIBADD+= bsm .endif .if ${MK_BLACKLIST_SUPPORT} != "no" -CFLAGS+= -DUSE_BLACKLIST=1 -I${SRCTOP}/contrib/blacklist/include +CFLAGS+= -DUSE_BLACKLIST=1 -I${SRCTOP}/contrib/blocklist/include SRCS+= blacklist.c LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile index 1e4778bf0953..065c17843cee 100644 --- a/usr.sbin/blacklistctl/Makefile +++ b/usr.sbin/blacklistctl/Makefile @@ -1,6 +1,6 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist -.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist +.PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port PACKAGE= blocklist @@ -12,7 +12,7 @@ MAN= blacklistctl.8 LDFLAGS+=-L${LIBBLACKLISTDIR} LIBADD+= blacklist util -CFLAGS+=-I${BLACKLIST_DIR}/include -I${BLACKLIST_DIR}/port \ +CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \ -D_PATH_BLCONTROL=\"/usr/libexec/blacklistd-helper\" \ -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \ -DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_FPARSELN \ diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile index b6d1e236911e..92928ca3e60f 100644 --- a/usr.sbin/blacklistd/Makefile +++ b/usr.sbin/blacklistd/Makefile @@ -1,6 +1,6 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist -.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist +.PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port PACKAGE= blocklist @@ -13,7 +13,7 @@ MAN= blacklistd.8 blacklistd.conf.5 LDFLAGS+=-L${LIBBLACKLISTDIR} LIBADD+= blacklist util -CFLAGS+=-I${BLACKLIST_DIR}/include -I${BLACKLIST_DIR}/port \ +CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \ -D_PATH_BLCONTROL=\"/usr/libexec/blacklistd-helper\" \ -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \ -DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_FPARSELN \ From nobody Fri Nov 3 21:08: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 4SMYHp25hVz50NZW; Fri, 3 Nov 2023 21:08: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 4SMYHp1c4cz3MlW; Fri, 3 Nov 2023 21:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icgdBg7Mkb5TAkI1GndoqFjRI6/ANLCCc+tXY8SVkIo=; b=E0tcBEuT+vEkzg/+F0hWyA5vYASM8WiNndMSfKVcJVRlXh2/cnzhPeONQ26qsTJyDKWeiu 1KRqfOeUmf88NYDWUdqgZ4stJfWaJsc0NLRoZoYLBzVQNu4mOiadDbUjVaC8rCedvds+ym ocoyNyBG3NaUePy2299xBmSMM063metEgDG1e0UWin5zXGBAqHst6/uW9tPNcZkvIl3vpo 7kz4Bt9wuFtzJOTXU1aXh5oDvnIZRrRmRXuEfnlv1YnRLhZxwvOMpfL4sneTcAoretZZ0u JwN5bjx1MiH495SycBMw164Tv30T2QxAVqhveyl5vM9IeD12e3WQTffywCPdtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icgdBg7Mkb5TAkI1GndoqFjRI6/ANLCCc+tXY8SVkIo=; b=c32Ft+5fIeJzlNSofBjS4uNMZjoc6G7GI1hs9aI1Ltj6QUHiykm4cEjlMBEAxyDThBBMb8 wMd5lO4ZUYqFS6L+p7ehq1uBnz5bG6VCIGiZ+8Yif79wZVoA0QNgXbaE+LlvuukocAhndn amd8DHy/HmYZ+8Brpl/a7YEWFf6LtZLpyVjpewaYDSVSNqc8gvaRLj/gB58h67DIDAs8nW TeOJk/ExjWsqO6rRYhf9OK2/TOKYHoaJFUp9YiMPoTGXlXXjjxPiMeyH9AAT/t9RQZwIXM DajaweMgNgEBLrwZkzSD0qLVvnFbjkOT7Jcm3PyzXgq0LXSIGa3V5CFDlWTaEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045702; a=rsa-sha256; cv=none; b=MYOwZY+kVZCYaZ+kYbxQkgVtKSWHbbW/E0gDvQT/+C+rLK8bA5sJ/w4/kZxN5u32ugJZx4 3dRHVKbCONLrfFz+hUD1toG/LRxRcxR40ANRBh4kSLX7bK08fSALSHC0s1EjhncAk6NGw0 mhWhGsxli/qI+dOipkHwwoECEPDPqhjsSgmkBLMsmdWadYaasd6Lc/wPva8C0CVqOeN5Jg KpEk8xqCPn/gra9UhI3Db/8eE0pnLEY99vIoSBCQ5ai7rps74wXz1ZYCcm137MtAr6tJdI a6Abrz20wrBEjAN027d5a4GV2yu79jgEhIkJ44c3rBQ488LmXHksQK98hUCwqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMYHp0ggBzWLr; Fri, 3 Nov 2023 21:08: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 3A3L8LkE081080; Fri, 3 Nov 2023 21:08:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8LDm081077; Fri, 3 Nov 2023 21:08:21 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:21 GMT Message-Id: <202311032108.3A3L8LDm081077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 45c27ad5241f - main - LinuxKPI: 802.11: error on state transition failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45c27ad5241f5491234afd0b47d13b8005fdb4de Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=45c27ad5241f5491234afd0b47d13b8005fdb4de commit 45c27ad5241f5491234afd0b47d13b8005fdb4de Author: Bjoern A. Zeeb AuthorDate: 2023-10-25 22:29:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:03 +0000 LinuxKPI: 802.11: error on state transition failure The state transition failures we were seeing in the early days are solved. If we now experience one stop processing before passing over to net80211 (sta_newstate()) and before updating iv_state on the vap. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42423 --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index e8fb5b4914a6..3da91fa3e0b7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2137,12 +2137,11 @@ lkpi_iv_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) } if (error != 0) { - /* XXX-BZ currently expected so ignore. */ ic_printf(vap->iv_ic, "%s: error %d during state transition " "%d (%s) -> %d (%s)\n", __func__, error, ostate, ieee80211_state_name[ostate], nstate, ieee80211_state_name[nstate]); - /* return (error); */ + return (error); } #ifdef LINUXKPI_DEBUG_80211 From nobody Fri Nov 3 21:08: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 4SMYHq4Q5Rz50Ncl; Fri, 3 Nov 2023 21:08: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 4SMYHq2GtDz3Mms; Fri, 3 Nov 2023 21:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzTo1VKUtl7oyInXtEPAksLZc+oeuSvu4t/+MM9v2V8=; b=bpu02ov33n6lL8OaeNajA/VFJcMP6VmArgmonBtNd++8/vMuR3LWevPSZliQEZhh0Vnunu CsiI1EclzvHKCYhKNJ0joOZZ+lxAyzdIysLVVGolzSZvJZsXhsYxoRalMY9l3SJqiO9H5W 1EM5H+Y6N56aSjWaiR2C7CxE7v1tpxtJPP+Z97a4YwM7jg/yYeZpC4D4SZ6vwCKokQHJtX oCYiprOaY5fhX3NK+/5UMOHH/aEshHW4P22zESxqmLSK1B42F1koExEym67XzRGnHuo3yL Hx5QdJ8Sb8+ALpfbqrNaI/oWfCEWlOu0VKzuPBSMzaDNCuubVGCyCBW7tUNDLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzTo1VKUtl7oyInXtEPAksLZc+oeuSvu4t/+MM9v2V8=; b=mQRkjzYXbAdzFzamQQv19rcR9sg3bacwbBIH/mXhXoWyNR4BGsbvpHBCS+7guvu7DozPpu 6VroRjKbjxwWw5R24T0MqztIg8Y128gk5pR/5Yz4H8Akr7qjUvgxwTslLn1Jw2NZtrcZL3 UOYwbcfPqbfh1d356RuaueEZzCxCSBYvj6aPlW8Fujab6iJVF55FLooRw5emG8z9zoteks 33OrqUgLa2YS08M2lXq588vqt+MghgXArqKxlzdrPe+ACGPEmqCvukkmzCb/ikAERIdMPW F9wEDBWy9PrAZsLwZK0GWvsYWxkZ3gC8vXLPLsBx04h/FSRsymSIJ4AhATaiVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045703; a=rsa-sha256; cv=none; b=EPozNpNazT6NSEHhGvbgMW4LlXmHSE+V7JAqAQNylzz+ibYj+tByJuVx4cez80Wsk8j2Ed xzIiXasDxej/iBMcuvd45ysHWsymWpAxnJRllBmFhPUIB9jp14m03E7tblnGDo4J5WUn9r 4uGceQpghC2N9rQ+Uc+COAg49YCFp4I+TINYcomrOE4ScbGY3EitIaIEniD5wR9zADVH5z yDYt+lcpW/APjnP8MKnHbOpw0YBWko/MtIsukLnVnX+Iq+UiCkdmg3DoQdzLUI8NXqmUnw Pl38EqWhfF6bc6ABtGuG9OHWvvFgjtGqPO0UbR63dFbD/UVhVEedQl3+T3Dqeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMYHq1NK5zVck; Fri, 3 Nov 2023 21:08: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 3A3L8NX9081125; Fri, 3 Nov 2023 21:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8N1Z081122; Fri, 3 Nov 2023 21:08:23 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:23 GMT Message-Id: <202311032108.3A3L8N1Z081122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5856761fd5f6 - main - LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5856761fd5f675c3871a82effdbf714a1d1bcc5e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5856761fd5f675c3871a82effdbf714a1d1bcc5e commit 5856761fd5f675c3871a82effdbf714a1d1bcc5e Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 00:11:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:03 +0000 LinuxKPI: 802.11: fix ieee80211_add_channel_cbw() argument Fix the last argument passed to ieee80211_add_channel_cbw() in lkpi_ic_getradiocaps() for both 2Ghz and 5Ghz bands. We passed in the unmodified version rather than the adjusted version based on the per-band channel information possibly leaving ieee80211_channel_flags enabled which should not be. So far this should not have made a difference given we did not enable HT or VHT. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42424 --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3da91fa3e0b7..aba7e0e961a6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3527,7 +3527,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, error = ieee80211_add_channel_cbw(c, maxchan, n, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, - nflags, bands, chan_flags); + nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " @@ -3597,7 +3597,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, error = ieee80211_add_channel_cbw(c, maxchan, n, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, - nflags, bands, chan_flags); + nflags, bands, cflags); /* net80211::ENOBUFS: *n >= maxchans */ if (error != 0 && error != ENOBUFS) ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x " From nobody Fri Nov 3 21:08: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 4SMYHr3pRRz50NVQ; Fri, 3 Nov 2023 21:08: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 4SMYHr3LWbz3MtD; Fri, 3 Nov 2023 21:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fad37BNzTjkFBfreIsrot4WxMDS0DODz809ocRVfQX0=; b=Aj3yTua03SN6QYd0c6HzH9h5CUQeMzHnjveE8tFoSlwjr/RACeSk/k7o7ZS1alkd278lSl LyikDPROfYNcy5Al3Hc3bgWH/ope4V3ksUd9ycwYCCMxCunNflPCbVfFJj2z9PEvaeeplZ ZtiXjf9xH2BHjTpjCuYm3fYOUXc1QnkhWfGJ5WxM+Cu9ALCwV3nG41A3K294vXADLsr8Im y4qOE8FRhSSMt7E26m0EfcwjkOQVp0R3in9veyiXRuV/TLTz3PeidN1SoNNrdm2NioX676 +uSJa8HO4/r0cnxG8TmjbwGzF1xUOGnQp8aIIoZ4lQPtbE5mKWfeF2aN0JE7SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fad37BNzTjkFBfreIsrot4WxMDS0DODz809ocRVfQX0=; b=vD4ba0s6zrUizbaJxTjoBfVPWTE/bx1pOL4f38DeMEL1uQkfPgWoSeQ2uxZoXav1tyELor JHsr0ZiC1hMlYj0uZx2Ha7e7qOGbMqEFpp8CzOwRsZak8gwP2YZaxnQc/aim/1ekk8IQxD DCDSKtnofTTCOdNvcOgPQIVYDYDhhAVSgzWyTZ4hfGr73OMwKQjMF5Ul5EpH0pCUcvbkwy xqnLjzRj4GPJ2tLru7CW4ewbcNYPP5o0uMxjC1oiZJi9Kutjl8HbnWbyU5q4ywk/2kn3uv m6sYsmHLwhPN2cfTpRfU4OaxBkJo6NNHZZR/JvI6YWVj6QcJIPhqdbKIFyw7Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045704; a=rsa-sha256; cv=none; b=wE7v++FKACO62iH5P/7dzH1apL+FpAWQJP5s6MM3nFD/T36HqYxBXjzqEDYJu1XMjwox6F wXIfjn1RakvWXnkoDuMa2MZeKI1t452WeMU02SsFuBLszNgC9EabKH85JzRE1iCMxxV0AA yAeKbAFx+OGCw3Kmy+Pc/dYpgJLprXYkCFiMzZ6byooZUIhsT8RTg92gGudmazqJCWYIDe LfpLEEmTtts+DVnGkOEreOAQxBCRa5yKU/Z0ptyTH8lkNk7KyTtxsCxFGrSD8bXQ6ZNY/f q5CK1gZ0qBygC6U72L6HnW6X3NdcJ/610gvXN+KNgbs9ajVH2Sw7po/RLwfF0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMYHr2QypzWLs; Fri, 3 Nov 2023 21:08: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 3A3L8ONF081175; Fri, 3 Nov 2023 21:08:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8OvQ081172; Fri, 3 Nov 2023 21:08:24 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:24 GMT Message-Id: <202311032108.3A3L8OvQ081172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 78ca45df3105 - main - LinuxKPI: 802.11: deal with scan_ie_len List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78ca45df310563ca46448a124674e0542aab2e31 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=78ca45df310563ca46448a124674e0542aab2e31 commit 78ca45df310563ca46448a124674e0542aab2e31 Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 20:41:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:03 +0000 LinuxKPI: 802.11: deal with scan_ie_len We only need to reserve the extra space for DSSS if NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES is set, so add the conditional. Also add checks in case scan_ie_len will grow beyond the maximum. Given this is currently unlikely, leave the cleanup for later as some other restructuring should be done first. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D42425 --- sys/compat/linuxkpi/common/src/linux_80211.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index aba7e0e961a6..ffda3c5693cd 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3919,20 +3919,30 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->scan_ie_len = 2 + IEEE80211_RATE_SIZE; if (lhw->max_rates > IEEE80211_RATE_SIZE) lhw->scan_ie_len += 2 + (lhw->max_rates - IEEE80211_RATE_SIZE); - /* - * net80211 does not seem to support the DSSS Parameter Set but some of - * the drivers insert it so calculate the extra fixed space in. - */ - lhw->scan_ie_len += 2 + 1; + + if (hw->wiphy->features & NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES) { + /* + * net80211 does not seem to support the DSSS Parameter Set but + * some of the drivers insert it so calculate the extra fixed + * space in. + */ + lhw->scan_ie_len += 2 + 1; + } /* Reduce the max_scan_ie_len "left" by the amount we consume already. */ - if (hw->wiphy->max_scan_ie_len > 0) + if (hw->wiphy->max_scan_ie_len > 0) { + if (lhw->scan_ie_len > hw->wiphy->max_scan_ie_len) + goto err; hw->wiphy->max_scan_ie_len -= lhw->scan_ie_len; + } if (bootverbose) ieee80211_announce(ic); return (0); +err: + IMPROVE("TODO FIXME CLEANUP"); + return (-EAGAIN); } void From nobody Fri Nov 3 21:08: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 4SMYHs4khCz50NSg; Fri, 3 Nov 2023 21:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SMYHs489nz3N2m; Fri, 3 Nov 2023 21:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vmd/zU5Btis2P0AQo3wpKJew0AoBIRJFj2E8w6D4SL4=; b=RYFHEA2o2HSF1FWpy/avSDQgwjzYt0vp2XoHViM+CoequBB+3fH6IUIJhhia120Vppjj9J 5rlQ/TKOPFB6EFmVLUaGVE4q6mLsnnEtNDxbZIXQdLO807uw1/vxhjIoQbNSxFaHGMmYAi 5pbftCS2MTK41tTBe5BZgDce5G0zRJKZbjAo52N8iC+PHQI9NOvK6bKJbUYSTLRqjrWtfb OaOrxZRMIljDyzwqBDbC6E6d/KbqcVOUrsGUw4zbZcw/EJNVvUjN2dIYlrTjoIKQBffVvm zI36NAfmyhLpzRARoxWiowrDY07/ckrCLbF2OUDRjHQjYqyWcsSPQZzHe9eRFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vmd/zU5Btis2P0AQo3wpKJew0AoBIRJFj2E8w6D4SL4=; b=rXbsiTSglvF2i9xzyyXPQAnF86zeGt2Oqx8Bto5e0ZOjTxVEMSsuBWqbZbmtphN3fQsVN7 jAv9+9JnN76bGokCg7x6pKguV+GBUimqt+DfVsTzA02vdqN/scOI9L4KWFRzXTeWBQ4O6K KSTpb0Rx5mNHh0ZD6DO11s2ZJPZQI4gj7iuuZQA4nLTT/0G1S/VvgwuYEmQF3H1PObi+mW HEXp4sORacRG8Uk+0jHBCe5ogtGAzKJGdjXco/XRuySzPi9Sad99pmb6CS4tfHyPsP2QUz sKl21GVshkxbbCAsZfddc1R+DIVTjIc09c4WrRMygzRIPvKLMZW6DgywzbvN/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045705; a=rsa-sha256; cv=none; b=Wrp7UfnrduWRiRuFCCUw5ZRVXynRuZjquC8YLVtupEdaa09txoqjO5ynBnSf5Q2nIhHQMb W2NTWrxfFzbz1MfeMXB/+/AR0OUtZBKK3nm5lop+GG1AdjvujEXD+UNefGHYL1J0Pp5ebL xhQEidJT5s8OtHLSCeNNf+Uxy6li175Agl5fN6/FE4kTrPalqUe/YeQ9uNxlWwXM/Qdjfc 38RyQ08Z5YYa4yhf3GPsb/doO4A6v4O/Lincl8+ppvUr+Dm/rETMw9KIPGXtQbIi32USxb N/9N8nK2dDEO1HL1wU+52pMwcG3DIezEkmHXmn8/pje47sJk4c1c2U0U7HSzLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMYHs3BcczWJM; Fri, 3 Nov 2023 21:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A3L8PQU081220; Fri, 3 Nov 2023 21:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8PbF081217; Fri, 3 Nov 2023 21:08:25 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:25 GMT Message-Id: <202311032108.3A3L8PbF081217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8895b47638ea - main - LinuxKPI: 802.11: zero-pad debug 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8895b47638ea4d7a13fba97afe8cd9faacfdda83 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8895b47638ea4d7a13fba97afe8cd9faacfdda83 commit 8895b47638ea4d7a13fba97afe8cd9faacfdda83 Author: Bjoern A. Zeeb AuthorDate: 2023-10-28 18:43:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:03 +0000 LinuxKPI: 802.11: zero-pad debug flags Write the debug flags as full 32bit hex numbers to have a better view on them. No functional changes. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: cc, emaste Differential Revision: https://reviews.freebsd.org/D42426 --- sys/compat/linuxkpi/common/src/linux_80211.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 93c1e2873206..74dc3c9f9dee 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -45,23 +45,23 @@ /* #define LINUXKPI_DEBUG_80211 */ #ifndef D80211_TODO -#define D80211_TODO 0x1 +#define D80211_TODO 0x00000001 #endif #ifndef D80211_IMPROVE -#define D80211_IMPROVE 0x2 +#define D80211_IMPROVE 0x00000002 #endif -#define D80211_IMPROVE_TXQ 0x4 -#define D80211_TRACE 0x10 -#define D80211_TRACEOK 0x20 -#define D80211_TRACE_TX 0x100 -#define D80211_TRACE_TX_DUMP 0x200 -#define D80211_TRACE_RX 0x1000 -#define D80211_TRACE_RX_DUMP 0x2000 -#define D80211_TRACE_RX_BEACONS 0x4000 +#define D80211_IMPROVE_TXQ 0x00000004 +#define D80211_TRACE 0x00000010 +#define D80211_TRACEOK 0x00000020 +#define D80211_TRACE_TX 0x00000100 +#define D80211_TRACE_TX_DUMP 0x00000200 +#define D80211_TRACE_RX 0x00001000 +#define D80211_TRACE_RX_DUMP 0x00002000 +#define D80211_TRACE_RX_BEACONS 0x00004000 #define D80211_TRACEX (D80211_TRACE_TX|D80211_TRACE_RX) #define D80211_TRACEX_DUMP (D80211_TRACE_TX_DUMP|D80211_TRACE_RX_DUMP) -#define D80211_TRACE_STA 0x10000 -#define D80211_TRACE_MO 0x100000 +#define D80211_TRACE_STA 0x00010000 +#define D80211_TRACE_MO 0x00100000 #define IMPROVE_TXQ(...) \ if (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) \ From nobody Fri Nov 3 21:08: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 4SMYHt61c3z50NXf; Fri, 3 Nov 2023 21:08: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 4SMYHt56Jwz3N3D; Fri, 3 Nov 2023 21:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045706; h=from:from:reply-to:subject:subject: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+fsUsirUnN7Hml/s8Lr8skbU7EqhJc/RddHCYhiWdo=; b=bB+ZsU+5WmHiBIPuFUcMVR/yVKPJjp/821pld/Yi75bksdmr2BRf7a+AQEyIjDr6ZxjJYb QpFcuCIB4W6hMj/xoUS/QEaYEvVD56xpHusRU42vzDQOF9hOXej2YNx+04Bo+x0bOVR9U0 pjpnKTBw+Q7goXZ6vt3UenJiPqzfTYCsp+Ru+ZDcPUIToNUiA0SgEzLobSPg5AIvdwfHse ufY4YhhgyMmqE6bxbsro68eoeB6yiiiGvPVawWvzyFVCZImuNRN4LrK2fJBQ0MZ2PaUxjp stqbE8WeZPgCfmWp3SIhuqIVMm0dKiZyIa//BPelLO0hIDzI4sUtmaqT/kq9LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045706; h=from:from:reply-to:subject:subject: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+fsUsirUnN7Hml/s8Lr8skbU7EqhJc/RddHCYhiWdo=; b=R/LNPHcL7qtEBgbIc9DVMDelIM3FssNBXRFHx7JyWCv7Oppy4TmNypd4bY3GS/PYUW/gSi m9Ei1veUJorhk+P/8GU5if9zT23ohPdS+pDpPZ7Hjho5NTphvMZl1M3sxUy3/v9QJXalPy R2nvdiWeSqdegKut17vsADhhLQAcODVeQtlhnKmY19fHkU97UGlI7aMt5jQmRfiR6vc7q2 3Xh8Zmzd13WlJ6vuhdEvJBmbFNxxcZ0DQFSYPmNpUqFYWp7gPIP2J9x983VK5cwT57GpHd IQxoWOK8YjJcuqTn/EYhFgEkk/iMMYICxL31sx/axRJ7IFBtdwkhe5SNf9/NrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045706; a=rsa-sha256; cv=none; b=K7N/JQ6aEMWmajcrWwlxrEvwBAFbYTVTZxqHSX5Dkx13mPimyOEyqLEVAlBVRrQrsMSiKN kHuNym8dTcLLGVVcQ9wgN+2UyJvyAxwBVgYM59frRj1SBeLSsV/UVQdNbaxJmRh+qgOWwm 3meBjVanuXw3xzFc5rbBs9D8fqGcRb8yU6vWnSlWdYqTXpcumfmBC80erlfG3StBTP85cv oW+8YZkqJtZgyqhxGLTCtgnm2mELfSVZDGs+IyRVp3Ul9sgyvz0XL1DX4oN2T2NxE3/J8c iYx7vM2XuAxWHxfZzNlzzLzXlVOiJt/fexXfRGBmBOTkSzygN480sMBfo2e8uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMYHt43LpzVcl; Fri, 3 Nov 2023 21:08: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 3A3L8QY6081272; Fri, 3 Nov 2023 21:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8Q4F081269; Fri, 3 Nov 2023 21:08:26 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:26 GMT Message-Id: <202311032108.3A3L8Q4F081269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ef48d4fa122d - main - net80211: rename iv_flags_vht to iv_vht_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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef48d4fa122d863db11e41608ceea641eec54704 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ef48d4fa122d863db11e41608ceea641eec54704 commit ef48d4fa122d863db11e41608ceea641eec54704 Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:18:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:04 +0000 net80211: rename iv_flags_vht to iv_vht_flags While the flag field is internal start naming it as well as "iv_vht*" so we keep all "VHT" fields together. This breaks with what was done done for HT but with HE, EHT, .. coming one day seems the more logic choice. No functional changes intended. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42419 --- sys/net80211/ieee80211.c | 6 +++--- sys/net80211/ieee80211_ht.c | 12 ++++++------ sys/net80211/ieee80211_ioctl.c | 2 +- sys/net80211/ieee80211_node.c | 6 +++--- sys/net80211/ieee80211_output.c | 6 +++--- sys/net80211/ieee80211_scan_sta.c | 8 ++++---- sys/net80211/ieee80211_sta.c | 4 ++-- sys/net80211/ieee80211_var.h | 2 +- sys/net80211/ieee80211_vht.c | 10 +++++----- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 6584e0b6e027..41b743c988f4 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -939,7 +939,7 @@ ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag) bit = 0; TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) - if (vap->iv_flags_vht & flag) { + if (vap->iv_vht_flags & flag) { bit = 1; break; } @@ -957,9 +957,9 @@ ieee80211_syncflag_vht(struct ieee80211vap *vap, int flag) IEEE80211_LOCK(ic); if (flag < 0) { flag = -flag; - vap->iv_flags_vht &= ~flag; + vap->iv_vht_flags &= ~flag; } else - vap->iv_flags_vht |= flag; + vap->iv_vht_flags |= flag; ieee80211_syncflag_vht_locked(ic, flag); IEEE80211_UNLOCK(ic); } diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 0e5a4df04305..34d330f0dd09 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1935,12 +1935,12 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) uint32_t vhtflags = 0; vhtflags = 0; - if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1952,7 +1952,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) /* XXX 2 means "160MHz and 80+80MHz" */ (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1961,7 +1961,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) vhtflags |= IEEE80211_CHAN_HT40D; } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80MHZ) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80)) { vhtflags = IEEE80211_CHAN_VHT80; /* Mirror the HT40 flags */ if (htflags == IEEE80211_CHAN_HT40U) { @@ -1979,11 +1979,11 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) * 'ht40' as that flag. */ if ((htflags == IEEE80211_CHAN_HT40U) && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { vhtflags = IEEE80211_CHAN_VHT40U | IEEE80211_CHAN_HT40U; } else if (htflags == IEEE80211_CHAN_HT40D && - (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT40)) { + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { vhtflags = IEEE80211_CHAN_VHT40D | IEEE80211_CHAN_HT40D; } else if (htflags == IEEE80211_CHAN_HT20) { diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 674d163e3e67..d3e4bd1ca561 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1156,7 +1156,7 @@ ieee80211_ioctl_get80211(struct ieee80211vap *vap, u_long cmd, ireq->i_val = 1; break; case IEEE80211_IOC_VHTCONF: - ireq->i_val = vap->iv_flags_vht & IEEE80211_FVHT_MASK; + ireq->i_val = vap->iv_vht_flags & IEEE80211_FVHT_MASK; break; default: error = ieee80211_ioctl_getdefault(vap, ireq); diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index e451b03d8dac..60230fcec1c5 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1015,7 +1015,7 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, */ if (ni->ni_ies.vhtopmode_ie != NULL && ni->ni_ies.vhtcap_ie != NULL && - vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) { printf("%s: BSS %6D: 2GHz channel, VHT info; ignoring\n", __func__, @@ -1589,7 +1589,7 @@ ieee80211_node_create_wds(struct ieee80211vap *vap, * ni_chan will be adjusted to an HT channel. */ ieee80211_ht_wds_init(ni); - if (vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (vap->iv_vht_flags & IEEE80211_FVHT_VHT) { printf("%s: TODO: vht_wds_init\n", __func__); } } else { @@ -1824,7 +1824,7 @@ ieee80211_init_neighbor(struct ieee80211_node *ni, if ((ni->ni_ies.vhtcap_ie != NULL) && (ni->ni_ies.vhtopmode_ie != NULL) && - (ni->ni_vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (ni->ni_vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { do_vht_setup = 1; } } diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index a02073ae8d9c..a5fad2462598 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -2524,12 +2524,12 @@ ieee80211_probereq_ie(struct ieee80211vap *vap, struct ieee80211com *ic, * VHT channel. */ #ifdef notyet - if (vap->iv_flags_vht & IEEE80211_FVHT_VHT) { + if (vap->iv_vht_flags & IEEE80211_FVHT_VHT) { struct ieee80211_channel *c; c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, vap->iv_flags_ht); - c = ieee80211_vht_adjust_channel(ic, c, vap->iv_flags_vht); + c = ieee80211_vht_adjust_channel(ic, c, vap->iv_vht_flags); frm = ieee80211_add_vhtcap_ch(frm, vap, c); } #endif @@ -2887,7 +2887,7 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg) frm = ieee80211_add_htcap(frm, ni); } - if ((vap->iv_flags_vht & IEEE80211_FVHT_VHT) && + if ((vap->iv_vht_flags & IEEE80211_FVHT_VHT) && IEEE80211_IS_CHAN_VHT(ni->ni_chan) && ni->ni_ies.vhtcap_ie != NULL && ni->ni_ies.vhtcap_ie[0] == IEEE80211_ELEMID_VHT_CAP) { diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c index 9389a7bf53d0..a8159fca6d80 100644 --- a/sys/net80211/ieee80211_scan_sta.c +++ b/sys/net80211/ieee80211_scan_sta.c @@ -1680,7 +1680,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); ieee80211_create_ibss(vap, chan); return 1; } @@ -1713,7 +1713,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; return 1; /* terminate scan */ @@ -1866,7 +1866,7 @@ ap_end(struct ieee80211_scan_state *ss, struct ieee80211vap *vap) return 1; } chan = ieee80211_ht_adjust_channel(ic, bestchan, vap->iv_flags_ht); - chan = ieee80211_vht_adjust_channel(ic, chan, vap->iv_flags_vht); + chan = ieee80211_vht_adjust_channel(ic, chan, vap->iv_vht_flags); ieee80211_create_ibss(vap, chan); return 1; @@ -1946,7 +1946,7 @@ notfound: chan = ieee80211_ht_adjust_channel(ic, chan, vap->iv_flags_ht); chan = ieee80211_vht_adjust_channel(ic, - chan, vap->iv_flags_vht); + chan, vap->iv_vht_flags); } } else chan = vap->iv_des_chan; diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 37f384325970..042f5636be29 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -1524,7 +1524,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, do_ht = 1; } if (scan.vhtcap != NULL && scan.vhtopmode != NULL && - (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { /* XXX state changes? */ ieee80211_vht_updateparams(ni, scan.vhtcap, scan.vhtopmode); @@ -1870,7 +1870,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, ieee80211_ht_updateparams(ni, htcap, htinfo); if ((vhtcap != NULL) && (vhtopmode != NULL) & - (vap->iv_flags_vht & IEEE80211_FVHT_VHT)) { + (vap->iv_vht_flags & IEEE80211_FVHT_VHT)) { /* * Log if we get a VHT assoc/reassoc response. * We aren't ready for 2GHz VHT support. diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 2fd46278d7ea..1208a8b3ab4e 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -423,7 +423,7 @@ struct ieee80211vap { int iv_inact_probe; /* inactive probe time */ /* VHT flags */ - uint32_t iv_flags_vht; /* VHT state flags */ + uint32_t iv_vht_flags; /* VHT state flags */ uint32_t iv_vhtcaps; /* VHT capabilities */ uint32_t iv_vhtextcaps; /* VHT extended capabilities (TODO) */ struct ieee80211_vht_mcs_info iv_vht_mcsinfo; diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 77611d9704a2..9f8b104db10c 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -148,14 +148,14 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ - vap->iv_flags_vht = + vap->iv_vht_flags = IEEE80211_FVHT_VHT | IEEE80211_FVHT_USEVHT40 | IEEE80211_FVHT_USEVHT80; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vhtcaps)) - vap->iv_flags_vht |= IEEE80211_FVHT_USEVHT160; + vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vhtcaps)) - vap->iv_flags_vht |= IEEE80211_FVHT_USEVHT80P80; + vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; memcpy(&vap->iv_vht_mcsinfo, &ic->ic_vht_mcsinfo, sizeof(struct ieee80211_vht_mcs_info)); @@ -383,10 +383,10 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); } if ((val2 == 2) && - ((vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80) == 0)) + ((vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80) == 0)) val2 = 1; if ((val2 == 1) && - ((vap->iv_flags_vht & IEEE80211_FVHT_USEVHT160) == 0)) + ((vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160) == 0)) val2 = 0; val = MIN(val1, val2); new_vhtcap |= _IEEE80211_SHIFTMASK(val, From nobody Fri Nov 3 21:08: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 4SMYHw1GQPz50Nm8; Fri, 3 Nov 2023 21:08: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 4SMYHv61f6z3N81; Fri, 3 Nov 2023 21:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BkWjOWXegU/82aY5XHTDqgtVhIHMn3FfmSKRNINI8eE=; b=pVlyhG/6XiHkAik9R4TwgJV8tgh3MlOcFyghsBnzMN1UavGIV56xkLu+mzn/Bz3a7ZwLFe jCaK/1wBi/RMEpxRwWUyDeMTySBAVYNPE5cbCFERbqSM1E0t6GkJtN7rVg2q94hW9O5n/A tSZ+omxtivSaID8VBSKFnwNz5qV42kSlgN7n0MTf2Kpjd9rzo8sZo5J2IOFANDEc7x+hS5 cmMNrMXucdxQFMur4h6//2Ft+aFf5D3Cab8WMaSQy0UMaO7TTyYzjyLQVBdPwiCxVILLfE NIhiSIKn5kZDvWinSeFJ1oGiwn1SzfQGgIZLckbNrxxQhVkWTlOVpuD8zlD87w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BkWjOWXegU/82aY5XHTDqgtVhIHMn3FfmSKRNINI8eE=; b=S5dr9OSMJfEZ0Rc9fmPBiDMJKiY+HyBAbfjecHTRwerKMMEsMyDp7lT2sA3FMoUX8pbsp2 BL+5JI3aOKhNLfyD9ZvLpEcu6bvMXF6QeGhV53ZOhpVdV3i7FTVEBgZeO10Zile3UwzZtD kx0Vzpgyx6t1NtQ+B2Ax1jqiR1WGg6WeDvV21a4SeDZ8JNl8kTwNXE6IetwZejl2BZHJLO DZsBPITNFGUo+jfXDJ38h/v98az28Gd/T1WYMeo5CKczKOg5u5rbNBUBuIDt4gRdF3YqTk t/X7iShYCTTxY+tFJz9jyHwIY7hXCPH3YnG8AHjXyEiZA46NGrcx7zVg4pbWzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045707; a=rsa-sha256; cv=none; b=PnRfJ4ixdzC/v0bH6xyJNuJrwSpTUxZifWtUfePOBvGF+0n5CVJA9+kJ57sj7vdoAvwnWA VP7yHEr/OVyefkXB6O1fk7rO+1JdM5H8m6FqOOlYCpr7tidZ3i92kKIzEWR3Cu/LA5muYa IOxxZxLXEdyWEMKhMLPjZzyN+vKmfAda50oN57Hb/k2pmeRmhtn1lBiyBPRkTxXA2wZaKS MHOrIU1FprAve8suTd2pTxLuCpIZe1dKNvL1gU8sJveX7Wm8Q1IMD5IUoEtFrSWeWWyiHa aerbcPaNiZrYdv9cj4vp6Yz+ety3PMmUWo26ZmLNL1kK0dbMJcaDD+sKS5aScQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMYHv4rH3zVcm; Fri, 3 Nov 2023 21:08: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 3A3L8R5r081319; Fri, 3 Nov 2023 21:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8RaQ081316; Fri, 3 Nov 2023 21:08:27 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:27 GMT Message-Id: <202311032108.3A3L8RaQ081316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fbba0d6b6364 - main - net80211: combine iv_vhtcaps and iv_vht_mcsinfo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbba0d6b636492505dc5878b9ed2c1bbdcd88b91 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fbba0d6b636492505dc5878b9ed2c1bbdcd88b91 commit fbba0d6b636492505dc5878b9ed2c1bbdcd88b91 Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:33:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:04 +0000 net80211: combine iv_vhtcaps and iv_vht_mcsinfo The iv_vhtcaps and iv_vht_mcsinfo fields together form struct ieee80211_vht_cap so combine them into one field in the VAP and keep the information together. While the structure layout changes no other functional changes intended. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42420 --- sys/net80211/ieee80211.c | 2 +- sys/net80211/ieee80211_ddb.c | 2 +- sys/net80211/ieee80211_ht.c | 4 ++-- sys/net80211/ieee80211_var.h | 3 +-- sys/net80211/ieee80211_vht.c | 50 ++++++++++++++++++++++---------------------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 41b743c988f4..dcd61e8de43a 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -553,7 +553,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, vap->iv_htextcaps = ic->ic_htextcaps; /* 11ac capabilities - XXX methodize */ - vap->iv_vhtcaps = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; vap->iv_vhtextcaps = ic->ic_vhtextcaps; vap->iv_opmode = opmode; diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index e4a09a58049b..e3f70fbe3f29 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -490,7 +490,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) db_printf("\tflags_ven=%b\n", vap->iv_flags_ven, IEEE80211_FVEN_BITS); db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS); db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS); - db_printf("\tvhtcaps=%b\n", vap->iv_vhtcaps, IEEE80211_VHTCAP_BITS); + db_printf("\tvhtcap=%b\n", vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); _db_show_stats(&vap->iv_stats); diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 34d330f0dd09..61c57b87c5d7 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1938,7 +1938,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; @@ -1950,7 +1950,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) && /* XXX 2 means "160MHz and 80+80MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 1208a8b3ab4e..08812c5eb27c 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -424,9 +424,8 @@ struct ieee80211vap { /* VHT flags */ uint32_t iv_vht_flags; /* VHT state flags */ - uint32_t iv_vhtcaps; /* VHT capabilities */ + struct ieee80211_vht_cap iv_vht_cap; /* VHT capabilities + MCS info */ uint32_t iv_vhtextcaps; /* VHT extended capabilities (TODO) */ - struct ieee80211_vht_mcs_info iv_vht_mcsinfo; uint32_t iv_vht_spare[4]; int iv_des_nssid; /* # desired ssids */ diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 9f8b104db10c..49d5fa18b448 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -144,7 +144,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (! IEEE80211_CONF_VHT(ic)) return; - vap->iv_vhtcaps = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ @@ -152,12 +152,12 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) IEEE80211_FVHT_VHT | IEEE80211_FVHT_USEVHT40 | IEEE80211_FVHT_USEVHT80; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT160; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; - memcpy(&vap->iv_vht_mcsinfo, &ic->ic_vht_mcsinfo, + memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_mcsinfo, sizeof(struct ieee80211_vht_mcs_info)); } @@ -366,7 +366,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* Limit MPDU size to the smaller of the two */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MAX_MPDU_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -376,7 +376,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_MAX_MPDU_MASK); /* Limit supp channel config */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -393,7 +393,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK); /* RX LDPC */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RXLDPC); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -403,7 +403,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_RXLDPC); /* Short-GI 80 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SHORT_GI_80); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -413,7 +413,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_SHORT_GI_80); /* Short-GI 160 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SHORT_GI_160); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -438,7 +438,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* TX STBC */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_TXSTBC); if (opmode == 1) { /* STA mode - enable it only if node RXSTBC is non-zero */ @@ -452,7 +452,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_TXSTBC); /* RX STBC1..4 */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RXSTBC_MASK); if (opmode == 1) { /* STA mode - enable it only if node TXSTBC is non-zero */ @@ -483,7 +483,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* SU Beamformer capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -494,7 +494,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE); /* SU Beamformee capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -505,7 +505,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); /* Beamformee STS capability - only if SU beamformee capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK); if (opmode == 1) { val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -518,7 +518,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK); /* Sounding dimensions - only if SU beamformer capable */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -533,7 +533,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * MU Beamformer capable - only if SU BFF capable, MU BFF capable * and STA (not AP) */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MU_BEAMFORMER_CAPABLE); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -550,7 +550,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * MU Beamformee capable - only if SU BFE capable, MU BFE capable * and AP (not STA) */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MU_BEAMFORMEE_CAPABLE); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -564,7 +564,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE); /* VHT TXOP PS */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_VHT_TXOP_PS); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -573,7 +573,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, new_vhtcap |= _IEEE80211_SHIFTMASK(val, IEEE80211_VHTCAP_VHT_TXOP_PS); /* HTC_VHT */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_HTC_VHT); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -583,7 +583,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, /* A-MPDU length max */ /* XXX TODO: we need a userland config knob for this */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -596,7 +596,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, * Link adaptation is only valid if HTC-VHT capable is 1. * Otherwise, always set it to 0. */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_MASK); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -613,7 +613,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* RX antenna pattern */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_RX_ANTENNA_PATTERN); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -623,7 +623,7 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, IEEE80211_VHTCAP_RX_ANTENNA_PATTERN); /* TX antenna pattern */ - val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vhtcaps, + val2 = val1 = _IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, IEEE80211_VHTCAP_TX_ANTENNA_PATTERN); if (opmode == 1) val2 = _IEEE80211_MASKSHIFT(ni->ni_vhtcap, @@ -639,9 +639,9 @@ ieee80211_vht_get_vhtcap_ie(struct ieee80211_node *ni, */ /* MCS set - start with whatever the device supports */ - vhtcap->supp_mcs.rx_mcs_map = vap->iv_vht_mcsinfo.rx_mcs_map; + vhtcap->supp_mcs.rx_mcs_map = vap->iv_vht_cap.supp_mcs.rx_mcs_map; vhtcap->supp_mcs.rx_highest = 0; - vhtcap->supp_mcs.tx_mcs_map = vap->iv_vht_mcsinfo.tx_mcs_map; + vhtcap->supp_mcs.tx_mcs_map = vap->iv_vht_cap.supp_mcs.tx_mcs_map; vhtcap->supp_mcs.tx_highest = 0; vhtcap->vht_cap_info = new_vhtcap; From nobody Fri Nov 3 21:08: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 4SMYHx1yWxz50Ncy; Fri, 3 Nov 2023 21:08: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 4SMYHx0VCcz3NBp; Fri, 3 Nov 2023 21:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxXYawBr+hDwE78uTVOJrYZadgUxr+dLk1ZgkrK/Rjg=; b=gwm2qS3qKYt3gWfKFVIipdO0Kc322gq1qP+v48i2n2VZEbe17LSA92JWgYYgExrPj1Uv55 al89/x3jnifHrtwVndUqn9y+I7LqjgXRAqbg8gzrWo808GMtlpG/P9iIYhLNUgA3Hj/JK0 d3u8HRpgQXBAfLOdXRqD3pjDtGkJV99tBJBvcHQ8XTNpI4JYZqQpviuJy3kkDw71aDmb2+ ltdkQAYF6mRZmpnZvl5REJs7flU1u/6e0ZAD8fdA+Io/QAWXeG720qRd/m/ZT/CuIouVaW y7cRMu10zu7W0oxi9//6BOrV/mAIIXeLVixBmU+TxDa9NLr1cG6kpZ8ZF9qBQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxXYawBr+hDwE78uTVOJrYZadgUxr+dLk1ZgkrK/Rjg=; b=pcqISpr+eey51ZAhD+wcHbsMS9jJNt6DyoF7WuEvbzzLpVlTJkZFDSxdEpvAAjfZJlWyTZ PczoDw+qzQwVT5spU6SU5ixlj+t9nTgL9JOJ2RFq1zfxf++VjvHJ/8+ERVTfvHJs/6GMnL 6nhShdI+fFR5kaxIa1DWhPPMD/sOExuxnQ++0DRddRua6Nbvhuav8JPttpvjEs63EK2QVq KkXPLuzFejWYIc0Akl7oUTBFAkKJaBChNVTutiQZw7P2F+56Fn5Yg1e2R5nYzF7fRqUt2j XEqmFug44XbSnbnNdi7BZJEaZ3+IzAshLW01Jr8ssL8zB3zYS4Aa1V2oCCfcRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045709; a=rsa-sha256; cv=none; b=BAMvK/4+wSvuHl/VJ6WsQj4r6jsIOMPEGohCKUURLPAk5HOoonaIYKHN2A0sQ4KpjNvLeq BasuMQ0dqy4VJh+K5oUA6ltAVKVwPZ4Jl4qvl1Ph9+OY1VOkBM++t2t1BRibWZzf+LH4An +Hou3N+PhJebs88bFb08SBd0Ivp0tRODmtiwYzMbVbC/lfpScG0bJpUPVFiKT8/oCrNReQ jyYL1fsid6iJH2u0fOtD3yYomRJpaXyWqnJV2bgfeFT/EPD+g6J9P413aBOOW7uuXntcA1 IePa1/x3B8uKxZyaflGghaNyrV6x4kDkg5zWjsZcQ5Z1+6VZdFkt2oxLGtpk7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMYHw6FwmzTtb; Fri, 3 Nov 2023 21:08: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 3A3L8S20081365; Fri, 3 Nov 2023 21:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8S6s081362; Fri, 3 Nov 2023 21:08:28 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:28 GMT Message-Id: <202311032108.3A3L8S6s081362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 562adbe1d354 - main - net80211: migrate ic_vhtcaps, ic_vht_mcsinfo, ic_flags_vht List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 562adbe1d354377a260e66eedb6072b720a606dc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=562adbe1d354377a260e66eedb6072b720a606dc commit 562adbe1d354377a260e66eedb6072b720a606dc Author: Bjoern A. Zeeb AuthorDate: 2023-10-27 18:44:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:04 +0000 net80211: migrate ic_vhtcaps, ic_vht_mcsinfo, ic_flags_vht Like for the VAP rename ic_flags_vht to ic_vht_flags for consistency to keep "VHT" fields together and merge ic_vhtcaps and ic_vht_mcsinfo into struct ieee80211_vht_cap ic_vht_cap. While the structure layout changes no other functional changes intended. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42421 --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 +++--- sys/net80211/ieee80211.c | 6 +++--- sys/net80211/ieee80211_ddb.c | 2 +- sys/net80211/ieee80211_ioctl.c | 2 +- sys/net80211/ieee80211_node.c | 2 +- sys/net80211/ieee80211_regdomain.c | 4 ++-- sys/net80211/ieee80211_var.h | 5 ++--- sys/net80211/ieee80211_vht.c | 14 +++++++------- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ffda3c5693cd..42fb7a60ce57 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3556,16 +3556,16 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, if (hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.vht_supported){ ic->ic_flags_ext |= IEEE80211_FEXT_VHT; - ic->ic_vhtcaps = + ic->ic_vht_cap.vht_cap_info = hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.cap; setbit(bands, IEEE80211_MODE_VHT_5GHZ); chan_flags |= NET80211_CBW_FLAG_VHT80; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) chan_flags |= NET80211_CBW_FLAG_VHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) chan_flags |= NET80211_CBW_FLAG_VHT80P80; } #endif diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index dcd61e8de43a..3809b7e6596c 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -553,7 +553,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, vap->iv_htextcaps = ic->ic_htextcaps; /* 11ac capabilities - XXX methodize */ - vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vht_cap.vht_cap_info; vap->iv_vhtextcaps = ic->ic_vhtextcaps; vap->iv_opmode = opmode; @@ -944,9 +944,9 @@ ieee80211_syncflag_vht_locked(struct ieee80211com *ic, int flag) break; } if (bit) - ic->ic_flags_vht |= flag; + ic->ic_vht_flags |= flag; else - ic->ic_flags_vht &= ~flag; + ic->ic_vht_flags &= ~flag; } void diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index e3f70fbe3f29..cd4a4f191745 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -672,7 +672,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta, db_printf("\tcryptocaps=%b\n", ic->ic_cryptocaps, IEEE80211_CRYPTO_BITS); db_printf("\thtcaps=%b\n", ic->ic_htcaps, IEEE80211_HTCAP_BITS); - db_printf("\tvhtcaps=%b\n", ic->ic_vhtcaps, IEEE80211_VHTCAP_BITS); + db_printf("\tvhtcaps=%b\n", ic->ic_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); #if 0 uint8_t ic_modecaps[2]; /* set of mode capabilities */ diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index d3e4bd1ca561..170cdc416276 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -711,7 +711,7 @@ ieee80211_ioctl_getdevcaps(struct ieee80211com *ic, dc->dc_drivercaps = ic->ic_caps; dc->dc_cryptocaps = ic->ic_cryptocaps; dc->dc_htcaps = ic->ic_htcaps; - dc->dc_vhtcaps = ic->ic_vhtcaps; + dc->dc_vhtcaps = ic->ic_vht_cap.vht_cap_info; ci = &dc->dc_chaninfo; ic->ic_getradiocaps(ic, maxchans, &ci->ic_nchans, ci->ic_chans); KASSERT(ci->ic_nchans <= maxchans, diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 60230fcec1c5..f277293ceb14 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -809,7 +809,7 @@ ieee80211_setupcurchan(struct ieee80211com *ic, struct ieee80211_channel *c) * based on what HT has done; it may further promote the * channel to VHT80 or above. */ - if (ic->ic_vhtcaps != 0) { + if (ic->ic_vht_cap.vht_cap_info != 0) { int flags = getvhtadjustflags(ic); if (flags > ieee80211_vhtchanflags(c)) c = ieee80211_vht_adjust_channel(ic, c, flags); diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c index a482e1eaad32..3f222dc31a5a 100644 --- a/sys/net80211/ieee80211_regdomain.c +++ b/sys/net80211/ieee80211_regdomain.c @@ -149,10 +149,10 @@ ieee80211_init_channels(struct ieee80211com *ic, if (isset(bands, IEEE80211_MODE_VHT_5GHZ)) { cbw_flags |= NET80211_CBW_FLAG_HT40; /* Make sure this is set; or assert? */ cbw_flags |= NET80211_CBW_FLAG_VHT80; - if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vhtcaps)) + if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vht_cap.vht_cap_info)) cbw_flags |= NET80211_CBW_FLAG_VHT160; if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ( - ic->ic_vhtcaps)) + ic->ic_vht_cap.vht_cap_info)) cbw_flags |= NET80211_CBW_FLAG_VHT80P80; ieee80211_add_channel_list_5ghz(chans, IEEE80211_CHAN_MAX, nchans, def_chan_5ghz_band1, nitems(def_chan_5ghz_band1), diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 08812c5eb27c..f42ebb4fa261 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -240,10 +240,9 @@ struct ieee80211com { uint8_t ic_txstream; /* # TX streams */ /* VHT information */ - uint32_t ic_vhtcaps; /* VHT capabilities */ + uint32_t ic_vht_flags; /* VHT state flags */ + struct ieee80211_vht_cap ic_vht_cap; /* VHT capabilities + MCS info */ uint32_t ic_vhtextcaps; /* VHT extended capabilities (TODO) */ - struct ieee80211_vht_mcs_info ic_vht_mcsinfo; /* Support TX/RX VHT MCS */ - uint32_t ic_flags_vht; /* VHT state flags */ uint32_t ic_vht_spare[3]; /* optional state for Atheros SuperG protocol extensions */ diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 49d5fa18b448..50f5a6b17656 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -144,7 +144,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (! IEEE80211_CONF_VHT(ic)) return; - vap->iv_vht_cap.vht_cap_info = ic->ic_vhtcaps; + vap->iv_vht_cap.vht_cap_info = ic->ic_vht_cap.vht_cap_info; vap->iv_vhtextcaps = ic->ic_vhtextcaps; /* XXX assume VHT80 support; should really check vhtcaps */ @@ -157,7 +157,7 @@ ieee80211_vht_vattach(struct ieee80211vap *vap) if (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info)) vap->iv_vht_flags |= IEEE80211_FVHT_USEVHT80P80; - memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_mcsinfo, + memcpy(&vap->iv_vht_cap.supp_mcs, &ic->ic_vht_cap.supp_mcs, sizeof(struct ieee80211_vht_mcs_info)); } @@ -199,19 +199,19 @@ ieee80211_vht_announce(struct ieee80211com *ic) /* Channel width */ ic_printf(ic, "[VHT] Channel Widths: 20MHz, 40MHz, 80MHz%s%s\n", - (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vhtcaps)) ? + (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(ic->ic_vht_cap.vht_cap_info)) ? ", 160MHz" : "", - (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(ic->ic_vhtcaps)) ? + (IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(ic->ic_vht_cap.vht_cap_info)) ? ", 80+80MHz" : ""); /* Features */ - ic_printf(ic, "[VHT] Features: %b\n", ic->ic_vhtcaps, + ic_printf(ic, "[VHT] Features: %b\n", ic->ic_vht_cap.vht_cap_info, IEEE80211_VHTCAP_BITS); /* For now, just 5GHz VHT. Worry about 2GHz VHT later */ for (i = 0; i < 8; i++) { /* Each stream is 2 bits */ - tx = (ic->ic_vht_mcsinfo.tx_mcs_map >> (2*i)) & 0x3; - rx = (ic->ic_vht_mcsinfo.rx_mcs_map >> (2*i)) & 0x3; + tx = (ic->ic_vht_cap.supp_mcs.tx_mcs_map >> (2*i)) & 0x3; + rx = (ic->ic_vht_cap.supp_mcs.rx_mcs_map >> (2*i)) & 0x3; if (tx == 3 && rx == 3) continue; ic_printf(ic, "[VHT] NSS %d: TX MCS 0..%d, RX MCS 0..%d\n", From nobody Fri Nov 3 21:08: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 4SMYHy261Rz50Njv; Fri, 3 Nov 2023 21:08: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 4SMYHy1PYvz3NKd; Fri, 3 Nov 2023 21:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VX9Oh2lRbMjC17W1SyPq0jWKeLMeCNC5EaND95cpsW0=; b=CBuB2shh+g3OlFIkUOnHolSSgbO0L6j5mXVFbjchXEf5jYyFcoc9hLTZLn2vGIttCyhSXK PxcqOEdFESpD+c3pvDXg6mg4bOlqlCjuZVSJkP0BwkztMfC+ZsBlKfhk0mX9fmwMhizcBp OGjO2AUOWAqL0r67ExMwAcq15Q9hYUkH+HH2dROSFSrvGsAfgYSeWyo5xWqjsBZgn26QrT YK1bXUiOuYCyY7xofhjyf3e5AhTzYzFXLWE/91/h3Nazp8+mMgTupiv/GGUrGJmuhcYiQr OFTAwyxP4M7hrnSCNRmIKHRQmjBUH6rDivu+ZVmXrZdtNlFWGE0Kc558YQDmAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699045710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VX9Oh2lRbMjC17W1SyPq0jWKeLMeCNC5EaND95cpsW0=; b=NFUFCePdSjlrkFr8wrr28Jy2z+X0RGdyR+W3mk5l6xfZeJfmOzLsSY+edsxBo8CawSRYi9 tMZ/k7S9/r0N/hn7P+8ASczD0fiNLZLErfAJOzBRGACbpqRohWX591unng2GDbD6mqEsAC 6EF8kzcanAUeLwboRDProOxziuNKvECTNDOeSmK4e32vyqdem475LxH8yWYK9MaHsyFxQs NhpQTrDgqJD0fppKIRty+PV1xI3oYL5LwvbfCZMzl2q8bHXRY5kovqmHzHCqD/dxV/ct9+ ES7Ky6dDoCp6eGT7UHhWTNrTgZwbLo3DfHFciFdzpcBJPyl7SIIWW7w/XySzww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699045710; a=rsa-sha256; cv=none; b=H4HA16I8b39s5PGx5hkMz0UlGSUF3RIaoxDezzn3PVc7XAWakVfWfTjb99GbQVAMt3I6Kp OZKnq/w0gCOEtskCV49w07rTbHlKuhbw+ZAH+tiVfXM56X1BBytmIzMlPeNigWupHECMSe 6vR01CixsnrOVQ/Nl8lsKsMazj6x3TUoGa7haVCWAsoJs1DR1qD2feYwOawhMwlyUbsfvk vhGuG8ENvCGk7YbwdVbUVm5eEQiJCMILimpdlXTr2DZsvLbC2hg+tUbxzkru7WfzAUfeqG Fdz+5DC1++MLZ//9ygtf2ENjTuK1sWvIY5psmSN/17HY/QvOb2jiB3KoLXgL/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 4SMYHy0CxczTtc; Fri, 3 Nov 2023 21:08: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 3A3L8T74081413; Fri, 3 Nov 2023 21:08:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3L8TrC081410; Fri, 3 Nov 2023 21:08:29 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:08:29 GMT Message-Id: <202311032108.3A3L8TrC081410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6c3ae01cc75a - main - net80211: add ieee80211_add_vhtcap_ch() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c3ae01cc75afdd575f54289b2879a7c98d55bf6 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6c3ae01cc75afdd575f54289b2879a7c98d55bf6 commit 6c3ae01cc75afdd575f54289b2879a7c98d55bf6 Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 20:55:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-03 21:08:04 +0000 net80211: add ieee80211_add_vhtcap_ch() Add an implementation of ieee80211_add_vhtcap() which works based on information derived from the vap (and possibly channel/band but we do not support that yet in net80211). This is needed for scans request information in LinuxKPI at times before we have a BSS. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D42422 --- sys/net80211/ieee80211_vht.c | 27 +++++++++++++++++++++++++++ sys/net80211/ieee80211_vht.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 50f5a6b17656..1561255be101 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -707,6 +707,33 @@ ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *ni) return (frm); } +/* + * Non-associated probe requests. Add VHT capabilities based on + * the current channel configuration. No BSS yet. + */ +uint8_t * +ieee80211_add_vhtcap_ch(uint8_t *frm, struct ieee80211vap *vap, + struct ieee80211_channel *c) +{ + struct ieee80211_vht_cap *vhtcap; + + memset(frm, 0, 2 + sizeof(*vhtcap)); + frm[0] = IEEE80211_ELEMID_VHT_CAP; + frm[1] = sizeof(*vhtcap); + frm += 2; + + /* 32-bit VHT capability */ + ADDWORD(frm, vap->iv_vht_cap.vht_cap_info); + + /* supp_mcs */ + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_highest); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_highest); + + return (frm); +} + static uint8_t ieee80211_vht_get_chwidth_ie(struct ieee80211_channel *c) { diff --git a/sys/net80211/ieee80211_vht.h b/sys/net80211/ieee80211_vht.h index a3830ae13ba7..756c2e367485 100644 --- a/sys/net80211/ieee80211_vht.h +++ b/sys/net80211/ieee80211_vht.h @@ -50,6 +50,8 @@ void ieee80211_vht_node_leave(struct ieee80211_node *ni); uint8_t * ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *); uint8_t * ieee80211_add_vhtinfo(uint8_t *frm, struct ieee80211_node *); +uint8_t *ieee80211_add_vhtcap_ch(uint8_t *, struct ieee80211vap *, + struct ieee80211_channel *); void ieee80211_vht_update_cap(struct ieee80211_node *, const uint8_t *, const uint8_t *); From nobody Fri Nov 3 21:44: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 4SMZ5C17nQz50VkM; Fri, 3 Nov 2023 21:44: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 4SMZ5C0dHjz3bTy; Fri, 3 Nov 2023 21:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699047855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+p2CVdc3iR2w2qe2B8sk0Xdggx9yooYwP+cW41OHu7Y=; b=OVMDEskb0QXcOijEwESxpY7kDRvnqahUZgpXlrG5Lt8doX3E/453sRW1fAlbkMjCU2WgTU MpTXSWOb9f9olNuHwP20DACKIyfyrYoKXQW+d2KhRJr9AwhO314GwbZz4ydYBCsXugluop MuIDS6LglEwYQKMQMQ1jjkKUgwGkmOinWbcaSv2zSo0QXoMz/56crXc6ENlcRql7LsTmiL YtqW+cexiAtDwnhW0TylyUtYPGE0Yjj2SaCQZh6D4cgMOMmWQYZpNT6P0QAqULggVukmkH ICbRXGD7mFzTd3diBPGUZ1Is437MhvBwJqDgSau42nbohOWiGp1nWpazheXXsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699047855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+p2CVdc3iR2w2qe2B8sk0Xdggx9yooYwP+cW41OHu7Y=; b=IZqzfftKJrjwu9bBYIprQWEZ/S7nFGI0t8QF9W7Be0dEBQyOkdbsE8biTPXvQqOlnk/izq TRmS5wsH/+3G4wb1yFOyW637HnCY/ElUB21zLi1rMyRZtCmQd4HD3Pzg6nORq0aRODKjUo 4LaYAM3gogaHme/74keUm/9mVmoJcQMz1ky+rUTrO+arP4iLZCtmAXA58OAQ9UA8eoDOtX 7ylYR5CPoiAY1V06T/kpkIs1W3HMRAqip3Hgnwcax7pNo7j5hln4yr/zB9WCsnGUpVklqH vsCCdtCCsJS53497oQsM8W9Qg6WaJT+MY+Scny2vN0hrQZSbxjy/aRj/9jGJyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699047855; a=rsa-sha256; cv=none; b=yXUFc6CTrouKrmCuc6LwohPQgNyGOSkMJtBmz+q9CVz7jwKmCFFEv3pK3ReweUBhzbNcKB t3HXUH3SAZpTnaMT9zxvyJBpjGDRdeb3BrQSpO4ZrrkfanLHhyYmlTCZlUaVqGxfh7y9gX tyrdYbPBP5Iigt+7JFvrlVEgrtK5KRTQCWTTpDGSL8egEtVDm00yDDFGQxKrbtMrXglRg2 BC4K6HqWgWzIQFmGLkfgo3yaxiTTi21F0DUmkpIzXJ1+c5Ke6Z/+Nd/DWh+0opUq0eQ54X 3/66D+IC8eRUiKHRb0kw9jGb/7WRI+H/JYwcjH2mc9R8IU8op5hUl7TZ2S1oOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMZ5B6qf1zXYd; Fri, 3 Nov 2023 21:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A3LiEVd049269; Fri, 3 Nov 2023 21:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A3LiEF3049266; Fri, 3 Nov 2023 21:44:14 GMT (envelope-from git) Date: Fri, 3 Nov 2023 21:44:14 GMT Message-Id: <202311032144.3A3LiEF3049266@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: 98fd69f0090d - main - rtld/arm: fix initial-exec (IE) thread-local storage relocation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 98fd69f0090da73d9d0451bd769d7752468284c6 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=98fd69f0090da73d9d0451bd769d7752468284c6 commit 98fd69f0090da73d9d0451bd769d7752468284c6 Author: R. Christian McDonald AuthorDate: 2023-11-03 12:56:58 +0000 Commit: Kristof Provost CommitDate: 2023-11-03 21:43:40 +0000 rtld/arm: fix initial-exec (IE) thread-local storage relocation net/frr[89] revealed an interesting edge-case on arm when dynamically linking a shared library that declares more than one static TLS variable with at least one using the "initial-exec" TLS model. In the case of frr[89], this library was libfrr.so which essentially does the following: #include #include "lib.h" static __thread int *a __attribute__((tls_model("initial-exec"))); void lib_test() { static __thread int b = -1; printf("&a = %p\n", &a); printf(" a = %p\n", a); printf("\n"); printf("&b = %p\n", &b); printf(" b = %d\n", b); } Allocates a file scoped `static __thread` pointer with tls_model("initial-exec") and later a block scoped TLS int. Notice in the above minimal reproducer, `b == -1`. The relocation process does the wrong thing and ends up pointing both `a` and `b` at the same place in memory. The output of the above in the broken state is: &a = 0x4009c018 a = 0xffffffff &b = 0x4009c018 b = -1 With the patch applied, the output becomes: &a = 0x4009c01c a = 0x0 &b = 0x4009c018 b = -1 Reviewed by: kib Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42415/ --- libexec/rtld-elf/arm/reloc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index c3e95940be74..6efc9f499761 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -280,10 +280,13 @@ reloc_nonplt_object(Obj_Entry *obj, const Elf_Rel *rel, SymCache *cache, return -1; tmp = (Elf_Addr)def->st_value + defobj->tlsoffset; - if (__predict_true(RELOC_ALIGNED_P(where))) + if (__predict_true(RELOC_ALIGNED_P(where))) { + tmp += *where; *where = tmp; - else + } else { + tmp += load_ptr(where); store_ptr(where, tmp); + } dbg("TLS_TPOFF32 %s in %s --> %p", obj->strtab + obj->symtab[symnum].st_name, obj->path, (void *)tmp); From nobody Sat Nov 4 00:04: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 4SMdCM545rz4yn7G; Sat, 4 Nov 2023 00:04: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 4SMdCM4GjDz4QsB; Sat, 4 Nov 2023 00:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699056287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQVOlqQMialL5ml4rFr2Nyf+Go7s22s3ARxdk10cyyA=; b=ngplpUXtrsQxSi2UUeaKGDSMwnhkRaWaudqwhNXyeYH5ZnC97ZNMaSaO46mRuhQegHn8SP agCvXclVWEY4wx1EJf8JllYxnwEv2oa3zNLBgkImf6B9pf1nbTPFONBGqmToYsfFMvDaEs DSCVdEcImMkx/LIlmbRWFbDM0jIcFY7nciiuXNgjorLAy/LOdpGTsiYYIg/iy2BlLXr37J xRycW/AhpOmVJdxvUWzOO2+enRgNYulNKwTi9yQI6kFTvD4PTfEatZ3Z2D1ezjWCwOR48t GOyLvek0Ehgfw1uB1MQrIE6lIdVd9s0EmftLj0+PjG+hAtBObAe0FBoa2RyDqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699056287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQVOlqQMialL5ml4rFr2Nyf+Go7s22s3ARxdk10cyyA=; b=d4lr41AqLcJ0M1Yqj6Ncjr6xeJ824yezXWqEOddP9pfrA+/mdexQiQxm5nVLJ2wMjcYFf/ 3mCgyU3L+ySnXce/0GwkR2ozH1Wn/Yuf5LKj5orzvntH69z2ROI6UH8OqE5q4q/weliQlB /w09lTV3tkCFGcuiYL2/kVzEKsP0jqrWW4EcQA2phb0i8w9Mfgqi3kbLvL4ZS5SZx9ceG0 9Aw7qc6locQAn3WBsXeZ9Q81R8SszINwEXE3tdXCmHbsKeghNJC9n2JbWYAnwRzx4GtZO1 LkYkclkbnTjaK5AqJ/jc0pVszNC37VsUs2bGTSceteiM8DLYO0EVFpQFCmVLHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699056287; a=rsa-sha256; cv=none; b=h/gxl0mUlx8lZJByef9nK1bZmiC2M7cAkvDmOQezQhNtO7VWyMLoOOpZGtldHvmfZIahDT oAiXaGkYdYGlqvIQ/wo26Cnjzlx1958aqUrVulk8Txx857utLgWnJ2y5/opOeNhXP5ARqF ZDk/dJR8eN70S+j7N2HdYYN0AlhF/FSLwGT7nf5rVuf8htV7Ig4F0p0lCogpEYNFredHCI TSOsqnU++HErxaOkzmblS0vWM+aNXJ8oDKNx9pbWNDyshlkKjyFWSdp03t0HpmPnou9+tl m0VWo/1afPPywLk5n/fYq3XYOwo5miH1WW+fRtGSYSetsPxRD2jU9x/F7X7uEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMdCM3FSkzbvc; Sat, 4 Nov 2023 00:04: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 3A404let082942; Sat, 4 Nov 2023 00:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A404lhg082939; Sat, 4 Nov 2023 00:04:47 GMT (envelope-from git) Date: Sat, 4 Nov 2023 00:04:47 GMT Message-Id: <202311040004.3A404lhg082939@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: b0203aaa46fb - main - committers-src: Add Jake Freeland List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0203aaa46fbf2a77cbce034b8b7928401649aa8 Auto-Submitted: auto-generated The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=b0203aaa46fbf2a77cbce034b8b7928401649aa8 commit b0203aaa46fbf2a77cbce034b8b7928401649aa8 Author: Jake Freeland AuthorDate: 2023-11-03 16:14:21 +0000 Commit: Jake Freeland CommitDate: 2023-11-04 00:04:17 +0000 committers-src: Add Jake Freeland Add myself to the active src committers list and document my mentor/mentee relationships. --- share/misc/committers-src.dot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index fb2ff44b06d2..00e61605f451 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -212,6 +212,7 @@ jch [label="Julien Charbon\njch@FreeBSD.org\n2014/09/24"] jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"] jeb [label="Jeb Cramer\njeb@FreeBSD.org\n2018/01/25"] jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"] +jfree [label="Jake Freeland\njfree@FreeBSD.org\n2023/11/03"] jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"] jhb [label="John Baldwin\njhb@FreeBSD.org\n1999/08/23"] jhibbits [label="Justin Hibbits\njhibbits@FreeBSD.org\n2011/11/30"] @@ -590,6 +591,7 @@ imp -> chuck imp -> dmlb imp -> emax imp -> furuta +imp -> jfree imp -> joe imp -> johalun imp -> jon @@ -742,6 +744,7 @@ marcel -> sjg markj -> cem markj -> christos markj -> dougm +markj -> jfree markj -> lwhsu markj -> mhorne markj -> rlibby From nobody Sat Nov 4 03:07: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 4SMjFr1j3Bz50Ny2; Sat, 4 Nov 2023 03:07: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 4SMjFq6sQYz3MwM; Sat, 4 Nov 2023 03:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699067232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WXkzmmxyKkGzvtfbaih+2Hd2Qph3+X1+EjsuR5gQpuE=; b=nNKa5MgFzOA9rpWCpKZAZ3RkhQ0d7NizENT5BhFEk0uK0ygh9Wxz1Gc0Hl7uJZKF4wnGzz t2RsOvM6yAHHvaPc7rdcvjOwTiQgfdKnyd3DKkdt/XDQQFR8hQI+GKy9dSagp7EbKyZrSN xnKmdvBltK9uLEQD5fQ1AhgR8sRHnJQv/hau4L25bsaXe9r1IAnJJT2tL4THpkoUVNbWr5 TOJvXLCkX5MUa4onBd7Z3Nm9AKHhwjr6HKdZsgZZpthHocr8ZVb8ar9Qgrm4yL0WnAesKI HeNw7JGm6lKjKgllLzdvo8vHDYbH3ARD2+RAJ7PTtssGX0jP9wNjkqTug08OlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699067232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WXkzmmxyKkGzvtfbaih+2Hd2Qph3+X1+EjsuR5gQpuE=; b=G67BQNErm0PkUzhtWyZRZc/t9vw4fpTKHvAD6KEB9cXdc0R5KfO4ON/fGFIyII0JZR2lUV YcXWcPTVId24hj/3gYef2cOzuTdFrBQFueHgu5Y8T5gvXoWhXa//NcPSOlJnfKhlc/Rt9X 3Dtxm2yrJcsD1z167On/p0Q9Jmk87OsJQl9oOATVLIP9vePU2B0DhfLHv/GXnUQwiq1DeS /ye7Hkr9K5P2mbq6Xgeq2cs1W3onmeOtKWedxbREB7NnQRmVAMI4VeYcRhrbsd+mS8Ge0q LGh0R2RxbxJfKpiZQ9qiuJBnwAAnf2Dj+itdz4ru9WOhcHtfkpS942qCI78olQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699067232; a=rsa-sha256; cv=none; b=HF5MioyXOId2nGrVij7/jivoQh5p0919ZZgWLHShOIH6Kexdy39i7vDh+72NCurEFMDu55 ZuOvn2dBzru/RT9kmo57R9PfxOhfAk2VloCMdxc8lm/QEXtMDb7601MeIsphLlqK0ejfA1 LjjVAdXKci0dbTjvhZQbC+amgYJ2kclobaRmJjqrw8nts9AXZOggrHY8+CEhcpKK+dLttS t1B9giSooc3pgzjzI3ZlhP7SKBX7/GXY8A2oM3YwAEAbjjh/tSQsbefWX5aF+pKK1Q3/fm 5HBUUfK4CIKrVGh8CMugZPHuzF30ecZhX4JpRehbh6aZIbrzpi62eZNvaAYLMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMjFq5wr1zh14; Sat, 4 Nov 2023 03:07: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 3A437B9Y085005; Sat, 4 Nov 2023 03:07:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A437BT5085002; Sat, 4 Nov 2023 03:07:11 GMT (envelope-from git) Date: Sat, 4 Nov 2023 03:07:11 GMT Message-Id: <202311040307.3A437BT5085002@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: c3ca5da36ebe - stable/14 - file_test: Fix file test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3ca5da36ebee7efb6ba38cec72f57127e302ada Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ca5da36ebee7efb6ba38cec72f57127e302ada commit c3ca5da36ebee7efb6ba38cec72f57127e302ada Author: Jose Luis Duran AuthorDate: 2023-10-07 12:47:29 +0000 Commit: Ed Maste CommitDate: 2023-11-04 03:05:19 +0000 file_test: Fix file test Trimming of the line feed is no longer necessary after https://github.com/file/file/commit/d993c6b0db20711b2c4cb9d2bee8c7f2e59b0a43 Currently the tests: - bcachefs2 - gpkg-1-zst - multiple are failing, but a fix will be committed upstream. This also reverts c5e957ad4 "file: fix test case for gpkg by removing the extra \n." MFC after: 3 days (cherry picked from commit 0d3a87569f14b0e48826bbaab5e05f35669bcebf) --- contrib/file/tests/gpkg-1-zst.result | 2 +- usr.bin/file/tests/file_test.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/file/tests/gpkg-1-zst.result b/contrib/file/tests/gpkg-1-zst.result index 10379834d4b1..e99149450b1a 100644 --- a/contrib/file/tests/gpkg-1-zst.result +++ b/contrib/file/tests/gpkg-1-zst.result @@ -1 +1 @@ -Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression \ No newline at end of file +Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression diff --git a/usr.bin/file/tests/file_test.sh b/usr.bin/file/tests/file_test.sh index e6e398f6e51d..02d494b0f643 100644 --- a/usr.bin/file/tests/file_test.sh +++ b/usr.bin/file/tests/file_test.sh @@ -40,8 +40,7 @@ contrib_file_tests_body() { # The result files were created in UTC. TZ=Z atf_check -o save:actual_output file ${file_args} \ --brief "$testfile" - atf_check -o save:trimmed_output tr -d '\012' < actual_output - atf_check cmp trimmed_output "$result_file" + atf_check cmp actual_output "$result_file" done } From nobody Sat Nov 4 03:07: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 4SMjFs1KnDz50NhP; Sat, 4 Nov 2023 03:07: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 4SMjFs0hXSz3NCX; Sat, 4 Nov 2023 03:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699067233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/g8250iKFFFwPU41CZ6ctp2y5qXxlStjfIfHa5hk31A=; b=xLu01BLv353gu7L/cszqvtyy27mq12kv0/H9VEGB2i9LKkPTk/aHaJF7D7yS3oMzBDTVIb tYteSrR3F0Y5A55bfVOYO/lYb+3YllusIZmgrcQETSUrOyplIu/fY8F9EgGXFoc0cUVeM4 GUDQqzUHYP8Ttv40EdX+uPIp6iXr+Vg9Xe7Zvu0KqxJHvogYtAIAzgLhZCd0l+JEbKhuW0 KpjlJnmZnKadGzG0Xb9DOYXxBL+4hj4mRq8wwjKyz2F0O5fwjOPqSiYOZtiDV5QhYUoWW2 U6QpiYJd4V1nj8zSxTOdiBcWwMtDYwSd5PMPHOlm408QeKt58lJ6MDtUr+mmuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699067233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/g8250iKFFFwPU41CZ6ctp2y5qXxlStjfIfHa5hk31A=; b=BlTRO8X0+aFqU4JDdRYNnBYB5vNgneevP522glLDyx55R0sSLtdijXNJYL/nwhZfia0SDv mM188L7PtljMuQ/sukY9jLIVuh4bdutLtAZt3X8jvrY3OfuAU204lAXeLfetOzPvvHbzfV EcnUrvoTr9owgblxu52q49qp4OCVvXFhEJfESngcLemzgikM0Z5rvPEWCWdI+BoCvCkIWD vBjxHt1etExT+N02Bwk8xgZWZiic71+eajHBekf6xUBEEePUyafH1J5ynv7MEwzWprKcse Kr7r431zuSACs7kYI2C0y+fsgltIgG8SY8R29Wfv0oHzAQ/SgznXWizWmBb2Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699067233; a=rsa-sha256; cv=none; b=xoYL/R6oxkmWoyXPlk+It4DJhAVwGAmDUQMlWuSlSWlctz1tfnGabJTMaADXrvV7K/2+ZT Se6Ya672nRmg6poGAZHdD6k56Ajevc5XJbYbiB+CGicZzNk9pEw2TFVGuD2O0sfhdX7BWy kEHRPG1d0IE8tPcvJuPr3WT4sHzYVlmAltdLtz0F9LaCJbNcR3dRIQZTUnT0Ljq8gmAFWz 4Hrhq1gJM2CPQmpZng/IQvSovwsIaLnxErm10SoNWM4/aZko5NP70ACBdms/882RGuamgW N/AiOMPJq0y/Ij9b+K8HniizkqStkdcAjaT38zl+jAPWzy2Vq95hDR0ZoMdFXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMjFr6jSwzgwn; Sat, 4 Nov 2023 03:07: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 3A437CEn085058; Sat, 4 Nov 2023 03:07:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A437C5N085055; Sat, 4 Nov 2023 03:07:12 GMT (envelope-from git) Date: Sat, 4 Nov 2023 03:07:12 GMT Message-Id: <202311040307.3A437C5N085055@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: 660be17a01ff - stable/14 - file: Support testing multiple magic 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 660be17a01ffdfa9494ff6039b7b6ddd82e61e65 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=660be17a01ffdfa9494ff6039b7b6ddd82e61e65 commit 660be17a01ffdfa9494ff6039b7b6ddd82e61e65 Author: Xin LI AuthorDate: 2023-10-09 06:06:20 +0000 Commit: Ed Maste CommitDate: 2023-11-04 03:05:19 +0000 file: Support testing multiple magic files. This is based on upstream b74150490be904801378b2712fe0d532e1700124 but adapted to ATF. Reviewed by: jlduran@gmail.com, markj, vangyzen Differential Revision: https://reviews.freebsd.org/D42129 (cherry picked from commit 8f75390c66bdcde95e1b383aecaa27b4adf88279) --- usr.bin/file/tests/Makefile | 2 +- usr.bin/file/tests/file_test.sh | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.bin/file/tests/Makefile b/usr.bin/file/tests/Makefile index ea0ebaa12ce2..cd3d00ae742c 100644 --- a/usr.bin/file/tests/Makefile +++ b/usr.bin/file/tests/Makefile @@ -2,7 +2,7 @@ PACKAGE= tests ATF_TESTS_SH= file_test SRCDIR= ${SRCTOP}/contrib/file/tests -_files!= echo ${SRCDIR}/*.testfile ${SRCDIR}/*.result ${SRCDIR}/*.magic +_files!= echo ${SRCDIR}/*.testfile ${SRCDIR}/*.flags ${SRCDIR}/*.result ${SRCDIR}/*.magic ${PACKAGE}FILES+=${_files} .include diff --git a/usr.bin/file/tests/file_test.sh b/usr.bin/file/tests/file_test.sh index 02d494b0f643..490274c05892 100644 --- a/usr.bin/file/tests/file_test.sh +++ b/usr.bin/file/tests/file_test.sh @@ -32,14 +32,26 @@ contrib_file_tests_body() { for testfile in "${srcdir}"/*.testfile; do test_name="${testfile%.testfile}" result_file="${test_name}.result" - magic_file="${test_name}.magic" file_args= - if [ -e "${magic_file}" ]; then - file_args="${file_args} --magic-file ${magic_file}" + magic_files= + for magic_file in ${test_name}*.magic; do + if [ -f "${magic_file}" ]; then + if [ -z "${magic_files}" ]; then + magic_files="${magic_file}" + else + magic_files="${magic_files}:${magic_file}" + fi + fi + done + if [ -z "${magic_files}" ]; then + magic_files=/usr/share/misc/magic + fi + if [ -f "${test_name}.flags" ]; then + file_args="${file_args} -$(cat "${test_name}.flags")" fi # The result files were created in UTC. - TZ=Z atf_check -o save:actual_output file ${file_args} \ - --brief "$testfile" + atf_check -o save:actual_output -e ignore env TZ=Z MAGIC="${magic_files}" \ + file ${file_args} --brief "$testfile" atf_check cmp actual_output "$result_file" done } From nobody Sat Nov 4 03:28: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 4SMjkx6ZvZz4yjwK; Sat, 4 Nov 2023 03:28: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 4SMjkx5wM8z3QbW; Sat, 4 Nov 2023 03:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699068537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8OLcTfcqgpfznGAXEoajVvMWqgeWpYvf2KRU/gqQBs=; b=GcHex6MwjCgEWJXSab1vr6edINMYN1j4aof89F2gMkSS9qdQ1rSQa2mTaD5QU7xZXSqBxf Eeb+ls6ouOYqIc4yVTIXNgq1iuH3XcuFfH8nbBdomDPzPCa27E4yVETqlR87Z1FCJhBzwj feRWdrtK36XqWo4TFFia+9n8r1ALRw0UH93DgBM5ir9K9fmKLqe9HnQbzWBDouOhCWl+W6 VI+lv8hStrtvNWdEn1g3KC0JlYMA0lkRKwoFgobXHy6dnekmANUyj9WJ5BquEkHf8CS8EE FBlkCm5xSzVhS4tUcgTxx5JDgNS2+27nlvEvte3IQyDP/r8Y5vYNI0dVzSSGew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699068537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8OLcTfcqgpfznGAXEoajVvMWqgeWpYvf2KRU/gqQBs=; b=QkVE/wqKC6yQw6mojw28Tn/qrYmNDCdGH/B5LXjA1/VOkeFg4vVf7U7AyYvblvsImjVMNe eSO2Fhe5eN+b5jZ4u+K5WD7/+lF1szMHuvLIFVh6FLk5nk7uUpnlJNE1J5OBpR5RxHhA3H T8LP6zsAdkCs2slDXKq/IMmkQmNxCFYBzVyTtJCKcXT86r0u56oTip1MmMq8OywQuP2gS/ B9LDKvHQ7lrfvplDZLKh6f6m9FY9wffEXuKzbOgTCiC0JhW4JyV50mePnhLqw02SEAZMsn NwkIxf5BOQDgOejzBy+AHBD7fVbFHq/1u6Vy8vnyuFigdhvwld5VShBDawhNzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699068537; a=rsa-sha256; cv=none; b=gm+YLkyYVhYplSfwXHSE48zcmV119c/wtQCF/mnJcsHNwhxcAy395I9w23b6bCESZj5y2h UIfQqlsPt5ZwgUq/kVuAfrNT+HtYDSGaJjpi5Tq3WgsLGU2/BPRCgHKIJfAwOSM5N//Ast xF3Rzyxo1L/4A5Wt7+jylP0T1snF20il2PTOwKsfZWl1bbXkjuE4wD+If4gGr09vJHiNsU JfmzXA/XCCTjU+xj57Ru05v63b80Mc/srU9JuZDgvgCstxQJh1s27iJLjV4NL6Ltpi611K fisLddqDz7B+ZYGjxzwRbHD/s8cumdNEXw0GbuMmkJV8x7KjCSxutn1nZmRTPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMjkx4zGNzhV9; Sat, 4 Nov 2023 03:28: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 3A43SvT8018453; Sat, 4 Nov 2023 03:28:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A43SvL3018451; Sat, 4 Nov 2023 03:28:57 GMT (envelope-from git) Date: Sat, 4 Nov 2023 03:28:57 GMT Message-Id: <202311040328.3A43SvL3018451@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: 687bf7433c3d - stable/14 - (upstream) PR/386: Add newlines for consitency 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 687bf7433c3d585ae4826c2713ab182f46e7bdf3 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=687bf7433c3d585ae4826c2713ab182f46e7bdf3 commit 687bf7433c3d585ae4826c2713ab182f46e7bdf3 Author: Jose Luis Duran AuthorDate: 2023-10-09 04:52:53 +0000 Commit: Ed Maste CommitDate: 2023-11-04 03:28:32 +0000 (upstream) PR/386: Add newlines for consitency 2 Obtained from: https://github.com/file/file/pull/134/ (cherry picked from commit 3347078000c078f2e67214ef1ba2e0bffe1aea4f) --- contrib/file/tests/bcachefs2.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/file/tests/bcachefs2.result b/contrib/file/tests/bcachefs2.result index 9ebf64bb55bc..30fe8e8910d2 100644 --- a/contrib/file/tests/bcachefs2.result +++ b/contrib/file/tests/bcachefs2.result @@ -1 +1 @@ -bcachefs, UUID=4fa11b1e-75e6-4210-9167-34e1769c0fe1, label "Label", version 26, min version 26, device 0/UUID=0a3643b7-c515-47f8-a0ea-91fc38d043d1, 1 devices (unclean) \ No newline at end of file +bcachefs, UUID=4fa11b1e-75e6-4210-9167-34e1769c0fe1, label "Label", version 26, min version 26, device 0/UUID=0a3643b7-c515-47f8-a0ea-91fc38d043d1, 1 devices (unclean) From nobody Sat Nov 4 09:39: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 4SMsyd2Rv8z4yfp4; Sat, 4 Nov 2023 09:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SMsyd22Ktz3GR2; Sat, 4 Nov 2023 09:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699090777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6l4pQvCEcyOT7i6eZ9Zu1/3IAyWg+w5W8MaBQFCyT2Q=; b=OwF1hu4c94aOs4/lt4BisqpEk2TzBydagqsB6X+YJlIdYLw3Ujyt041FsJBELcIW7szuS5 YtN9/m8XP/7cy08yjl0qMd3WNOK2X2543eav2/lh63+5igELmHvHmf/x4jxOo4vbbeWPZJ LikAZPijmZG2bywdXEp4V5yW9dD7/aky2xmf5szOqoqVcTyRJN1HUZ/TwHaXqtWxKoeFlX 4ViW1QWUBjY1QFOqu1UOaGnPHdJNzTT9+t3e7thW9NnR418ZKPx9VvHEtM6Wo9HJC1FnPJ CjV1+zYZeGvBtO4JKuXop6vThbC99SE40CrzsS+Eb5tX3EfeCm12OlHy0ff8BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699090777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6l4pQvCEcyOT7i6eZ9Zu1/3IAyWg+w5W8MaBQFCyT2Q=; b=rS77p6uVW2AZSytBk9vd9A83DWlaNvyHghfgNbKB/P5OuCiZ8GoKBNtrjDV6Ep/nzRlNFc qiIhemJ+ZU98K2p9Gyusc+ETo67fSfsdGHVmukBFIkGk+9OuvoAKS2ClZVj3R8lFabCUyD 2Sd83ZgYVf7+uHkyk+2o6fUnSnjpSIPbQ2PW3meSUDJ3gdksN+V8D7Kv6vvUlSRy1Xb4z1 OykisgyQyTCb1vsU21HgFfWFS/HZEPGE/95uV2KdY0NJxZkXvZkhNmKTYhRm0uu0vMAZuL 6CTJxkZRdQ6dq4QHa4WSIFrIeTfXdFasqtePEuynEK+ljtKPpMFUGG0pN2lxvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699090777; a=rsa-sha256; cv=none; b=aLZDgXSivd4PLzOk+zPBir/q6/XlGEXNjBCB0h+KulaCrfYlou4wAVRNxY5V7/GaYK4FPM Qwnb+P0uGW8SiAQ6szdQgEHgEMT0bYyGvDo9UgeIcUrz1k2E4TsvwJ892/K1bYcEfW68vz gGpol+NK/JLElNqCfNynY8iyQUVlmSeHzalTqWsYEfeHWqKQjKOT07FcHnEtf6PWA4fhg9 ZD2aVoe3KvkzihX5Hr6/Ho0ceyBfzCI6m/YippPxy4VzUtpxWnELV1PebPRoJjlZUm+ZfE UU/OV8kOiTUWYBIyuXJr1Sie1G11NDGicyueHs0+H6BdnKpc9spxC5HAahQWTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SMsyd17pRzsNc; Sat, 4 Nov 2023 09:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A49dbVe036745; Sat, 4 Nov 2023 09:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A49dboh036742; Sat, 4 Nov 2023 09:39:37 GMT (envelope-from git) Date: Sat, 4 Nov 2023 09:39:37 GMT Message-Id: <202311040939.3A49dboh036742@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: 4ffe410e40e9 - main - if_tuntap: improve code consistency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4ffe410e40e90c265c20cb4675ed74a40dc1fcc4 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4ffe410e40e90c265c20cb4675ed74a40dc1fcc4 commit 4ffe410e40e90c265c20cb4675ed74a40dc1fcc4 Author: Michael Tuexen AuthorDate: 2023-11-04 09:22:42 +0000 Commit: Michael Tuexen CommitDate: 2023-11-04 09:22:42 +0000 if_tuntap: improve code consistency No functional change intended. Reviewed by: rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D42462 --- sys/net/if_tuntap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index a01bc11aa64c..3eeaadb83a20 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1413,8 +1413,7 @@ tunoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst, else af = RO_GET_FAMILY(ro, dst); - if (bpf_peers_present(ifp->if_bpf)) - bpf_mtap2(ifp->if_bpf, &af, sizeof(af), m0); + BPF_MTAP2(ifp, &af, sizeof(af), m0); /* prepend sockaddr? this may abort if the mbuf allocation fails */ if (cached_tun_flags & TUN_LMODE) { From nobody Sat Nov 4 14:29:05 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 4SN0Nf03dwz50cjM; Sat, 4 Nov 2023 14:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SN0Nd6dRYz4Tgw; Sat, 4 Nov 2023 14:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699108145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7s8Wp9Iu79r9YZGS2xRwqFE8Tu2V3Yd4K4W6h6q4r7o=; b=YME5BtDzRaIH9imy7JLmajWnVDFJKTg/mj4h2ZgVifSVAuZagIbWg1ZSuaBrV2NOWnEfBu t/cbtDD6ktRNe23ugGmbtMAUOdlKlS28vD69dchPJ+swjYtz0H0Eo21pTfPaoAb0b4Y1Hd g3CqaziGOnKeR66+mB5AipZBI2G577bzYGSpjn9WUcd8UApOQjZx9PsupE9mNOEvYkhaSD iRApsFMtBxZScsO8K3xoevV5qeHoGqMzQIK59JvxSZ05M+Rt3bWZlGD1EUK/JucLfs0Xc2 r4J3AyepZFKiCttUWn6DAoEVGv6TD8bzioBnz2QJaznz6DDVAf6ZbSV6ZDBtVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699108145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7s8Wp9Iu79r9YZGS2xRwqFE8Tu2V3Yd4K4W6h6q4r7o=; b=QY15QVqjBKKirI7W6kQ0ghkCz13/lI3XdqQFD7hGrYi4uBIaOB/Pha7yYNhTNW78GjAAem d7Haa6sZZjPE2vwwPE6EtqGSnhyzh1lyuvCaGhsP73TcjPicLQNsODHvB/Xf/YDWXEcypU YTl0/w9w79LEcR7e1g5QS6ZH042LjN+7jFbuKS/j4n7oh3f+GQ10PiSuCepXzgVWOjMf6g Ku6HmjnHobMrBBr/bjrihSbxLNASdtyZQEaWY1aAuVkTRGkr3B6f+j1vI+YaJvDVXRYkiG wDTPwYDVY1TaWjhPUPBk0ku6cbdfMNuCdAJL75sz7dnd6nLb/+XxI77hgHwDOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699108145; a=rsa-sha256; cv=none; b=P1asvt1ciVh4s6XXnsGrLBR6VogilgY8ZWFX5HpzQZBcfZBsX44Z4biRgN8bEtSQ+eDUoJ CSVw/U/OrTB82Gyiu2F0g149X6MIc/dRSAQXyyodwofYcFw8Rm/Sf4xOIB2cFPzoL61Eo1 DSCjWFy3gmh3tjQHFLY71JvljwUcfEBdh1a4tMZ2CkKqEzCLpgItHixT0b8bsfX+qhLFRS OpojIShXtw27os4tdYKnCkGJ036vFXskpbO/nhO9ckwFfIFpby24A9mxMxL4NMpE5H7cYm ulI9P4Dwnnh5WMrHXoYC9y7aSaBstda7NlWpY9Vp5ZoSRS/CvXcZ10roBMEpjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN0Nd5hQcz11n8; Sat, 4 Nov 2023 14:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A4ET59M019589; Sat, 4 Nov 2023 14:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4ET5Fj019586; Sat, 4 Nov 2023 14:29:05 GMT (envelope-from git) Date: Sat, 4 Nov 2023 14:29:05 GMT Message-Id: <202311041429.3A4ET5Fj019586@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: 346134f19aa9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 346134f19aa9ba38a0384244609e2bcd4f7838f4 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=346134f19aa9ba38a0384244609e2bcd4f7838f4 commit 346134f19aa9ba38a0384244609e2bcd4f7838f4 Author: Mark Johnston AuthorDate: 2023-11-03 19:37:09 +0000 Commit: Mark Johnston CommitDate: 2023-11-04 14:28:13 +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()") --- 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 4 14:29: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 4SN0Ng12mtz50cnd; Sat, 4 Nov 2023 14:29: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 4SN0Ng0SpDz4TnC; Sat, 4 Nov 2023 14:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699108147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4TxgoxKZlah61uq4nS8HxxLKPXorserNUAVOcBUwrg=; b=Cgs34PgNzj2YVtvavr4eqM0DugCGh5utEoUUceHnX6WH6iGuxXK34+U9hHHX1dDid5pLMC rSGiedWcRXf0t7WePSg3S1y4jYBYD9F149IptcBcAt/UDtZdVxM7/tOSWNHkaplyl+fBVA 98MPPWvP6hpJsJrzfm/hPQe7qObEQPcENmiDUaKVLgi/fo+ae973Ksgy27nOjNu+cBOpnj rKa47eVWn2NWBBhPoXsKsFW8HqUkHZkbHlJ7aFdPnov+sNj+u4JI8tyhTORlfAk1VsNTXj c4wPs9MCP5iTjUdYSXR0/UUQ4lzBJM7W4vDAn03kBzcDs5W3TTHFlFMjcNEvDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699108147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o4TxgoxKZlah61uq4nS8HxxLKPXorserNUAVOcBUwrg=; b=SqIvxAsF8eP3Icv97LzFsDXxfW+CpyYVmLZsgHWRYPqxd1XDkWj/gS5gNPnl7PWARU/b4y QeVHvLWBN6Pe++FHULltjiNX9stkEziwrLJY8fxUv8X6ByV1mvTyIGUca9kSwPOHyT2FMw ctw1YFv7Q2GLA+qcgWYhG4rsLigeVhyQgT5OCWL3eqcwg/8AFXG58Q4SAsyeGt/HiG8vcN +5W03TphNnSauIo/sIWfDMNW7pKD3KE3IAwDuf6TBshr3sCpOPihEMtk15hbk04uC/v3J5 7yqroIYXYARcnnJKiyc1xV4ybJN8CQhuEJbYHwGvyRnn7cNX2RIGcU63y6pByw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699108147; a=rsa-sha256; cv=none; b=OrYaqfoesftOFumDpad6Sk9H2ocI7t5oxICDCsbWQTrQYABcr3I9PixO0foV8uHlHZbPve 1eim7XxLaSx5Vbx62TqO488LUVB8rz8gzRX/DQB+IJUAdc0rypmbi6MyHv5IoAlJtMTu1u t9V9g3EPh1ddxBU7nzSj+FzZrs7lqD5AAcoKESL5bk1t96Yx5rwzoqASZaefU1xC0Difee WbbIBtnarrl/+ly4PIaUT0OYztGPQPn+uwJtC41oWNVoCwPcDWx7xppztC40exFDr9Fq1d dXf4fy3IB4yyctHb+L9ibu5+Eovl1rEgg3riVRVmU1M+Lr6RUmwJfDTLvkO+lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN0Nf6gdGz11Vg; Sat, 4 Nov 2023 14:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A4ET6kG019637; Sat, 4 Nov 2023 14:29:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4ET6XR019634; Sat, 4 Nov 2023 14:29:06 GMT (envelope-from git) Date: Sat, 4 Nov 2023 14:29:06 GMT Message-Id: <202311041429.3A4ET6XR019634@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: bd80263606d7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bd80263606d73c0391d3fa8a156fcca89a821810 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bd80263606d73c0391d3fa8a156fcca89a821810 commit bd80263606d73c0391d3fa8a156fcca89a821810 Author: Mark Johnston AuthorDate: 2023-11-04 14:28:24 +0000 Commit: Mark Johnston CommitDate: 2023-11-04 14:28:24 +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 --- 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 Sat Nov 4 14:49: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 4SN0rK2JpXz4yRZg; Sat, 4 Nov 2023 14:49: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 4SN0rK1sHqz4Y6H; Sat, 4 Nov 2023 14:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699109377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/rjWxjsdzOtP722pO1LhpZcHglzd/Lc8XrjlQUkibw=; b=VMIthXWkA24d3qHK1vl1bVmG9CoWWMLxwyHjtyw7Ug5TR4dePbM2uCqFYlS1oev+hTHd3e Zjp9yFmcUEZ3/VdlWzvrsLqL4jcSV3sqtZ1BpcE5bUFzK6sGHzc9Lml61po91fwpJ1PUB6 7okD/Od7Q90/rPeSimCfm/yo6zcatvaCYESUEi1l3coRr743ctdFuWqzsLxvNyVAuPWVE1 qu1Vdl7nJuoTMPy98o7zrcNcM/WCjbd+F3N4SVYT2V+ZwcNabMWlG/IVlP9zaBxS7eoZQQ wunaxE2N9/qN9qqtx62Wn0768yKc8MWnLp5z8+a5ID2UUsq1VidgEp/LxYG6+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699109377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/rjWxjsdzOtP722pO1LhpZcHglzd/Lc8XrjlQUkibw=; b=wI1PLgFgfUz5iDXsvag03ZLe4I7cCL8wEWaAjqMB2IyA6FuUciJBZO2KbgjuwuR9HXALup y+KJM3JwLlMEVmQ4yGemt1h4wRsGzTlhYzlsSZZptaB9h2XgKrYy12D48/cOMDUzhxWHSp ZSmmpWOYOQG5PoHVkW1d01/hccyjL4MTdVguKJRCJYGPRzRgcbM5tzjuOnFSyNMP+8FZ04 DLf/d0zAi2WyXHTKbrnzW9CRPrdzMg6tCRdpqAD7LKy6DBRJfdQTwqt7LQCERejf8kA0vH qhoyrPET7Qxyci+r6xM7eWFNksz1kndOZKX0nrjohi34ko31NfroFFeDtRvn4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699109377; a=rsa-sha256; cv=none; b=rwoXKUOlBniZUxtuFOZkkqEk4t8sJRc3CwTSKvX5kQy0QEBdKIse2Xmdriz757naq43swq SeZ7P8zNMIKhioPHKXh6modad/2BySSvNTmeb36GqjxcBFqBXNVNostMR2VWFj9SzVBVPb H4C0GOR+sbNVwF9u562uCguL50qu4mzp2rt4QteZlKxIjqHVkS6RFf85nhWHfrESLREZBB a8B7p70362eKe1Q3FWjo2FODU1uDzyf39GkBG7um6BbU4s7WK8O4Ip/IYCT3fzRdmpT0rT aMWokKyRab0DdPOKGGLd/IASdxhliDK6Ws0WHltFKC+2/UbdSqETMtDOhUoLCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN0rK0xMsz12Jv; Sat, 4 Nov 2023 14:49: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 3A4EnbUt053411; Sat, 4 Nov 2023 14:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4Enbk6053408; Sat, 4 Nov 2023 14:49:37 GMT (envelope-from git) Date: Sat, 4 Nov 2023 14:49:37 GMT Message-Id: <202311041449.3A4Enbk6053408@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: deacab756026 - main - 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/main X-Git-Reftype: branch X-Git-Commit: deacab756026f86515781944a9e0271e8db9f86b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=deacab756026f86515781944a9e0271e8db9f86b commit deacab756026f86515781944a9e0271e8db9f86b Author: Mark Johnston AuthorDate: 2023-11-04 14:48:58 +0000 Commit: Mark Johnston CommitDate: 2023-11-04 14:48:58 +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 --- 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 Sat Nov 4 15: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 4SN1my6fRgz4yZxt; Sat, 4 Nov 2023 15: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 4SN1my66Hqz4dnD; Sat, 4 Nov 2023 15: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=1699111906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gulb+rc8gTYb+FJjKpo8kabi5uGUzvb5kYHys3cWN6k=; b=P0RQrNuVTUXkVjmdXmnj136NK+mqIY9JykoSw2Z0XFg+JEnlTXLaZ23gtCBSZkjtI5MK0h E5eonb/oGlDAvkERyQBQAtnTA4Z6y1gd0aw05cxVQ2maXOVcCibA8AnC77v71i3IGUgEJW i6y86AJfc6Z98iCmRHQI/a8q89FNaOBcMsIIaymcIdXv1lSjeReCCDadmSK4MDdeK5RBmZ +RFAPl7Xde+eBNgWhdFK7OpVNx+oGE0Vj/D7onbZ7t3Vg8g7V0BVBXFZsfpt9YOky5VACX vxd98nUMnJar1dpr8EMvBTumEX/344A0W++Kubn13xMjak27wQeSTFsXWGEMVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699111906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gulb+rc8gTYb+FJjKpo8kabi5uGUzvb5kYHys3cWN6k=; b=k9+Nua0f33F5wD1Uc0Air2j4XvWbslCZ+Zmjd5+jiJ89+KJAbcCDK55R0OfvWLXT1o4pC5 qbVUVrLfH4Li9Yqx4O8lSnqnzFwvyuPrw7W7c7o7PsmOeSdzMbWtg1wbP6Lqk+upSolPcd hOyKOF58ji0+LnNtRFYsau9hRbMWTRX1DAvTOkblFva6D1K6FDohh2X/iELqsEeheb3xC7 6o7kEJNaSphZJA800+yMRBss4qoEzaxYwd4I7HRt+s78cLVbh8ppqfE6fAkto5TT/CHGCJ KVxFeaqfRD8I3WcQaYPnM+MmbuQh+NYuXOH359p11ASg1/THgngSJoVVp2eosw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699111906; a=rsa-sha256; cv=none; b=AYy0c0ySnVm3UgC/q8DjcvtRrmqJlOs7/nk8QWqDCcgO1yGlszNvKl7IJ+/xdv+v3pvseL ZZUNhwA0OjQjulmdVCTrj4AoK73gygd9Jdy+gjHOLzUIZS/f8Dm90Bix69Qn5DEs5TLbhm dZfb9FAulKUniAEGwltO+HKJ911fVaGTgBx3W+dMxzaYiFjUquJ6svGyZHznkLqny02yIq AlV3jfs8W7d3itYKN7E7iOuRAIeWiZONpgE0x8RbuCShltMmlN3RICDOAJH64zkThd7nxq Lj4apCaTFzoVhFz3mcg8laCJwV/lU9Y19olgrwnfmidR+W1Cu26dbCJrOmkrSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN1my59sXz137L; Sat, 4 Nov 2023 15: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 3A4FVkXF032882; Sat, 4 Nov 2023 15: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 3A4FVkE9032879; Sat, 4 Nov 2023 15:31:46 GMT (envelope-from git) Date: Sat, 4 Nov 2023 15:31:46 GMT Message-Id: <202311041531.3A4FVkE9032879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Daniel Engberg Subject: git: 105e5f55aefe - main - share/examples/etc/make.conf: Add AMD Zen 4 to list List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 105e5f55aefee86fbb87b9ae7b8682998e0cd1db Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/src/commit/?id=105e5f55aefee86fbb87b9ae7b8682998e0cd1db commit 105e5f55aefee86fbb87b9ae7b8682998e0cd1db Author: Daniel Engberg AuthorDate: 2023-11-04 15:28:46 +0000 Commit: Daniel Engberg CommitDate: 2023-11-04 15:28:56 +0000 share/examples/etc/make.conf: Add AMD Zen 4 to list Add AMD Zen 4 (znver4) to the list of valid "Intel x86 CPU types" Reviewed by: emaste Approved by: emaste Differential Revision: https://reviews.freebsd.org/D41518 --- share/examples/etc/make.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index e450ea04eb14..0cf156371aec 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -29,11 +29,11 @@ # NO_CPU_CFLAGS variable below. # Currently the following CPU types are recognized: # Intel x86 architecture: -# (AMD CPUs) znver3, znver2, znver1, bdver4, bdver3, bdver2, bdver1, -# btver2, btver1, amdfam10, opteron-sse3, athlon64-sse3, -# k8-sse3, opteron, athlon64, athlon-fx, k8, athlon-mp, -# athlon-xp, athlon-4, athlon-tbird, athlon, k7, geode, -# k6-3, k6-2, k6 +# (AMD CPUs) znver4, znver3, znver2, znver1, bdver4, bdver3, bdver2, +# bdver1, btver2, btver1, amdfam10, opteron-sse3, +# athlon64-sse3, k8-sse3, opteron, athlon64, athlon-fx, +# k8, athlon-mp, athlon-xp, athlon-4, athlon-tbird, +# athlon, k7, geode, k6-3, k6-2, k6 # (Intel CPUs) alderlake, sapphirerapids, tigerlake, cooperlake, # cascadelake, tremont, goldmont-plus, icelake-server, # icelake-client, cannonlake, knm, skylake-avx512, knl, From nobody Sat Nov 4 16:39: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 4SN3HM4XvZz4ypFr; Sat, 4 Nov 2023 16:39: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 4SN3HM41v0z3KH8; Sat, 4 Nov 2023 16:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699115983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=piiNrwWfW/NOUceqInKjeKsdSNS3oxdLXJLjRw9Sh9w=; b=K+hMRdextFJaDT66VtxQZAFZLF8z3PH+2vukMnJaXe1OB11vqyO1kzJiSBjv4i2KJLsMMY Vn2PaHkhNJ186vAccWlL4/eAqHnjeAF26DmHfTeDITTPYwkroe28CbVJukizrCSBwpcAbW vKJXjaCne/98Q2xoaItVepPCiRx90fgqECIVj2ocQJDcE+GVAXphLJt9u+nnmJGvoJSYfi 4k/qEkG7+k47tpPmxstIm4zLfUFxb9qv8V3qzmFZMjVROZwCmM4ijjA3r9WdsCJKw3xej8 Z3QWzWsS7rh30sjYSKi3hdxkbbCU3JCTvWCCOym3wOYtHi55NtfcL3NCe021SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699115983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=piiNrwWfW/NOUceqInKjeKsdSNS3oxdLXJLjRw9Sh9w=; b=jaDS8acKOmqEsy4BFI3aGTDuJ1FNSg2R+uUcKcQXMAAHvIYzhrreCNuJhDpTW4y88sEZH+ R/yJaV1TGscWcUWAdq3OmxwsspuNG/zbulr3nVyHH0EBitchQKyIzzis6qfF/164cfH6O/ SbqZTNdkWZAsHJvg5UP9evmTjIFhzB9ZeC4H/kvD/0PPqfkMoIWv+9iHJfpqd+E7crE+aW iH18dFSM/tD0xQPIYqe3/+/cANFXCg6PzdKswEylMjhllUVrd+F4K0CJkbd0gKmMT2op0V 4xYKvfcKaOafB6YCbR6wjWyODH16kq0MRkTOyyRNivns36wjp71NKh+LvxjVdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699115983; a=rsa-sha256; cv=none; b=lcp0n+zaimEX3zkYjc19mpHie7UAvPMjc+kGRZXCiSYgQ6vACdh3seQmjVrE1Em6FoQEah 3sY5/nIFnEileltkmwZrNtt8c39W7pQ1TyjYt66lXP9E018XiUSQqwmPqlozSvbiBoQEZE HO5EvcSS/MI8hB3RPFq4eDQYpahcm71f2PWY/58l7BPV6VMGxh7/oDY0C0NmPiIuehtfoY /iT3AA+8SebQOND2ubXqCE7Ef9PwaqTVOdzX6IhxHhSKmK3tn4rG+JsbAwyQElKICGdDjs /fP7H0QeR0M+01QYbd/4p6M6hw9eoFitwPRzF91wqveR9KocYiiQ3eNF/Pci5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN3HM34r4z152m; Sat, 4 Nov 2023 16:39: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 3A4GdhgR037210; Sat, 4 Nov 2023 16:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4GdhP5037207; Sat, 4 Nov 2023 16:39:43 GMT (envelope-from git) Date: Sat, 4 Nov 2023 16:39:43 GMT Message-Id: <202311041639.3A4GdhP5037207@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: 939a62d673e6 - main - stand/zfs: Remove read-compatible features List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 939a62d673e6c340ee2b7243074a529919e39196 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=939a62d673e6c340ee2b7243074a529919e39196 commit 939a62d673e6c340ee2b7243074a529919e39196 Author: Alexander Motin AuthorDate: 2023-11-04 16:26:25 +0000 Commit: Alexander Motin CommitDate: 2023-11-04 16:26:25 +0000 stand/zfs: Remove read-compatible features These features are marked as ZFEATURE_FLAG_READONLY_COMPAT and so irrelevant for read-only pool imports by the loader: "com.datto:resilver_defer", "com.delphix:obsolete_counts", "com.delphix:spacemap_histogram", "com.delphix:zpool_checkpoint", "com.intel:allocation_classes", "org.zfsonlinux:allocation_classes" This should cause no functional changes, just a code cleanup. MFC after: 2 months --- stand/libsa/zfs/zfsimpl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index b904ead24e1d..253cfd2f16e3 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -113,23 +113,19 @@ typedef struct indirect_vsd { static vdev_list_t zfs_vdevs; /* - * List of ZFS features supported for read + * List of supported read-incompatible ZFS features. Do not add here features + * marked as ZFEATURE_FLAG_READONLY_COMPAT, they are irrelevant for read-only! */ static const char *features_for_read[] = { "com.datto:bookmark_v2", "com.datto:encryption", - "com.datto:resilver_defer", "com.delphix:bookmark_written", "com.delphix:device_removal", "com.delphix:embedded_data", "com.delphix:extensible_dataset", "com.delphix:head_errlog", "com.delphix:hole_birth", - "com.delphix:obsolete_counts", - "com.delphix:spacemap_histogram", "com.delphix:spacemap_v2", - "com.delphix:zpool_checkpoint", - "com.intel:allocation_classes", "com.joyent:multi_vdev_crash_dump", "com.klarasystems:vdev_zaps_v2", "org.freebsd:zstd_compress", @@ -138,7 +134,6 @@ static const char *features_for_read[] = { "org.illumos:skein", "org.open-zfs:large_blocks", "org.openzfs:blake3", - "org.zfsonlinux:allocation_classes", "org.zfsonlinux:large_dnode", NULL }; From nobody Sat Nov 4 16:47: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 4SN3Sq6wlwz4yqKX; Sat, 4 Nov 2023 16:47: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 4SN3Sq6L0Fz3LW3; Sat, 4 Nov 2023 16:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699116475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iH7ClaGC1pEVmVwO5jkTUTv3dllqTe9/VtQonP1hKHs=; b=uragS5/gtQ8E+WnkAxyVSe6WjPm5QKIQeKKFzFUnOCvd58Znkb0FoH37/ZnKPcPFLQkGne V9sGeZ6L/AXLvUV5KebKPpNYpedgbOOXwomFMR/CjfQM2tdf7jLM8c+CUdC3FvZNEZbVD2 /rj3+NjmApEiLHLlAptDf55N0bqSsZsr1C3xi6qEBLQCrvIBZ1AiYIXqsY2aJNTfIOKdzL Z+J0vsYOIBJUi1+KNsHx9qlfxqEvc/TrVYLVHEzois8BX+/hnVBbnOqJ7MkEGx6/GtXrML SED3XW2xGAG9HZMLcc6PJ2ic5qbzj2TOJ2mjLnoXHxVgbenyDVvEQWznkX3V7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699116475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iH7ClaGC1pEVmVwO5jkTUTv3dllqTe9/VtQonP1hKHs=; b=w+KtqudxngA0ONOvViOhfIWWWOv73vpZJz/jh2dajfQXUmqrDFb0O8MmIqByW85VZZlstz DqIah/yzBtjq66dUbGmSFiLvIrHtP1mFfDDxPhStlYktn53y6TTJYB40Azdp9iFWypXcix xxOk2HjWppjuvlzFntUc5byaHAQO44u023J41Kyb8wTHGdRu0z0N/HjQE2VlAhdUmF+OAQ imkkojNUbK5XEwoS146OacnTFKc4PRjy6gFGhg0MGHVD/1G6QOKb2a1IfnRRFlOpQU/pD/ jy1C0ZtGcC22rSHwONHZ7ev0wsCWeDqPXRYZ/nG3dBISTb1Acb74alhUrsgmHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699116475; a=rsa-sha256; cv=none; b=e+i5GslDaPHmjeZG6b0KkMXRNNPuAMyVFpnVgE85kNyHinN+CuNyHYvdjlzinQkEWU5BhK NRIpQAtWEe8x3q6qEJP9PQ3GNiWQzZ6X+PsMKYes0kwqAN18oj8I4oc8mPo5cBtVLre+bn KcDu10cbwd7wwUUoekZQYxpoT0o9ErcX2u4vN8ItuentmnIaH1gl6VGH6lZDMJItkRB9K3 R1BxBbf9fOQaaRq+xMrvkScDkwzdsS6c+W9+1Vh1dT3itTr+SpbAEDByV3bhpm5avGUvuM M4o/kr8BvMjjWuyxjUkl0bOCVtgMGOB2PGnuhEl5s6U58pWxd53YXUY92I931A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN3Sq5PF3z153c; Sat, 4 Nov 2023 16:47: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 3A4Gltqf053211; Sat, 4 Nov 2023 16:47:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4GltXm053208; Sat, 4 Nov 2023 16:47:55 GMT (envelope-from git) Date: Sat, 4 Nov 2023 16:47:55 GMT Message-Id: <202311041647.3A4GltXm053208@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: 967022aa5aa6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 967022aa5aa60a18764a668ae0fb78e39e16fa8e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=967022aa5aa60a18764a668ae0fb78e39e16fa8e commit 967022aa5aa60a18764a668ae0fb78e39e16fa8e Author: Konstantin Belousov AuthorDate: 2023-10-25 01:03:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-04 16:47:50 +0000 arm64: improve UVA layout for 32bit processes Add compat.aarch32 tunables for maxssiz, maxdsiz, and maxvmem. Set the default values same as for amd64. Fix freebsd32 sysentvec on arm64 to provide sv_maxssiz, and sv_fixlimit. PR: 274705 Reviewed by: markj Tested by: fuz Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42451 --- 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 4 16:48: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 4SN3V24p7Tz4yqXK; Sat, 4 Nov 2023 16:48: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 4SN3V242crz3Ld8; Sat, 4 Nov 2023 16:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699116538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEAHi2sbuXcXw1vXm139jwaQF8WLdMx1fcz8xNfS7K4=; b=e4A4UPNcOIa842evw/GvAAmiKk/F5TF1pJu90LgRSs816/k9ynW9I7I7ftzi0gCQdv8uvq GuUF9N6/BSn9D+SEnGTaP+ENK77Sly1tDw4Xjt5r3I6nNrzCNFzsm8WLCBBxDpSFHowqfe p2ehXhIgzWebv0dh1wr8UEm/bES6YMtoaVH49jMqntvRCcOVVEcfygV1/Gk+mHWRcGwXvN Xfb+mOF5MiQNbDy/Dht14dz7T2pGE/NC2do1KNhzMASI1EEs8qFB8GLtZ+TBpJITi2HA// 335GTSKRwv7LIFXGWp0bVZe7FQ5JgM548IlN0xtkNdogAUtWcGGmnwBt0CyEww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699116538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEAHi2sbuXcXw1vXm139jwaQF8WLdMx1fcz8xNfS7K4=; b=FUw/FbjB9+iLHIC0/ygCYWV12vueiyxq/G6A3naSNhcFEgLfcQRLzdNx7MQzPyvyubOOwa qI87ivayZDZZEAhbRGCp8Hoo2Fl3eXvSIZCg5AUrm4ZkQhCuJgLzyHgC3tsjnZSUyOXdh0 7VlBHUe6cYu611S3HcEJDmL87zW0vzOa2CIGyMXkBw4mF9HnSElUH+K2C7fP+ilIT1Vv0F u5J7zDFmNO4hSLq/Kn9Ry3uMw3qjwOs59wk7q5kRGqfoKSoQCX2C9uoBdxa0CefKYAEl26 sjCUulIfKM8keZLMouVL2LgtKkj/dYjCZIZyBbD49nJkXBgtJwE+3sUPhTF/GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699116538; a=rsa-sha256; cv=none; b=Uc7qAEOMzgbZWaUopDI8nQ1gsJeoqtf2EL/Xo6xIXtDHnikVsp+PbsJart/TXXK9EaIF6A UBHd1Ivj67Y6XyfEwbuGwtGTgM5MD6/3VHhB2NflWg/QOGTPc9SbizUrULmkYXhFP1Kuol ww34w0h6xU6jsxKHei63DgYIc7EUPtec52xqOGvHyY2ZA8PrPhYAN98qYqTU9bIxiBfuRI fp+wmMejt5tc7Dti7M0MEbNj0UX6fpJNnn3YlT9GI+LnYYIQFNNlP+8oBxpwVc3a0Z0su6 qAZls3EGK/aaRCGGmOTnx5ykWb3ve6MoZhJT8ARRiAPY/plESBNgJi5FW/OpNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN3V236MVz14xh; Sat, 4 Nov 2023 16:48: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 3A4Gmwtg053482; Sat, 4 Nov 2023 16:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4GmwZ0053479; Sat, 4 Nov 2023 16:48:58 GMT (envelope-from git) Date: Sat, 4 Nov 2023 16:48:58 GMT Message-Id: <202311041648.3A4GmwZ0053479@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: d093fe94e10f - main - 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/main X-Git-Reftype: branch X-Git-Commit: d093fe94e10f88fb5f46108f28555584f2f90d08 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d093fe94e10f88fb5f46108f28555584f2f90d08 commit d093fe94e10f88fb5f46108f28555584f2f90d08 Author: Konstantin Belousov AuthorDate: 2023-11-04 16:48:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-04 16:48:25 +0000 Fix typo Fixes: 967022aa5aa60a18764a668ae0fb78e39e16fa8e MFC after: 1 week --- 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 4 17: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 4SN3vW5dtjz4ytJv; Sat, 4 Nov 2023 17:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SN3vW57spz3PGr; Sat, 4 Nov 2023 17: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=1699117655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eFDdBRvRrHUAqi7f6PtKo58LjXx3/Ab/qsaIn+kGoEM=; b=jYBXI7wWcvZrHej+zzDTGfQggCQQt5UCPWxUHMkCDIaTXZg3l/OTW0MDvLzZvy3zEh90iE +/XSrtrG/ypiPiDbT0j/DXhso3Ts6BLIweWbyu/pSKGGBSGLvMXZbYsWPIXkhvaDecsAlw iiF6Zq+46wIY03hGJ01KS2MLLMV1mCwXZUhb5Dhq+JODH8Q/ftnJsOnZqCirrvRgWGnQZ9 6YYjLKjZSu/xK/vW/JMcQz22q2TeWWAlZ4tB15sQfwIqeRq1GmQe3dQAZJieSJ9sxzkA9v uycZXwHfyLi7Vf9hHMkxWggzssz2K48kJsEZl6rtw+sKp+8fbGOn0Dd8YUL0Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699117655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eFDdBRvRrHUAqi7f6PtKo58LjXx3/Ab/qsaIn+kGoEM=; b=mi0qtnlnOr+v0Ba+nJXSo4VEONXPj55LokVdNH/J0Ah99tn0JWKQ8fxbcvFF+AhPPe0jGs U5AtD6Zf9z9R7+Dx7lftlqYh92dMAghioLhfQi4IM+4cRzdrSLlTIXNSIuMJg4CS+D5JN1 WuoHteFu/pVd1C9+bPSi9aDZQpgfzYiWpqRPOqA86b+TXg3SNm+sKGOiV+TYnU3YSfSSln /SP5PnNyQrEMPlQljugNmUUaHLi5sXbOY7BJVhHInrW7IWIojEvJMXBTDxVhkTbva2NGpl z5FZOai8l8q993vm0Lo4lvShrSStPeANeB7Js5IaKOKXxFqdTzxvwZzUOVHO2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699117655; a=rsa-sha256; cv=none; b=Fw+Ky+goDvCDyJEbnGOysuvM30EXlAiZGo8e3Pr04rEpT3tME+79zNUAyb/54CE2UDQbbO qAzWUnl/kLgoqBOiVi557sPlIsnlfs2QwXa0e5jzk1gBJKLt5OVg6J1TD1qO0oTfcNrGNC EVPddIuPorfiz73bq+7W8OHtprEKZxsQPc3R/a39XB/+5L5yrCNvCAPqLlKGQuyoN53pS4 GfjRpsDN9KCYytCkmMOLUWaVdsd6j0dlhv3KgbQorKhI0sMsfGJvgNg6b1wDOwReWnFPGS 4Nrr/WJ0JDtUNeLCBLXNidUN9uMXBnRpRZFMuoGmMRBbMxsqbd/l6XJEtG2sew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN3vW4Bhqz15XC; Sat, 4 Nov 2023 17: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 3A4H7ZoJ088120; Sat, 4 Nov 2023 17: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 3A4H7ZtF088117; Sat, 4 Nov 2023 17:07:35 GMT (envelope-from git) Date: Sat, 4 Nov 2023 17:07:35 GMT Message-Id: <202311041707.3A4H7ZtF088117@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: c2588f5e066b - main - stand/zfs: Remove one more read-compatible 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2588f5e066bbeb37e6bbdd5faf14320c60c1cbd Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c2588f5e066bbeb37e6bbdd5faf14320c60c1cbd commit c2588f5e066bbeb37e6bbdd5faf14320c60c1cbd Author: Alexander Motin AuthorDate: 2023-11-04 17:04:33 +0000 Commit: Alexander Motin CommitDate: 2023-11-04 17:07:31 +0000 stand/zfs: Remove one more read-compatible feature This feature is marked as ZFEATURE_FLAG_READONLY_COMPAT and so irrelevant for read-only pool imports by the loader: "com.delphix:spacemap_v2" This should cause no functional changes, just a code cleanup. I'm sorry, missed it in previous commit. MFC after: 2 months --- stand/libsa/zfs/zfsimpl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 253cfd2f16e3..ed9c3753dd19 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -125,7 +125,6 @@ static const char *features_for_read[] = { "com.delphix:extensible_dataset", "com.delphix:head_errlog", "com.delphix:hole_birth", - "com.delphix:spacemap_v2", "com.joyent:multi_vdev_crash_dump", "com.klarasystems:vdev_zaps_v2", "org.freebsd:zstd_compress", From nobody Sat Nov 4 17:15: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 4SN4524GXNz4yvkD; Sat, 4 Nov 2023 17:15: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 4SN4523Ybwz3Q6q; Sat, 4 Nov 2023 17:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699118150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIJjiLrIhxTgo/C+YgCGkwCRKM6KLrTZAIwVpq4eVZM=; b=ow8kUvsFjzuxqZogzIjTAdmNpby3HATbthKU5/lrtvkm/MlhQfOLjHgRMS1BCJGGbvbsBY AkYVCHquFne3i+BqfaK3Y/dJMfp2RD3h6Psi3IAcFgkKRUWoz71hBAZJ1/GHneRURlTNzc FEcoesG9yMzIXDZBLi9WnNV0p82vh5MQLZoIGm+C8b9zia9gJ1SJacDLkHhSvMvQlEQchH XhJZG6vYzzqJcy9kfcSCgga1liXPJp2YNUX/bVOcRxVadAboiYSiWiVQnsu4ufOSmrqosv Go043zd4CRofZxJ8NJ2H28ANC44VnK/0ASkaHX2tT689dbVR7Kq7JRepPF84yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699118150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIJjiLrIhxTgo/C+YgCGkwCRKM6KLrTZAIwVpq4eVZM=; b=nuA4g0RZsvhlR36esVQm6OgWt6DmqsYcO353m2M/ookZxykW0iAs762zSDlB6byLyFQHZB KCM6CtUU4iq9V+R2inck/GG5wI23eG5/vzgrkPgWVFLsd5A/5GkrThDuylaPR0kk+M+fVO xmMmQrCkuB9GowVvIKo5adrf4EJg+7OMOUefI42wzfXpCve5wxCVX2/l6Mc78ND2sxe6V2 es/w0kjRVN2TUaCWZ9wOE5jZYBecsmOFKrgjcXmSUK63MziqnIq2xKfpHdsJ4MhyNHej4H 3zG2GJ4RSOCLdDSGlbNu2YEzh2wMM50ps3KGtPjuXivmJ20wUcmP2gFjQANklw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699118150; a=rsa-sha256; cv=none; b=tnzoMSJADpNoUqpMGtRPTCtbEp7JjcSqgw0IKQq0rPFGZf/3/qfnfFxL1Kn16hCJHZ61kT gt/DcggvqQBC8JYyx+icGqVK1ltHTT5WwP2ZO234UuUQhy4gWhJVo1VfDu7pg+bL6sMjlZ PTvIGK88nwMJHMTLpH7TOGEun/sklxQgy4GasLMFqjnAdJTF4pEsOcvfXIRo6CmQK7TvhS x5FZE8ydygcESjUHvxv7WdKTZhm575G91u7Ao4kQ9IjLeSs+8a7nzqZX4Tcnc8NEl+PCnK QeB0pfQmbboVMMAktIFZSl4yzVfr2Fhncm93QflJxqO1cotCe39qyT/l1tzW6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN4522dVxz15mn; Sat, 4 Nov 2023 17:15: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 3A4HFoxv004111; Sat, 4 Nov 2023 17:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4HFoZW004108; Sat, 4 Nov 2023 17:15:50 GMT (envelope-from git) Date: Sat, 4 Nov 2023 17:15:50 GMT Message-Id: <202311041715.3A4HFoZW004108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 586fed0b0356 - main - vfs_lookup_cross_mount(): restore previous do...while 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 586fed0b03561558644eccc37f824c7110500182 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=586fed0b03561558644eccc37f824c7110500182 commit 586fed0b03561558644eccc37f824c7110500182 Author: Jason A. Harmening AuthorDate: 2023-11-04 16:56:45 +0000 Commit: Jason A. Harmening CommitDate: 2023-11-04 17:15:20 +0000 vfs_lookup_cross_mount(): restore previous do...while loop When the cross-mount walking logic in vfs_lookup() was factored into a separate function, the main cross-mount traversal loop was changed from a do...while loop conditional on the current vnode having VIRF_MOUNTPOINT set to an unconditional for(;;) loop. For the unionfs 'crosslock' case in which the vnode may be re-locked, this meant that continuing the loop upon finding inconsistent v_mountedhere state would no longer branch to a check that the vnode is in fact still a mountpoint. This would in turn lead to over- iteration and, for INVARIANTS builds, a failed assert on the next iteration. Fix this by restoring the previous loop behavior. Reported by: pho Tested by: pho Fixes: 80bd5ef0702562c546fa1717e8fe221058974eac MFC after: 1 week --- sys/kern/vfs_lookup.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index d75351c34314..922adda33b94 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -882,7 +882,7 @@ vfs_lookup_cross_mount(struct nameidata *ndp) * The vnode has been mounted on, find the root of the mounted * filesystem. */ - for (;;) { + do { mp = dp->v_mountedhere; ASSERT_VOP_LOCKED(dp, __func__); VNPASS((vn_irflag_read(dp) & VIRF_MOUNTPOINT) != 0 && mp != NULL, dp); @@ -915,6 +915,12 @@ vfs_lookup_cross_mount(struct nameidata *ndp) break; } if (dp->v_mountedhere != mp) { + /* + * Note that we rely on the + * VIRF_MOUNTPOINT loop condition to + * ensure we stop iterating if dp is + * no longer a mountpoint at all. + */ continue; } } else @@ -939,9 +945,7 @@ vfs_lookup_cross_mount(struct nameidata *ndp) if (error != 0) break; ndp->ni_vp = dp = tdp; - if ((vn_irflag_read(dp) & VIRF_MOUNTPOINT) == 0) - break; - } + } while ((vn_irflag_read(dp) & VIRF_MOUNTPOINT) != 0); return (error); } From nobody Sat Nov 4 17:18: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 4SN4852Rglz4yvwV; Sat, 4 Nov 2023 17:18: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 4SN48522V0z3Qf6; Sat, 4 Nov 2023 17:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699118309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/TBliD5KSGlM5P4el2VFUFL1S/56GZbJNqGQOC6uFw=; b=hREo3rlHAcMHKOxI1Ph7ch2kmhP+gS/WTSZ9t16XV1slx7YZs2eSfkp0lyD0NDUqjUXh7P qpn0Y3sJfyM9giotU0Q1JM0KnTxW0wbhawo7isRsJUZG4i9a0Y5dDKlGgQ41EtTpGNDaqe 1btkrJ2jvaYcz5CysFe/z7Y2oOC9NJeJF0ASPOabUR8yL2F3jyGSGzgj8Eb9cRnKgH5sVi DJE15/eys1ZgnjFdGiXJ/RpBdnLxS1hblZwBNOJjyk8tPbb4Fv+8XIsCiBOJXBIHtBbYh6 2zu4HTakaDN2uw/C0//vNmIJSuaL38DMSY4ddQJiqDInIPFLZOX4G1qIZYgE4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699118309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/TBliD5KSGlM5P4el2VFUFL1S/56GZbJNqGQOC6uFw=; b=OMjlx6GLaYJZZw5fixIju/5cyVdR9AXXifjpihXG7GG1vW5soykHA/BMpxz71ENug8FQkU 79TsZfjHX0UBXxFhcfSBBKyVee5Aai5wqteRC2zDSKWW8UbYGKMUPzMttLD46xCkvBKbH/ TdSO4ijvYmeFW4ikOWFIEFg+IaANp1Xc/uJdQe66488JWHzwwo0mUmlpVz5178vSvWcq4M BCjwVDRzpGjfozFGLJA4m9h5sXtLoak3G94ikR4r1oPypE7CfE2Dzowt6knGONDNmCeUag 4dHYjBiXbvu8v1crgc8yHNbMXf1gv9qnuiBEP8+sIiGLbEIziGjh9cc+eUbCLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699118309; a=rsa-sha256; cv=none; b=M0z2hU/AoWUYFNq7FStYNLCtZDG2s9SAXG1ngWh3NKDmql04ED4UU0Y0rhJc59jCQPfACX HXgUzzaIYCoVhl+XRldlfGeVOHTjM7Kgr5KUwLpxsU2ZJUb51daw2nJiTblEkCHdT/vlGZ sDb95cZVNO+6RrzTL+ZaeqDyFszumAtyERa9tQ5SiUHS6I6vciinnJc5jgT3Sq0M94XR7Z 0aRVDabaOv0qjJpqd1swkOeBlMnNzzJmaYcu8Hojg+wulN1sQgTYa8mZiAJ7oqKS81AEpG 0DYdN4dG+D1R1qsoDZj4+Xq0GCwHC2DFjwH/GuWQ/ld2cJWksauso7noPz+Mgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN48516Nyz15yb; Sat, 4 Nov 2023 17:18: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 3A4HIT8p004606; Sat, 4 Nov 2023 17:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4HITtf004603; Sat, 4 Nov 2023 17:18:29 GMT (envelope-from git) Date: Sat, 4 Nov 2023 17:18:29 GMT Message-Id: <202311041718.3A4HITtf004603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 6647af9b56b3 - main - bsd.progs.mk must pass META_XTRAS to gendirdeps.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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6647af9b56b3998bc6e57c55a2a96115366bd62f Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=6647af9b56b3998bc6e57c55a2a96115366bd62f commit 6647af9b56b3998bc6e57c55a2a96115366bd62f Author: Simon J. Gerraty AuthorDate: 2023-11-04 17:16:33 +0000 Commit: Simon J. Gerraty CommitDate: 2023-11-04 17:17:40 +0000 bsd.progs.mk must pass META_XTRAS to gendirdeps.mk The indirection used by bsd.progs.mk is setting META_XTRAS means the value needs to be passed in the environment to gendirdeps.mk, as any expansion before then will be empty. Remove a now misleading comment from bsd.progs.mk before it includes bsd.prog.mk Update gendirdeps.mk to accommodate this. Reviewed by: stevek --- share/mk/bsd.progs.mk | 3 ++- share/mk/gendirdeps.mk | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 946c44f76570..fba617b12595 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -64,6 +64,8 @@ all: ${PROGS} .endif META_XTRAS+= ${cat ${PROGS:S/$/*.meta_files/} 2>/dev/null || true:L:sh} +# the above does no use unless we pass it on to gendirdeps.mk +GENDIRDEPS_ENV += META_XTRAS='${META_XTRAS}' .if ${MK_STAGING} != "no" && !empty(PROGS) # Stage from parent while respecting PROGNAME and BINDIR overrides. @@ -88,7 +90,6 @@ $v = .endfor .endif -# handle being called [bsd.]progs.mk .include .if !defined(_SKIP_BUILD) diff --git a/share/mk/gendirdeps.mk b/share/mk/gendirdeps.mk index ec4e188cdf78..5d54aa232152 100644 --- a/share/mk/gendirdeps.mk +++ b/share/mk/gendirdeps.mk @@ -1,4 +1,4 @@ -# $Id: gendirdeps.mk,v 1.49 2023/04/20 17:45:03 sjg Exp $ +# $Id: gendirdeps.mk,v 1.50 2023/11/04 16:47:34 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -102,6 +102,10 @@ _DEPENDFILE := ${_CURDIR}/${.MAKE.DEPENDFILE:T} # caller should have set this META_FILES ?= ${.MAKE.META.FILES} +# this sometimes needs to be passed separately +.if !empty(META_XTRAS) +META_FILES += ${META_XTRAS:N\*.meta} +.endif .if !empty(META_FILES) From nobody Sat Nov 4 19:22: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 4SN6vh1dgmz50HT6; Sat, 4 Nov 2023 19:22: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 4SN6vh1D6Mz4DxR; Sat, 4 Nov 2023 19:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B7iMjoUPSArQStnXvrCJJlaouY1qh2P7H+OyxszHRSk=; b=oNhuzgYtPbU9ONnpXzfYZsEnhVKTIq/fgXN33kfnxadn9Cl24mzJDKlzts0s64imIVOSC1 YHrXTAPFnkHQUjkM3bPUHAUjygMyiFv+qGDoJO6x65h9aUs0U3LlAl3yWXTBGVOvIHcuV/ ilDiSAZaLEnPLpv6u5SQnyCufxL3oQcqT1sI1rETNgf+6p8UodvywseqiFc3E0W1X479OX 0A4Gkgy2wNfPWCMJXoQExwPwmzjj0qO245cuU8IyMVzU9SEB6d2a8/P01OntxxUqYhK+Mz rjqmoA5tkL2KcabZbW3yCEbzRg/st8iv1cGKLmVLp+a73x7PWlL5RwpQUG9o/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B7iMjoUPSArQStnXvrCJJlaouY1qh2P7H+OyxszHRSk=; b=FVW0sRKBaXzNp5boXo+LCzcg6bKNRNupVnpC+amMYOsHmE10UfNO61C6wTvpgJi7gaRmJZ uw4ldOkh5C6ChSbbup7OJoneVBJyqG8dWhov6knsSWIpa86hJ5sYo9PaCNOo/qyB7+LS8E giBFhzKSbHuEFh8iLZiDtb49kcO7fcqJCGqK45gZDleBbWwi3PMpOC2UYfWBKR7QuSt7Rg D198zJfi0Z2GOjEvCciwETXq6otss7IxgQBBJb3pi+Dcnu5uaRsZFcOskY5U+1keQO6Lhr cBviVNRCRrsw1xz58A8hnA7PPT1C66MG/h+mKlwXMb2dhjtH/EIkfr3NdQbvTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699125776; a=rsa-sha256; cv=none; b=JlS8WyC2lRfr15EAPr1v5MIzIsc8HXS62ivhEUSaS+5XU1Z73q6I6LPH+ENjKhsidxlDDe os5/CSri/EKCH272sSDYd+0+6S39dD4jzYfM8uJLGjnjxFKSKUy1RmfAnTeDsv7LOye37O UVhTSLFw/wAT+l55DYN2WJd83Lep0jyfnPMcQ1zDzZLN0MB94P/W2mE/+yA93BwTMDsBZU Jt51YwyGmqQGTU+qSboe5UrjcppS2ffzVcvp8UkNts59ZNzb6uOTViDVRbE4lkz2xUZ/cK amXrkjBWX1mls0S9ZlHGRwGrLnUBdRp8ukOFaFNgmO5tevyHBAjBII+vAp0FkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN6vh00Vtz18fl; Sat, 4 Nov 2023 19:22: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 3A4JMt8l020118; Sat, 4 Nov 2023 19:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JMtvV020114; Sat, 4 Nov 2023 19:22:55 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:22:55 GMT Message-Id: <202311041922.3A4JMtvV020114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 83dbc1dc8b87 - stable/14 - mlx5ib: Fix ethertype to be ETH_P_IPV6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 83dbc1dc8b87d319df66ad631651bb7d8532d674 Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=83dbc1dc8b87d319df66ad631651bb7d8532d674 commit 83dbc1dc8b87d319df66ad631651bb7d8532d674 Author: Ka Ho Ng AuthorDate: 2023-10-28 20:54:32 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-04 19:22:18 +0000 mlx5ib: Fix ethertype to be ETH_P_IPV6 Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: ae, kib, zlei Differential Revision: https://reviews.freebsd.org/D42184 (cherry picked from commit 3b173281764ba7c02f9de0a67caa1c4eca604413) --- sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index 232309f79266..1b02c8741a56 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -1925,7 +1925,7 @@ static int parse_flow_attr(u32 *match_c, u32 *match_v, MLX5_SET(fte_match_set_lyr_2_4, outer_headers_c, ethertype, 0xffff); MLX5_SET(fte_match_set_lyr_2_4, outer_headers_v, - ethertype, IPPROTO_IPV6); + ethertype, ETH_P_IPV6); memcpy(MLX5_ADDR_OF(fte_match_set_lyr_2_4, outer_headers_c, src_ipv4_src_ipv6.ipv6_layout.ipv6), From nobody Sat Nov 4 19:22: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 4SN6vj2jBgz50HpR; Sat, 4 Nov 2023 19:22: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 4SN6vj21ZQz4F3f; Sat, 4 Nov 2023 19:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqi4WwXQrRmTPWNmD8B2J8Z/qaRzk5qTl4yllEFEhyQ=; b=St6B3ESNI73gYGEff1g1luZJ15GguBhQpqKTJj31js3Czptort49rtufx0GBfG7U2oUuJt nDvGtNjVX08175fUlSWG6hO1GtiawdfSIuE1aWpTEB+I1JqFTNobZ9g9PmxhQI+v9OIuKd v73rSGkTVv/ZaXkBy7KV2Gg9uKYQva4MZtEOaHqc1MbGcgGyDTQAT2nvsen25AudlZZQHl RCgLm0dv1vXjaxjNCxAuZ+093JDr8Tte04Uzwa5cY2LNmCc91h/5iTXfXPzTNoQnjxLLHK FVFv/t4iXVlema41flwnW2jENdOM+wdMMc1c+m34ijtDa1Jb9lA2fNkVszTkqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqi4WwXQrRmTPWNmD8B2J8Z/qaRzk5qTl4yllEFEhyQ=; b=pZWoWsbpXyrNuulZOIVIhUgHIqzdMyfziEEJChr5JfAvWB1kuj/rJm1xML58eaFdxrSkPC VeiyDhWWu9jysKh5JpgRbZ4qmdQ+DLQ7G57xJ2LtEuEb+B2AUIHvIglVhMK5ZQ5M9lAXum zWyrrUlnedOpQMzUgejhJstofKTjmGXZjYwduA5Gf6ZqIzM/SEB/hcCdYb7oOvPobtslcT vsDco+6DmK2Mb7YBa/dFzQeGSBr+OpjMAj182Y2f/j5yaG/SxeRMXIUPXItPiKSpbpkpas Ab6gHuh5pl2vXX2IypdRq1excT3I3wwHtjy8HCb9eroXFWCN3CBTmp7ThLrfMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699125777; a=rsa-sha256; cv=none; b=LpX0M5g6OB3MQGVRRm1NEfhBvhzX+8Sh//vsZ6MKKuCzFGJLvuAYafCi+q+pNhEQBcHCED 8yKBu9hdxjlGMJAi+jfqeRIdgy3JXLRb891tfx6cUQM2pQ9GDp6F6BcnTmEr3058U0UvtH w8uHAzb1ruzV2r97vfxZweqoTbH0TIZevHj3vrSaSrExvakqBihxfxWScdYEu95zs29E4t F5ClsYRDotuHBoxRh36DV5lQgKowxmrg9dDsiPi7gdUK4DVE0BWdsgT5QxrHNDlbcCY4HM XKL7M35BGn24PyvxFWd3BU9JgyfeoW/df9ogaDvV2SUyGWqQkUvYzIqm4CnV2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN6vj16Dtz192K; Sat, 4 Nov 2023 19:22: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 3A4JMvdT020184; Sat, 4 Nov 2023 19:22:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JMvQ9020181; Sat, 4 Nov 2023 19:22:57 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:22:57 GMT Message-Id: <202311041922.3A4JMvQ9020181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: f521f9c17825 - stable/14 - mlx5ib: Fix RSS Toeplitz setup to be aligned with the HW specification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: f521f9c178256bac8621eba59b51e5b82d84100f Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=f521f9c178256bac8621eba59b51e5b82d84100f commit f521f9c178256bac8621eba59b51e5b82d84100f Author: Yishai Hadas AuthorDate: 2023-10-28 20:55:47 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-04 19:22:18 +0000 mlx5ib: Fix RSS Toeplitz setup to be aligned with the HW specification The specification for the Toeplitz function doesn't require to set the key explicitly to be symmetric. In case a symmetric functionality is required a symmetric key can be simply used. Wrongly forcing the algorithm to symmetric causes the wrong packet distribution and a performance degradation. Link: https://lore.kernel.org/r/20190723065733.4899-7-leon@kernel.org Fixes: 28d6137008b2 ("IB/mlx5: Add RSS QP support") Signed-off-by: Yishai Hadas Reviewed-by: Alex Vainman Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe [khng: cherry-picked from Linux b7165bd0d6cbb93732559be6ea8774653b204480] Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: kib, zlei Differential Revision: https://reviews.freebsd.org/D42178 (cherry picked from commit 813d981e1e78daffde4b2a05df35d054fcb4343f) --- sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c index 08e73a6dedd8..a504f1ff1788 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c @@ -1449,7 +1449,6 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, } MLX5_SET(tirc, tirc, rx_hash_fn, MLX5_RX_HASH_FUNC_TOEPLITZ); - MLX5_SET(tirc, tirc, rx_hash_symmetric, 1); memcpy(rss_key, ucmd.rx_hash_key, len); break; } From nobody Sat Nov 4 19:22: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 4SN6vk6cw8z50Hpd; Sat, 4 Nov 2023 19:22: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 4SN6vk33j7z4FLB; Sat, 4 Nov 2023 19:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtdD6FQcLNEWlGIClJThoSM1/l93giZQm0+Id83tgeI=; b=mNtQJi/WgoAAGaNc+puI9zvCLizbhre9WPdkH8vRGXp66W0BxUmgiTPjsTSMc12P5mjq55 dB9IRpnTK5mqo2QN+3bH7OKm1LV7z7srnCHOsCwTR3rLNCjwON2FrCQI+8hwL7o2IbU0J3 Gp8OQip3BGxNRmrXt+ZOvAgk+lyUgIWmkcgfwCf8Xa9J3hROqRufMcN9MCd6rbALc1hg6Z flApsXTQCu9M5nGb5wCOQPt4tNgXRvLhdKlVEsxAtG/aZjBx3CbCWZGEyY5zEO0Rc9aBXU ORCmq11O0/4+G5LBdSTy1j9B77o0QAyCbf21Hi/4KxSvVp1ApGZhNKfWrXMfsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtdD6FQcLNEWlGIClJThoSM1/l93giZQm0+Id83tgeI=; b=vue353OJwN7cgx4pSaUR/Q5/jASduqbyy4uB6s6oMp74N+Vr+fF68KVkMszjdsLZsugo1v 4fkGI42Mwbf4zaC4Q+sUM8eAYJBxs8LhoXuZGKQ1ypzCgEg2nXxjcZQdu7otFGx1p+RRe9 mSbNI+P30dw6H6m044+pODPUYW+l8bC3mqgMfzqSgmkR5TkYnnOaWI3AR0sXm+aDqHn+ZH 0sdhI1PJtexTir9jMjsRsbBKnT77/1UqfUHY19XW5gTyq6uZF76n8BXdvM1E8z+2+uK0Vv T0xhmtR/1xM1gJUrmSXKa5rvyC3zHeMps+NQEjSa27DxmD3DohLAGvKpGV4k8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699125778; a=rsa-sha256; cv=none; b=pgkPU5K0trLyMZwpz6L2NmujnjDVdrY4yWu+tnrO60w1p2iylfiP5Cw7LmcyrinQl262wR RNkav8F+095MxrhCB231futIcFDtlSNgZjSTwZa7jAVZ83Kagud+Ctw/T5PCStN0O+dboj fNM91gMX+Qtcil59+uH5L9/X6g7QCFblAdBFombAvjnKQaHYp3qsnkM3vFCXz0LIYsfrVm PfB1hM1JHvZiBKRRLKITP5cdhkydRg32kyzQtLlco789G90xbtgQOPlTgHvFHzIuJyhWh/ Fr6xCfy15HHASSBpAQ+obwYQ92+J5hwbV7T86HrKMIU71cweL0xZPFBNkesOgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN6vk27dpz18r2; Sat, 4 Nov 2023 19:22: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 3A4JMwtI020235; Sat, 4 Nov 2023 19:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JMwXa020232; Sat, 4 Nov 2023 19:22:58 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:22:58 GMT Message-Id: <202311041922.3A4JMwXa020232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: ae0620c41f9c - stable/14 - ibcore: Introduce enum ib_raw_packet_caps from Linux 4.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae0620c41f9cdd837417b967fff1ce04f4bf0032 Auto-Submitted: auto-generated The branch stable/14 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=ae0620c41f9cdd837417b967fff1ce04f4bf0032 commit ae0620c41f9cdd837417b967fff1ce04f4bf0032 Author: Ka Ho Ng AuthorDate: 2023-10-28 20:57:49 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-04 19:22:18 +0000 ibcore: Introduce enum ib_raw_packet_caps from Linux 4.11 This enum also exists as enum ibv_raw_packet_caps in libibverbs/verbs.h. [khng: cherry-picked from Linux ebaaee253ad3a3c573ab7d3d77e849056bdfa9ea] Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: kib, zlei Differential Revision: https://reviews.freebsd.org/D42177 (cherry picked from commit a69b6af2024fdd501b4bbc674092fb2b6d466364) --- sys/ofed/include/rdma/ib_verbs.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 406e1bc4d570..78aa0af4fa2b 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -226,6 +226,7 @@ enum ib_device_cap_flags { IB_DEVICE_MEM_WINDOW_TYPE_2A = (1 << 23), IB_DEVICE_MEM_WINDOW_TYPE_2B = (1 << 24), IB_DEVICE_RC_IP_CSUM = (1 << 25), + /* Deprecated. Please use IB_RAW_PACKET_CAP_IP_CSUM. */ IB_DEVICE_RAW_IP_CSUM = (1 << 26), /* * Devices should set IB_DEVICE_CROSS_CHANNEL if they @@ -239,6 +240,7 @@ enum ib_device_cap_flags { IB_DEVICE_ON_DEMAND_PAGING = (1ULL << 31), IB_DEVICE_SG_GAPS_REG = (1ULL << 32), IB_DEVICE_VIRTUAL_FUNCTION = (1ULL << 33), + /* Deprecated. Please use IB_RAW_PACKET_CAP_SCATTER_FCS. */ IB_DEVICE_RAW_SCATTER_FCS = (1ULL << 34), IB_DEVICE_KNOWSEPOCH = (1ULL << 35), }; @@ -1493,6 +1495,18 @@ struct ib_srq { } ext; }; +enum ib_raw_packet_caps { + /* Strip cvlan from incoming packet and report it in the matching work + * completion is supported. + */ + IB_RAW_PACKET_CAP_CVLAN_STRIPPING = (1 << 0), + /* Scatter FCS field of an incoming packet to host memory is supported. + */ + IB_RAW_PACKET_CAP_SCATTER_FCS = (1 << 1), + /* Checksum offloads are supported (for both send and receive). */ + IB_RAW_PACKET_CAP_IP_CSUM = (1 << 2), +}; + enum ib_wq_type { IB_WQT_RQ }; From nobody Sat Nov 4 19:25: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 4SN6yC2hHXz50JDb; Sat, 4 Nov 2023 19:25: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 4SN6yC2HK5z4G06; Sat, 4 Nov 2023 19:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKZpgxvDXau+kfrIJEvrwGhvG85wN+6kHjhvOn0x2eU=; b=NdP7oe+6gO1SMwz7wGoOCWO+sPB+WwXrGRFuTh8NH9p/eoELMNv6HS39c96Qyq/WRGENei eLi++cUrmMBVADzVkgRJfgx0ktuywU/lqMeZDfLPYI8ptIN1CnfNVD99zLHdjxQEmFu0gM JLrkgDVCTY9x0nUM96A/QqDJxpXs+mtgYkGi/iE69yMUHn54MTovciakU2cX5jE9R0sry4 3n6OMfcGnX564Am1DZeysyhp89xFoVdffcb8IaQviJ+GuvDvUzfeP/xEbEBbeQE/pj1rVT uM0cwBT4QMlWTNXPykzN7EzWPeRzi9R63EsTsjs5Y79gfCavRDvIY/g3ufKKNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKZpgxvDXau+kfrIJEvrwGhvG85wN+6kHjhvOn0x2eU=; b=lzPCaTwxbwiOx7gMw3upJwScEoextJFR8u5hOBRoEzopoa1KDWE3jZIg3nLPQ276dufXfQ BizbYZpSQ4n1kbwFNirtV3tIhmZ7Gr9c8UVgTnzTcuv3w1lCgkplRvonSl4f/lbSzYH3Un f/ShKlReAo6bMz+Ycd0oxuIo3KTepw90YVvx8bktsnMYeE2/EGPwLxkUJseqHp66mMllJt 5mpECmivNZ9lvrk42veoW9yd+vcwKxPTpOIBFhRtR5BQwrdtswdzUjnp+ZtyZVciW88UXZ ifJQtKjKYo4/l39q4KOctjDAg499BgM5SkuDrnkppYkkau0W+j9HWHy76IjKkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699125907; a=rsa-sha256; cv=none; b=x6B1qDmZhcFZNVAB/moyW47akePCmR61frw7Teifc6F5fl3q31fSGvMvVHZe7Il0DcyKmi zOA87t01RTC1zyYbtQ+ZL8b6xR18O0lIDB+px9caTu6Ztce3HMUopBTe0y5/mnvEnl/v6n DqOtLOuZwZ8rgG97InMAobgZpYKd6cqQUsPUUgt3/AhZkNQCQwJiAUemc6FhDpslll79eo wYf6K/hC2oh+GcJXjsbfaR/cOczWKlyUZmqea1L7KtiNHbhBcSSrN+lcwd1SiYt1Hiy04u CkXgrfsIUJ13iBnyX/NxWoZpFXUhSNBtHHRxy89Ll0YXdlf+XCJ6JHM3dIW/AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN6yC1LjKz18fm; Sat, 4 Nov 2023 19:25: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 3A4JP7pE020700; Sat, 4 Nov 2023 19:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JP7mI020697; Sat, 4 Nov 2023 19:25:07 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:25:07 GMT Message-Id: <202311041925.3A4JP7mI020697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: cdb26f08e5cc - stable/13 - mlx5ib: Fix ethertype to be ETH_P_IPV6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: cdb26f08e5cc21b67bec03268edc5347bbcb47da Auto-Submitted: auto-generated The branch stable/13 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=cdb26f08e5cc21b67bec03268edc5347bbcb47da commit cdb26f08e5cc21b67bec03268edc5347bbcb47da Author: Ka Ho Ng AuthorDate: 2023-10-28 20:54:32 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-04 19:24:35 +0000 mlx5ib: Fix ethertype to be ETH_P_IPV6 Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: ae, kib, zlei Differential Revision: https://reviews.freebsd.org/D42184 (cherry picked from commit 3b173281764ba7c02f9de0a67caa1c4eca604413) --- sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index f2fcca2c741c..d43cdadb21b2 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -1975,7 +1975,7 @@ static int parse_flow_attr(u32 *match_c, u32 *match_v, MLX5_SET(fte_match_set_lyr_2_4, outer_headers_c, ethertype, 0xffff); MLX5_SET(fte_match_set_lyr_2_4, outer_headers_v, - ethertype, IPPROTO_IPV6); + ethertype, ETH_P_IPV6); memcpy(MLX5_ADDR_OF(fte_match_set_lyr_2_4, outer_headers_c, src_ipv4_src_ipv6.ipv6_layout.ipv6), From nobody Sat Nov 4 19:25: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 4SN6yD4Fq3z50JVJ; Sat, 4 Nov 2023 19:25: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 4SN6yD3dYBz4GJK; Sat, 4 Nov 2023 19:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qSLMmngyu/itXzcYHcsUJ0t113JrShgOkcujSO5DbY=; b=yzPbKBNjRuoixngoL5RnVvIdR5PO/hjgvlVXlKui+VcPXYJv4noCakvOGwEwUdfUZkinQl +lfiFdBVEgRfnKae78D5dNKQ31IITSIRs0EcEjUA/3kAU/17EGl9lHPDaVIoX1oBd5vG05 en0JH21A+7n4DbQGo+UTZwyRuQG346c4X4xgopSNi5x/F3ilUBg4b8ygiON9KdQz2dkhYB /i4TSxslYCqGpVl1iaZQyCgQDpxlV/f5AvDRFV+AZTyCJZ+3n3JZcLs6JIEG+8gZahWhtR DagnfeeletJlzuc1tbTvvQDtdR6GQrr1PmmW8zBSj+VqjoucOGTRKtP6WAlFmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qSLMmngyu/itXzcYHcsUJ0t113JrShgOkcujSO5DbY=; b=qyQXrE+Jf/iUHSWZnY/BQulTMvPLYGBkWWLcsfPmbmmkiOhz6Ic/s+vD6EyClHbIz1F2KY GfAbEozKCgVDHspxdJAPaJ0g3dgz2BPJBVT1QCMmt3smPhxiJtdhHT5RwJQ9Shqa+NSWax MZa6C0pX7VmFOSsqmXegp4R7ZI+PEX6Ckb+7S6Pj/zWB3L+sL4mouBIrXE10eFjWqiuBEn siQ1zdTJ/f4JroiyCqHX6d3XLbTCBTyzR836aQkp7/ugP3bQCEBXY6aQWYtKhnwZsQ/Nmg GscyaLmFb4aHfkiFRWbrKbVOPuQXqkLPNJkKornmT47dIgzBveT4IWdtwL0dzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699125908; a=rsa-sha256; cv=none; b=ujzEzTD6yS3pG6Cqv3pzdFCD/a6L0/Yl1OiuaDcZO7ZEWJ3t3PSCVkBiIgBrDP965lf1gx U/MCpiNtSUL07T2lwdjUUgWOeVIsCK9K+Jymj/APMJYPoVuqEqWjUAsBK+7da5kLByFLpy o9inABno+AkK8ry+PH1rki/nd9RYi0g+CQupEj8qiOzlBrTODGUgayL0Sae3pW3eRRrVa2 ldMRp8XHHaGVglfz3zWEmp1k6TLvh20Uq3BUYrUnhCcv1hiDzCbvcF6IV+2pgl5Q0Y5S8C RUEzEVyhaJgcFqMDZwYMOk3BFpZnnipcaz3LFfXpTFtTX2NXwwx3LExrRX2kMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN6yD2h5Gz18fn; Sat, 4 Nov 2023 19:25: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 3A4JP8Gg020769; Sat, 4 Nov 2023 19:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JP8mD020766; Sat, 4 Nov 2023 19:25:08 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:25:08 GMT Message-Id: <202311041925.3A4JP8mD020766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: cffcdfbf4938 - stable/13 - mlx5ib: Fix RSS Toeplitz setup to be aligned with the HW specification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: cffcdfbf4938083c1977d645ebe78c636ab9a43f Auto-Submitted: auto-generated The branch stable/13 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=cffcdfbf4938083c1977d645ebe78c636ab9a43f commit cffcdfbf4938083c1977d645ebe78c636ab9a43f Author: Yishai Hadas AuthorDate: 2023-10-28 20:55:47 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-04 19:24:36 +0000 mlx5ib: Fix RSS Toeplitz setup to be aligned with the HW specification The specification for the Toeplitz function doesn't require to set the key explicitly to be symmetric. In case a symmetric functionality is required a symmetric key can be simply used. Wrongly forcing the algorithm to symmetric causes the wrong packet distribution and a performance degradation. Link: https://lore.kernel.org/r/20190723065733.4899-7-leon@kernel.org Fixes: 28d6137008b2 ("IB/mlx5: Add RSS QP support") Signed-off-by: Yishai Hadas Reviewed-by: Alex Vainman Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe [khng: cherry-picked from Linux b7165bd0d6cbb93732559be6ea8774653b204480] Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: kib, zlei Differential Revision: https://reviews.freebsd.org/D42178 (cherry picked from commit 813d981e1e78daffde4b2a05df35d054fcb4343f) --- sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c index 7d57db8f4581..33021d1c6dd8 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c @@ -1426,7 +1426,6 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, } MLX5_SET(tirc, tirc, rx_hash_fn, MLX5_RX_HASH_FUNC_TOEPLITZ); - MLX5_SET(tirc, tirc, rx_hash_symmetric, 1); memcpy(rss_key, ucmd.rx_hash_key, len); break; } From nobody Sat Nov 4 19:25: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 4SN6yF75BLz50JDg; Sat, 4 Nov 2023 19:25: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 4SN6yF4ffHz4GG4; Sat, 4 Nov 2023 19:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+TZVYAGyWejXW+vqkDECoihg/IazCJr5coYsEtn/GY=; b=cm/ikYqRjn/0UxHvzAtPnr5k1tPyhJwUsnAn9yGUoFSXu0lZzYqITu+b+CkoTM9guA9xsw s8f8TopuL7zPjQ/DHSvZYoyN8KLsV9OHtFapkpQbzDOg3Od5PWXLWDt+foOObrnHTKyjnz LQWdw6kiyJhOPBTSYoIBZsYm7VHtW0+JtF4fu8plhgb2MUjHrjpHDw/8Gl8zQHjCbXaWHA tZBiDKK9csTSoGGZFdFXCUzFCJCp7PFFGR2CY1WUaCAgLwYTI4dokzanronRV25kwtJpJx wqWe9KrOfJtj8ckwYBbhcwIshKsJsKncn6BK/3bQ24OeJoCgcejgdI3hq8Vc8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699125909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+TZVYAGyWejXW+vqkDECoihg/IazCJr5coYsEtn/GY=; b=enFDuK9+LL8DeWD44KFtId6zE+x6CClh0AgvcMA69ay4enLwamg+vFXPT0H7w1bIfuHWy9 bZx95xgg2OfTU7ECxxAe2qYhDAwG6TWfBMlXjb8Wsq5AzzxQp60LdPWiOYHIrJzoctsDcs NEtdFWynWF0RHybeaAnEjtIuzM0h7c9pKTb5m3MxUpT/SwIpoxzN3TqOBjVhChJ9+ByI2u CKf0fEEbKYtfFLIikBlrLfD9SQ+EP7TSQm+iKiYSIuMrbZFweD7eToMuzToihkqAJssqBE KSPk26dKHsN5cMLvfl8HHkoAq0pD+nUk18wxtb6+u1S3sb+i6MgzAx8AGZy88A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699125909; a=rsa-sha256; cv=none; b=MTSYgEU1uJiGGVZSDkGwfaE9K/CBE42i3txoTZ4eK0RG6vPa/fzZSrXCic2WqSi+XiS9kd DnnQB3x3uFyAdeXzJhgqcR429TavOAsfInxVXEvTmUSqfE0Zhfgn85EY/r0oQ/mRK0twMK wZ4Xnr718nW5gX+Ls/dPCwXTLn+Algeqe4JUQuLVe4RLF/l07vbj7GJZlFiH3bdWEOv0Mr 9y88PbCdUNL1ibKeIVOuAOQJuEiwrZe67iChD8PUB3kXLyPHXNtY2AQkBdZJK+UlhNJWIb /NxUFkxA62vX8FVFtte4xxKC/qSyM1mvQ/QbklQIGsmkYIvnxZGqJrMdoafHHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN6yF3jGJz18vD; Sat, 4 Nov 2023 19:25: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 3A4JP9Xp020820; Sat, 4 Nov 2023 19:25:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JP9Bi020817; Sat, 4 Nov 2023 19:25:09 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:25:09 GMT Message-Id: <202311041925.3A4JP9Bi020817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 550f632c11c1 - stable/13 - ibcore: Introduce enum ib_raw_packet_caps from Linux 4.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 550f632c11c1dabfea2dd8f40a9e821f6118bbfe Auto-Submitted: auto-generated The branch stable/13 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=550f632c11c1dabfea2dd8f40a9e821f6118bbfe commit 550f632c11c1dabfea2dd8f40a9e821f6118bbfe Author: Ka Ho Ng AuthorDate: 2023-10-28 20:57:49 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-04 19:24:36 +0000 ibcore: Introduce enum ib_raw_packet_caps from Linux 4.11 This enum also exists as enum ibv_raw_packet_caps in libibverbs/verbs.h. [khng: cherry-picked from Linux ebaaee253ad3a3c573ab7d3d77e849056bdfa9ea] Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: kib, zlei Differential Revision: https://reviews.freebsd.org/D42177 (cherry picked from commit a69b6af2024fdd501b4bbc674092fb2b6d466364) --- sys/ofed/include/rdma/ib_verbs.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 223ba679485c..1d6f26febfa2 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -213,6 +213,7 @@ enum ib_device_cap_flags { IB_DEVICE_MEM_WINDOW_TYPE_2A = (1 << 23), IB_DEVICE_MEM_WINDOW_TYPE_2B = (1 << 24), IB_DEVICE_RC_IP_CSUM = (1 << 25), + /* Deprecated. Please use IB_RAW_PACKET_CAP_IP_CSUM. */ IB_DEVICE_RAW_IP_CSUM = (1 << 26), /* * Devices should set IB_DEVICE_CROSS_CHANNEL if they @@ -226,6 +227,7 @@ enum ib_device_cap_flags { IB_DEVICE_ON_DEMAND_PAGING = (1ULL << 31), IB_DEVICE_SG_GAPS_REG = (1ULL << 32), IB_DEVICE_VIRTUAL_FUNCTION = (1ULL << 33), + /* Deprecated. Please use IB_RAW_PACKET_CAP_SCATTER_FCS. */ IB_DEVICE_RAW_SCATTER_FCS = (1ULL << 34), IB_DEVICE_KNOWSEPOCH = (1ULL << 35), }; @@ -1501,6 +1503,18 @@ struct ib_srq { } ext; }; +enum ib_raw_packet_caps { + /* Strip cvlan from incoming packet and report it in the matching work + * completion is supported. + */ + IB_RAW_PACKET_CAP_CVLAN_STRIPPING = (1 << 0), + /* Scatter FCS field of an incoming packet to host memory is supported. + */ + IB_RAW_PACKET_CAP_SCATTER_FCS = (1 << 1), + /* Checksum offloads are supported (for both send and receive). */ + IB_RAW_PACKET_CAP_IP_CSUM = (1 << 2), +}; + enum ib_wq_type { IB_WQT_RQ }; From nobody Sat Nov 4 20:32: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 4SN8Rk0HCKz4yY4n; Sat, 4 Nov 2023 20:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SN8Rj6v17z4R3R; Sat, 4 Nov 2023 20:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699129938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OO7lxEWtMO359P9+oVr8Opo0fcqPISpFtC675JarzLg=; b=HMyowt5xSGm0WNteiCT1mD5lw8E1eziS1gp0FPbVyTSui4lhwAs/dcTPDjB2UzkuRxkQym glEEOCND9kSkEsA2DeEneSr3usSoFJnozSx5FmdK0E6JCyyx76OTB9d33E67plVrSF8lnA kdRdFKF6xo6c9ZILeipmCX6lHsWmcWoDGmJoCBerkYW67A5XgWHhReJstcPwtbmsNfi2Mh ccWE/AVQE/baBUWgOnhF0nl0QINqXl67oIvXM2KF/skhtDy1UKcH02hYyC6iPW//9YhJQb HpPht3sw2ymZ8eWFZbxHRxutvVI5oY0OciL7yUgMrtTz2OQHh02fN8Cb1Pdz+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699129938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OO7lxEWtMO359P9+oVr8Opo0fcqPISpFtC675JarzLg=; b=e9Cox6U5jMwAm9nTHg0PvS68Bk2uhIZ2dwkztOsXYo+ZfzLlEmkjd+3rrqK8ksNLUmBelE k8NwIoR3Ahlvmuw9DV7Kq4Qkir/IhK6OZj084BbKUjTMfknbI8uX+98NbUyxn2CEdWzWP6 SOrNm1NLcQzoHXhEQSgfVP6bcG2NgNYRRu+f/zXEncxISoFv6FqpDcHIbAmTG2xk9+NZPA PFdrlqlhrycDtqHvARf9LzpBuKrOOjre8lJJZZ3RG9hqJ6f3B9NcEZN6dCkKMvp9QLj4zp /V6fgnXX9ImMUTdAdjUPQapahGk0q08ILu8Je8aoBIpDTRPURz4xREDqFdtHvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699129938; a=rsa-sha256; cv=none; b=P5/aQFn80epCDzxCzdWZqwkqXR22udYVfWNCjqOLt1cBRrAzqJsG0MRABtIRUiNvEkWvZ0 xYasJP+EVmRSQOxpYwuOdTSeMnmNFchASv0bQYDNxOf4J8wS+qywPdIb4iOj1eA6byy+NV /aaJJCN4uU33fHEx3ikqEG0c588hDMYDHk16pcUHHhxpAmSTNk63trXSiR3TcKcvL1Xiu2 jNEQKHQnKaG5iSsoDoATKs1iUI9PMHGK64bgNsLhAEkVZ/Zd222bABC22w9D1ChoADm7Bo Ct+KViPEBKn48sad5XxppqxDHc5RlYgKoK2Tg+Y7knKSrVgn2xdr6UbyeY70BA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN8Rj5xy8z1BYW; Sat, 4 Nov 2023 20:32: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 3A4KWH30037297; Sat, 4 Nov 2023 20:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4KWHhE037294; Sat, 4 Nov 2023 20:32:17 GMT (envelope-from git) Date: Sat, 4 Nov 2023 20:32:17 GMT Message-Id: <202311042032.3A4KWHhE037294@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: bb830e346bd5 - main - tty: set IUTF8 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb830e346bd50545e9868a1802d631afb6b50bb0 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bb830e346bd50545e9868a1802d631afb6b50bb0 commit bb830e346bd50545e9868a1802d631afb6b50bb0 Author: Christos Margiolis AuthorDate: 2023-11-04 20:31:47 +0000 Commit: Christos Margiolis CommitDate: 2023-11-04 20:31:47 +0000 tty: set IUTF8 by default 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, and the feature itself is important enough, enable IUTF8 by default. Related discussion: https://lists.freebsd.org/archives/freebsd-arch/2023-November/000534.html Reviewed by: imp, bojan.novkovic_fer.hr Differential Revision: https://reviews.freebsd.org/D42464 --- sys/sys/ttydefaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h index 7e64babbc7f1..6f33973842ce 100644 --- a/sys/sys/ttydefaults.h +++ b/sys/sys/ttydefaults.h @@ -45,7 +45,7 @@ /* * Defaults on "first" open. */ -#define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY) +#define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY | IUTF8) #define TTYDEF_OFLAG (OPOST | ONLCR) #define TTYDEF_LFLAG_NOECHO (ICANON | ISIG | IEXTEN) #define TTYDEF_LFLAG_ECHO (TTYDEF_LFLAG_NOECHO \ From nobody Sat Nov 4 22:10: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 4SNBdX28Sfz4yvHw; Sat, 4 Nov 2023 22:10: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 4SNBdX1XfSz4ct7; Sat, 4 Nov 2023 22:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699135856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OXMsagkV18ME3jgWG+cZFnpBUBeol33eNZwcL3GpDM=; b=pjOEBOggoqGVUKigXKmFlFC7qVmbsmJnUC9aZmuahzQZjPJpc7x0SEY5O75C1NruDugeUx x53Cu/uskYw5KRLUNe4FaKsYU6R70JrbrVDzly4Vpqgv3ePVEexu4CZ1uDXTCWzIBcWRDl VLiVgClY5U8SObrzkMfNGqOEE154r9T4RvFHVt/WJfXH65u5pEik/2NwIjGd6uJcOR7YnJ /tTFRL4WatW3kSnwPxsLpsNaNaMbEQxJZNhqd0FdFZjNdqn59CrvbP01hAbdYB6H9qU1pH 1Ibz9zB6SRAGm3b4jMle/KmplrXppqsWW/QTpUBntolsn9tINGzg23bnWWMOjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699135856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OXMsagkV18ME3jgWG+cZFnpBUBeol33eNZwcL3GpDM=; b=Y8Ox4tRXB4lhFWYyR9gxQV5oh2dqLqkngrEiFDwtASrt7iB2HVC5IfiE25dsQY8VkHdfI9 3iPFWovlTnU2ZGt61UMOOkeJJpr7dBIZEGal0z1TviNwA0q1GM3YDJ+XZeTWQUKM9JEApB XWZlzg/Ue8T3b/07XWJUfEPy2wss1hKEVGvdxVIMGq2nfJU3GRsuZVS7Y5ovW+0+afovFS QR4i+UrbJmyhTGV7Kq3k2eziCutXw0VmLdvpUecXETNblFGl9zOHgi28DY+I/11qw1X0sy jvCizLIuiq8FJHNQ4kvEUAw0z8lvPZY1yLzGKd5iFoQSgMzkk47g+LJtbWqCKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699135856; a=rsa-sha256; cv=none; b=Yg79XH52GMozpySM9HWXgHQaXIw0L2OLo9TWZGdjSbIos3vwpkl70nLp0aHg762NU3EZCI N/D5h9+ip3p6zrnR6H/P3uy2RifAAGYxVejWOr4VwmSjGwcF6AqNXaAFYJQ0teS8mxfn2L 4qcSRUyPPzjuZZKMXjcz7H31pFTeynkuy1ZyJ+9sL21TviyCZPgXZeumfIEd3jZXmEsooP Vp03esZ8WPuzR8YyFJ5/0LMMwWxcETKcE7vrujzE13FzdAqbg+k90u1M/tNUgECPiI8Auk zv2dAngnAt2om79dZcMLkTdRSL3xqyXCCtdy1TQFqYZ0Q47WtZH4mdre+Skm6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNBdX0b75z1DvX; Sat, 4 Nov 2023 22:10: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 3A4MAtWU000142; Sat, 4 Nov 2023 22:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4MAtRd000139; Sat, 4 Nov 2023 22:10:55 GMT (envelope-from git) Date: Sat, 4 Nov 2023 22:10:55 GMT Message-Id: <202311042210.3A4MAtRd000139@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: 7c5146da1286 - main - mountd: Add support for spaces in exported directories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c5146da128688ba2bb6bdad5e98716087a47281 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=7c5146da128688ba2bb6bdad5e98716087a47281 commit 7c5146da128688ba2bb6bdad5e98716087a47281 Author: Dan Mcgregor AuthorDate: 2023-11-04 22:07:56 +0000 Commit: Rick Macklem CommitDate: 2023-11-04 22:07:56 +0000 mountd: Add support for spaces in exported directories The previous code would correctly parse strings including quotation marks (") or backslash (/), but the tests when creating the export includes them in the final string. This prevents exporting paths with embedded spaces, for example "/exports/with space". Trying results in log lines resembling: mountd[1337]: bad exports list line '/exports/with\ space': /exports/with\ space: lstat() failed: No such file or directory. Turns out that when creating its exports list, zfs escapes strings in a format compatible with vis(3). Since I expect that zfs sharenfs is the dominating use case for generating an exports list, use strunvis(3) to parse the export path. The result is lines like the following allowing spaces: /exports/with\040space -network 192.168.0 -mask 255.255.255.0 A man page update will be done as a separate commit. MFC after: 1 month Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D42432 --- usr.sbin/mountd/mountd.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 6602dbc09aa0..33c19a81a0cf 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -83,6 +83,7 @@ static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95"; #include #include #include +#include #include "pathnames.h" #include "mntopts.h" @@ -1561,10 +1562,13 @@ get_exportlist_one(int passno) char *err_msg = NULL; int len, has_host, got_nondir, dirplen, netgrp; uint64_t exflags; + char unvis_dir[PATH_MAX + 1]; + int unvis_len; v4root_phase = 0; anon.cr_groups = NULL; dirhead = (struct dirlist *)NULL; + unvis_dir[0] = '\0'; while (get_line()) { if (debug) warnx("got line %s", line); @@ -1631,17 +1635,25 @@ get_exportlist_one(int passno) } else if (*cp == '/') { savedc = *endcp; *endcp = '\0'; + unvis_len = strnunvis(unvis_dir, sizeof(unvis_dir), + cp); + if (unvis_len <= 0) { + getexp_err(ep, tgrp, "Cannot strunvis " + "decode dir"); + goto nextline; + } if (v4root_phase > 1) { if (dirp != NULL) { getexp_err(ep, tgrp, "Multiple V4 dirs"); goto nextline; } } - if (check_dirpath(cp, &err_msg) && - check_statfs(cp, &fsb, &err_msg)) { + if (check_dirpath(unvis_dir, &err_msg) && + check_statfs(unvis_dir, &fsb, &err_msg)) { if ((fsb.f_flags & MNT_AUTOMOUNTED) != 0) syslog(LOG_ERR, "Warning: exporting of " - "automounted fs %s not supported", cp); + "automounted fs %s not supported", + unvis_dir); if (got_nondir) { getexp_err(ep, tgrp, "dirs must be first"); goto nextline; @@ -1652,16 +1664,17 @@ get_exportlist_one(int passno) goto nextline; } if (strlen(v4root_dirpath) == 0) { - strlcpy(v4root_dirpath, cp, + strlcpy(v4root_dirpath, unvis_dir, sizeof (v4root_dirpath)); - } else if (strcmp(v4root_dirpath, cp) + } else if (strcmp(v4root_dirpath, unvis_dir) != 0) { syslog(LOG_ERR, - "different V4 dirpath %s", cp); + "different V4 dirpath %s", + unvis_dir); getexp_err(ep, tgrp, NULL); goto nextline; } - dirp = cp; + dirp = unvis_dir; v4root_phase = 2; got_nondir = 1; ep = get_exp(); @@ -1699,8 +1712,9 @@ get_exportlist_one(int passno) /* * Add dirpath to export mount point. */ - dirp = add_expdir(&dirhead, cp, len); - dirplen = len; + dirp = add_expdir(&dirhead, unvis_dir, + unvis_len); + dirplen = unvis_len; } } else { if (err_msg != NULL) {