From nobody Sat Oct 28 21:15:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHskF2mPdz4y35H; Sat, 28 Oct 2023 21:15: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 4SHskF2H4hz4TFl; Sat, 28 Oct 2023 21:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698527701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DupY1EfyTwFGvE2dRATduGXmJ+MyWLBGvxnY+u/OILE=; b=pzPhL9ZMtQxcV7kiDJHwxcKTnPr54lx1W7G46pwqoWuZ86FMGdGNxIOGDO6BixG5GquM+o L0nz+QmeFhhjCe13JFPLnSwLlpFKWRUze0axpRq+h05BjoJc0vxSKUvOKoKqG1ztmdi54+ Jko0KzBnNrmkAEJeQaADbd2iAffjKXnwHM+dfXou3m+va7/HUjNJocJWFjJoGOwtCoyqe+ VQQkb/w1TdYAn8R50wHO2i8zKGjGtppKPSFAOjmhhsGahYJLl8Q5Z7lIkS0wSdkaMLkv5V ktqoUJXK+mkD1br4lGlbkzA4eR6c+l/Fz6OyiMM0QVFkBbWveUqAYtigwHYoeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698527701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DupY1EfyTwFGvE2dRATduGXmJ+MyWLBGvxnY+u/OILE=; b=cJNH3oFqhXHiGZOeSby7DsWBWIoXCnhtDi3xAFp/1tqUjGznr9VCn1Ydw7MKv+sacLN6pu dktbbPHrXtcrCLrDFbE24n35NOT71/XqT6AIdB4vong7yzmrEpTJTKwVKri96x/UCwfPXn AlWNw44XusIKeLlBGjh9VjOgLia6XlE4QmzPe44D69Gbn5sWSR/pJyfK3ax8ngYbc0Yrr2 nGyX9XPUJF5q7c2cwVq13UIvXCtcTrtkANHCILVaLN3rH5+k0eiXzgQWxZ0TRCskGMfdOq DtIGekiZflV6PgwqWtCVMO4BWpCqpV6I96t8w6t8jirwz7Myu6MPyDIkkqVfAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698527701; a=rsa-sha256; cv=none; b=T+EbCr3y9evhNpS9WhM4FG1VQsDi79t6B2MxrOEhblVdecMs+RBe+1Bk+vMdJY5OLb1qnN L9OPuCDlIM74g8EE2SO7JFAe3j2LnASR9TFc45okMLNCoGPtv+cSCk9bCtsWY6+tHSmsIo xCxiiJ4BReai2kJpxUrOqxJLDFyHW5UAhVaWej/8lNkXVTBPHn76q7KXgA4MXXY8Jji3zO /DEVXI8z+eiDLw0eZ38tp4By0KxNTYxI7NIkODIMf4zJRoxVpS00kit9XI2ih+AE9HvHxU 6rrl6bse16yNLY5Fe08Wyao61YjzhqChUWuya2KJSBPZUpkE0/KcwXry5SIOzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHskF1M1Dz19tv; Sat, 28 Oct 2023 21:15: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 39SLF1bc061051; Sat, 28 Oct 2023 21:15:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SLF1fs061048; Sat, 28 Oct 2023 21:15:01 GMT (envelope-from git) Date: Sat, 28 Oct 2023 21:15:01 GMT Message-Id: <202310282115.39SLF1fs061048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: b08c5c8acf1e - stable/13 - Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b08c5c8acf1e85bd719cc1f65a304948ae39bc4f Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=b08c5c8acf1e85bd719cc1f65a304948ae39bc4f commit b08c5c8acf1e85bd719cc1f65a304948ae39bc4f Author: Kirk McKusick AuthorDate: 2023-10-20 22:14:46 +0000 Commit: Kirk McKusick CommitDate: 2023-10-28 21:14:32 +0000 Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. Reported-by: Andreas Bock PR: 274404 (cherry picked from commit 1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2) --- sbin/fsck_ffs/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index d33311c79250..4584456d8a64 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -318,6 +318,8 @@ checksnapinfo(struct inode *snapip) size = fragroundup(fs, DIP(snapip->i_dp, di_size) - lblktosize(fs, lbn)); bp = getdatablk(idesc.id_parent, size, BT_DATA); + if (bp->b_errs != 0) + return (0); snapblklist = (daddr_t *)bp->b_un.b_buf; /* * snapblklist[0] is the size of the list From nobody Sun Oct 29 00:47:25 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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 Mon Oct 30 00:55:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 17:13:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 Tue Oct 31 00:45:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 17:43:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 Wed Nov 1 09:06:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:07 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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:08 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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:29:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 16:23:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 Thu Nov 2 04:32:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:21:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:51:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:11:24 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 15:11:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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 22:02:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:45:40 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:50:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 13:31:09 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 Sat Nov 4 03:07:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 19:22:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 };